~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,122 @@
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	+
	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	+
257	381	//ObjEditor objEditor;
258	382	public void closeUI2()
259	383	{
..	..	@@ -291,11 +415,15 @@
291	415	this.copy = this.group = group;
292	416	//selectees = this.group.selectees;
293	417
294		- if (copy.versions == null)
295		- {
296		- copy.versions = new byte[100][];
297		- copy.versionindex = -1;
298		- }
	418	+ assert(false);
	419	+
	420	+// if (copy.versionlist == null)
	421	+// {
	422	+// copy.versionlist = new Object3D[100];
	423	+// copy.versionindex = -1;
	424	+//
	425	+// //Save(true);
	426	+// }
299	427
300	428	if(ui)
301	429	SetupUI(objEditor);
..	..	@@ -318,13 +446,13 @@
318	446
319	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
320	448
321		- if (copy.versions == null)
322		- {
323		- copy.versions = new byte[100][];
324		- copy.versionindex = -1;
325		-
326		- Save(true);
327		- }
	449	+// if (copy.versionlist == null)
	450	+// {
	451	+// copy.versionlist = new Object3D[100];
	452	+// copy.versionindex = -1;
	453	+//
	454	+// //Save(true);
	455	+// }
328	456	}
329	457
330	458	void CloneSelection(boolean supports)
..	..	@@ -414,33 +542,35 @@
414	542	// menu.add("-");
415	543	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
416	544	duplicateItem.addActionListener(this);
417		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
418	547	cloneItem.addActionListener(this);
419		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
420	549	{
421	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
422	551	cloneSupportItem.addActionListener(this);
423	552	}
	553	+ oe.jTree.popup.addSeparator();
424	554	menu.add("-");
425		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
426	556	cutItem.addActionListener(this);
427		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
428	558	copyItem.addActionListener(this);
429	559	pasteItem = menu.add(new MenuItem("Paste"));
430	560	pasteItem.addActionListener(this);
431	561
432		- menu.add("-");
433		- 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"));
434	565	pasteIntoItem.addActionListener(this);
435		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
436	567	pasteLinkItem.addActionListener(this);
437		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
438	569	pasteCloneItem.addActionListener(this);
439		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
440	571	// pasteExpandItem.addActionListener(this);
441		- menu.add("-");
442		- deleteItem = menu.add(new MenuItem("Delete"));
443		- deleteItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
444	574
445	575	if (Globals.ADVANCED)
446	576	{
..	..	@@ -526,11 +656,9 @@
526	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
527	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
528	658	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
529		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
530	659	oe.cameraMenu.add("-");
531	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
532	661	openWindowItem.addActionListener(this);
533		- editLeafItem.addActionListener(this);
534	662	lookAtItem.addActionListener(this);
535	663	//lookFromItem.addActinoListener(this);
536	664	//switchViewItem.addActionListener(this);
..	..	@@ -577,9 +705,8 @@
577	705	setMasterItem.addActionListener(this);
578	706	}
579	707
580		- oe.menuBar.add(menu = new Menu("Group"));
581		-// grabItem = menu.add(new MenuItem("Grab"));
582		-// grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
583	710	backItem = menu.add(new MenuItem("Back"));
584	711	backItem.addActionListener(this);
585	712	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -587,13 +714,21 @@
587	714	// compositeItem = menu.add(new MenuItem("Composite"));
588	715	// compositeItem.addActionListener(this);
589	716
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
590	720	if (Globals.ADVANCED)
591	721	{
592	722	hideItem = menu.add(new MenuItem("Hidden Group"));
593	723	hideItem.addActionListener(this);
594	724	}
595		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
596	726	ungroupItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
597	732
598	733	// menu.add("-");
599	734	//
..	..	@@ -630,11 +765,11 @@
630	765	shadowYItem.addActionListener(this);
631	766	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
632	767	shadowZItem.addActionListener(this);
633		- attributeItem = menu.add(new MenuItem("Attribute"));
634		- attributeItem.addActionListener(this);
635	768
636	769	if (Globals.ADVANCED)
637	770	{
	771	+ attributeItem = menu.add(new MenuItem("Attribute"));
	772	+ attributeItem.addActionListener(this);
638	773	menu.add("-");
639	774	linkerItem = menu.add(new MenuItem("Linker"));
640	775	linkerItem.addActionListener(this);
..	..	@@ -644,11 +779,18 @@
644	779	pointflowItem.addActionListener(this);
645	780	}
646	781	menu.add("-");
	782	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	783	+ textureRatioRItem.addActionListener(this);
	784	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	785	+ textureRatioGItem.addActionListener(this);
	786	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	787	+ textureRatioBItem.addActionListener(this);
	788	+ menu.add("-");
647	789	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
648	790	resetTransformItem.addActionListener(this);
649	791	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
650	792	resetCentroidItem.addActionListener(this);
651		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	793	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
652	794	resetCentroidXZItem.addActionListener(this);
653	795	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
654	796	transformGeometryItem.addActionListener(this);
..	..	@@ -700,6 +842,8 @@
700	842	}
701	843
702	844	oe.menuBar.add(menu = new Menu("Attributes"));
	845	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	846	+ clearVersionsItem.addActionListener(this);
703	847	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
704	848	clearMaterialsItem.addActionListener(this);
705	849	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -722,9 +866,9 @@
722	866	hideleavesItem.addActionListener(this);
723	867	showleavesItem = menu.add(new MenuItem("Show Leaves"));
724	868	showleavesItem.addActionListener(this);
725		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	869	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
726	870	markleavesItem.addActionListener(this);
727		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	871	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
728	872	unmarkleavesItem.addActionListener(this);
729	873	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
730	874	rewindleavesItem.addActionListener(this);
..	..	@@ -778,6 +922,9 @@
778	922	shareGeometriesItem.addActionListener(this);
779	923	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
780	924	mergeGeometriesItem.addActionListener(this);
	925	+ menu.add("-");
	926	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	927	+ editLeafItem.addActionListener(this);
781	928	if (Globals.ADVANCED)
782	929	{
783	930	// Pretty much the same as duplicate and clone.
..	..	@@ -794,6 +941,79 @@
794	941	buildToolsMenu(menu);
795	942	}
796	943
	944	+ JTabbedPane resourcecontainer;
	945	+ cGridBag currenttab;
	946	+ //boolean added; // patch for jar
	947	+
	948	+ int totalcount = 0;
	949	+
	950	+ int tabcount = 0;
	951	+ int colcount = 0;
	952	+ int rowcount = 0;
	953	+ int texturecount = 0;
	954	+
	955	+ int columns = 5;
	956	+ int rows = 7;
	957	+
	958	+ public void ResourceCallBack(String[] path)
	959	+ {
	960	+// for (int i = 0; i < path.length; i++)
	961	+// System.out.print(path[i] + "/");
	962	+// System.out.println();
	963	+
	964	+ if (//rowcount == 0 \|\|
	965	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	966	+ {
	967	+ currenttab = new cGridBag();
	968	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	969	+ currenttab.setName(tabname);
	970	+ //added = false;
	971	+ resourcecontainer.add(currenttab);
	972	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	973	+ rowcount = 1;
	974	+ colcount = 0;
	975	+ texturecount = 0;
	976	+ }
	977	+
	978	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	979	+ {
	980	+ //if (!added)
	981	+ {
	982	+ //added = true;
	983	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	984	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	985	+ }
	986	+
	987	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	988	+ totalcount++;
	989	+
	990	+ if (++colcount >= columns)
	991	+ {
	992	+ colcount = 0;
	993	+ currenttab.Return();
	994	+
	995	+ if (rowcount++ >= rows)
	996	+ {
	997	+ rowcount = 0;
	998	+ }
	999	+ }
	1000	+ }
	1001	+ else
	1002	+ {
	1003	+// if (!path[path.length-1].equals("icons"))
	1004	+// resourcecontainer.Return();
	1005	+ }
	1006	+ }
	1007	+
	1008	+ void CreateTexturePanel(cGridBag container)
	1009	+ {
	1010	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1011	+ container.add(resourcecontainer);
	1012	+
	1013	+ Grafreed.ParseResources("textures", this);
	1014	+
	1015	+ // 935. System.out.println("Total = " + totalcount);
	1016	+ }
797	1017
798	1018	void SetupUI2(ObjEditor oe)
799	1019	{
..	..	@@ -812,11 +1032,6 @@
812	1032	//new Exception().printStackTrace();
813	1033
814	1034	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	1035	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
821	1036
822	1037	oe.buttonGroup = new ButtonGroup();
..	..	@@ -837,9 +1052,9 @@
837	1052	oe.radioPanel.add(dummyButton);
838	1053	oe.buttonGroup.add(dummyButton);
839	1054	*/
840		- cGridBag copyOptionsPanel = new cGridBag();
	1055	+ cGridBag versionManagerPanel = new cGridBag();
841	1056
842		- copyOptionsPanel.preferredHeight = 2;
	1057	+ versionManagerPanel.preferredHeight = 4;
843	1058
844	1059	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
845	1060
..	..	@@ -849,58 +1064,102 @@
849	1064
850	1065	if (Globals.ADVANCED)
851	1066	{
852		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
853		- maxButton.setToolTipText("Maximize window");
854		- maxButton.addActionListener(this);
	1067	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+// maxButton.setToolTipText("Maximize window");
	1069	+// maxButton.addActionListener(this);
855	1070	}
856	1071
857		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ cButton gcButton;
	1073	+
	1074	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+// gcButton.setToolTipText("Garbage collect");
	1076	+// gcButton.addActionListener(new ActionListener()
	1077	+// {
	1078	+// public void actionPerformed(ActionEvent e)
	1079	+// {
	1080	+// System.gc();
	1081	+// }
	1082	+// });
	1083	+
	1084	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ collapseButton.setToolTipText("Collapse toolbar");
	1086	+ collapseButton.addActionListener(this);
	1087	+
	1088	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1090	+ maximize3DButton.addActionListener(this);
	1091	+
	1092	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ twoButton.setToolTipText("Show 3D view only");
	1094	+ twoButton.addActionListener(this);
	1095	+ this.fullscreenLayout = twoButton;
	1096	+
	1097	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ threeButton.setToolTipText("Show controls and 3D view");
	1099	+ threeButton.addActionListener(this);
	1100	+ if (Globals.ADVANCED)
	1101	+ {
	1102	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ sixButton.setToolTipText("Show 3D view and controls");
	1104	+ sixButton.addActionListener(this);
	1105	+ }
	1106	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+// sevenButton.setToolTipText("3-column layout");
	1108	+// sevenButton.addActionListener(this);
	1109	+ //
	1110	+
	1111	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
858	1112	fullButton.setToolTipText("Full-screen window");
859	1113	fullButton.addActionListener(this);
860	1114
861		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
862	1116	screenfitButton.setToolTipText("Screen fit");
863	1117	screenfitButton.addActionListener(this);
864	1118
865		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
866	1120	restoreCameraButton.setToolTipText("Restore viewpoint");
867	1121	restoreCameraButton.addActionListener(this);
868	1122
869		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
870		- saveButton.setToolTipText("New version");
871		- saveButton.addActionListener(this);
	1123	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ saveVersionButton.setToolTipText("Duplicate current version");
	1125	+ saveVersionButton.addActionListener(this);
872	1126
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);
	1127	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1128	+ deleteVersionButton.setToolTipText("Delete current version");
	1129	+ deleteVersionButton.addActionListener(this);
	1130	+ deleteVersionButton.setEnabled(false);
	1131	+
	1132	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1133	+ previousVersionButton.setToolTipText("Previous version");
	1134	+ previousVersionButton.addActionListener(this);
	1135	+ previousVersionButton.setEnabled(false);
877	1136
878	1137	cGridBag updown = new cGridBag().setVertical(true);
879		- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
880		- restoreButton.setToolTipText("Restore current");
	1138	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1139	+ restoreButton.setToolTipText("Undo (restore current version)");
881	1140	restoreButton.addActionListener(this);
882	1141	restoreButton.setEnabled(false);
883	1142
884		- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
885		- replaceButton.setToolTipText("Replace current");
	1143	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ replaceButton.setToolTipText("Save (replace current version)");
886	1145	replaceButton.addActionListener(this);
887	1146	replaceButton.setEnabled(false);
888	1147
889		- copyOptionsPanel.add(updown);
	1148	+ versionManagerPanel.add(updown);
890	1149
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);
	1150	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1151	+ nextVersionButton.setToolTipText("Next version");
	1152	+ nextVersionButton.addActionListener(this);
	1153	+ nextVersionButton.setEnabled(false);
	1154	+
	1155	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1156	+ oneStepButton.setToolTipText("Animate one step forward");
	1157	+ oneStepButton.addActionListener(this);
895	1158
896	1159	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
897	1160	liveCB.setToolTipText("Enable animation");
898	1161	liveCB.addItemListener(this);
899	1162
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	1163	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
905	1164	fastCB.setToolTipText("Fast mode");
906	1165	fastCB.addItemListener(this);
..	..	@@ -916,38 +1175,23 @@
916	1175
917	1176	if (Globals.ADVANCED)
918	1177	{
919		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1178	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
920	1179	snapobjectButton.addActionListener(this);
921	1180	snapobjectButton.setToolTipText("Snap Object");
922	1181
923		- oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
924	1183	fourButton.addActionListener(this);
925	1184	fourButton.setToolTipText("Show control panel only");
926	1185	}
927	1186
928	1187	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
929	1188
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	1189
946		- oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
947	1191	rootButton.setToolTipText("Open selection in new tab");
948	1192	rootButton.addActionListener(this);
949	1193
950		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
951	1195	closeButton.setToolTipText("Close tab");
952	1196	closeButton.addActionListener(this);
953	1197	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..	..	@@ -956,38 +1200,38 @@
956	1200	cGridBag row1 = new cGridBag();
957	1201
958	1202	// INSERT
959		- row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
960		- gridButton.setToolTipText("Create grid");
	1203	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ gridButton.setToolTipText("Create ground");
961	1205	gridButton.addActionListener(this);
962	1206
963		- row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
964	1208	boxButton.setToolTipText("Create box");
965	1209	boxButton.addActionListener(this);
966	1210
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);
	1211	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
980	1212	superButton.setToolTipText("Create superellipsoid");
981	1213	superButton.addActionListener(this);
982	1214
983		- if (Globals.ADVANCED)
	1215	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ sphereButton.setToolTipText("Create sphere");
	1217	+ sphereButton.addActionListener(this);
	1218	+
	1219	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ coneButton.setToolTipText("Create cone");
	1221	+ coneButton.addActionListener(this);
	1222	+
	1223	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ torusButton.setToolTipText("Create torus");
	1225	+ torusButton.addActionListener(this);
	1226	+
	1227	+ if (false) //Globals.ADVANCED)
984	1228	{
985		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
986	1230	kleinButton.setToolTipText("Create Klein bottle");
987	1231	kleinButton.addActionListener(this);
988	1232	}
989	1233
990		- row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
991	1235	particlesButton.setToolTipText("Create particle system");
992	1236	particlesButton.addActionListener(this);
993	1237
..	..	@@ -995,71 +1239,73 @@
995	1239
996	1240	cGridBag row2 = new cGridBag();
997	1241
998		- row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1242	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
999	1243	groupButton.setToolTipText("Create group");
1000	1244	groupButton.addActionListener(this);
1001	1245
1002		- row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1003	1247	compositeButton.setToolTipText("Create composite");
1004	1248	compositeButton.addActionListener(this);
1005	1249
1006		- row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1007	1251	switchButton.setToolTipText("Create item switcher");
1008	1252	switchButton.addActionListener(this);
1009	1253
1010		- row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1254	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1011	1255	loopButton.setToolTipText("Create loop");
1012	1256	loopButton.addActionListener(this);
1013	1257
1014		- row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1258	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1015	1259	textureButton.setToolTipText("Create texture");
1016	1260	textureButton.addActionListener(this);
1017	1261
1018		- row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1262	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1019	1263	overlayButton.setToolTipText("Create overlay");
1020	1264	overlayButton.addActionListener(this);
1021	1265
1022		- row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1023	1267	lightButton.setToolTipText("Create light");
1024	1268	lightButton.addActionListener(this);
1025	1269
1026	1270	oe.toolboxPanel.add(row2);
1027	1271
1028		- // ENVYMAPS
1029		- cGridBag skyboxpane = new cGridBag();
1030		- skyboxpane.preferredHeight = 100;
	1272	+ cGridBag textures = new cGridBag();
1031	1273
1032		- oe.toolboxPanel.add(skyboxpane);
	1274	+ CreateTexturePanel(textures);
1033	1275
1034		- JTabbedPane skyboxpanel = new JTabbedPane();
1035		- skyboxpane.add(skyboxpanel);
	1276	+ int tabCount = resourcecontainer.getTabCount();
1036	1277
1037		- AddSkyboxTab0(skyboxpanel);
1038		- AddSkyboxTab1(skyboxpanel);
1039		- AddSkyboxTab2(skyboxpanel);
	1278	+ if (tabCount > 0)
	1279	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1280	+
	1281	+ oe.toolboxPanel.add(textures);
	1282	+
	1283	+ textures.preferredHeight = 100;
	1284	+
	1285	+ CreateSkyboxPanel(oe.skyboxPanel);
1040	1286
1041	1287	// EDIT panel
1042		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1288	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1043	1289	editButton.setToolTipText("Pin selection controls");
1044	1290	editButton.addActionListener(this);
1045	1291
1046		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1047		- uneditButton.setToolTipText("Remove selection controls");
	1292	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1293	+ uneditButton.setToolTipText("Unpin and remove selection controls");
1048	1294	uneditButton.addActionListener(this);
1049	1295
1050	1296	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1051		- allParamsButton.setToolTipText("Show all controle");
	1297	+ allParamsButton.setToolTipText("Show all controls");
1052	1298	allParamsButton.addActionListener(this);
1053	1299
1054		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1055		- clearPanelButton.setToolTipText("Clear edit panel");
	1300	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1301	+ clearPanelButton.setToolTipText("Clear all controls");
1056	1302	clearPanelButton.addActionListener(this);
1057	1303
1058		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1059		- unselectButton.setToolTipText("Unselect");
1060		- unselectButton.addActionListener(this);
	1304	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1305	+ //unselectButton.setToolTipText("Unselect");
	1306	+ //unselectButton.addActionListener(this);
1061	1307
1062		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1308	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1063	1309	flashSelectionButton.setToolTipText("Highlight selection");
1064	1310	flashSelectionButton.addActionListener(this);
1065	1311
..	..	@@ -1082,6 +1328,8 @@
1082	1328
1083	1329	cGridBag jSPPanel = new cGridBag();
1084	1330
	1331	+ jSPPanel.preferredHeight = 20;
	1332	+
1085	1333	JScrollPane jSP;
1086	1334	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1087	1335	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -1090,11 +1338,11 @@
1090	1338	oe.treePanel.add(jSPPanel);
1091	1339	oe.treePanel.Return();
1092	1340
1093		- oe.treePanel.add(copyOptionsPanel);
	1341	+ oe.treePanel.add(versionManagerPanel);
1094	1342	oe.treePanel.Return();
1095		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1096		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1097		- sliderPane.preferredHeight = 1;
	1343	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1344	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1345	+ versionSliderPane.preferredHeight = 3;
1098	1346
1099	1347	// mainPanel.setDividerLocation(0.1); //1.0);
1100	1348	mainPanel.setResizeWeight(0.4);
..	..	@@ -1117,7 +1365,7 @@
1117	1365	dgr.addDragGestureListener(this);
1118	1366	}catch(Exception e) {}
1119	1367	*/
1120		- radio.layout = sixButton; // sevenButton;
	1368	+ radio.layout = threeButton; // sixButton;
1121	1369	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1122	1370	}
1123	1371
..	..	@@ -1168,9 +1416,12 @@
1168	1416	smoothCB.setToolTipText("Snapping delay");
1169	1417	smoothCB.addItemListener(this);
1170	1418
1171		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1172		- slowCB.setToolTipText("Smooth interpolation");
1173		- slowCB.addItemListener(this);
	1419	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1420	+// slowCB.setToolTipText("Smooth interpolation");
	1421	+// slowCB.addItemListener(this);
	1422	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1423	+ minshaderCB.setToolTipText("Minimal fast shader");
	1424	+ minshaderCB.addItemListener(this);
1174	1425
1175	1426	// constraints.gridy += 1;
1176	1427	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1249,6 +1500,14 @@
1249	1500
1250	1501	void EditObject(Object3D obj)
1251	1502	{
	1503	+ //assert(obj instanceof Composite);
	1504	+
	1505	+// if (obj.versionlist == null)
	1506	+// {
	1507	+// obj.versionlist = new Object3D[100];
	1508	+// obj.versionindex = -1;
	1509	+// }
	1510	+
1252	1511	cRadio radioButton = new cRadio(obj.name);
1253	1512
1254	1513	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1259,7 +1518,7 @@
1259	1518	}
1260	1519
1261	1520	radioButton.SetObject(obj);
1262		- radioButton.layout = sixButton; // sevenButton;
	1521	+ radioButton.layout = threeButton; // sixButton;
1263	1522	radioButton.SetCamera(cameraView.renderCamera, false);
1264	1523	radioButton.addActionListener(this);
1265	1524	radioPanel.add(radioButton);
..	..	@@ -1273,6 +1532,7 @@
1273	1532
1274	1533	oe.SetupViews();
1275	1534
	1535	+ if (Globals.DEBUG)
1276	1536	System.out.println("SetupViews");
1277	1537	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1278	1538	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1284,6 +1544,8 @@
1284	1544	cCheckBox localCB;
1285	1545	cCheckBox crowdCB;
1286	1546	cCheckBox smoothCB;
	1547	+ cCheckBox minshaderCB;
	1548	+
1287	1549	cToggleButton fastCB;
1288	1550	cCheckBox slowCB;
1289	1551	cCheckBox boxCB;
..	..	@@ -1354,6 +1616,12 @@
1354	1616	{
1355	1617	cameraView.ToggleInertia();
1356	1618	cameraView.repaint();
	1619	+ }
	1620	+ else if(e.getSource() == minshaderCB)
	1621	+ {
	1622	+ Globals.MINSHADER ^= true;
	1623	+ cameraView.programInitialized = false;
	1624	+ cameraView.repaint();
1357	1625	}
1358	1626	else if(e.getSource() == localCB)
1359	1627	{
..	..	@@ -1631,7 +1899,12 @@
1631	1899	TreePath path;
1632	1900
1633	1901	public TransferableTreePath(TreePath tp) {
1634		- path = tp;
	1902	+ Object[] objs = new Object[tp.getPathCount()];
	1903	+ for (int i=0; i<objs.length; i++)
	1904	+ {
	1905	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1906	+ }
	1907	+ path = new TreePath(objs);
1635	1908	}
1636	1909
1637	1910	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1863,24 +2136,24 @@
1863	2136	switch(axis)
1864	2137	{
1865	2138	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;
	2139	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2140	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2141	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2142	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1870	2143	norm = cVector.X;
1871	2144	break;
1872	2145	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;
	2146	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2147	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2148	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2149	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1877	2150	norm = cVector.Y;
1878	2151	break;
1879	2152	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;
	2153	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2154	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2155	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2156	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1884	2157	norm = cVector.Z;
1885	2158	break;
1886	2159	}
..	..	@@ -1921,7 +2194,11 @@
1921	2194	shadow.material = new cMaterial(obj.material);
1922	2195	shadow.material.diffuse = 0.0001f;
1923	2196	shadow.material.specular = 0.0001f;
1924		- //shadow.projectedVertices[1].x = 300;
	2197	+ shadow.material.opacity = 0.75f;
	2198	+
	2199	+ AllocProjectedVertices(shadow);
	2200	+
	2201	+ shadow.projectedVertices[1].x = 300;
1925	2202
1926	2203	makeSomething(shadow);
1927	2204	}
..	..	@@ -2442,27 +2719,35 @@
2442	2719	} else
2443	2720	if (source == loopItem \|\| source == loopButton)
2444	2721	{
	2722	+ if (!group.selection.isEmpty())
	2723	+ {
2445	2724	Composite csg = new GroupLeaf();
2446	2725	csg.count = 5;
2447		- group(csg);
2448	2726	Composite child = new cGroup("Branch");
2449	2727	csg.addChild(child);
2450	2728	child.addChild(csg);
	2729	+ group(csg);
	2730	+ }
2451	2731	} else
2452	2732	if (source == doubleItem)
2453	2733	{
	2734	+ if (!group.selection.isEmpty())
	2735	+ {
2454	2736	Composite csg = new GroupLeaf("Fork");
2455	2737	csg.count = 5;
2456		- group(csg);
2457	2738	Composite child = new cGroup("Branch A");
2458	2739	csg.addChild(child);
2459	2740	child.addChild(csg);
2460	2741	child = new cGroup("Branch B");
2461	2742	csg.addChild(child);
2462	2743	child.addChild(csg);
	2744	+ group(csg);
	2745	+ }
2463	2746	} else
2464	2747	if (source == tripleItem)
2465	2748	{
	2749	+ if (!group.selection.isEmpty())
	2750	+ {
2466	2751	Composite csg = new GroupLeaf("Trident");
2467	2752	csg.count = 4;
2468	2753	group(csg);
..	..	@@ -2475,6 +2760,7 @@
2475	2760	child = new cGroup();
2476	2761	csg.addChild(child);
2477	2762	child.addChild(csg);
	2763	+ }
2478	2764	} else
2479	2765	if (source == computeAOItem)
2480	2766	{
..	..	@@ -2494,7 +2780,7 @@
2494	2780	if (source == invariantsItem)
2495	2781	{
2496	2782	System.out.println("Invariants:");
2497		- Grafreed.grafreeD.universe.invariants();
	2783	+ Grafreed.grafreed.universe.invariants();
2498	2784	} else
2499	2785	if (source == memoryItem)
2500	2786	{
..	..	@@ -2525,33 +2811,52 @@
2525	2811	{
2526	2812	ToggleFullScreen();
2527	2813	} else
2528		- if (source == undoButton)
	2814	+ if (source == collapseButton)
	2815	+ {
	2816	+ this.expandedLayout = radio.layout;
	2817	+ CollapseToolbar();
	2818	+ } else
	2819	+ if (source == maximize3DButton)
	2820	+ {
	2821	+ this.expandedLayout = radio.layout;
	2822	+ radio.layout = twoButton;
	2823	+ Show3DView();
	2824	+ CollapseToolbar();
	2825	+ } else
	2826	+ if (source == previousVersionButton)
2529	2827	{
2530	2828	// Go to previous version
2531	2829	//if (!Undo())
2532	2830	//java.awt.Toolkit.getDefaultToolkit().beep();
2533		- Undo();
	2831	+ PreviousVersion();
2534	2832	} else
2535	2833	if (source == restoreButton)
2536	2834	{
2537	2835	// Restore current version
2538	2836	Restore();
	2837	+ //restoreButton.setEnabled(false);
2539	2838	} else
2540	2839	if (source == replaceButton)
2541	2840	{
2542	2841	// Overwrite current version
2543	2842	Replace();
	2843	+ //replaceButton.setEnabled(false);
2544	2844	} else
2545		- if (source == redoButton)
	2845	+ if (source == nextVersionButton)
2546	2846	{
2547	2847	// Go to next version
2548		- Redo();
	2848	+ NextVersion();
2549	2849	} else
2550		- if (source == saveButton)
	2850	+ if (source == saveVersionButton)
2551	2851	{
2552	2852	// Save a new version
2553	2853	if (!Save(true))
2554	2854	java.awt.Toolkit.getDefaultToolkit().beep();
	2855	+ } else
	2856	+ if (source == deleteVersionButton)
	2857	+ {
	2858	+ // Delete a new version
	2859	+ DeleteVersion();
2555	2860	} else
2556	2861	if (source == oneStepButton)
2557	2862	{
..	..	@@ -2606,11 +2911,11 @@
2606	2911	} else
2607	2912	if (source == undoItem)
2608	2913	{
2609		- Undo();
	2914	+ PreviousVersion();
2610	2915	} else
2611	2916	if (source == redoItem)
2612	2917	{
2613		- Redo();
	2918	+ NextVersion();
2614	2919	} else
2615	2920	if (source == duplicateItem)
2616	2921	{
..	..	@@ -3091,22 +3396,34 @@
3091	3396	} else
3092	3397	if (source == ungroupItem \|\| source == ungroupButton)
3093	3398	{
3094		- boolean hasRoot = false;
	3399	+ boolean canUngroup = true;
3095	3400
3096	3401	for (int i=0; i<group.selection.size(); i++)
3097	3402	{
3098		- if (group.selection.get(i) == group)
	3403	+ Object3D selectedItem = group.selection.get(i);
	3404	+
	3405	+ if (selectedItem.Size() == 0)
3099	3406	{
3100		- hasRoot = true;
	3407	+ // Cannot ungroup leaves
	3408	+ canUngroup = false;
	3409	+ break;
	3410	+ }
	3411	+
	3412	+ if (selectedItem == group)
	3413	+ {
	3414	+ // Cannot ungroup root
	3415	+ canUngroup = false;
3101	3416	break;
3102	3417	}
3103	3418	}
3104	3419
3105		- if (!hasRoot)
	3420	+ if (canUngroup)
3106	3421	{
3107	3422	for (int i=0; i<group.selection.size(); i++)
3108	3423	{
3109		- Ungroup(group.selection.get(i));
	3424	+ Object3D selectedItem = group.selection.get(i);
	3425	+
	3426	+ Ungroup(selectedItem);
3110	3427	}
3111	3428
3112	3429	ClearSelection(false);
..	..	@@ -3157,6 +3474,10 @@
3157	3474	if (source == clearMaterialsItem)
3158	3475	{
3159	3476	ClearMaterials();
	3477	+ } else
	3478	+ if (source == clearVersionsItem)
	3479	+ {
	3480	+ ClearVersions();
3160	3481	} else
3161	3482	if (source == liveleavesItem)
3162	3483	{
..	..	@@ -3297,6 +3618,18 @@
3297	3618	if (source == transformChildrenItem)
3298	3619	{
3299	3620	TransformChildren();
	3621	+ } else
	3622	+ if (source == textureRatioRItem)
	3623	+ {
	3624	+ TextureRatio(0);
	3625	+ } else
	3626	+ if (source == textureRatioGItem)
	3627	+ {
	3628	+ TextureRatio(1);
	3629	+ } else
	3630	+ if (source == textureRatioBItem)
	3631	+ {
	3632	+ TextureRatio(2);
3300	3633	} else
3301	3634	if (source == resetTransformItem)
3302	3635	{
..	..	@@ -3469,38 +3802,7 @@
3469	3802	if (CameraPane.FULLSCREEN)
3470	3803	fullscreenLayout = radio.layout;
3471	3804
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();
	3805	+ Show3DView();
3504	3806
3505	3807	cameraView.requestFocusInWindow();
3506	3808
..	..	@@ -3686,6 +3988,7 @@
3686	3988	} else
3687	3989	if (source == rootButton)
3688	3990	{
	3991	+ Replace();
3689	3992	Object3D obj;
3690	3993	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3691	3994	{
..	..	@@ -3700,6 +4003,9 @@
3700	4003	if (source == closeButton)
3701	4004	{
3702	4005	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4006	+ if (copy.versionlist != null)
	4007	+ Replace();
	4008	+
3703	4009	cRadio ab;
3704	4010	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3705	4011	{
..	..	@@ -3743,10 +4049,10 @@
3743	4049	{
3744	4050	Object3D child = (Object3D)e.nextElement();
3745	4051	if(child.editWindow != null)
3746		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3747	4052	child.pinned = false;
3748	4053	child.CloseUI();
3749	4054	listUI.remove(child);
	4055	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3750	4056
3751	4057	//child.editWindow = null; // ???????????
3752	4058	}
..	..	@@ -3765,6 +4071,7 @@
3765	4071	obj.CloseUI();
3766	4072	}
3767	4073	listUI.clear();
	4074	+ SetPinStates(group.selection.size() > 0);
3768	4075	refreshContents(true);
3769	4076	} else
3770	4077	if (source == allParamsButton)
..	..	@@ -3797,6 +4104,9 @@
3797	4104	} else
3798	4105	if(source instanceof cRadio)
3799	4106	{
	4107	+ if (copy.versionlist != null)
	4108	+ Replace();
	4109	+
3800	4110	group.parent = keepparent;
3801	4111	group.attributes = 0;
3802	4112	//group.editWindow = null;
..	..	@@ -3821,8 +4131,6 @@
3821	4131
3822	4132	copy = group;
3823	4133
3824		- SetUndoStates();
3825		-
3826	4134	//Globals.theRenderer.object = group;
3827	4135	if(!useclient)
3828	4136	{
..	..	@@ -3850,7 +4158,33 @@
3850	4158	*/
3851	4159	radio.layout.doClick();
3852	4160
	4161	+ //assert(copy instanceof Composite);
	4162	+
	4163	+ if (copy.versionlist == null)
	4164	+ {
	4165	+ copy.versionindex = -1;
	4166	+
	4167	+ // Cannot work with loops
	4168	+ // To fix this issue, we first mark all nodes above the root,
	4169	+ // and check if any of these nodes are reachable below the root.
	4170	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4171	+
	4172	+ if (copy instanceof Composite && copy.versionlist == null && !copy.HasTags())
	4173	+ {
	4174	+ copy.versionlist = new Object3D[100];
	4175	+
	4176	+ //Save(true);
	4177	+ }
	4178	+ else
	4179	+ copy.versionindex = -2;
	4180	+
	4181	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4182	+ }
	4183	+
	4184	+ SetVersionStates();
	4185	+
3853	4186	ClearUnpinned();
	4187	+
3854	4188	//Grafreed.Assert(group != null);
3855	4189	//Grafreed.Assert(group.selection != null);
3856	4190	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3867,11 +4201,13 @@
3867	4201	} else if (event.getSource() == editCameraItem)
3868	4202	{
3869	4203	cameraView.ProtectCamera();
	4204	+ cameraView.requestFocusInWindow();
3870	4205	cameraView.repaint();
3871	4206	return;
3872	4207	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3873	4208	{
3874	4209	cameraView.RevertCamera();
	4210	+ cameraView.requestFocusInWindow();
3875	4211	cameraView.repaint();
3876	4212	return;
3877	4213	// } else if (event.getSource() == textureButton)
..	..	@@ -3960,6 +4296,18 @@
3960	4296	refreshContents();
3961	4297	}
3962	4298
	4299	+ void TextureRatio(int axis)
	4300	+ {
	4301	+ Object3D obj;
	4302	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4303	+ {
	4304	+ obj = (Object3D)e.nextElement();
	4305	+ obj.TextureRatio(axis);
	4306	+ }
	4307	+
	4308	+ refreshContents();
	4309	+ }
	4310	+
3963	4311	void ResetTransform()
3964	4312	{
3965	4313	ResetTransform(-1);
..	..	@@ -3975,42 +4323,8 @@
3975	4323	if (obj.toParent == null)
3976	4324	continue;
3977	4325
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		- }
	4326	+ obj.ResetTransform(mask);
	4327	+
4014	4328	if (obj.parent == null)
4015	4329	{
4016	4330	System.out.println("NULL PARENT!");
..	..	@@ -4519,6 +4833,12 @@
4519	4833	{
4520	4834	Object3D obj = group.selection.get(i);
4521	4835
	4836	+ if (obj.toParent == null)
	4837	+ {
	4838	+ obj.toParent = LA.newMatrix();
	4839	+ obj.fromParent = LA.newMatrix();
	4840	+ }
	4841	+
4522	4842	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4523	4843	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4524	4844	}
..	..	@@ -4810,6 +5130,12 @@
4810	5130	refreshContents();
4811	5131	}
4812	5132
	5133	+ void ClearVersions()
	5134	+ {
	5135	+ group.selection.ClearVersions();
	5136	+ refreshContents();
	5137	+ }
	5138	+
4813	5139	void FlipV(boolean flip)
4814	5140	{
4815	5141	group.selection.FlipV(flip);
..	..	@@ -5004,9 +5330,7 @@
5004	5330
5005	5331	freezemodel = false;
5006	5332	}
5007		-
5008		- boolean flashIt = true;
5009		-
	5333	+
5010	5334	public void valueChanged(TreeSelectionEvent e)
5011	5335	//public boolean handleEvent(Event event)
5012	5336	{
..	..	@@ -5079,13 +5403,31 @@
5079	5403	{
5080	5404	editButton.setEnabled(enabled);
5081	5405	uneditButton.setEnabled(enabled);
5082		- unselectButton.setEnabled(enabled);
	5406	+ //unselectButton.setEnabled(enabled);
5083	5407	flashSelectionButton.setEnabled(enabled);
	5408	+
	5409	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5410	+
	5411	+ boolean allComposites = true;
	5412	+
	5413	+ if (group.selection != null)
	5414	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5415	+ {
	5416	+ Object next = e.nextElement();
	5417	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5418	+ {
	5419	+ allComposites = false;
	5420	+ break;
	5421	+ }
	5422	+ }
	5423	+
	5424	+ rootButton.setEnabled(true); // allComposites);
5084	5425	}
5085	5426
5086	5427	void refreshContents(boolean cp)
5087	5428	{
5088		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5429	+ if (Globals.ADVANCED)
	5430	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5089	5431	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5090	5432	{
5091	5433	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5095,7 +5437,7 @@
5095	5437	Object3D child = (Object3D) group.selection.get(i);
5096	5438
5097	5439	objEditor.AddInfo(child, this, true);
5098		- System.err.println("info : " + child.GetPath());
	5440	+// System.err.println("info : " + child.GetPath());
5099	5441	}
5100	5442
5101	5443	objEditor.SetText(); // jan 2014
..	..	@@ -5921,7 +6263,6 @@
5921	6263
5922	6264	cButton restoreCameraButton;
5923	6265
5924		- cButton saveButton;
5925	6266	cButton oneStepButton;
5926	6267
5927	6268	cButton groupButton;
..	..	@@ -5979,11 +6320,11 @@
5979	6320	private MenuItem lookAtItem;
5980	6321	private MenuItem lookFromItem;
5981	6322	private MenuItem switchViewItem;
5982		- private MenuItem cutItem;
	6323	+ private JMenuItem cutItem;
5983	6324	private MenuItem undoItem;
5984	6325	private MenuItem redoItem;
5985	6326	private JMenuItem duplicateItem;
5986		- private MenuItem cloneItem;
	6327	+ private JMenuItem cloneItem;
5987	6328	private MenuItem cloneSupportItem;
5988	6329	private MenuItem overwriteGeoItem;
5989	6330	private MenuItem overwriteMatItem;
..	..	@@ -6004,13 +6345,13 @@
6004	6345	private MenuItem cloneGeometriesItem;
6005	6346	private MenuItem shareGeometriesItem;
6006	6347	private MenuItem mergeGeometriesItem;
6007		- private MenuItem copyItem;
	6348	+ private JMenuItem copyItem;
6008	6349	private MenuItem pasteItem;
6009		- private MenuItem pasteIntoItem;
6010		- private MenuItem pasteLinkItem;
6011		- private MenuItem pasteCloneItem;
6012		- private MenuItem pasteExpandItem;
6013		- private MenuItem deleteItem;
	6350	+ private JMenuItem pasteIntoItem;
	6351	+ private JMenuItem pasteLinkItem;
	6352	+ private JMenuItem pasteCloneItem;
	6353	+ private JMenuItem pasteExpandItem;
	6354	+ private JMenuItem deleteItem;
6014	6355	private MenuItem clearAllItem;
6015	6356	private MenuItem genUVItem;
6016	6357	private MenuItem genNormalsMESHItem;
..	..	@@ -6036,6 +6377,7 @@
6036	6377	private MenuItem clipMeshItem;
6037	6378	private MenuItem smoothMeshItem;
6038	6379	private MenuItem clearMaterialsItem;
	6380	+ private MenuItem clearVersionsItem;
6039	6381
6040	6382	private MenuItem liveleavesItem;
6041	6383	private MenuItem unliveleavesItem;
..	..	@@ -6059,13 +6401,16 @@
6059	6401	private MenuItem maxTexturesItem;
6060	6402	private MenuItem panoTexturesItem;
6061	6403
	6404	+ private MenuItem textureRatioRItem;
	6405	+ private MenuItem textureRatioGItem;
	6406	+ private MenuItem textureRatioBItem;
6062	6407	private MenuItem resetCentroidItem;
6063	6408	private MenuItem resetCentroidXZItem;
6064	6409	private MenuItem resetTransformItem;
6065	6410	private MenuItem transformGeometryItem;
6066	6411	private MenuItem transformChildrenItem;
6067	6412	private MenuItem hideItem;
6068		- private MenuItem grabItem;
	6413	+ private JMenuItem grabItem;
6069	6414	private MenuItem backItem;
6070	6415	private MenuItem frontItem;
6071	6416	private MenuItem cameraItem;
..	..	@@ -6078,7 +6423,7 @@
6078	6423	private MenuItem switchTransfoItem;
6079	6424	private MenuItem morphItem;
6080	6425	private MenuItem linkerItem;
6081		- private MenuItem ungroupItem;
	6426	+ private JMenuItem ungroupItem;
6082	6427	private MenuItem editItem;
6083	6428	private MenuItem openWindowItem;
6084	6429	private MenuItem editLeafItem;