~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,360 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !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	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane(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	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,10 +415,14 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
63		- if (copy.versions == null)
	418	+ assert(false);
	419	+
	420	+ if (copy.versionlist == null)
64	421	{
65		- copy.versions = new byte[100][];
	422	+ copy.versionlist = new Object3D[100];
66	423	copy.versionindex = -1;
	424	+
	425	+ //Save(true);
67	426	}
68	427
69	428	if(ui)
..	..	@@ -80,18 +439,20 @@
80	439	this.copy = this.group = copy;
81	440	//selectees = this.group.selectees;
82	441
83		- if (copy.versions == null)
84		- {
85		- copy.versions = new byte[100][];
86		- copy.versionindex = -1;
87		- }
88		-
89	442	SetupMenu2(this); //objEditor);
90	443	SetupUI2(objEditor);
91	444	objEditor.SetupUI(true);
92	445	SetupViews(objEditor);
93	446
94	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	448	+
	449	+ if (copy.versionlist == null)
	450	+ {
	451	+ copy.versionlist = new Object3D[100];
	452	+ copy.versionindex = -1;
	453	+
	454	+ //Save(true);
	455	+ }
95	456	}
96	457
97	458	void CloneSelection(boolean supports)
..	..	@@ -181,33 +542,35 @@
181	542	// menu.add("-");
182	543	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
183	544	duplicateItem.addActionListener(this);
184		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
185	547	cloneItem.addActionListener(this);
186		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
187	549	{
188	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
189	551	cloneSupportItem.addActionListener(this);
190	552	}
	553	+ oe.jTree.popup.addSeparator();
191	554	menu.add("-");
192		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
193	556	cutItem.addActionListener(this);
194		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
195	558	copyItem.addActionListener(this);
196	559	pasteItem = menu.add(new MenuItem("Paste"));
197	560	pasteItem.addActionListener(this);
198	561
199		- menu.add("-");
200		- 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"));
201	565	pasteIntoItem.addActionListener(this);
202		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
203	567	pasteLinkItem.addActionListener(this);
204		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
205	569	pasteCloneItem.addActionListener(this);
206		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
207	571	// pasteExpandItem.addActionListener(this);
208		- menu.add("-");
209		- deleteItem = menu.add(new MenuItem("Delete"));
210		- deleteItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
211	574
212	575	if (Globals.ADVANCED)
213	576	{
..	..	@@ -293,11 +656,9 @@
293	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
294	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
295	658	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
296		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
297	659	oe.cameraMenu.add("-");
298	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
299	661	openWindowItem.addActionListener(this);
300		- editLeafItem.addActionListener(this);
301	662	lookAtItem.addActionListener(this);
302	663	//lookFromItem.addActinoListener(this);
303	664	//switchViewItem.addActionListener(this);
..	..	@@ -344,9 +705,8 @@
344	705	setMasterItem.addActionListener(this);
345	706	}
346	707
347		- oe.menuBar.add(menu = new Menu("Group"));
348		-// grabItem = menu.add(new MenuItem("Grab"));
349		-// grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
350	710	backItem = menu.add(new MenuItem("Back"));
351	711	backItem.addActionListener(this);
352	712	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -354,13 +714,21 @@
354	714	// compositeItem = menu.add(new MenuItem("Composite"));
355	715	// compositeItem.addActionListener(this);
356	716
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
357	720	if (Globals.ADVANCED)
358	721	{
359	722	hideItem = menu.add(new MenuItem("Hidden Group"));
360	723	hideItem.addActionListener(this);
361	724	}
362		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
363	726	ungroupItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
364	732
365	733	// menu.add("-");
366	734	//
..	..	@@ -489,9 +857,9 @@
489	857	hideleavesItem.addActionListener(this);
490	858	showleavesItem = menu.add(new MenuItem("Show Leaves"));
491	859	showleavesItem.addActionListener(this);
492		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	860	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
493	861	markleavesItem.addActionListener(this);
494		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	862	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
495	863	unmarkleavesItem.addActionListener(this);
496	864	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
497	865	rewindleavesItem.addActionListener(this);
..	..	@@ -526,10 +894,15 @@
526	894	attachBumpItem.addActionListener(this);
527	895	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
528	896	pigmentBumpItem.addActionListener(this);
	897	+ //embedTexturesItem
529	898	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
530	899	detachPigmentItem.addActionListener(this);
531	900	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
532	901	detachBumpItem.addActionListener(this);
	902	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	903	+ embedTexturesItem.addActionListener(this);
	904	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	905	+ deEmbedTexturesItem.addActionListener(this);
533	906	menu.add("-");
534	907	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
535	908	sortbysizeItem.addActionListener(this);
..	..	@@ -540,6 +913,9 @@
540	913	shareGeometriesItem.addActionListener(this);
541	914	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
542	915	mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
543	919	if (Globals.ADVANCED)
544	920	{
545	921	// Pretty much the same as duplicate and clone.
..	..	@@ -556,6 +932,74 @@
556	932	buildToolsMenu(menu);
557	933	}
558	934
	935	+ JTabbedPane resourcecontainer;
	936	+ cGridBag currenttab;
	937	+ //boolean added; // patch for jar
	938	+
	939	+ int tabcount = 0;
	940	+ int colcount = 0;
	941	+ int rowcount = 0;
	942	+ int texturecount = 0;
	943	+
	944	+ int columns = 5;
	945	+ int rows = 7;
	946	+
	947	+ public void ResourceCallBack(String[] path)
	948	+ {
	949	+// for (int i = 0; i < path.length; i++)
	950	+// System.out.print(path[i] + "/");
	951	+// System.out.println();
	952	+
	953	+ if (//rowcount == 0 \|\|
	954	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	955	+ {
	956	+ currenttab = new cGridBag();
	957	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	958	+ currenttab.setName(tabname);
	959	+ //added = false;
	960	+ resourcecontainer.add(currenttab);
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ rowcount = 1;
	963	+ colcount = 0;
	964	+ texturecount = 0;
	965	+ }
	966	+
	967	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	968	+ {
	969	+ //if (!added)
	970	+ {
	971	+ //added = true;
	972	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	973	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	974	+ }
	975	+
	976	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	977	+
	978	+ if (++colcount >= columns)
	979	+ {
	980	+ colcount = 0;
	981	+ currenttab.Return();
	982	+
	983	+ if (rowcount++ >= rows)
	984	+ {
	985	+ rowcount = 0;
	986	+ }
	987	+ }
	988	+ }
	989	+ else
	990	+ {
	991	+// if (!path[path.length-1].equals("icons"))
	992	+// resourcecontainer.Return();
	993	+ }
	994	+ }
	995	+
	996	+ void CreateTexturePanel(cGridBag container)
	997	+ {
	998	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	999	+ container.add(resourcecontainer);
	1000	+
	1001	+ Grafreed.ParseResources("textures", this);
	1002	+ }
559	1003
560	1004	void SetupUI2(ObjEditor oe)
561	1005	{
..	..	@@ -574,11 +1018,6 @@
574	1018	//new Exception().printStackTrace();
575	1019
576	1020	oe.radioPanel = new JPanel(new GridBagLayout());
577		- oe.aConstraints.weightx = 1;
578		- oe.aConstraints.weighty = 0;
579		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
580		- oe.aConstraints.gridwidth = 100;
581		- oe.aConstraints.gridheight = 1;
582	1021	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
583	1022
584	1023	oe.buttonGroup = new ButtonGroup();
..	..	@@ -599,9 +1038,9 @@
599	1038	oe.radioPanel.add(dummyButton);
600	1039	oe.buttonGroup.add(dummyButton);
601	1040	*/
602		- cGridBag copyOptionsPanel = new cGridBag();
	1041	+ cGridBag versionManagerPanel = new cGridBag();
603	1042
604		- copyOptionsPanel.preferredHeight = 1;
	1043	+ versionManagerPanel.preferredHeight = 4;
605	1044
606	1045	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
607	1046
..	..	@@ -611,58 +1050,102 @@
611	1050
612	1051	if (Globals.ADVANCED)
613	1052	{
614		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
615		- maxButton.setToolTipText("Maximize window");
616		- maxButton.addActionListener(this);
	1053	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// maxButton.setToolTipText("Maximize window");
	1055	+// maxButton.addActionListener(this);
617	1056	}
618	1057
619		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ cButton gcButton;
	1059	+
	1060	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+// gcButton.setToolTipText("Garbage collect");
	1062	+// gcButton.addActionListener(new ActionListener()
	1063	+// {
	1064	+// public void actionPerformed(ActionEvent e)
	1065	+// {
	1066	+// System.gc();
	1067	+// }
	1068	+// });
	1069	+
	1070	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1071	+ collapseButton.setToolTipText("Collapse toolbar");
	1072	+ collapseButton.addActionListener(this);
	1073	+
	1074	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1076	+ maximize3DButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ twoButton.setToolTipText("Show 3D view only");
	1080	+ twoButton.addActionListener(this);
	1081	+ this.fullscreenLayout = twoButton;
	1082	+
	1083	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ threeButton.setToolTipText("Show controls and 3D view");
	1085	+ threeButton.addActionListener(this);
	1086	+ if (Globals.ADVANCED)
	1087	+ {
	1088	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ sixButton.setToolTipText("Show 3D view and controls");
	1090	+ sixButton.addActionListener(this);
	1091	+ }
	1092	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+// sevenButton.setToolTipText("3-column layout");
	1094	+// sevenButton.addActionListener(this);
	1095	+ //
	1096	+
	1097	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
620	1098	fullButton.setToolTipText("Full-screen window");
621	1099	fullButton.addActionListener(this);
622	1100
623		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1101	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
624	1102	screenfitButton.setToolTipText("Screen fit");
625	1103	screenfitButton.addActionListener(this);
626	1104
627		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1105	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
628	1106	restoreCameraButton.setToolTipText("Restore viewpoint");
629	1107	restoreCameraButton.addActionListener(this);
630	1108
631		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632		- saveButton.setToolTipText("New version");
633		- saveButton.addActionListener(this);
	1109	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ saveVersionButton.setToolTipText("Duplicate current version");
	1111	+ saveVersionButton.addActionListener(this);
634	1112
635		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
636		- undoButton.setToolTipText("Previous version");
637		- undoButton.addActionListener(this);
638		- undoButton.setEnabled(false);
	1113	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ deleteVersionButton.setToolTipText("Delete current version");
	1115	+ deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
	1117	+
	1118	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ previousVersionButton.setToolTipText("Previous version");
	1120	+ previousVersionButton.addActionListener(this);
	1121	+ previousVersionButton.setEnabled(false);
639	1122
640	1123	cGridBag updown = new cGridBag().setVertical(true);
641		- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642		- restoreButton.setToolTipText("Restore current");
	1124	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1125	+ restoreButton.setToolTipText("Undo (restore current version)");
643	1126	restoreButton.addActionListener(this);
644	1127	restoreButton.setEnabled(false);
645	1128
646		- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647		- replaceButton.setToolTipText("Replace current");
	1129	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ replaceButton.setToolTipText("Save (replace current version)");
648	1131	replaceButton.addActionListener(this);
649	1132	replaceButton.setEnabled(false);
650	1133
651		- copyOptionsPanel.add(updown);
	1134	+ versionManagerPanel.add(updown);
652	1135
653		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654		- redoButton.setToolTipText("Next version");
655		- redoButton.addActionListener(this);
656		- redoButton.setEnabled(false);
	1136	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ nextVersionButton.setToolTipText("Next version");
	1138	+ nextVersionButton.addActionListener(this);
	1139	+ nextVersionButton.setEnabled(false);
	1140	+
	1141	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ oneStepButton.setToolTipText("Animate one step forward");
	1143	+ oneStepButton.addActionListener(this);
657	1144
658	1145	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
659	1146	liveCB.setToolTipText("Enable animation");
660	1147	liveCB.addItemListener(this);
661	1148
662		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
663		- oneStepButton.setToolTipText("Animate one step forward");
664		- oneStepButton.addActionListener(this);
665		-
666	1149	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
667	1150	fastCB.setToolTipText("Fast mode");
668	1151	fastCB.addItemListener(this);
..	..	@@ -678,143 +1161,137 @@
678	1161
679	1162	if (Globals.ADVANCED)
680	1163	{
681		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1164	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
682	1165	snapobjectButton.addActionListener(this);
683	1166	snapobjectButton.setToolTipText("Snap Object");
	1167	+
	1168	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ fourButton.addActionListener(this);
	1170	+ fourButton.setToolTipText("Show control panel only");
684	1171	}
685	1172
686	1173	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
687	1174
688		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
689		- fourButton.addActionListener(this);
690		- fourButton.setToolTipText("Show left panel only");
691		-
692		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
693		- twoButton.setToolTipText("Show right view only");
694		- twoButton.addActionListener(this);
695		- this.fullscreenLayout = twoButton;
696		-
697		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
698		- sixButton.setToolTipText("Show left and right");
699		- sixButton.addActionListener(this);
700		-// oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
701		-// threeButton.setToolTipText("2-column layout right");
702		-// threeButton.addActionListener(this);
703		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
704		-// sevenButton.setToolTipText("3-column layout");
705		-// sevenButton.addActionListener(this);
706		- //
707	1175
708		- oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1176	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
709	1177	rootButton.setToolTipText("Open selection in new tab");
710	1178	rootButton.addActionListener(this);
711	1179
712		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
713	1181	closeButton.setToolTipText("Close tab");
714	1182	closeButton.addActionListener(this);
715	1183	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
716	1184	//clearButton.addActionListener(this);
717	1185
	1186	+ cGridBag row1 = new cGridBag();
	1187	+
718	1188	// INSERT
719		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
720		- gridButton.setToolTipText("Create grid");
	1189	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ gridButton.setToolTipText("Create ground");
721	1191	gridButton.addActionListener(this);
722	1192
723		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1193	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
724	1194	boxButton.setToolTipText("Create box");
725	1195	boxButton.addActionListener(this);
726	1196
727		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
728		- sphereButton.setToolTipText("Create sphere");
729		- sphereButton.addActionListener(this);
730		-
731		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
732		- coneButton.setToolTipText("Create cone");
733		- coneButton.addActionListener(this);
734		-
735		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
736		- torusButton.setToolTipText("Create torus");
737		- torusButton.addActionListener(this);
738		-
739		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
740	1198	superButton.setToolTipText("Create superellipsoid");
741	1199	superButton.addActionListener(this);
742	1200
	1201	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ sphereButton.setToolTipText("Create sphere");
	1203	+ sphereButton.addActionListener(this);
	1204	+
	1205	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ coneButton.setToolTipText("Create cone");
	1207	+ coneButton.addActionListener(this);
	1208	+
	1209	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ torusButton.setToolTipText("Create torus");
	1211	+ torusButton.addActionListener(this);
	1212	+
743	1213	if (Globals.ADVANCED)
744	1214	{
745		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
746	1216	kleinButton.setToolTipText("Create Klein bottle");
747	1217	kleinButton.addActionListener(this);
748	1218	}
749	1219
750		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
751	1221	particlesButton.setToolTipText("Create particle system");
752	1222	particlesButton.addActionListener(this);
753	1223
754		- oe.toolboxPanel.Return();
	1224	+ oe.toolboxPanel.add(row1);
755	1225
756		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ cGridBag row2 = new cGridBag();
	1227	+
	1228	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
757	1229	groupButton.setToolTipText("Create group");
758	1230	groupButton.addActionListener(this);
759	1231
760		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
761	1233	compositeButton.setToolTipText("Create composite");
762	1234	compositeButton.addActionListener(this);
763	1235
764		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
765	1237	switchButton.setToolTipText("Create item switcher");
766	1238	switchButton.addActionListener(this);
767	1239
768		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
769	1241	loopButton.setToolTipText("Create loop");
770	1242	loopButton.addActionListener(this);
771	1243
772		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1244	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
773	1245	textureButton.setToolTipText("Create texture");
774	1246	textureButton.addActionListener(this);
775	1247
776		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1248	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
777	1249	overlayButton.setToolTipText("Create overlay");
778	1250	overlayButton.addActionListener(this);
779	1251
780		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1252	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
781	1253	lightButton.setToolTipText("Create light");
782	1254	lightButton.addActionListener(this);
783	1255
784		- for (int i=6; --i>=0;)
785		- {
786		- oe.toolboxPanel.Return();
787		- oe.toolboxPanel.add(new cGridBag());
788		- oe.toolboxPanel.add(new cGridBag());
789		- oe.toolboxPanel.add(new cGridBag());
790		- oe.toolboxPanel.add(new cGridBag());
791		- oe.toolboxPanel.add(new cGridBag());
792		- oe.toolboxPanel.add(new cGridBag());
793		- oe.toolboxPanel.add(new cGridBag());
794		- }
	1256	+ oe.toolboxPanel.add(row2);
	1257	+
	1258	+ cGridBag textures = new cGridBag();
	1259	+
	1260	+ CreateTexturePanel(textures);
	1261	+
	1262	+ int tabCount = resourcecontainer.getTabCount();
	1263	+
	1264	+ if (tabCount > 0)
	1265	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1266	+
	1267	+ oe.toolboxPanel.add(textures);
	1268	+
	1269	+ textures.preferredHeight = 100;
	1270	+
	1271	+ CreateSkyboxPanel(oe.skyboxPanel);
795	1272
796	1273	// EDIT panel
797		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1274	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
798	1275	editButton.setToolTipText("Pin selection controls");
799	1276	editButton.addActionListener(this);
800	1277
801		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
802		- uneditButton.setToolTipText("Remove selection controls");
	1278	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ uneditButton.setToolTipText("Unpin and remove selection controls");
803	1280	uneditButton.addActionListener(this);
804	1281
805	1282	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
806		- allParamsButton.setToolTipText("Show all controle");
	1283	+ allParamsButton.setToolTipText("Show all controls");
807	1284	allParamsButton.addActionListener(this);
808	1285
809		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
810		- clearPanelButton.setToolTipText("Clear edit panel");
	1286	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1287	+ clearPanelButton.setToolTipText("Clear all controls");
811	1288	clearPanelButton.addActionListener(this);
812	1289
813		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
814		- unselectButton.setToolTipText("Unselect");
815		- unselectButton.addActionListener(this);
	1290	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1291	+ //unselectButton.setToolTipText("Unselect");
	1292	+ //unselectButton.addActionListener(this);
816	1293
817		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1294	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
818	1295	flashSelectionButton.setToolTipText("Highlight selection");
819	1296	flashSelectionButton.addActionListener(this);
820	1297
..	..	@@ -837,6 +1314,8 @@
837	1314
838	1315	cGridBag jSPPanel = new cGridBag();
839	1316
	1317	+ jSPPanel.preferredHeight = 20;
	1318	+
840	1319	JScrollPane jSP;
841	1320	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
842	1321	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -845,14 +1324,14 @@
845	1324	oe.treePanel.add(jSPPanel);
846	1325	oe.treePanel.Return();
847	1326
848		- oe.treePanel.add(copyOptionsPanel);
	1327	+ oe.treePanel.add(versionManagerPanel);
849	1328	oe.treePanel.Return();
850		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
851		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
852		- sliderPane.preferredHeight = 1;
	1329	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1330	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1331	+ versionSliderPane.preferredHeight = 3;
853	1332
854		-// mainPanel.setDividerLocation(0.5); //1.0);
855		-// mainPanel.setResizeWeight(0.5);
	1333	+// mainPanel.setDividerLocation(0.1); //1.0);
	1334	+ mainPanel.setResizeWeight(0.4);
856	1335
857	1336	//jList.addListSelectionListener(this);
858	1337	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -860,7 +1339,7 @@
860	1339	//jTree.setEditable(true);
861	1340	oe.jTree.setDragEnabled(true);
862	1341	//jTree.setPreferredSize(new Dimension(10,10));
863		- jSP.setPreferredSize(new Dimension(100,200));
	1342	+ //jSP.setPreferredSize(new Dimension(100,200));
864	1343
865	1344	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
866	1345
..	..	@@ -872,7 +1351,7 @@
872	1351	dgr.addDragGestureListener(this);
873	1352	}catch(Exception e) {}
874	1353	*/
875		- radio.layout = sixButton; // sevenButton;
	1354	+ radio.layout = threeButton; // sixButton;
876	1355	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
877	1356	}
878	1357
..	..	@@ -923,9 +1402,12 @@
923	1402	smoothCB.setToolTipText("Snapping delay");
924	1403	smoothCB.addItemListener(this);
925	1404
926		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
927		- slowCB.setToolTipText("Smooth interpolation");
928		- slowCB.addItemListener(this);
	1405	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1406	+// slowCB.setToolTipText("Smooth interpolation");
	1407	+// slowCB.addItemListener(this);
	1408	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1409	+ minshaderCB.setToolTipText("Minimal fast shader");
	1410	+ minshaderCB.addItemListener(this);
929	1411
930	1412	// constraints.gridy += 1;
931	1413	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1004,6 +1486,14 @@
1004	1486
1005	1487	void EditObject(Object3D obj)
1006	1488	{
	1489	+ assert(obj instanceof Composite);
	1490	+
	1491	+// if (obj.versionlist == null)
	1492	+// {
	1493	+// obj.versionlist = new Object3D[100];
	1494	+// obj.versionindex = -1;
	1495	+// }
	1496	+
1007	1497	cRadio radioButton = new cRadio(obj.name);
1008	1498
1009	1499	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1014,7 +1504,7 @@
1014	1504	}
1015	1505
1016	1506	radioButton.SetObject(obj);
1017		- radioButton.layout = sixButton; // sevenButton;
	1507	+ radioButton.layout = threeButton; // sixButton;
1018	1508	radioButton.SetCamera(cameraView.renderCamera, false);
1019	1509	radioButton.addActionListener(this);
1020	1510	radioPanel.add(radioButton);
..	..	@@ -1028,6 +1518,7 @@
1028	1518
1029	1519	oe.SetupViews();
1030	1520
	1521	+ if (Globals.DEBUG)
1031	1522	System.out.println("SetupViews");
1032	1523	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1033	1524	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1039,6 +1530,8 @@
1039	1530	cCheckBox localCB;
1040	1531	cCheckBox crowdCB;
1041	1532	cCheckBox smoothCB;
	1533	+ cCheckBox minshaderCB;
	1534	+
1042	1535	cToggleButton fastCB;
1043	1536	cCheckBox slowCB;
1044	1537	cCheckBox boxCB;
..	..	@@ -1109,6 +1602,12 @@
1109	1602	{
1110	1603	cameraView.ToggleInertia();
1111	1604	cameraView.repaint();
	1605	+ }
	1606	+ else if(e.getSource() == minshaderCB)
	1607	+ {
	1608	+ Globals.MINSHADER ^= true;
	1609	+ cameraView.programInitialized = false;
	1610	+ cameraView.repaint();
1112	1611	}
1113	1612	else if(e.getSource() == localCB)
1114	1613	{
..	..	@@ -1386,7 +1885,12 @@
1386	1885	TreePath path;
1387	1886
1388	1887	public TransferableTreePath(TreePath tp) {
1389		- path = tp;
	1888	+ Object[] objs = new Object[tp.getPathCount()];
	1889	+ for (int i=0; i<objs.length; i++)
	1890	+ {
	1891	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1892	+ }
	1893	+ path = new TreePath(objs);
1390	1894	}
1391	1895
1392	1896	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1676,7 +2180,11 @@
1676	2180	shadow.material = new cMaterial(obj.material);
1677	2181	shadow.material.diffuse = 0.0001f;
1678	2182	shadow.material.specular = 0.0001f;
1679		- //shadow.projectedVertices[1].x = 300;
	2183	+ shadow.material.opacity = 0.75f;
	2184	+
	2185	+ AllocProjectedVertices(shadow);
	2186	+
	2187	+ shadow.projectedVertices[1].x = 300;
1680	2188
1681	2189	makeSomething(shadow);
1682	2190	}
..	..	@@ -2132,6 +2640,23 @@
2132	2640	{
2133	2641	makeSomething(new Light());
2134	2642	} else
	2643	+// if (source == skybox1Button \|\|
	2644	+// source == skybox2Button \|\|
	2645	+// source == skybox3Button \|\|
	2646	+// source == skybox4Button \|\|
	2647	+// source == skybox5Button \|\|
	2648	+// source == skybox6Button \|\|
	2649	+// source == skybox7Button \|\|
	2650	+// source == skybox11Button \|\|
	2651	+// source == skybox12Button \|\|
	2652	+// source == skybox13Button \|\|
	2653	+// source == skybox14Button \|\|
	2654	+// source == skybox15Button \|\|
	2655	+// source == skybox16Button \|\|
	2656	+// source == skybox17Button)
	2657	+// {
	2658	+// ChangeSkybox(source);
	2659	+// } else
2135	2660	if (source == csgItem)
2136	2661	{
2137	2662	group(new CSG());
..	..	@@ -2180,27 +2705,35 @@
2180	2705	} else
2181	2706	if (source == loopItem \|\| source == loopButton)
2182	2707	{
	2708	+ if (!group.selection.isEmpty())
	2709	+ {
2183	2710	Composite csg = new GroupLeaf();
2184	2711	csg.count = 5;
2185		- group(csg);
2186	2712	Composite child = new cGroup("Branch");
2187	2713	csg.addChild(child);
2188	2714	child.addChild(csg);
	2715	+ group(csg);
	2716	+ }
2189	2717	} else
2190	2718	if (source == doubleItem)
2191	2719	{
	2720	+ if (!group.selection.isEmpty())
	2721	+ {
2192	2722	Composite csg = new GroupLeaf("Fork");
2193	2723	csg.count = 5;
2194		- group(csg);
2195	2724	Composite child = new cGroup("Branch A");
2196	2725	csg.addChild(child);
2197	2726	child.addChild(csg);
2198	2727	child = new cGroup("Branch B");
2199	2728	csg.addChild(child);
2200	2729	child.addChild(csg);
	2730	+ group(csg);
	2731	+ }
2201	2732	} else
2202	2733	if (source == tripleItem)
2203	2734	{
	2735	+ if (!group.selection.isEmpty())
	2736	+ {
2204	2737	Composite csg = new GroupLeaf("Trident");
2205	2738	csg.count = 4;
2206	2739	group(csg);
..	..	@@ -2213,11 +2746,12 @@
2213	2746	child = new cGroup();
2214	2747	csg.addChild(child);
2215	2748	child.addChild(csg);
	2749	+ }
2216	2750	} else
2217	2751	if (source == computeAOItem)
2218	2752	{
2219	2753	Globals.drawMode = CameraPane.OCCLUSION;
2220		- Globals.theRenderer.repaint();
	2754	+ cameraView.repaint();
2221	2755	} else
2222	2756	if (source == recompileItem)
2223	2757	{
..	..	@@ -2232,7 +2766,7 @@
2232	2766	if (source == invariantsItem)
2233	2767	{
2234	2768	System.out.println("Invariants:");
2235		- Grafreed.grafreeD.universe.invariants();
	2769	+ Grafreed.grafreed.universe.invariants();
2236	2770	} else
2237	2771	if (source == memoryItem)
2238	2772	{
..	..	@@ -2263,33 +2797,52 @@
2263	2797	{
2264	2798	ToggleFullScreen();
2265	2799	} else
2266		- if (source == undoButton)
	2800	+ if (source == collapseButton)
	2801	+ {
	2802	+ this.expandedLayout = radio.layout;
	2803	+ CollapseToolbar();
	2804	+ } else
	2805	+ if (source == maximize3DButton)
	2806	+ {
	2807	+ this.expandedLayout = radio.layout;
	2808	+ radio.layout = twoButton;
	2809	+ Show3DView();
	2810	+ CollapseToolbar();
	2811	+ } else
	2812	+ if (source == previousVersionButton)
2267	2813	{
2268	2814	// Go to previous version
2269	2815	//if (!Undo())
2270	2816	//java.awt.Toolkit.getDefaultToolkit().beep();
2271		- Undo();
	2817	+ PreviousVersion();
2272	2818	} else
2273	2819	if (source == restoreButton)
2274	2820	{
2275	2821	// Restore current version
2276	2822	Restore();
	2823	+ //restoreButton.setEnabled(false);
2277	2824	} else
2278	2825	if (source == replaceButton)
2279	2826	{
2280	2827	// Overwrite current version
2281	2828	Replace();
	2829	+ //replaceButton.setEnabled(false);
2282	2830	} else
2283		- if (source == redoButton)
	2831	+ if (source == nextVersionButton)
2284	2832	{
2285	2833	// Go to next version
2286		- Redo();
	2834	+ NextVersion();
2287	2835	} else
2288		- if (source == saveButton)
	2836	+ if (source == saveVersionButton)
2289	2837	{
2290	2838	// Save a new version
2291	2839	if (!Save(true))
2292	2840	java.awt.Toolkit.getDefaultToolkit().beep();
	2841	+ } else
	2842	+ if (source == deleteVersionButton)
	2843	+ {
	2844	+ // Delete a new version
	2845	+ DeleteVersion();
2293	2846	} else
2294	2847	if (source == oneStepButton)
2295	2848	{
..	..	@@ -2344,11 +2897,11 @@
2344	2897	} else
2345	2898	if (source == undoItem)
2346	2899	{
2347		- Undo();
	2900	+ PreviousVersion();
2348	2901	} else
2349	2902	if (source == redoItem)
2350	2903	{
2351		- Redo();
	2904	+ NextVersion();
2352	2905	} else
2353	2906	if (source == duplicateItem)
2354	2907	{
..	..	@@ -2829,22 +3382,34 @@
2829	3382	} else
2830	3383	if (source == ungroupItem \|\| source == ungroupButton)
2831	3384	{
2832		- boolean hasRoot = false;
	3385	+ boolean canUngroup = true;
2833	3386
2834	3387	for (int i=0; i<group.selection.size(); i++)
2835	3388	{
2836		- if (group.selection.get(i) == group)
	3389	+ Object3D selectedItem = group.selection.get(i);
	3390	+
	3391	+ if (selectedItem.Size() == 0)
2837	3392	{
2838		- hasRoot = true;
	3393	+ // Cannot ungroup leaves
	3394	+ canUngroup = false;
	3395	+ break;
	3396	+ }
	3397	+
	3398	+ if (selectedItem == group)
	3399	+ {
	3400	+ // Cannot ungroup root
	3401	+ canUngroup = false;
2839	3402	break;
2840	3403	}
2841	3404	}
2842	3405
2843		- if (!hasRoot)
	3406	+ if (canUngroup)
2844	3407	{
2845	3408	for (int i=0; i<group.selection.size(); i++)
2846	3409	{
2847		- Ungroup(group.selection.get(i));
	3410	+ Object3D selectedItem = group.selection.get(i);
	3411	+
	3412	+ Ungroup(selectedItem);
2848	3413	}
2849	3414
2850	3415	ClearSelection(false);
..	..	@@ -3151,7 +3716,7 @@
3151	3716	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3152	3717	{
3153	3718	obj = (Object3D)e.nextElement();
3154		- obj.SetBumpTexture(null);
	3719	+ obj.ResetBumpTexture();
3155	3720	}
3156	3721
3157	3722	refreshContents();
..	..	@@ -3165,6 +3730,31 @@
3165	3730	obj.SetBumpTexture(obj.GetPigmentTexture());
3166	3731	}
3167	3732
	3733	+ refreshContents();
	3734	+ } else
	3735	+ if (source == embedTexturesItem)
	3736	+ {
	3737	+ Object3D obj;
	3738	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3739	+ {
	3740	+ obj = (Object3D)e.nextElement();
	3741	+ obj.EmbedTextures(true);
	3742	+ }
	3743	+
	3744	+ refreshContents();
	3745	+ } else
	3746	+ if (source == deEmbedTexturesItem)
	3747	+ {
	3748	+ Object3D obj;
	3749	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3750	+ {
	3751	+ obj = (Object3D)e.nextElement();
	3752	+ obj.EmbedTextures(false);
	3753	+ }
	3754	+
	3755	+ CameraPane.texturepigment.clear();
	3756	+ CameraPane.texturebump.clear();
	3757	+
3168	3758	refreshContents();
3169	3759	} else
3170	3760	if (source == flashSelectionButton)
..	..	@@ -3182,38 +3772,7 @@
3182	3772	if (CameraPane.FULLSCREEN)
3183	3773	fullscreenLayout = radio.layout;
3184	3774
3185		- // bug
3186		- //gridPanel.setDividerLocation(1.0);
3187		- //bigPanel.setDividerLocation(0.0);
3188		-// bigThree.remove(scenePanel);
3189		-// bigThree.remove(centralPanel);
3190		-// bigThree.remove(XYZPanel);
3191		-// aWindowConstraints.gridx = 0;
3192		-// aWindowConstraints.gridy = 0;
3193		-// aWindowConstraints.gridwidth = 1;
3194		-// // aConstraints.gridheight = 3;
3195		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3196		-// aWindowConstraints.weightx = 0;
3197		-// aWindowConstraints.weighty = 1;
3198		-// //bigThree.add(jtp, aWindowConstraints);
3199		-// aWindowConstraints.weightx = 1;
3200		-// aWindowConstraints.gridwidth = 3;
3201		-// // aConstraints.gridheight = 3;
3202		-// aWindowConstraints.gridx = 1;
3203		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3204		-// bigThree.add(centralPanel, aWindowConstraints);
3205		-// aWindowConstraints.weightx = 0;
3206		-// aWindowConstraints.gridx = 4;
3207		-// aWindowConstraints.gridwidth = 1;
3208		-// // aConstraints.gridheight = 3;
3209		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3210		-// //bigThree.add(XYZPanel, aWindowConstraints);
3211		-// scenePanel.setVisible(false);
3212		-// centralPanel.setVisible(true);
3213		-// XYZPanel.setVisible(false);
3214		- bigThree.ClearUI();
3215		- bigThree.add(centralPanel);
3216		- bigThree.FlushUI();
	3775	+ Show3DView();
3217	3776
3218	3777	cameraView.requestFocusInWindow();
3219	3778
..	..	@@ -3268,8 +3827,8 @@
3268	3827	// centralPanel.setVisible(true);
3269	3828	// XYZPanel.setVisible(true);
3270	3829	bigThree.ClearUI();
	3830	+ bigThree.add(scenePanel);
3271	3831	bigThree.add(centralPanel);
3272		- bigThree.add(XYZPanel);
3273	3832	bigThree.FlushUI();
3274	3833
3275	3834	cameraView.requestFocusInWindow();
..	..	@@ -3349,8 +3908,8 @@
3349	3908	// centralPanel.setVisible(true);
3350	3909	// XYZPanel.setVisible(false);
3351	3910	bigThree.ClearUI();
3352		- bigThree.add(scenePanel);
3353	3911	bigThree.add(centralPanel);
	3912	+ bigThree.add(scenePanel);
3354	3913	bigThree.FlushUI();
3355	3914
3356	3915	cameraView.requestFocusInWindow();
..	..	@@ -3399,6 +3958,7 @@
3399	3958	} else
3400	3959	if (source == rootButton)
3401	3960	{
	3961	+ Replace();
3402	3962	Object3D obj;
3403	3963	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3404	3964	{
..	..	@@ -3413,6 +3973,8 @@
3413	3973	if (source == closeButton)
3414	3974	{
3415	3975	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3976	+ Replace();
	3977	+
3416	3978	cRadio ab;
3417	3979	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3418	3980	{
..	..	@@ -3456,10 +4018,10 @@
3456	4018	{
3457	4019	Object3D child = (Object3D)e.nextElement();
3458	4020	if(child.editWindow != null)
3459		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3460	4021	child.pinned = false;
3461	4022	child.CloseUI();
3462	4023	listUI.remove(child);
	4024	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3463	4025
3464	4026	//child.editWindow = null; // ???????????
3465	4027	}
..	..	@@ -3478,6 +4040,7 @@
3478	4040	obj.CloseUI();
3479	4041	}
3480	4042	listUI.clear();
	4043	+ SetPinStates(group.selection.size() > 0);
3481	4044	refreshContents(true);
3482	4045	} else
3483	4046	if (source == allParamsButton)
..	..	@@ -3510,6 +4073,8 @@
3510	4073	} else
3511	4074	if(source instanceof cRadio)
3512	4075	{
	4076	+ Replace();
	4077	+
3513	4078	group.parent = keepparent;
3514	4079	group.attributes = 0;
3515	4080	//group.editWindow = null;
..	..	@@ -3534,8 +4099,6 @@
3534	4099
3535	4100	copy = group;
3536	4101
3537		- SetUndoStates();
3538		-
3539	4102	//Globals.theRenderer.object = group;
3540	4103	if(!useclient)
3541	4104	{
..	..	@@ -3563,7 +4126,31 @@
3563	4126	*/
3564	4127	radio.layout.doClick();
3565	4128
	4129	+ assert(copy instanceof Composite);
	4130	+
	4131	+ if (copy.versionlist == null)
	4132	+ {
	4133	+ copy.versionindex = -1;
	4134	+
	4135	+ // Cannot work with loops
	4136	+ // To fix this issue, we first mark all nodes above the root,
	4137	+ // and check if any of these nodes are reachable below the root.
	4138	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4139	+
	4140	+ if (!copy.HasTags())
	4141	+ {
	4142	+ copy.versionlist = new Object3D[100];
	4143	+
	4144	+ Save(true);
	4145	+ }
	4146	+
	4147	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4148	+ }
	4149	+
	4150	+ SetVersionStates();
	4151	+
3566	4152	ClearUnpinned();
	4153	+
3567	4154	//Grafreed.Assert(group != null);
3568	4155	//Grafreed.Assert(group.selection != null);
3569	4156	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3580,11 +4167,13 @@
3580	4167	} else if (event.getSource() == editCameraItem)
3581	4168	{
3582	4169	cameraView.ProtectCamera();
	4170	+ cameraView.requestFocusInWindow();
3583	4171	cameraView.repaint();
3584	4172	return;
3585	4173	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3586	4174	{
3587	4175	cameraView.RevertCamera();
	4176	+ cameraView.requestFocusInWindow();
3588	4177	cameraView.repaint();
3589	4178	return;
3590	4179	// } else if (event.getSource() == textureButton)
..	..	@@ -3703,7 +4292,7 @@
3703	4292	TouchTransform(obj);
3704	4293	continue;
3705	4294	}
3706		- if ((mask&2) != 0) // Scale
	4295	+ if ((mask&2) != 0) // Scale/rotation
3707	4296	{
3708	4297	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3709	4298	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3711,10 +4300,6 @@
3711	4300	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3712	4301	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3713	4302	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3714		- }
3715		- if ((mask&4) != 0) // Rotation
3716		- {
3717		- // ?
3718	4303	}
3719	4304	if ((mask&1) != 0) // Translation
3720	4305	{
..	..	@@ -4161,7 +4746,7 @@
4161	4746
4162	4747	try
4163	4748	{
4164		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4749	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4165	4750	}
4166	4751	catch (Exception e)
4167	4752	{
..	..	@@ -4717,9 +5302,7 @@
4717	5302
4718	5303	freezemodel = false;
4719	5304	}
4720		-
4721		- boolean flashIt = true;
4722		-
	5305	+
4723	5306	public void valueChanged(TreeSelectionEvent e)
4724	5307	//public boolean handleEvent(Event event)
4725	5308	{
..	..	@@ -4792,13 +5375,31 @@
4792	5375	{
4793	5376	editButton.setEnabled(enabled);
4794	5377	uneditButton.setEnabled(enabled);
4795		- unselectButton.setEnabled(enabled);
	5378	+ //unselectButton.setEnabled(enabled);
4796	5379	flashSelectionButton.setEnabled(enabled);
	5380	+
	5381	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5382	+
	5383	+ boolean allComposites = true;
	5384	+
	5385	+ if (group.selection != null)
	5386	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5387	+ {
	5388	+ Object next = e.nextElement();
	5389	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5390	+ {
	5391	+ allComposites = false;
	5392	+ break;
	5393	+ }
	5394	+ }
	5395	+
	5396	+ rootButton.setEnabled(allComposites);
4797	5397	}
4798	5398
4799	5399	void refreshContents(boolean cp)
4800	5400	{
4801		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	5401	+ if (Globals.ADVANCED)
	5402	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4802	5403	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4803	5404	{
4804	5405	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4808,7 +5409,7 @@
4808	5409	Object3D child = (Object3D) group.selection.get(i);
4809	5410
4810	5411	objEditor.AddInfo(child, this, true);
4811		- System.err.println("info : " + child.GetPath());
	5412	+// System.err.println("info : " + child.GetPath());
4812	5413	}
4813	5414
4814	5415	objEditor.SetText(); // jan 2014
..	..	@@ -5634,7 +6235,6 @@
5634	6235
5635	6236	cButton restoreCameraButton;
5636	6237
5637		- cButton saveButton;
5638	6238	cButton oneStepButton;
5639	6239
5640	6240	cButton groupButton;
..	..	@@ -5643,6 +6243,22 @@
5643	6243	cButton switchButton;
5644	6244	cButton loopButton;
5645	6245	cButton textureButton;
	6246	+
	6247	+ cButton skybox1Button;
	6248	+ cButton skybox2Button;
	6249	+ cButton skybox3Button;
	6250	+ cButton skybox4Button;
	6251	+ cButton skybox5Button;
	6252	+ cButton skybox6Button;
	6253	+ cButton skybox7Button;
	6254	+
	6255	+ cButton skybox11Button;
	6256	+ cButton skybox12Button;
	6257	+ cButton skybox13Button;
	6258	+ cButton skybox14Button;
	6259	+ cButton skybox15Button;
	6260	+ cButton skybox16Button;
	6261	+ cButton skybox17Button;
5646	6262
5647	6263	cButton gridButton;
5648	6264	cButton boxButton;
..	..	@@ -5676,11 +6292,11 @@
5676	6292	private MenuItem lookAtItem;
5677	6293	private MenuItem lookFromItem;
5678	6294	private MenuItem switchViewItem;
5679		- private MenuItem cutItem;
	6295	+ private JMenuItem cutItem;
5680	6296	private MenuItem undoItem;
5681	6297	private MenuItem redoItem;
5682	6298	private JMenuItem duplicateItem;
5683		- private MenuItem cloneItem;
	6299	+ private JMenuItem cloneItem;
5684	6300	private MenuItem cloneSupportItem;
5685	6301	private MenuItem overwriteGeoItem;
5686	6302	private MenuItem overwriteMatItem;
..	..	@@ -5701,13 +6317,13 @@
5701	6317	private MenuItem cloneGeometriesItem;
5702	6318	private MenuItem shareGeometriesItem;
5703	6319	private MenuItem mergeGeometriesItem;
5704		- private MenuItem copyItem;
	6320	+ private JMenuItem copyItem;
5705	6321	private MenuItem pasteItem;
5706		- private MenuItem pasteIntoItem;
5707		- private MenuItem pasteLinkItem;
5708		- private MenuItem pasteCloneItem;
5709		- private MenuItem pasteExpandItem;
5710		- private MenuItem deleteItem;
	6322	+ private JMenuItem pasteIntoItem;
	6323	+ private JMenuItem pasteLinkItem;
	6324	+ private JMenuItem pasteCloneItem;
	6325	+ private JMenuItem pasteExpandItem;
	6326	+ private JMenuItem deleteItem;
5711	6327	private MenuItem clearAllItem;
5712	6328	private MenuItem genUVItem;
5713	6329	private MenuItem genNormalsMESHItem;
..	..	@@ -5762,7 +6378,7 @@
5762	6378	private MenuItem transformGeometryItem;
5763	6379	private MenuItem transformChildrenItem;
5764	6380	private MenuItem hideItem;
5765		- private MenuItem grabItem;
	6381	+ private JMenuItem grabItem;
5766	6382	private MenuItem backItem;
5767	6383	private MenuItem frontItem;
5768	6384	private MenuItem cameraItem;
..	..	@@ -5775,7 +6391,7 @@
5775	6391	private MenuItem switchTransfoItem;
5776	6392	private MenuItem morphItem;
5777	6393	private MenuItem linkerItem;
5778		- private MenuItem ungroupItem;
	6394	+ private JMenuItem ungroupItem;
5779	6395	private MenuItem editItem;
5780	6396	private MenuItem openWindowItem;
5781	6397	private MenuItem editLeafItem;
..	..	@@ -5791,6 +6407,8 @@
5791	6407	private MenuItem attachBumpItem;
5792	6408	private MenuItem detachBumpItem;
5793	6409	private MenuItem pigmentBumpItem;
	6410	+ private MenuItem embedTexturesItem;
	6411	+ private MenuItem deEmbedTexturesItem;
5794	6412
5795	6413	private MenuItem particleItem;
5796	6414	private MenuItem ragdollItem;