~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,
..	..	@@ -28,9 +29,9 @@
28	29	{
29	30	cButton skyboxButton;
30	31	final String path = "cubemaps/" + f + "-skyboxes/" + s;
31		- //row.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
32		- row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
33		- 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);
34	35	skyboxButton.addActionListener(new ActionListener()
35	36	{
36	37	@Override
..	..	@@ -41,6 +42,22 @@
41	42	});
42	43	}
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	+
44	61	public void AddSkyboxTab0(JTabbedPane skyboxpanel)
45	62	{
46	63	cGridBag tab0 = new cGridBag().setVertical(true);
..	..	@@ -56,12 +73,13 @@
56	73	cGridBag row5 = new cGridBag();
57	74	cGridBag row6 = new cGridBag();
58	75
59		- AddSkyboxButton("default", "rgb", row0);
60		- AddSkyboxButton("default", "cornell", row0);
61		- AddSkyboxButton("default", "uffizi", row0);
62		- AddSkyboxButton("default", "CloudyHills", row0);
63		-
64		- AddSkyboxButton("default", "skycube", row1);
	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);
65	83	AddSkyboxButton("bridge", "Bridge", row1);
66	84	AddSkyboxButton("bridge", "Bridge2", row1);
67	85	AddSkyboxButton("urban", "GamlaStan2", row1);
..	..	@@ -73,23 +91,23 @@
73	91
74	92	AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
75	93	AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
76	95	AddSkyboxButton("park", "BerzeliiPark", row3);
77		- AddSkyboxButton("park", "Buddha", row3);
78	96
	97	+ AddSkyboxButton("park", "Buddha", row4);
79	98	AddSkyboxButton("park", "CNTower2", row4);
80	99	AddSkyboxButton("park", "NiagaraFalls1", row4);
81	100	AddSkyboxButton("park", "NiagaraFalls3", row4);
82		- AddSkyboxButton("park", "Park", row4);
83	101
	102	+ AddSkyboxButton("park", "Park", row5);
84	103	AddSkyboxButton("park", "Pond", row5);
85	104	AddSkyboxButton("park", "Skansen", row5);
86	105	AddSkyboxButton("park", "Skansen2", row5);
87		- AddSkyboxButton("park", "Skansen3", row5);
88	106
	107	+ AddSkyboxButton("park", "Skansen3", row6);
89	108	AddSkyboxButton("park", "Skansen4", row6);
90	109	AddSkyboxButton("park", "Skansen5", row6);
91		- AddSkyboxButton("park", "Stairs", row6);
92		- AddSkyboxButton("park", "Tantolunden4", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
93	111
94	112	tab0.add(row0);
95	113	tab0.add(row1);
..	..	@@ -140,24 +158,29 @@
140	158	AddSkyboxButton("forest", "Langholmen2", row3);
141	159	AddSkyboxButton("forest", "Plants", row3);
142	160	AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
143	162	AddSkyboxButton("mountain", "Maskonaive2", row4);
144		-
145	163	AddSkyboxButton("mountain", "Maskonaive3", row4);
146		- AddSkyboxButton("mountain", "Ryfjallet", row4);
147		- AddSkyboxButton("mountain", "Teide", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
148	166
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
149	169	AddSkyboxButton("rocky", "Langholmen", row5);
150		- AddSkyboxButton("rocky", "Riddarfjarden", row5);
151	170	AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
152	172	AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
153	176	/*
154		-Kastellholmen
155		-Langholmen
156		-Riddarfjarden
157		-Skinnarviksberget
158		-Tanto
159		-Tantolunden2
160		-Tantolunden6
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
161	184	*/
162	185
163	186	tab0.add(row0);
..	..	@@ -197,39 +220,33 @@
197	220
198	221	AddSkyboxButton("urban", "CNTower", row1);
199	222	AddSkyboxButton("bridge", "ArstaBridge", row1);
200		- AddSkyboxButton("indoors", "DallasW", row1);
201		- AddSkyboxButton("indoors", "MarriottMadisonWest", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
202	225
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
203	229	AddSkyboxButton("indoors", "Vasa", row2);
204		- AddSkyboxButton("winter", "Backyard", row2);
205		- AddSkyboxButton("winter", "Creek", row2);
206		- AddSkyboxButton("winter", "FootballField3", row2);
207	230
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
208	234	AddSkyboxButton("winter", "Forest", row3);
209		- AddSkyboxButton("winter", "HornstullsStrand2", row3);
210		- AddSkyboxButton("winter", "House", row3);
211		- AddSkyboxButton("winter", "IceLake", row3);
212	235
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
213	239	AddSkyboxButton("winter", "IceRiver", row4);
214		- AddSkyboxButton("winter", "Park3", row4);
215		- AddSkyboxButton("winter", "PondWinter", row4);
216	240
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
217	243	AddSkyboxButton("winter", "Tantolunden5", row5);
218	244	AddSkyboxButton("winter", "Vindelalven", row5);
219		- /*
220		-Backyard
221		-Creek
222		-FootballField3
223		-Forest
224		-HornstullsStrand2
225		-House
226		-IceLake
227		-IceRiver
228		-Park3
229		-PondWinter
230		-Tantolunden5
231		-Vindelalven *
232		- */
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
233	250
234	251	tab0.add(row0);
235	252	tab0.add(row1);
..	..	@@ -245,15 +262,112 @@
245	262	//tab0.add(new cGridBag());
246	263	}
247	264	}
248		-
249		- public void ChangeSkybox(String name)
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
250	267	{
251		- cameraView.envyoff = false;
252		- cameraView.skyboxname = name;
253		- cameraView.skyboxext = "jpg";
254		- cameraView.repaint();
	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);
255	358	}
256	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	+
257	371	//ObjEditor objEditor;
258	372	public void closeUI2()
259	373	{
..	..	@@ -291,11 +405,15 @@
291	405	this.copy = this.group = group;
292	406	//selectees = this.group.selectees;
293	407
294		- if (copy.versions == null)
295		- {
296		- copy.versions = new byte[100][];
297		- copy.versionindex = -1;
298		- }
	408	+ assert(false);
	409	+
	410	+// if (copy.versionlist == null)
	411	+// {
	412	+// copy.versionlist = new Object3D[100];
	413	+// copy.versionindex = -1;
	414	+//
	415	+// //Save(true);
	416	+// }
299	417
300	418	if(ui)
301	419	SetupUI(objEditor);
..	..	@@ -318,13 +436,13 @@
318	436
319	437	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
320	438
321		- if (copy.versions == null)
322		- {
323		- copy.versions = new byte[100][];
324		- copy.versionindex = -1;
325		-
326		- Save(true);
327		- }
	439	+// if (copy.versionlist == null)
	440	+// {
	441	+// copy.versionlist = new Object3D[100];
	442	+// copy.versionindex = -1;
	443	+//
	444	+// //Save(true);
	445	+// }
328	446	}
329	447
330	448	void CloneSelection(boolean supports)
..	..	@@ -414,33 +532,35 @@
414	532	// menu.add("-");
415	533	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
416	534	duplicateItem.addActionListener(this);
417		- cloneItem = menu.add(new MenuItem("Clone"));
	535	+
	536	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
418	537	cloneItem.addActionListener(this);
419		- if (Globals.ADVANCED)
	538	+ //if (Globals.ADVANCED)
420	539	{
421	540	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
422	541	cloneSupportItem.addActionListener(this);
423	542	}
	543	+ oe.jTree.popup.addSeparator();
424	544	menu.add("-");
425		- cutItem = menu.add(new MenuItem("Cut"));
	545	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
426	546	cutItem.addActionListener(this);
427		- copyItem = menu.add(new MenuItem("Copy"));
	547	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
428	548	copyItem.addActionListener(this);
429	549	pasteItem = menu.add(new MenuItem("Paste"));
430	550	pasteItem.addActionListener(this);
431	551
432		- menu.add("-");
433		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	552	+ oe.jTree.popup.addSeparator();
	553	+ //menu.add("-");
	554	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
434	555	pasteIntoItem.addActionListener(this);
435		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	556	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
436	557	pasteLinkItem.addActionListener(this);
437		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	558	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
438	559	pasteCloneItem.addActionListener(this);
439		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	560	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
440	561	// pasteExpandItem.addActionListener(this);
441		- menu.add("-");
442		- deleteItem = menu.add(new MenuItem("Delete"));
443		- deleteItem.addActionListener(this);
	562	+ //menu.add("-");
	563	+ oe.jTree.popup.addSeparator();
444	564
445	565	if (Globals.ADVANCED)
446	566	{
..	..	@@ -526,11 +646,9 @@
526	646	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
527	647	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
528	648	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
529		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
530	649	oe.cameraMenu.add("-");
531	650	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
532	651	openWindowItem.addActionListener(this);
533		- editLeafItem.addActionListener(this);
534	652	lookAtItem.addActionListener(this);
535	653	//lookFromItem.addActinoListener(this);
536	654	//switchViewItem.addActionListener(this);
..	..	@@ -577,9 +695,8 @@
577	695	setMasterItem.addActionListener(this);
578	696	}
579	697
580		- oe.menuBar.add(menu = new Menu("Group"));
581		-// grabItem = menu.add(new MenuItem("Grab"));
582		-// grabItem.addActionListener(this);
	698	+ oe.menuBar.add(menu = new Menu("Order"));
	699	+
583	700	backItem = menu.add(new MenuItem("Back"));
584	701	backItem.addActionListener(this);
585	702	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -587,13 +704,21 @@
587	704	// compositeItem = menu.add(new MenuItem("Composite"));
588	705	// compositeItem.addActionListener(this);
589	706
	707	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	708	+ grabItem.addActionListener(this);
	709	+
590	710	if (Globals.ADVANCED)
591	711	{
592	712	hideItem = menu.add(new MenuItem("Hidden Group"));
593	713	hideItem.addActionListener(this);
594	714	}
595		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	715	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
596	716	ungroupItem.addActionListener(this);
	717	+
	718	+ oe.jTree.popup.addSeparator();
	719	+
	720	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	721	+ deleteItem.addActionListener(this);
597	722
598	723	// menu.add("-");
599	724	//
..	..	@@ -630,9 +755,9 @@
630	755	shadowYItem.addActionListener(this);
631	756	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
632	757	shadowZItem.addActionListener(this);
	758	+
633	759	attributeItem = menu.add(new MenuItem("Attribute"));
634	760	attributeItem.addActionListener(this);
635		-
636	761	if (Globals.ADVANCED)
637	762	{
638	763	menu.add("-");
..	..	@@ -644,11 +769,18 @@
644	769	pointflowItem.addActionListener(this);
645	770	}
646	771	menu.add("-");
	772	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	773	+ textureRatioRItem.addActionListener(this);
	774	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	775	+ textureRatioGItem.addActionListener(this);
	776	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	777	+ textureRatioBItem.addActionListener(this);
	778	+ menu.add("-");
647	779	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
648	780	resetTransformItem.addActionListener(this);
649	781	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
650	782	resetCentroidItem.addActionListener(this);
651		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	783	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
652	784	resetCentroidXZItem.addActionListener(this);
653	785	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
654	786	transformGeometryItem.addActionListener(this);
..	..	@@ -700,6 +832,8 @@
700	832	}
701	833
702	834	oe.menuBar.add(menu = new Menu("Attributes"));
	835	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	836	+ clearVersionsItem.addActionListener(this);
703	837	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
704	838	clearMaterialsItem.addActionListener(this);
705	839	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -722,9 +856,9 @@
722	856	hideleavesItem.addActionListener(this);
723	857	showleavesItem = menu.add(new MenuItem("Show Leaves"));
724	858	showleavesItem.addActionListener(this);
725		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	859	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
726	860	markleavesItem.addActionListener(this);
727		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	861	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
728	862	unmarkleavesItem.addActionListener(this);
729	863	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
730	864	rewindleavesItem.addActionListener(this);
..	..	@@ -778,6 +912,9 @@
778	912	shareGeometriesItem.addActionListener(this);
779	913	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
780	914	mergeGeometriesItem.addActionListener(this);
	915	+ menu.add("-");
	916	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	917	+ editLeafItem.addActionListener(this);
781	918	if (Globals.ADVANCED)
782	919	{
783	920	// Pretty much the same as duplicate and clone.
..	..	@@ -794,6 +931,79 @@
794	931	buildToolsMenu(menu);
795	932	}
796	933
	934	+ JTabbedPane resourcecontainer;
	935	+ cGridBag currenttab;
	936	+ //boolean added; // patch for jar
	937	+
	938	+ int totalcount = 0;
	939	+
	940	+ int tabcount = 0;
	941	+ int colcount = 0;
	942	+ int rowcount = 0;
	943	+ int texturecount = 0;
	944	+
	945	+ int columns = 5;
	946	+ int rows = 7;
	947	+
	948	+ public void ResourceCallBack(String[] path)
	949	+ {
	950	+// for (int i = 0; i < path.length; i++)
	951	+// System.out.print(path[i] + "/");
	952	+// System.out.println();
	953	+
	954	+ if (//rowcount == 0 \|\|
	955	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	956	+ {
	957	+ currenttab = new cGridBag();
	958	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	959	+ currenttab.setName(tabname);
	960	+ //added = false;
	961	+ resourcecontainer.add(currenttab);
	962	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	963	+ rowcount = 1;
	964	+ colcount = 0;
	965	+ texturecount = 0;
	966	+ }
	967	+
	968	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	969	+ {
	970	+ //if (!added)
	971	+ {
	972	+ //added = true;
	973	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	974	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	975	+ }
	976	+
	977	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	978	+ totalcount++;
	979	+
	980	+ if (++colcount >= columns)
	981	+ {
	982	+ colcount = 0;
	983	+ currenttab.Return();
	984	+
	985	+ if (rowcount++ >= rows)
	986	+ {
	987	+ rowcount = 0;
	988	+ }
	989	+ }
	990	+ }
	991	+ else
	992	+ {
	993	+// if (!path[path.length-1].equals("icons"))
	994	+// resourcecontainer.Return();
	995	+ }
	996	+ }
	997	+
	998	+ void CreateTexturePanel(cGridBag container)
	999	+ {
	1000	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1001	+ container.add(resourcecontainer);
	1002	+
	1003	+ Grafreed.ParseResources("textures", this);
	1004	+
	1005	+ // 935. System.out.println("Total = " + totalcount);
	1006	+ }
797	1007
798	1008	void SetupUI2(ObjEditor oe)
799	1009	{
..	..	@@ -812,11 +1022,6 @@
812	1022	//new Exception().printStackTrace();
813	1023
814	1024	oe.radioPanel = new JPanel(new GridBagLayout());
815		- oe.aConstraints.weightx = 1;
816		- oe.aConstraints.weighty = 0;
817		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
818		- oe.aConstraints.gridwidth = 100;
819		- oe.aConstraints.gridheight = 1;
820	1025	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
821	1026
822	1027	oe.buttonGroup = new ButtonGroup();
..	..	@@ -837,9 +1042,9 @@
837	1042	oe.radioPanel.add(dummyButton);
838	1043	oe.buttonGroup.add(dummyButton);
839	1044	*/
840		- cGridBag copyOptionsPanel = new cGridBag();
	1045	+ cGridBag versionManagerPanel = new cGridBag();
841	1046
842		- copyOptionsPanel.preferredHeight = 2;
	1047	+ versionManagerPanel.preferredHeight = 4;
843	1048
844	1049	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
845	1050
..	..	@@ -849,58 +1054,102 @@
849	1054
850	1055	if (Globals.ADVANCED)
851	1056	{
852		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
853		- maxButton.setToolTipText("Maximize window");
854		- maxButton.addActionListener(this);
	1057	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+// maxButton.setToolTipText("Maximize window");
	1059	+// maxButton.addActionListener(this);
855	1060	}
856	1061
857		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
858		- fullButton.setToolTipText("Full-screen window");
859		- fullButton.addActionListener(this);
	1062	+ cButton gcButton;
860	1063
861		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+// gcButton.setToolTipText("Garbage collect");
	1066	+// gcButton.addActionListener(new ActionListener()
	1067	+// {
	1068	+// public void actionPerformed(ActionEvent e)
	1069	+// {
	1070	+// System.gc();
	1071	+// }
	1072	+// });
	1073	+
	1074	+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ fullScreenButton.setToolTipText("Full-screen window");
	1076	+ fullScreenButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ collapseButton.setToolTipText("Collapse toolbar");
	1080	+ collapseButton.addActionListener(this);
	1081	+
	1082	+// oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1083	+// maximize3DButton.setToolTipText("Maximize 3D view");
	1084	+// maximize3DButton.addActionListener(this);
	1085	+
	1086	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ twoButton.setToolTipText("Show 3D view only");
	1088	+ twoButton.addActionListener(this);
	1089	+ this.fullscreenLayout = twoButton;
	1090	+
	1091	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1092	+ threeButton.setToolTipText("Show controls and 3D view");
	1093	+ threeButton.addActionListener(this);
	1094	+ if (Globals.ADVANCED)
	1095	+ {
	1096	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ sixButton.setToolTipText("Show 3D view and controls");
	1098	+ sixButton.addActionListener(this);
	1099	+ }
	1100	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1101	+// sevenButton.setToolTipText("3-column layout");
	1102	+// sevenButton.addActionListener(this);
	1103	+ //
	1104	+
	1105	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
862	1106	screenfitButton.setToolTipText("Screen fit");
863	1107	screenfitButton.addActionListener(this);
864	1108
865		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
866	1110	restoreCameraButton.setToolTipText("Restore viewpoint");
867	1111	restoreCameraButton.addActionListener(this);
868	1112
869		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
870		- saveButton.setToolTipText("New version");
871		- saveButton.addActionListener(this);
	1113	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ saveVersionButton.setToolTipText("Duplicate current version");
	1115	+ saveVersionButton.addActionListener(this);
872	1116
873		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
874		- undoButton.setToolTipText("Previous version");
875		- undoButton.addActionListener(this);
876		- undoButton.setEnabled(false);
	1117	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ deleteVersionButton.setToolTipText("Delete current version");
	1119	+ deleteVersionButton.addActionListener(this);
	1120	+ deleteVersionButton.setEnabled(false);
	1121	+
	1122	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ previousVersionButton.setToolTipText("Previous version");
	1124	+ previousVersionButton.addActionListener(this);
	1125	+ previousVersionButton.setEnabled(false);
877	1126
878	1127	cGridBag updown = new cGridBag().setVertical(true);
879		- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
880		- restoreButton.setToolTipText("Restore current");
	1128	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ restoreButton.setToolTipText("Undo (restore current version)");
881	1130	restoreButton.addActionListener(this);
882	1131	restoreButton.setEnabled(false);
883	1132
884		- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
885		- replaceButton.setToolTipText("Replace current");
	1133	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ replaceButton.setToolTipText("Save (replace current version)");
886	1135	replaceButton.addActionListener(this);
887	1136	replaceButton.setEnabled(false);
888	1137
889		- copyOptionsPanel.add(updown);
	1138	+ versionManagerPanel.add(updown);
890	1139
891		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
892		- redoButton.setToolTipText("Next version");
893		- redoButton.addActionListener(this);
894		- redoButton.setEnabled(false);
	1140	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1141	+ nextVersionButton.setToolTipText("Next version");
	1142	+ nextVersionButton.addActionListener(this);
	1143	+ nextVersionButton.setEnabled(false);
	1144	+
	1145	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1146	+ oneStepButton.setToolTipText("Animate one step forward");
	1147	+ oneStepButton.addActionListener(this);
895	1148
896	1149	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
897	1150	liveCB.setToolTipText("Enable animation");
898	1151	liveCB.addItemListener(this);
899	1152
900		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
901		- oneStepButton.setToolTipText("Animate one step forward");
902		- oneStepButton.addActionListener(this);
903		-
904	1153	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
905	1154	fastCB.setToolTipText("Fast mode");
906	1155	fastCB.addItemListener(this);
..	..	@@ -916,38 +1165,23 @@
916	1165
917	1166	if (Globals.ADVANCED)
918	1167	{
919		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
920	1169	snapobjectButton.addActionListener(this);
921	1170	snapobjectButton.setToolTipText("Snap Object");
922	1171
923		- oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1172	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
924	1173	fourButton.addActionListener(this);
925	1174	fourButton.setToolTipText("Show control panel only");
926	1175	}
927	1176
928	1177	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
929	1178
930		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
931		- twoButton.setToolTipText("Show 3D view only");
932		- twoButton.addActionListener(this);
933		- this.fullscreenLayout = twoButton;
934		-
935		- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
936		- threeButton.setToolTipText("Show controls and 3D view");
937		- threeButton.addActionListener(this);
938		- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
939		- sixButton.setToolTipText("Show 3D view and controls");
940		- sixButton.addActionListener(this);
941		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
942		-// sevenButton.setToolTipText("3-column layout");
943		-// sevenButton.addActionListener(this);
944		- //
945	1179
946		- oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
947	1181	rootButton.setToolTipText("Open selection in new tab");
948	1182	rootButton.addActionListener(this);
949	1183
950		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
951	1185	closeButton.setToolTipText("Close tab");
952	1186	closeButton.addActionListener(this);
953	1187	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..	..	@@ -956,38 +1190,38 @@
956	1190	cGridBag row1 = new cGridBag();
957	1191
958	1192	// INSERT
959		- row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
960		- gridButton.setToolTipText("Create grid");
	1193	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ gridButton.setToolTipText("Create ground");
961	1195	gridButton.addActionListener(this);
962	1196
963		- row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
964	1198	boxButton.setToolTipText("Create box");
965	1199	boxButton.addActionListener(this);
966	1200
967		- row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
968		- sphereButton.setToolTipText("Create sphere");
969		- sphereButton.addActionListener(this);
970		-
971		- row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
972		- coneButton.setToolTipText("Create cone");
973		- coneButton.addActionListener(this);
974		-
975		- row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
976		- torusButton.setToolTipText("Create torus");
977		- torusButton.addActionListener(this);
978		-
979		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1201	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
980	1202	superButton.setToolTipText("Create superellipsoid");
981	1203	superButton.addActionListener(this);
982	1204
983		- if (Globals.ADVANCED)
	1205	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ sphereButton.setToolTipText("Create sphere");
	1207	+ sphereButton.addActionListener(this);
	1208	+
	1209	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ coneButton.setToolTipText("Create cone");
	1211	+ coneButton.addActionListener(this);
	1212	+
	1213	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ torusButton.setToolTipText("Create torus");
	1215	+ torusButton.addActionListener(this);
	1216	+
	1217	+ if (false) //Globals.ADVANCED)
984	1218	{
985		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
986	1220	kleinButton.setToolTipText("Create Klein bottle");
987	1221	kleinButton.addActionListener(this);
988	1222	}
989	1223
990		- row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
991	1225	particlesButton.setToolTipText("Create particle system");
992	1226	particlesButton.addActionListener(this);
993	1227
..	..	@@ -995,71 +1229,73 @@
995	1229
996	1230	cGridBag row2 = new cGridBag();
997	1231
998		- row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
999	1233	groupButton.setToolTipText("Create group");
1000	1234	groupButton.addActionListener(this);
1001	1235
1002		- row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1003	1237	compositeButton.setToolTipText("Create composite");
1004	1238	compositeButton.addActionListener(this);
1005	1239
1006		- row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1007	1241	switchButton.setToolTipText("Create item switcher");
1008	1242	switchButton.addActionListener(this);
1009	1243
1010		- row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1244	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1011	1245	loopButton.setToolTipText("Create loop");
1012	1246	loopButton.addActionListener(this);
1013	1247
1014		- row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1248	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1015	1249	textureButton.setToolTipText("Create texture");
1016	1250	textureButton.addActionListener(this);
1017	1251
1018		- row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1252	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1019	1253	overlayButton.setToolTipText("Create overlay");
1020	1254	overlayButton.addActionListener(this);
1021	1255
1022		- row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1256	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1023	1257	lightButton.setToolTipText("Create light");
1024	1258	lightButton.addActionListener(this);
1025	1259
1026	1260	oe.toolboxPanel.add(row2);
1027	1261
1028		- // ENVYMAPS
1029		- cGridBag skyboxpane = new cGridBag();
1030		- skyboxpane.preferredHeight = 100;
	1262	+ cGridBag textures = new cGridBag();
1031	1263
1032		- oe.toolboxPanel.add(skyboxpane);
	1264	+ CreateTexturePanel(textures);
1033	1265
1034		- JTabbedPane skyboxpanel = new JTabbedPane();
1035		- skyboxpane.add(skyboxpanel);
	1266	+ int tabCount = resourcecontainer.getTabCount();
1036	1267
1037		- AddSkyboxTab0(skyboxpanel);
1038		- AddSkyboxTab1(skyboxpanel);
1039		- AddSkyboxTab2(skyboxpanel);
	1268	+ if (tabCount > 0)
	1269	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1270	+
	1271	+ oe.toolboxPanel.add(textures);
	1272	+
	1273	+ textures.preferredHeight = 100;
	1274	+
	1275	+ CreateSkyboxPanel(oe.skyboxPanel);
1040	1276
1041	1277	// EDIT panel
1042		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1278	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1043	1279	editButton.setToolTipText("Pin selection controls");
1044	1280	editButton.addActionListener(this);
1045	1281
1046		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1047		- uneditButton.setToolTipText("Remove selection controls");
	1282	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ uneditButton.setToolTipText("Unpin and remove selection controls");
1048	1284	uneditButton.addActionListener(this);
1049	1285
1050	1286	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1051		- allParamsButton.setToolTipText("Show all controle");
	1287	+ allParamsButton.setToolTipText("Show all controls");
1052	1288	allParamsButton.addActionListener(this);
1053	1289
1054		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1055		- clearPanelButton.setToolTipText("Clear edit panel");
	1290	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1291	+ clearPanelButton.setToolTipText("Clear all controls");
1056	1292	clearPanelButton.addActionListener(this);
1057	1293
1058		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1059		- unselectButton.setToolTipText("Unselect");
1060		- unselectButton.addActionListener(this);
	1294	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1295	+ //unselectButton.setToolTipText("Unselect");
	1296	+ //unselectButton.addActionListener(this);
1061	1297
1062		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1298	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1063	1299	flashSelectionButton.setToolTipText("Highlight selection");
1064	1300	flashSelectionButton.addActionListener(this);
1065	1301
..	..	@@ -1082,6 +1318,8 @@
1082	1318
1083	1319	cGridBag jSPPanel = new cGridBag();
1084	1320
	1321	+ jSPPanel.preferredHeight = 20;
	1322	+
1085	1323	JScrollPane jSP;
1086	1324	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1087	1325	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -1090,11 +1328,11 @@
1090	1328	oe.treePanel.add(jSPPanel);
1091	1329	oe.treePanel.Return();
1092	1330
1093		- oe.treePanel.add(copyOptionsPanel);
	1331	+ oe.treePanel.add(versionManagerPanel);
1094	1332	oe.treePanel.Return();
1095		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1096		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1097		- sliderPane.preferredHeight = 1;
	1333	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1334	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1335	+ versionSliderPane.preferredHeight = 3;
1098	1336
1099	1337	// mainPanel.setDividerLocation(0.1); //1.0);
1100	1338	mainPanel.setResizeWeight(0.4);
..	..	@@ -1117,7 +1355,7 @@
1117	1355	dgr.addDragGestureListener(this);
1118	1356	}catch(Exception e) {}
1119	1357	*/
1120		- radio.layout = sixButton; // sevenButton;
	1358	+ radio.layout = threeButton; // sixButton;
1121	1359	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1122	1360	}
1123	1361
..	..	@@ -1168,9 +1406,12 @@
1168	1406	smoothCB.setToolTipText("Snapping delay");
1169	1407	smoothCB.addItemListener(this);
1170	1408
1171		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1172		- slowCB.setToolTipText("Smooth interpolation");
1173		- slowCB.addItemListener(this);
	1409	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1410	+// slowCB.setToolTipText("Smooth interpolation");
	1411	+// slowCB.addItemListener(this);
	1412	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1413	+ minshaderCB.setToolTipText("Minimal fast shader");
	1414	+ minshaderCB.addItemListener(this);
1174	1415
1175	1416	// constraints.gridy += 1;
1176	1417	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1249,6 +1490,14 @@
1249	1490
1250	1491	void EditObject(Object3D obj)
1251	1492	{
	1493	+ //assert(obj instanceof Composite);
	1494	+
	1495	+// if (obj.versionlist == null)
	1496	+// {
	1497	+// obj.versionlist = new Object3D[100];
	1498	+// obj.versionindex = -1;
	1499	+// }
	1500	+
1252	1501	cRadio radioButton = new cRadio(obj.name);
1253	1502
1254	1503	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1259,7 +1508,7 @@
1259	1508	}
1260	1509
1261	1510	radioButton.SetObject(obj);
1262		- radioButton.layout = sixButton; // sevenButton;
	1511	+ radioButton.layout = threeButton; // sixButton;
1263	1512	radioButton.SetCamera(cameraView.renderCamera, false);
1264	1513	radioButton.addActionListener(this);
1265	1514	radioPanel.add(radioButton);
..	..	@@ -1273,6 +1522,7 @@
1273	1522
1274	1523	oe.SetupViews();
1275	1524
	1525	+ if (Globals.DEBUG)
1276	1526	System.out.println("SetupViews");
1277	1527	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1278	1528	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1284,6 +1534,8 @@
1284	1534	cCheckBox localCB;
1285	1535	cCheckBox crowdCB;
1286	1536	cCheckBox smoothCB;
	1537	+ cCheckBox minshaderCB;
	1538	+
1287	1539	cToggleButton fastCB;
1288	1540	cCheckBox slowCB;
1289	1541	cCheckBox boxCB;
..	..	@@ -1354,6 +1606,12 @@
1354	1606	{
1355	1607	cameraView.ToggleInertia();
1356	1608	cameraView.repaint();
	1609	+ }
	1610	+ else if(e.getSource() == minshaderCB)
	1611	+ {
	1612	+ Globals.MINSHADER ^= true;
	1613	+ cameraView.programInitialized = false;
	1614	+ cameraView.repaint();
1357	1615	}
1358	1616	else if(e.getSource() == localCB)
1359	1617	{
..	..	@@ -1631,7 +1889,12 @@
1631	1889	TreePath path;
1632	1890
1633	1891	public TransferableTreePath(TreePath tp) {
1634		- path = tp;
	1892	+ Object[] objs = new Object[tp.getPathCount()];
	1893	+ for (int i=0; i<objs.length; i++)
	1894	+ {
	1895	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1896	+ }
	1897	+ path = new TreePath(objs);
1635	1898	}
1636	1899
1637	1900	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1863,24 +2126,24 @@
1863	2126	switch(axis)
1864	2127	{
1865	2128	case 0 :
1866		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1867		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1868		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1869		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2129	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2130	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2131	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2132	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1870	2133	norm = cVector.X;
1871	2134	break;
1872	2135	case 1 :
1873		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1874		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1875		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1876		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2136	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2137	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2138	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2139	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1877	2140	norm = cVector.Y;
1878	2141	break;
1879	2142	case 2 :
1880		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1881		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1882		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1883		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2143	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2144	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2145	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2146	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1884	2147	norm = cVector.Z;
1885	2148	break;
1886	2149	}
..	..	@@ -1921,7 +2184,11 @@
1921	2184	shadow.material = new cMaterial(obj.material);
1922	2185	shadow.material.diffuse = 0.0001f;
1923	2186	shadow.material.specular = 0.0001f;
1924		- //shadow.projectedVertices[1].x = 300;
	2187	+ shadow.material.opacity = 0.75f;
	2188	+
	2189	+ AllocProjectedVertices(shadow);
	2190	+
	2191	+ shadow.projectedVertices[1].x = 300;
1925	2192
1926	2193	makeSomething(shadow);
1927	2194	}
..	..	@@ -2442,27 +2709,35 @@
2442	2709	} else
2443	2710	if (source == loopItem \|\| source == loopButton)
2444	2711	{
	2712	+ if (!group.selection.isEmpty())
	2713	+ {
2445	2714	Composite csg = new GroupLeaf();
2446		- csg.count = 5;
2447	2715	group(csg);
	2716	+ csg.count = 5;
2448	2717	Composite child = new cGroup("Branch");
2449	2718	csg.addChild(child);
2450	2719	child.addChild(csg);
	2720	+ }
2451	2721	} else
2452	2722	if (source == doubleItem)
2453	2723	{
	2724	+ if (!group.selection.isEmpty())
	2725	+ {
2454	2726	Composite csg = new GroupLeaf("Fork");
2455		- csg.count = 5;
2456	2727	group(csg);
	2728	+ csg.count = 5;
2457	2729	Composite child = new cGroup("Branch A");
2458	2730	csg.addChild(child);
2459	2731	child.addChild(csg);
2460	2732	child = new cGroup("Branch B");
2461	2733	csg.addChild(child);
2462	2734	child.addChild(csg);
	2735	+ }
2463	2736	} else
2464	2737	if (source == tripleItem)
2465	2738	{
	2739	+ if (!group.selection.isEmpty())
	2740	+ {
2466	2741	Composite csg = new GroupLeaf("Trident");
2467	2742	csg.count = 4;
2468	2743	group(csg);
..	..	@@ -2475,6 +2750,7 @@
2475	2750	child = new cGroup();
2476	2751	csg.addChild(child);
2477	2752	child.addChild(csg);
	2753	+ }
2478	2754	} else
2479	2755	if (source == computeAOItem)
2480	2756	{
..	..	@@ -2494,7 +2770,7 @@
2494	2770	if (source == invariantsItem)
2495	2771	{
2496	2772	System.out.println("Invariants:");
2497		- Grafreed.grafreeD.universe.invariants();
	2773	+ Grafreed.grafreed.universe.invariants();
2498	2774	} else
2499	2775	if (source == memoryItem)
2500	2776	{
..	..	@@ -2521,37 +2797,56 @@
2521	2797	{
2522	2798	Maximize();
2523	2799	} else
2524		- if (source == fullButton)
	2800	+ if (source == fullScreenButton)
2525	2801	{
2526	2802	ToggleFullScreen();
2527	2803	} else
2528		- if (source == undoButton)
	2804	+ if (source == collapseButton)
	2805	+ {
	2806	+ this.expandedLayout = radio.layout;
	2807	+ CollapseToolbar();
	2808	+ } else
	2809	+// if (source == maximize3DButton)
	2810	+// {
	2811	+// this.expandedLayout = radio.layout;
	2812	+// radio.layout = twoButton;
	2813	+// CollapseToolbar();
	2814	+// Show3DView();
	2815	+// } else
	2816	+ if (source == previousVersionButton)
2529	2817	{
2530	2818	// Go to previous version
2531	2819	//if (!Undo())
2532	2820	//java.awt.Toolkit.getDefaultToolkit().beep();
2533		- Undo();
	2821	+ PreviousVersion();
2534	2822	} else
2535	2823	if (source == restoreButton)
2536	2824	{
2537	2825	// Restore current version
2538	2826	Restore();
	2827	+ //restoreButton.setEnabled(false);
2539	2828	} else
2540	2829	if (source == replaceButton)
2541	2830	{
2542	2831	// Overwrite current version
2543	2832	Replace();
	2833	+ //replaceButton.setEnabled(false);
2544	2834	} else
2545		- if (source == redoButton)
	2835	+ if (source == nextVersionButton)
2546	2836	{
2547	2837	// Go to next version
2548		- Redo();
	2838	+ NextVersion();
2549	2839	} else
2550		- if (source == saveButton)
	2840	+ if (source == saveVersionButton)
2551	2841	{
2552	2842	// Save a new version
2553	2843	if (!Save(true))
2554	2844	java.awt.Toolkit.getDefaultToolkit().beep();
	2845	+ } else
	2846	+ if (source == deleteVersionButton)
	2847	+ {
	2848	+ // Delete a new version
	2849	+ DeleteVersion();
2555	2850	} else
2556	2851	if (source == oneStepButton)
2557	2852	{
..	..	@@ -2606,11 +2901,11 @@
2606	2901	} else
2607	2902	if (source == undoItem)
2608	2903	{
2609		- Undo();
	2904	+ PreviousVersion();
2610	2905	} else
2611	2906	if (source == redoItem)
2612	2907	{
2613		- Redo();
	2908	+ NextVersion();
2614	2909	} else
2615	2910	if (source == duplicateItem)
2616	2911	{
..	..	@@ -3091,22 +3386,34 @@
3091	3386	} else
3092	3387	if (source == ungroupItem \|\| source == ungroupButton)
3093	3388	{
3094		- boolean hasRoot = false;
	3389	+ boolean canUngroup = true;
3095	3390
3096	3391	for (int i=0; i<group.selection.size(); i++)
3097	3392	{
3098		- if (group.selection.get(i) == group)
	3393	+ Object3D selectedItem = group.selection.get(i);
	3394	+
	3395	+ if (selectedItem.Size() == 0)
3099	3396	{
3100		- hasRoot = true;
	3397	+ // Cannot ungroup leaves
	3398	+ canUngroup = false;
	3399	+ break;
	3400	+ }
	3401	+
	3402	+ if (selectedItem == group)
	3403	+ {
	3404	+ // Cannot ungroup root
	3405	+ canUngroup = false;
3101	3406	break;
3102	3407	}
3103	3408	}
3104	3409
3105		- if (!hasRoot)
	3410	+ if (canUngroup)
3106	3411	{
3107	3412	for (int i=0; i<group.selection.size(); i++)
3108	3413	{
3109		- Ungroup(group.selection.get(i));
	3414	+ Object3D selectedItem = group.selection.get(i);
	3415	+
	3416	+ Ungroup(selectedItem);
3110	3417	}
3111	3418
3112	3419	ClearSelection(false);
..	..	@@ -3157,6 +3464,10 @@
3157	3464	if (source == clearMaterialsItem)
3158	3465	{
3159	3466	ClearMaterials();
	3467	+ } else
	3468	+ if (source == clearVersionsItem)
	3469	+ {
	3470	+ ClearVersions();
3160	3471	} else
3161	3472	if (source == liveleavesItem)
3162	3473	{
..	..	@@ -3297,6 +3608,18 @@
3297	3608	if (source == transformChildrenItem)
3298	3609	{
3299	3610	TransformChildren();
	3611	+ } else
	3612	+ if (source == textureRatioRItem)
	3613	+ {
	3614	+ TextureRatio(0);
	3615	+ } else
	3616	+ if (source == textureRatioGItem)
	3617	+ {
	3618	+ TextureRatio(1);
	3619	+ } else
	3620	+ if (source == textureRatioBItem)
	3621	+ {
	3622	+ TextureRatio(2);
3300	3623	} else
3301	3624	if (source == resetTransformItem)
3302	3625	{
..	..	@@ -3469,38 +3792,7 @@
3469	3792	if (CameraPane.FULLSCREEN)
3470	3793	fullscreenLayout = radio.layout;
3471	3794
3472		- // bug
3473		- //gridPanel.setDividerLocation(1.0);
3474		- //bigPanel.setDividerLocation(0.0);
3475		-// bigThree.remove(scenePanel);
3476		-// bigThree.remove(centralPanel);
3477		-// bigThree.remove(XYZPanel);
3478		-// aWindowConstraints.gridx = 0;
3479		-// aWindowConstraints.gridy = 0;
3480		-// aWindowConstraints.gridwidth = 1;
3481		-// // aConstraints.gridheight = 3;
3482		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3483		-// aWindowConstraints.weightx = 0;
3484		-// aWindowConstraints.weighty = 1;
3485		-// //bigThree.add(jtp, aWindowConstraints);
3486		-// aWindowConstraints.weightx = 1;
3487		-// aWindowConstraints.gridwidth = 3;
3488		-// // aConstraints.gridheight = 3;
3489		-// aWindowConstraints.gridx = 1;
3490		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3491		-// bigThree.add(centralPanel, aWindowConstraints);
3492		-// aWindowConstraints.weightx = 0;
3493		-// aWindowConstraints.gridx = 4;
3494		-// aWindowConstraints.gridwidth = 1;
3495		-// // aConstraints.gridheight = 3;
3496		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3497		-// //bigThree.add(XYZPanel, aWindowConstraints);
3498		-// scenePanel.setVisible(false);
3499		-// centralPanel.setVisible(true);
3500		-// XYZPanel.setVisible(false);
3501		- bigThree.ClearUI();
3502		- bigThree.add(centralPanel);
3503		- bigThree.FlushUI();
	3795	+ Show3DView();
3504	3796
3505	3797	cameraView.requestFocusInWindow();
3506	3798
..	..	@@ -3686,6 +3978,7 @@
3686	3978	} else
3687	3979	if (source == rootButton)
3688	3980	{
	3981	+ Replace();
3689	3982	Object3D obj;
3690	3983	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3691	3984	{
..	..	@@ -3700,6 +3993,9 @@
3700	3993	if (source == closeButton)
3701	3994	{
3702	3995	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3996	+ if (copy.versionlist != null)
	3997	+ Replace();
	3998	+
3703	3999	cRadio ab;
3704	4000	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3705	4001	{
..	..	@@ -3743,10 +4039,10 @@
3743	4039	{
3744	4040	Object3D child = (Object3D)e.nextElement();
3745	4041	if(child.editWindow != null)
3746		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3747	4042	child.pinned = false;
3748	4043	child.CloseUI();
3749	4044	listUI.remove(child);
	4045	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3750	4046
3751	4047	//child.editWindow = null; // ???????????
3752	4048	}
..	..	@@ -3765,6 +4061,7 @@
3765	4061	obj.CloseUI();
3766	4062	}
3767	4063	listUI.clear();
	4064	+ SetPinStates(group.selection.size() > 0);
3768	4065	refreshContents(true);
3769	4066	} else
3770	4067	if (source == allParamsButton)
..	..	@@ -3797,6 +4094,9 @@
3797	4094	} else
3798	4095	if(source instanceof cRadio)
3799	4096	{
	4097	+ if (copy.versionlist != null)
	4098	+ Replace();
	4099	+
3800	4100	group.parent = keepparent;
3801	4101	group.attributes = 0;
3802	4102	//group.editWindow = null;
..	..	@@ -3821,8 +4121,6 @@
3821	4121
3822	4122	copy = group;
3823	4123
3824		- SetUndoStates();
3825		-
3826	4124	//Globals.theRenderer.object = group;
3827	4125	if(!useclient)
3828	4126	{
..	..	@@ -3850,7 +4148,34 @@
3850	4148	*/
3851	4149	radio.layout.doClick();
3852	4150
	4151	+ //assert(copy instanceof Composite);
	4152	+
	4153	+ if (copy.versionlist == null)
	4154	+ {
	4155	+ copy.versionindex = -1;
	4156	+
	4157	+ // Cannot work with loops
	4158	+ // To fix this issue, we first mark all nodes above the root,
	4159	+ // and check if any of these nodes are reachable below the root.
	4160	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4161	+
	4162	+ if (copy instanceof Composite && !copy.HasTags())
	4163	+ {
	4164	+ if (copy.versionlist == null)
	4165	+ copy.versionlist = new Object3D[100];
	4166	+
	4167	+ //Save(true);
	4168	+ }
	4169	+ else
	4170	+ copy.versionindex = -2;
	4171	+
	4172	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4173	+ }
	4174	+
	4175	+ SetVersionStates();
	4176	+
3853	4177	ClearUnpinned();
	4178	+
3854	4179	//Grafreed.Assert(group != null);
3855	4180	//Grafreed.Assert(group.selection != null);
3856	4181	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3867,11 +4192,13 @@
3867	4192	} else if (event.getSource() == editCameraItem)
3868	4193	{
3869	4194	cameraView.ProtectCamera();
	4195	+ cameraView.requestFocusInWindow();
3870	4196	cameraView.repaint();
3871	4197	return;
3872	4198	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3873	4199	{
3874	4200	cameraView.RevertCamera();
	4201	+ cameraView.requestFocusInWindow();
3875	4202	cameraView.repaint();
3876	4203	return;
3877	4204	// } else if (event.getSource() == textureButton)
..	..	@@ -3960,6 +4287,18 @@
3960	4287	refreshContents();
3961	4288	}
3962	4289
	4290	+ void TextureRatio(int axis)
	4291	+ {
	4292	+ Object3D obj;
	4293	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4294	+ {
	4295	+ obj = (Object3D)e.nextElement();
	4296	+ obj.TextureRatio(axis);
	4297	+ }
	4298	+
	4299	+ refreshContents();
	4300	+ }
	4301	+
3963	4302	void ResetTransform()
3964	4303	{
3965	4304	ResetTransform(-1);
..	..	@@ -3975,42 +4314,8 @@
3975	4314	if (obj.toParent == null)
3976	4315	continue;
3977	4316
3978		- if (mask == -1)
3979		- {
3980		- if (obj instanceof Camera) // jan 2014
3981		- {
3982		- LA.matIdentity(obj.toParent);
3983		- LA.matIdentity(obj.fromParent);
3984		- }
3985		- else
3986		- {
3987		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3988		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3989		- }
3990		- TouchTransform(obj);
3991		- continue;
3992		- }
3993		- if ((mask&2) != 0) // Scale
3994		- {
3995		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3996		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3997		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3998		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3999		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4000		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4001		- }
4002		- if ((mask&4) != 0) // Rotation
4003		- {
4004		- // ?
4005		- }
4006		- if ((mask&1) != 0) // Translation
4007		- {
4008		- if (obj.toParent != null)
4009		- {
4010		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
4011		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
4012		- }
4013		- }
	4317	+ obj.ResetTransform(mask);
	4318	+
4014	4319	if (obj.parent == null)
4015	4320	{
4016	4321	System.out.println("NULL PARENT!");
..	..	@@ -4519,6 +4824,12 @@
4519	4824	{
4520	4825	Object3D obj = group.selection.get(i);
4521	4826
	4827	+ if (obj.toParent == null)
	4828	+ {
	4829	+ obj.toParent = LA.newMatrix();
	4830	+ obj.fromParent = LA.newMatrix();
	4831	+ }
	4832	+
4522	4833	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4523	4834	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4524	4835	}
..	..	@@ -4810,6 +5121,12 @@
4810	5121	refreshContents();
4811	5122	}
4812	5123
	5124	+ void ClearVersions()
	5125	+ {
	5126	+ group.selection.ClearVersions();
	5127	+ refreshContents();
	5128	+ }
	5129	+
4813	5130	void FlipV(boolean flip)
4814	5131	{
4815	5132	group.selection.FlipV(flip);
..	..	@@ -5004,9 +5321,7 @@
5004	5321
5005	5322	freezemodel = false;
5006	5323	}
5007		-
5008		- boolean flashIt = true;
5009		-
	5324	+
5010	5325	public void valueChanged(TreeSelectionEvent e)
5011	5326	//public boolean handleEvent(Event event)
5012	5327	{
..	..	@@ -5050,7 +5365,7 @@
5050	5365	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
5051	5366	// a camera
5052	5367	{
5053		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5368	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
5054	5369	{
5055	5370	CameraPane.camerachangeframe = 0; // don't refuse it
5056	5371	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -5079,13 +5394,31 @@
5079	5394	{
5080	5395	editButton.setEnabled(enabled);
5081	5396	uneditButton.setEnabled(enabled);
5082		- unselectButton.setEnabled(enabled);
	5397	+ //unselectButton.setEnabled(enabled);
5083	5398	flashSelectionButton.setEnabled(enabled);
	5399	+
	5400	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5401	+
	5402	+ boolean allComposites = true;
	5403	+
	5404	+ if (group.selection != null)
	5405	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5406	+ {
	5407	+ Object next = e.nextElement();
	5408	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5409	+ {
	5410	+ allComposites = false;
	5411	+ break;
	5412	+ }
	5413	+ }
	5414	+
	5415	+ rootButton.setEnabled(true); // allComposites);
5084	5416	}
5085	5417
5086	5418	void refreshContents(boolean cp)
5087	5419	{
5088		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5420	+ if (Globals.SHOWINFO)
	5421	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5089	5422	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5090	5423	{
5091	5424	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5095,7 +5428,7 @@
5095	5428	Object3D child = (Object3D) group.selection.get(i);
5096	5429
5097	5430	objEditor.AddInfo(child, this, true);
5098		- System.err.println("info : " + child.GetPath());
	5431	+// System.err.println("info : " + child.GetPath());
5099	5432	}
5100	5433
5101	5434	objEditor.SetText(); // jan 2014
..	..	@@ -5921,7 +6254,6 @@
5921	6254
5922	6255	cButton restoreCameraButton;
5923	6256
5924		- cButton saveButton;
5925	6257	cButton oneStepButton;
5926	6258
5927	6259	cButton groupButton;
..	..	@@ -5979,11 +6311,11 @@
5979	6311	private MenuItem lookAtItem;
5980	6312	private MenuItem lookFromItem;
5981	6313	private MenuItem switchViewItem;
5982		- private MenuItem cutItem;
	6314	+ private JMenuItem cutItem;
5983	6315	private MenuItem undoItem;
5984	6316	private MenuItem redoItem;
5985	6317	private JMenuItem duplicateItem;
5986		- private MenuItem cloneItem;
	6318	+ private JMenuItem cloneItem;
5987	6319	private MenuItem cloneSupportItem;
5988	6320	private MenuItem overwriteGeoItem;
5989	6321	private MenuItem overwriteMatItem;
..	..	@@ -6004,13 +6336,13 @@
6004	6336	private MenuItem cloneGeometriesItem;
6005	6337	private MenuItem shareGeometriesItem;
6006	6338	private MenuItem mergeGeometriesItem;
6007		- private MenuItem copyItem;
	6339	+ private JMenuItem copyItem;
6008	6340	private MenuItem pasteItem;
6009		- private MenuItem pasteIntoItem;
6010		- private MenuItem pasteLinkItem;
6011		- private MenuItem pasteCloneItem;
6012		- private MenuItem pasteExpandItem;
6013		- private MenuItem deleteItem;
	6341	+ private JMenuItem pasteIntoItem;
	6342	+ private JMenuItem pasteLinkItem;
	6343	+ private JMenuItem pasteCloneItem;
	6344	+ private JMenuItem pasteExpandItem;
	6345	+ private JMenuItem deleteItem;
6014	6346	private MenuItem clearAllItem;
6015	6347	private MenuItem genUVItem;
6016	6348	private MenuItem genNormalsMESHItem;
..	..	@@ -6036,6 +6368,7 @@
6036	6368	private MenuItem clipMeshItem;
6037	6369	private MenuItem smoothMeshItem;
6038	6370	private MenuItem clearMaterialsItem;
	6371	+ private MenuItem clearVersionsItem;
6039	6372
6040	6373	private MenuItem liveleavesItem;
6041	6374	private MenuItem unliveleavesItem;
..	..	@@ -6059,13 +6392,16 @@
6059	6392	private MenuItem maxTexturesItem;
6060	6393	private MenuItem panoTexturesItem;
6061	6394
	6395	+ private MenuItem textureRatioRItem;
	6396	+ private MenuItem textureRatioGItem;
	6397	+ private MenuItem textureRatioBItem;
6062	6398	private MenuItem resetCentroidItem;
6063	6399	private MenuItem resetCentroidXZItem;
6064	6400	private MenuItem resetTransformItem;
6065	6401	private MenuItem transformGeometryItem;
6066	6402	private MenuItem transformChildrenItem;
6067	6403	private MenuItem hideItem;
6068		- private MenuItem grabItem;
	6404	+ private JMenuItem grabItem;
6069	6405	private MenuItem backItem;
6070	6406	private MenuItem frontItem;
6071	6407	private MenuItem cameraItem;
..	..	@@ -6078,7 +6414,7 @@
6078	6414	private MenuItem switchTransfoItem;
6079	6415	private MenuItem morphItem;
6080	6416	private MenuItem linkerItem;
6081		- private MenuItem ungroupItem;
	6417	+ private JMenuItem ungroupItem;
6082	6418	private MenuItem editItem;
6083	6419	private MenuItem openWindowItem;
6084	6420	private MenuItem editLeafItem;