~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 + "/preview.jpg", !Grafreed.NIMBUSLAF));
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
32	33	//row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
33		- skyboxButton.setToolTipText(s);
	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,11 +73,11 @@
56	73	cGridBag row5 = new cGridBag();
57	74	cGridBag row6 = new cGridBag();
58	75
59		- AddSkyboxButton("default", "rgb", row0);
	76	+ AddSkyboxButton("default", "", row0);
60	77	//AddSkyboxButton("default", "cornell", row0);
61	78	AddSkyboxButton("penguins", "dust", row0);
62	79	AddSkyboxButton("penguins", "tropic", row0);
63		- AddSkyboxButton("default", "skycube", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
64	81
65	82	AddSkyboxButton("default", "uffizi", row1);
66	83	AddSkyboxButton("bridge", "Bridge", row1);
..	..	@@ -90,7 +107,7 @@
90	107	AddSkyboxButton("park", "Skansen3", row6);
91	108	AddSkyboxButton("park", "Skansen4", row6);
92	109	AddSkyboxButton("park", "Skansen5", row6);
93		- AddSkyboxButton("park", "Stairs", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
94	111
95	112	tab0.add(row0);
96	113	tab0.add(row1);
..	..	@@ -144,21 +161,18 @@
144	161
145	162	AddSkyboxButton("mountain", "Maskonaive2", row4);
146	163	AddSkyboxButton("mountain", "Maskonaive3", row4);
147		- AddSkyboxButton("mountain", "Ryfjallet", row4);
148	164	AddSkyboxButton("mountain", "Teide", row4);
149	165	AddSkyboxButton("park", "Tantolunden4", row4);
150	166
151		- AddSkyboxButton("penguins", "wrath", row5);
152		- AddSkyboxButton("penguins", "yonder", row5);
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
153	169	AddSkyboxButton("rocky", "Langholmen", row5);
154	170	AddSkyboxButton("rocky", "Skinnarviksberget", row5);
155		- AddSkyboxButton("rocky", "Tantolunden6", row5);
156	171
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
157	173	AddSkyboxButton("default", "CloudyHills", row6);
158	174	AddSkyboxButton("daz", "Autumn", row6);
159		- AddSkyboxButton("daz", "Greenlands", row6);
160	175	AddSkyboxButton("daz", "MountainTrail", row6);
161		- AddSkyboxButton("daz", "Oasis", row6);
162	176	/*
163	177	Autumn
164	178	Greenlands
..	..	@@ -210,8 +224,8 @@
210	224	AddSkyboxButton("penguins", "sleepyhollow", row1);
211	225
212	226	AddSkyboxButton("penguins", "kenon_star", row2);
213		- AddSkyboxButton("indoors", "DallasW", row2);
214		- AddSkyboxButton("indoors", "MarriottMadisonWest", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
215	229	AddSkyboxButton("indoors", "Vasa", row2);
216	230
217	231	AddSkyboxButton("winter", "Backyard", row3);
..	..	@@ -232,7 +246,7 @@
232	246	AddSkyboxButton("daz", "TheRock", row6);
233	247	AddSkyboxButton("daz", "TopOfTheWorld", row6);
234	248	AddSkyboxButton("daz", "Winter", row6);
235		- AddSkyboxButton("penguins", "desertdawn", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
236	250
237	251	tab0.add(row0);
238	252	tab0.add(row1);
..	..	@@ -248,15 +262,112 @@
248	262	//tab0.add(new cGridBag());
249	263	}
250	264	}
251		-
252		- public void ChangeSkybox(String name)
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
253	267	{
254		- cameraView.envyoff = false;
255		- cameraView.skyboxname = name;
256		- cameraView.skyboxext = "jpg";
257		- 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);
258	358	}
259	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	+
260	371	//ObjEditor objEditor;
261	372	public void closeUI2()
262	373	{
..	..	@@ -294,11 +405,15 @@
294	405	this.copy = this.group = group;
295	406	//selectees = this.group.selectees;
296	407
297		- if (copy.versions == null)
298		- {
299		- copy.versions = new byte[100][];
300		- copy.versionindex = -1;
301		- }
	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	+// }
302	417
303	418	if(ui)
304	419	SetupUI(objEditor);
..	..	@@ -321,13 +436,13 @@
321	436
322	437	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
323	438
324		- if (copy.versions == null)
325		- {
326		- copy.versions = new byte[100][];
327		- copy.versionindex = -1;
328		-
329		- Save(true);
330		- }
	439	+// if (copy.versionlist == null)
	440	+// {
	441	+// copy.versionlist = new Object3D[100];
	442	+// copy.versionindex = -1;
	443	+//
	444	+// //Save(true);
	445	+// }
331	446	}
332	447
333	448	void CloneSelection(boolean supports)
..	..	@@ -417,33 +532,35 @@
417	532	// menu.add("-");
418	533	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
419	534	duplicateItem.addActionListener(this);
420		- cloneItem = menu.add(new MenuItem("Clone"));
	535	+
	536	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
421	537	cloneItem.addActionListener(this);
422		- if (Globals.ADVANCED)
	538	+ //if (Globals.ADVANCED)
423	539	{
424	540	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
425	541	cloneSupportItem.addActionListener(this);
426	542	}
	543	+ oe.jTree.popup.addSeparator();
427	544	menu.add("-");
428		- cutItem = menu.add(new MenuItem("Cut"));
	545	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
429	546	cutItem.addActionListener(this);
430		- copyItem = menu.add(new MenuItem("Copy"));
	547	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
431	548	copyItem.addActionListener(this);
432	549	pasteItem = menu.add(new MenuItem("Paste"));
433	550	pasteItem.addActionListener(this);
434	551
435		- menu.add("-");
436		- 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"));
437	555	pasteIntoItem.addActionListener(this);
438		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	556	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
439	557	pasteLinkItem.addActionListener(this);
440		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	558	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
441	559	pasteCloneItem.addActionListener(this);
442		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	560	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
443	561	// pasteExpandItem.addActionListener(this);
444		- menu.add("-");
445		- deleteItem = menu.add(new MenuItem("Delete"));
446		- deleteItem.addActionListener(this);
	562	+ //menu.add("-");
	563	+ oe.jTree.popup.addSeparator();
447	564
448	565	if (Globals.ADVANCED)
449	566	{
..	..	@@ -529,11 +646,9 @@
529	646	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
530	647	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
531	648	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
532		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
533	649	oe.cameraMenu.add("-");
534	650	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
535	651	openWindowItem.addActionListener(this);
536		- editLeafItem.addActionListener(this);
537	652	lookAtItem.addActionListener(this);
538	653	//lookFromItem.addActinoListener(this);
539	654	//switchViewItem.addActionListener(this);
..	..	@@ -580,9 +695,8 @@
580	695	setMasterItem.addActionListener(this);
581	696	}
582	697
583		- oe.menuBar.add(menu = new Menu("Group"));
584		-// grabItem = menu.add(new MenuItem("Grab"));
585		-// grabItem.addActionListener(this);
	698	+ oe.menuBar.add(menu = new Menu("Order"));
	699	+
586	700	backItem = menu.add(new MenuItem("Back"));
587	701	backItem.addActionListener(this);
588	702	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -590,13 +704,21 @@
590	704	// compositeItem = menu.add(new MenuItem("Composite"));
591	705	// compositeItem.addActionListener(this);
592	706
	707	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	708	+ grabItem.addActionListener(this);
	709	+
593	710	if (Globals.ADVANCED)
594	711	{
595	712	hideItem = menu.add(new MenuItem("Hidden Group"));
596	713	hideItem.addActionListener(this);
597	714	}
598		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	715	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
599	716	ungroupItem.addActionListener(this);
	717	+
	718	+ oe.jTree.popup.addSeparator();
	719	+
	720	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	721	+ deleteItem.addActionListener(this);
600	722
601	723	// menu.add("-");
602	724	//
..	..	@@ -633,9 +755,9 @@
633	755	shadowYItem.addActionListener(this);
634	756	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
635	757	shadowZItem.addActionListener(this);
	758	+
636	759	attributeItem = menu.add(new MenuItem("Attribute"));
637	760	attributeItem.addActionListener(this);
638		-
639	761	if (Globals.ADVANCED)
640	762	{
641	763	menu.add("-");
..	..	@@ -647,11 +769,18 @@
647	769	pointflowItem.addActionListener(this);
648	770	}
649	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("-");
650	779	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
651	780	resetTransformItem.addActionListener(this);
652	781	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
653	782	resetCentroidItem.addActionListener(this);
654		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	783	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
655	784	resetCentroidXZItem.addActionListener(this);
656	785	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
657	786	transformGeometryItem.addActionListener(this);
..	..	@@ -703,6 +832,8 @@
703	832	}
704	833
705	834	oe.menuBar.add(menu = new Menu("Attributes"));
	835	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	836	+ clearVersionsItem.addActionListener(this);
706	837	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
707	838	clearMaterialsItem.addActionListener(this);
708	839	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -725,9 +856,9 @@
725	856	hideleavesItem.addActionListener(this);
726	857	showleavesItem = menu.add(new MenuItem("Show Leaves"));
727	858	showleavesItem.addActionListener(this);
728		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	859	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
729	860	markleavesItem.addActionListener(this);
730		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	861	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
731	862	unmarkleavesItem.addActionListener(this);
732	863	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
733	864	rewindleavesItem.addActionListener(this);
..	..	@@ -781,6 +912,9 @@
781	912	shareGeometriesItem.addActionListener(this);
782	913	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
783	914	mergeGeometriesItem.addActionListener(this);
	915	+ menu.add("-");
	916	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	917	+ editLeafItem.addActionListener(this);
784	918	if (Globals.ADVANCED)
785	919	{
786	920	// Pretty much the same as duplicate and clone.
..	..	@@ -797,6 +931,79 @@
797	931	buildToolsMenu(menu);
798	932	}
799	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	+ }
800	1007
801	1008	void SetupUI2(ObjEditor oe)
802	1009	{
..	..	@@ -815,11 +1022,6 @@
815	1022	//new Exception().printStackTrace();
816	1023
817	1024	oe.radioPanel = new JPanel(new GridBagLayout());
818		- oe.aConstraints.weightx = 1;
819		- oe.aConstraints.weighty = 0;
820		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
821		- oe.aConstraints.gridwidth = 100;
822		- oe.aConstraints.gridheight = 1;
823	1025	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
824	1026
825	1027	oe.buttonGroup = new ButtonGroup();
..	..	@@ -840,9 +1042,9 @@
840	1042	oe.radioPanel.add(dummyButton);
841	1043	oe.buttonGroup.add(dummyButton);
842	1044	*/
843		- cGridBag copyOptionsPanel = new cGridBag();
	1045	+ cGridBag versionManagerPanel = new cGridBag();
844	1046
845		- copyOptionsPanel.preferredHeight = 2;
	1047	+ versionManagerPanel.preferredHeight = 4;
846	1048
847	1049	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
848	1050
..	..	@@ -852,58 +1054,102 @@
852	1054
853	1055	if (Globals.ADVANCED)
854	1056	{
855		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
856		- maxButton.setToolTipText("Maximize window");
857		- 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);
858	1060	}
859	1061
860		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
861		- fullButton.setToolTipText("Full-screen window");
862		- fullButton.addActionListener(this);
	1062	+ cButton gcButton;
863	1063
864		- 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);
865	1106	screenfitButton.setToolTipText("Screen fit");
866	1107	screenfitButton.addActionListener(this);
867	1108
868		- 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);
869	1110	restoreCameraButton.setToolTipText("Restore viewpoint");
870	1111	restoreCameraButton.addActionListener(this);
871	1112
872		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
873		- saveButton.setToolTipText("New version");
874		- 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);
875	1116
876		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
877		- undoButton.setToolTipText("Previous version");
878		- undoButton.addActionListener(this);
879		- 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);
880	1126
881	1127	cGridBag updown = new cGridBag().setVertical(true);
882		- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
883		- restoreButton.setToolTipText("Restore current");
	1128	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ restoreButton.setToolTipText("Undo (restore current version)");
884	1130	restoreButton.addActionListener(this);
885	1131	restoreButton.setEnabled(false);
886	1132
887		- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
888		- replaceButton.setToolTipText("Replace current");
	1133	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ replaceButton.setToolTipText("Save (replace current version)");
889	1135	replaceButton.addActionListener(this);
890	1136	replaceButton.setEnabled(false);
891	1137
892		- copyOptionsPanel.add(updown);
	1138	+ versionManagerPanel.add(updown);
893	1139
894		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
895		- redoButton.setToolTipText("Next version");
896		- redoButton.addActionListener(this);
897		- 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);
898	1148
899	1149	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
900	1150	liveCB.setToolTipText("Enable animation");
901	1151	liveCB.addItemListener(this);
902	1152
903		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
904		- oneStepButton.setToolTipText("Animate one step forward");
905		- oneStepButton.addActionListener(this);
906		-
907	1153	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
908	1154	fastCB.setToolTipText("Fast mode");
909	1155	fastCB.addItemListener(this);
..	..	@@ -919,38 +1165,23 @@
919	1165
920	1166	if (Globals.ADVANCED)
921	1167	{
922		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
923	1169	snapobjectButton.addActionListener(this);
924	1170	snapobjectButton.setToolTipText("Snap Object");
925	1171
926		- 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);
927	1173	fourButton.addActionListener(this);
928	1174	fourButton.setToolTipText("Show control panel only");
929	1175	}
930	1176
931	1177	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
932	1178
933		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
934		- twoButton.setToolTipText("Show 3D view only");
935		- twoButton.addActionListener(this);
936		- this.fullscreenLayout = twoButton;
937		-
938		- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
939		- threeButton.setToolTipText("Show controls and 3D view");
940		- threeButton.addActionListener(this);
941		- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
942		- sixButton.setToolTipText("Show 3D view and controls");
943		- sixButton.addActionListener(this);
944		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
945		-// sevenButton.setToolTipText("3-column layout");
946		-// sevenButton.addActionListener(this);
947		- //
948	1179
949		- 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);
950	1181	rootButton.setToolTipText("Open selection in new tab");
951	1182	rootButton.addActionListener(this);
952	1183
953		- 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);
954	1185	closeButton.setToolTipText("Close tab");
955	1186	closeButton.addActionListener(this);
956	1187	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..	..	@@ -959,38 +1190,38 @@
959	1190	cGridBag row1 = new cGridBag();
960	1191
961	1192	// INSERT
962		- row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
963		- gridButton.setToolTipText("Create grid");
	1193	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ gridButton.setToolTipText("Create ground");
964	1195	gridButton.addActionListener(this);
965	1196
966		- row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
967	1198	boxButton.setToolTipText("Create box");
968	1199	boxButton.addActionListener(this);
969	1200
970		- row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
971		- sphereButton.setToolTipText("Create sphere");
972		- sphereButton.addActionListener(this);
973		-
974		- row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
975		- coneButton.setToolTipText("Create cone");
976		- coneButton.addActionListener(this);
977		-
978		- row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
979		- torusButton.setToolTipText("Create torus");
980		- torusButton.addActionListener(this);
981		-
982		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1201	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
983	1202	superButton.setToolTipText("Create superellipsoid");
984	1203	superButton.addActionListener(this);
985	1204
986		- 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)
987	1218	{
988		- 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);
989	1220	kleinButton.setToolTipText("Create Klein bottle");
990	1221	kleinButton.addActionListener(this);
991	1222	}
992	1223
993		- row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
994	1225	particlesButton.setToolTipText("Create particle system");
995	1226	particlesButton.addActionListener(this);
996	1227
..	..	@@ -998,71 +1229,73 @@
998	1229
999	1230	cGridBag row2 = new cGridBag();
1000	1231
1001		- row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1002	1233	groupButton.setToolTipText("Create group");
1003	1234	groupButton.addActionListener(this);
1004	1235
1005		- row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1006	1237	compositeButton.setToolTipText("Create composite");
1007	1238	compositeButton.addActionListener(this);
1008	1239
1009		- row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1010	1241	switchButton.setToolTipText("Create item switcher");
1011	1242	switchButton.addActionListener(this);
1012	1243
1013		- row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1244	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1014	1245	loopButton.setToolTipText("Create loop");
1015	1246	loopButton.addActionListener(this);
1016	1247
1017		- row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1248	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1018	1249	textureButton.setToolTipText("Create texture");
1019	1250	textureButton.addActionListener(this);
1020	1251
1021		- row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1252	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1022	1253	overlayButton.setToolTipText("Create overlay");
1023	1254	overlayButton.addActionListener(this);
1024	1255
1025		- 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);
1026	1257	lightButton.setToolTipText("Create light");
1027	1258	lightButton.addActionListener(this);
1028	1259
1029	1260	oe.toolboxPanel.add(row2);
1030	1261
1031		- // ENVYMAPS
1032		- cGridBag skyboxpane = new cGridBag();
1033		- skyboxpane.preferredHeight = 100;
	1262	+ cGridBag textures = new cGridBag();
1034	1263
1035		- oe.toolboxPanel.add(skyboxpane);
	1264	+ CreateTexturePanel(textures);
1036	1265
1037		- JTabbedPane skyboxpanel = new JTabbedPane();
1038		- skyboxpane.add(skyboxpanel);
	1266	+ int tabCount = resourcecontainer.getTabCount();
1039	1267
1040		- AddSkyboxTab0(skyboxpanel);
1041		- AddSkyboxTab1(skyboxpanel);
1042		- 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);
1043	1276
1044	1277	// EDIT panel
1045		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1278	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1046	1279	editButton.setToolTipText("Pin selection controls");
1047	1280	editButton.addActionListener(this);
1048	1281
1049		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1050		- 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");
1051	1284	uneditButton.addActionListener(this);
1052	1285
1053	1286	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1054		- allParamsButton.setToolTipText("Show all controle");
	1287	+ allParamsButton.setToolTipText("Show all controls");
1055	1288	allParamsButton.addActionListener(this);
1056	1289
1057		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1058		- clearPanelButton.setToolTipText("Clear edit panel");
	1290	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1291	+ clearPanelButton.setToolTipText("Clear all controls");
1059	1292	clearPanelButton.addActionListener(this);
1060	1293
1061		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1062		- unselectButton.setToolTipText("Unselect");
1063		- unselectButton.addActionListener(this);
	1294	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1295	+ //unselectButton.setToolTipText("Unselect");
	1296	+ //unselectButton.addActionListener(this);
1064	1297
1065		- 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);
1066	1299	flashSelectionButton.setToolTipText("Highlight selection");
1067	1300	flashSelectionButton.addActionListener(this);
1068	1301
..	..	@@ -1085,6 +1318,8 @@
1085	1318
1086	1319	cGridBag jSPPanel = new cGridBag();
1087	1320
	1321	+ jSPPanel.preferredHeight = 20;
	1322	+
1088	1323	JScrollPane jSP;
1089	1324	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1090	1325	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -1093,11 +1328,11 @@
1093	1328	oe.treePanel.add(jSPPanel);
1094	1329	oe.treePanel.Return();
1095	1330
1096		- oe.treePanel.add(copyOptionsPanel);
	1331	+ oe.treePanel.add(versionManagerPanel);
1097	1332	oe.treePanel.Return();
1098		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1099		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1100		- sliderPane.preferredHeight = 1;
	1333	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1334	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1335	+ versionSliderPane.preferredHeight = 3;
1101	1336
1102	1337	// mainPanel.setDividerLocation(0.1); //1.0);
1103	1338	mainPanel.setResizeWeight(0.4);
..	..	@@ -1120,7 +1355,7 @@
1120	1355	dgr.addDragGestureListener(this);
1121	1356	}catch(Exception e) {}
1122	1357	*/
1123		- radio.layout = sixButton; // sevenButton;
	1358	+ radio.layout = threeButton; // sixButton;
1124	1359	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1125	1360	}
1126	1361
..	..	@@ -1171,9 +1406,12 @@
1171	1406	smoothCB.setToolTipText("Snapping delay");
1172	1407	smoothCB.addItemListener(this);
1173	1408
1174		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1175		- slowCB.setToolTipText("Smooth interpolation");
1176		- 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);
1177	1415
1178	1416	// constraints.gridy += 1;
1179	1417	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1252,6 +1490,14 @@
1252	1490
1253	1491	void EditObject(Object3D obj)
1254	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	+
1255	1501	cRadio radioButton = new cRadio(obj.name);
1256	1502
1257	1503	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1262,7 +1508,7 @@
1262	1508	}
1263	1509
1264	1510	radioButton.SetObject(obj);
1265		- radioButton.layout = sixButton; // sevenButton;
	1511	+ radioButton.layout = threeButton; // sixButton;
1266	1512	radioButton.SetCamera(cameraView.renderCamera, false);
1267	1513	radioButton.addActionListener(this);
1268	1514	radioPanel.add(radioButton);
..	..	@@ -1276,6 +1522,7 @@
1276	1522
1277	1523	oe.SetupViews();
1278	1524
	1525	+ if (Globals.DEBUG)
1279	1526	System.out.println("SetupViews");
1280	1527	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1281	1528	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1287,6 +1534,8 @@
1287	1534	cCheckBox localCB;
1288	1535	cCheckBox crowdCB;
1289	1536	cCheckBox smoothCB;
	1537	+ cCheckBox minshaderCB;
	1538	+
1290	1539	cToggleButton fastCB;
1291	1540	cCheckBox slowCB;
1292	1541	cCheckBox boxCB;
..	..	@@ -1357,6 +1606,12 @@
1357	1606	{
1358	1607	cameraView.ToggleInertia();
1359	1608	cameraView.repaint();
	1609	+ }
	1610	+ else if(e.getSource() == minshaderCB)
	1611	+ {
	1612	+ Globals.MINSHADER ^= true;
	1613	+ cameraView.programInitialized = false;
	1614	+ cameraView.repaint();
1360	1615	}
1361	1616	else if(e.getSource() == localCB)
1362	1617	{
..	..	@@ -1634,7 +1889,12 @@
1634	1889	TreePath path;
1635	1890
1636	1891	public TransferableTreePath(TreePath tp) {
1637		- 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);
1638	1898	}
1639	1899
1640	1900	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1866,24 +2126,24 @@
1866	2126	switch(axis)
1867	2127	{
1868	2128	case 0 :
1869		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1870		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1871		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1872		- 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;
1873	2133	norm = cVector.X;
1874	2134	break;
1875	2135	case 1 :
1876		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1877		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1878		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1879		- 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;
1880	2140	norm = cVector.Y;
1881	2141	break;
1882	2142	case 2 :
1883		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1884		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1885		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1886		- 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;
1887	2147	norm = cVector.Z;
1888	2148	break;
1889	2149	}
..	..	@@ -1924,7 +2184,11 @@
1924	2184	shadow.material = new cMaterial(obj.material);
1925	2185	shadow.material.diffuse = 0.0001f;
1926	2186	shadow.material.specular = 0.0001f;
1927		- //shadow.projectedVertices[1].x = 300;
	2187	+ shadow.material.opacity = 0.75f;
	2188	+
	2189	+ AllocProjectedVertices(shadow);
	2190	+
	2191	+ shadow.projectedVertices[1].x = 300;
1928	2192
1929	2193	makeSomething(shadow);
1930	2194	}
..	..	@@ -2445,27 +2709,35 @@
2445	2709	} else
2446	2710	if (source == loopItem \|\| source == loopButton)
2447	2711	{
	2712	+ if (!group.selection.isEmpty())
	2713	+ {
2448	2714	Composite csg = new GroupLeaf();
2449		- csg.count = 5;
2450	2715	group(csg);
	2716	+ csg.count = 5;
2451	2717	Composite child = new cGroup("Branch");
2452	2718	csg.addChild(child);
2453	2719	child.addChild(csg);
	2720	+ }
2454	2721	} else
2455	2722	if (source == doubleItem)
2456	2723	{
	2724	+ if (!group.selection.isEmpty())
	2725	+ {
2457	2726	Composite csg = new GroupLeaf("Fork");
2458		- csg.count = 5;
2459	2727	group(csg);
	2728	+ csg.count = 5;
2460	2729	Composite child = new cGroup("Branch A");
2461	2730	csg.addChild(child);
2462	2731	child.addChild(csg);
2463	2732	child = new cGroup("Branch B");
2464	2733	csg.addChild(child);
2465	2734	child.addChild(csg);
	2735	+ }
2466	2736	} else
2467	2737	if (source == tripleItem)
2468	2738	{
	2739	+ if (!group.selection.isEmpty())
	2740	+ {
2469	2741	Composite csg = new GroupLeaf("Trident");
2470	2742	csg.count = 4;
2471	2743	group(csg);
..	..	@@ -2478,6 +2750,7 @@
2478	2750	child = new cGroup();
2479	2751	csg.addChild(child);
2480	2752	child.addChild(csg);
	2753	+ }
2481	2754	} else
2482	2755	if (source == computeAOItem)
2483	2756	{
..	..	@@ -2497,7 +2770,7 @@
2497	2770	if (source == invariantsItem)
2498	2771	{
2499	2772	System.out.println("Invariants:");
2500		- Grafreed.grafreeD.universe.invariants();
	2773	+ Grafreed.grafreed.universe.invariants();
2501	2774	} else
2502	2775	if (source == memoryItem)
2503	2776	{
..	..	@@ -2524,37 +2797,56 @@
2524	2797	{
2525	2798	Maximize();
2526	2799	} else
2527		- if (source == fullButton)
	2800	+ if (source == fullScreenButton)
2528	2801	{
2529	2802	ToggleFullScreen();
2530	2803	} else
2531		- 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)
2532	2817	{
2533	2818	// Go to previous version
2534	2819	//if (!Undo())
2535	2820	//java.awt.Toolkit.getDefaultToolkit().beep();
2536		- Undo();
	2821	+ PreviousVersion();
2537	2822	} else
2538	2823	if (source == restoreButton)
2539	2824	{
2540	2825	// Restore current version
2541	2826	Restore();
	2827	+ //restoreButton.setEnabled(false);
2542	2828	} else
2543	2829	if (source == replaceButton)
2544	2830	{
2545	2831	// Overwrite current version
2546	2832	Replace();
	2833	+ //replaceButton.setEnabled(false);
2547	2834	} else
2548		- if (source == redoButton)
	2835	+ if (source == nextVersionButton)
2549	2836	{
2550	2837	// Go to next version
2551		- Redo();
	2838	+ NextVersion();
2552	2839	} else
2553		- if (source == saveButton)
	2840	+ if (source == saveVersionButton)
2554	2841	{
2555	2842	// Save a new version
2556	2843	if (!Save(true))
2557	2844	java.awt.Toolkit.getDefaultToolkit().beep();
	2845	+ } else
	2846	+ if (source == deleteVersionButton)
	2847	+ {
	2848	+ // Delete a new version
	2849	+ DeleteVersion();
2558	2850	} else
2559	2851	if (source == oneStepButton)
2560	2852	{
..	..	@@ -2609,11 +2901,11 @@
2609	2901	} else
2610	2902	if (source == undoItem)
2611	2903	{
2612		- Undo();
	2904	+ PreviousVersion();
2613	2905	} else
2614	2906	if (source == redoItem)
2615	2907	{
2616		- Redo();
	2908	+ NextVersion();
2617	2909	} else
2618	2910	if (source == duplicateItem)
2619	2911	{
..	..	@@ -3094,22 +3386,34 @@
3094	3386	} else
3095	3387	if (source == ungroupItem \|\| source == ungroupButton)
3096	3388	{
3097		- boolean hasRoot = false;
	3389	+ boolean canUngroup = true;
3098	3390
3099	3391	for (int i=0; i<group.selection.size(); i++)
3100	3392	{
3101		- if (group.selection.get(i) == group)
	3393	+ Object3D selectedItem = group.selection.get(i);
	3394	+
	3395	+ if (selectedItem.Size() == 0)
3102	3396	{
3103		- 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;
3104	3406	break;
3105	3407	}
3106	3408	}
3107	3409
3108		- if (!hasRoot)
	3410	+ if (canUngroup)
3109	3411	{
3110	3412	for (int i=0; i<group.selection.size(); i++)
3111	3413	{
3112		- Ungroup(group.selection.get(i));
	3414	+ Object3D selectedItem = group.selection.get(i);
	3415	+
	3416	+ Ungroup(selectedItem);
3113	3417	}
3114	3418
3115	3419	ClearSelection(false);
..	..	@@ -3160,6 +3464,10 @@
3160	3464	if (source == clearMaterialsItem)
3161	3465	{
3162	3466	ClearMaterials();
	3467	+ } else
	3468	+ if (source == clearVersionsItem)
	3469	+ {
	3470	+ ClearVersions();
3163	3471	} else
3164	3472	if (source == liveleavesItem)
3165	3473	{
..	..	@@ -3300,6 +3608,18 @@
3300	3608	if (source == transformChildrenItem)
3301	3609	{
3302	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);
3303	3623	} else
3304	3624	if (source == resetTransformItem)
3305	3625	{
..	..	@@ -3472,38 +3792,7 @@
3472	3792	if (CameraPane.FULLSCREEN)
3473	3793	fullscreenLayout = radio.layout;
3474	3794
3475		- // bug
3476		- //gridPanel.setDividerLocation(1.0);
3477		- //bigPanel.setDividerLocation(0.0);
3478		-// bigThree.remove(scenePanel);
3479		-// bigThree.remove(centralPanel);
3480		-// bigThree.remove(XYZPanel);
3481		-// aWindowConstraints.gridx = 0;
3482		-// aWindowConstraints.gridy = 0;
3483		-// aWindowConstraints.gridwidth = 1;
3484		-// // aConstraints.gridheight = 3;
3485		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3486		-// aWindowConstraints.weightx = 0;
3487		-// aWindowConstraints.weighty = 1;
3488		-// //bigThree.add(jtp, aWindowConstraints);
3489		-// aWindowConstraints.weightx = 1;
3490		-// aWindowConstraints.gridwidth = 3;
3491		-// // aConstraints.gridheight = 3;
3492		-// aWindowConstraints.gridx = 1;
3493		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3494		-// bigThree.add(centralPanel, aWindowConstraints);
3495		-// aWindowConstraints.weightx = 0;
3496		-// aWindowConstraints.gridx = 4;
3497		-// aWindowConstraints.gridwidth = 1;
3498		-// // aConstraints.gridheight = 3;
3499		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3500		-// //bigThree.add(XYZPanel, aWindowConstraints);
3501		-// scenePanel.setVisible(false);
3502		-// centralPanel.setVisible(true);
3503		-// XYZPanel.setVisible(false);
3504		- bigThree.ClearUI();
3505		- bigThree.add(centralPanel);
3506		- bigThree.FlushUI();
	3795	+ Show3DView();
3507	3796
3508	3797	cameraView.requestFocusInWindow();
3509	3798
..	..	@@ -3689,6 +3978,7 @@
3689	3978	} else
3690	3979	if (source == rootButton)
3691	3980	{
	3981	+ Replace();
3692	3982	Object3D obj;
3693	3983	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3694	3984	{
..	..	@@ -3703,6 +3993,9 @@
3703	3993	if (source == closeButton)
3704	3994	{
3705	3995	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3996	+ if (copy.versionlist != null)
	3997	+ Replace();
	3998	+
3706	3999	cRadio ab;
3707	4000	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3708	4001	{
..	..	@@ -3746,10 +4039,10 @@
3746	4039	{
3747	4040	Object3D child = (Object3D)e.nextElement();
3748	4041	if(child.editWindow != null)
3749		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3750	4042	child.pinned = false;
3751	4043	child.CloseUI();
3752	4044	listUI.remove(child);
	4045	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3753	4046
3754	4047	//child.editWindow = null; // ???????????
3755	4048	}
..	..	@@ -3768,6 +4061,7 @@
3768	4061	obj.CloseUI();
3769	4062	}
3770	4063	listUI.clear();
	4064	+ SetPinStates(group.selection.size() > 0);
3771	4065	refreshContents(true);
3772	4066	} else
3773	4067	if (source == allParamsButton)
..	..	@@ -3800,6 +4094,9 @@
3800	4094	} else
3801	4095	if(source instanceof cRadio)
3802	4096	{
	4097	+ if (copy.versionlist != null)
	4098	+ Replace();
	4099	+
3803	4100	group.parent = keepparent;
3804	4101	group.attributes = 0;
3805	4102	//group.editWindow = null;
..	..	@@ -3824,8 +4121,6 @@
3824	4121
3825	4122	copy = group;
3826	4123
3827		- SetUndoStates();
3828		-
3829	4124	//Globals.theRenderer.object = group;
3830	4125	if(!useclient)
3831	4126	{
..	..	@@ -3853,7 +4148,34 @@
3853	4148	*/
3854	4149	radio.layout.doClick();
3855	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	+
3856	4177	ClearUnpinned();
	4178	+
3857	4179	//Grafreed.Assert(group != null);
3858	4180	//Grafreed.Assert(group.selection != null);
3859	4181	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3870,11 +4192,13 @@
3870	4192	} else if (event.getSource() == editCameraItem)
3871	4193	{
3872	4194	cameraView.ProtectCamera();
	4195	+ cameraView.requestFocusInWindow();
3873	4196	cameraView.repaint();
3874	4197	return;
3875	4198	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3876	4199	{
3877	4200	cameraView.RevertCamera();
	4201	+ cameraView.requestFocusInWindow();
3878	4202	cameraView.repaint();
3879	4203	return;
3880	4204	// } else if (event.getSource() == textureButton)
..	..	@@ -3963,6 +4287,18 @@
3963	4287	refreshContents();
3964	4288	}
3965	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	+
3966	4302	void ResetTransform()
3967	4303	{
3968	4304	ResetTransform(-1);
..	..	@@ -3978,42 +4314,8 @@
3978	4314	if (obj.toParent == null)
3979	4315	continue;
3980	4316
3981		- if (mask == -1)
3982		- {
3983		- if (obj instanceof Camera) // jan 2014
3984		- {
3985		- LA.matIdentity(obj.toParent);
3986		- LA.matIdentity(obj.fromParent);
3987		- }
3988		- else
3989		- {
3990		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3991		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3992		- }
3993		- TouchTransform(obj);
3994		- continue;
3995		- }
3996		- if ((mask&2) != 0) // Scale
3997		- {
3998		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3999		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
4000		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
4001		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4002		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4003		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4004		- }
4005		- if ((mask&4) != 0) // Rotation
4006		- {
4007		- // ?
4008		- }
4009		- if ((mask&1) != 0) // Translation
4010		- {
4011		- if (obj.toParent != null)
4012		- {
4013		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
4014		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
4015		- }
4016		- }
	4317	+ obj.ResetTransform(mask);
	4318	+
4017	4319	if (obj.parent == null)
4018	4320	{
4019	4321	System.out.println("NULL PARENT!");
..	..	@@ -4522,6 +4824,12 @@
4522	4824	{
4523	4825	Object3D obj = group.selection.get(i);
4524	4826
	4827	+ if (obj.toParent == null)
	4828	+ {
	4829	+ obj.toParent = LA.newMatrix();
	4830	+ obj.fromParent = LA.newMatrix();
	4831	+ }
	4832	+
4525	4833	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4526	4834	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4527	4835	}
..	..	@@ -4813,6 +5121,12 @@
4813	5121	refreshContents();
4814	5122	}
4815	5123
	5124	+ void ClearVersions()
	5125	+ {
	5126	+ group.selection.ClearVersions();
	5127	+ refreshContents();
	5128	+ }
	5129	+
4816	5130	void FlipV(boolean flip)
4817	5131	{
4818	5132	group.selection.FlipV(flip);
..	..	@@ -5007,9 +5321,7 @@
5007	5321
5008	5322	freezemodel = false;
5009	5323	}
5010		-
5011		- boolean flashIt = true;
5012		-
	5324	+
5013	5325	public void valueChanged(TreeSelectionEvent e)
5014	5326	//public boolean handleEvent(Event event)
5015	5327	{
..	..	@@ -5053,7 +5365,7 @@
5053	5365	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
5054	5366	// a camera
5055	5367	{
5056		- 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
5057	5369	{
5058	5370	CameraPane.camerachangeframe = 0; // don't refuse it
5059	5371	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -5082,13 +5394,31 @@
5082	5394	{
5083	5395	editButton.setEnabled(enabled);
5084	5396	uneditButton.setEnabled(enabled);
5085		- unselectButton.setEnabled(enabled);
	5397	+ //unselectButton.setEnabled(enabled);
5086	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);
5087	5416	}
5088	5417
5089	5418	void refreshContents(boolean cp)
5090	5419	{
5091		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5420	+ if (Globals.SHOWINFO)
	5421	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5092	5422	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5093	5423	{
5094	5424	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5098,7 +5428,7 @@
5098	5428	Object3D child = (Object3D) group.selection.get(i);
5099	5429
5100	5430	objEditor.AddInfo(child, this, true);
5101		- System.err.println("info : " + child.GetPath());
	5431	+// System.err.println("info : " + child.GetPath());
5102	5432	}
5103	5433
5104	5434	objEditor.SetText(); // jan 2014
..	..	@@ -5924,7 +6254,6 @@
5924	6254
5925	6255	cButton restoreCameraButton;
5926	6256
5927		- cButton saveButton;
5928	6257	cButton oneStepButton;
5929	6258
5930	6259	cButton groupButton;
..	..	@@ -5982,11 +6311,11 @@
5982	6311	private MenuItem lookAtItem;
5983	6312	private MenuItem lookFromItem;
5984	6313	private MenuItem switchViewItem;
5985		- private MenuItem cutItem;
	6314	+ private JMenuItem cutItem;
5986	6315	private MenuItem undoItem;
5987	6316	private MenuItem redoItem;
5988	6317	private JMenuItem duplicateItem;
5989		- private MenuItem cloneItem;
	6318	+ private JMenuItem cloneItem;
5990	6319	private MenuItem cloneSupportItem;
5991	6320	private MenuItem overwriteGeoItem;
5992	6321	private MenuItem overwriteMatItem;
..	..	@@ -6007,13 +6336,13 @@
6007	6336	private MenuItem cloneGeometriesItem;
6008	6337	private MenuItem shareGeometriesItem;
6009	6338	private MenuItem mergeGeometriesItem;
6010		- private MenuItem copyItem;
	6339	+ private JMenuItem copyItem;
6011	6340	private MenuItem pasteItem;
6012		- private MenuItem pasteIntoItem;
6013		- private MenuItem pasteLinkItem;
6014		- private MenuItem pasteCloneItem;
6015		- private MenuItem pasteExpandItem;
6016		- private MenuItem deleteItem;
	6341	+ private JMenuItem pasteIntoItem;
	6342	+ private JMenuItem pasteLinkItem;
	6343	+ private JMenuItem pasteCloneItem;
	6344	+ private JMenuItem pasteExpandItem;
	6345	+ private JMenuItem deleteItem;
6017	6346	private MenuItem clearAllItem;
6018	6347	private MenuItem genUVItem;
6019	6348	private MenuItem genNormalsMESHItem;
..	..	@@ -6039,6 +6368,7 @@
6039	6368	private MenuItem clipMeshItem;
6040	6369	private MenuItem smoothMeshItem;
6041	6370	private MenuItem clearMaterialsItem;
	6371	+ private MenuItem clearVersionsItem;
6042	6372
6043	6373	private MenuItem liveleavesItem;
6044	6374	private MenuItem unliveleavesItem;
..	..	@@ -6062,13 +6392,16 @@
6062	6392	private MenuItem maxTexturesItem;
6063	6393	private MenuItem panoTexturesItem;
6064	6394
	6395	+ private MenuItem textureRatioRItem;
	6396	+ private MenuItem textureRatioGItem;
	6397	+ private MenuItem textureRatioBItem;
6065	6398	private MenuItem resetCentroidItem;
6066	6399	private MenuItem resetCentroidXZItem;
6067	6400	private MenuItem resetTransformItem;
6068	6401	private MenuItem transformGeometryItem;
6069	6402	private MenuItem transformChildrenItem;
6070	6403	private MenuItem hideItem;
6071		- private MenuItem grabItem;
	6404	+ private JMenuItem grabItem;
6072	6405	private MenuItem backItem;
6073	6406	private MenuItem frontItem;
6074	6407	private MenuItem cameraItem;
..	..	@@ -6081,7 +6414,7 @@
6081	6414	private MenuItem switchTransfoItem;
6082	6415	private MenuItem morphItem;
6083	6416	private MenuItem linkerItem;
6084		- private MenuItem ungroupItem;
	6417	+ private JMenuItem ungroupItem;
6085	6418	private MenuItem editItem;
6086	6419	private MenuItem openWindowItem;
6087	6420	private MenuItem editLeafItem;