~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,7 +73,7 @@
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);
..	..	@@ -311,14 +328,46 @@
311	328	}
312	329	}
313	330
314		- public void ChangeSkybox(String name)
	331	+ public void ChangeSkybox(String skybox)
315	332	{
316		- //cameraView.envyoff = false;
317		- group.skyboxname = name;
318		- group.skyboxext = "jpg";
319		- cameraView.repaint();
	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);
320	358	}
321	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	+
322	371	//ObjEditor objEditor;
323	372	public void closeUI2()
324	373	{
..	..	@@ -356,11 +405,15 @@
356	405	this.copy = this.group = group;
357	406	//selectees = this.group.selectees;
358	407
359		- if (copy.versions == null)
360		- {
361		- copy.versions = new byte[100][];
362		- copy.versionindex = -1;
363		- }
	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	+// }
364	417
365	418	if(ui)
366	419	SetupUI(objEditor);
..	..	@@ -383,13 +436,13 @@
383	436
384	437	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
385	438
386		- if (copy.versions == null)
387		- {
388		- copy.versions = new byte[100][];
389		- copy.versionindex = -1;
390		-
391		- Save(true);
392		- }
	439	+// if (copy.versionlist == null)
	440	+// {
	441	+// copy.versionlist = new Object3D[100];
	442	+// copy.versionindex = -1;
	443	+//
	444	+// //Save(true);
	445	+// }
393	446	}
394	447
395	448	void CloneSelection(boolean supports)
..	..	@@ -430,11 +483,16 @@
430	483
431	484	Object3D parent = obj.parent;
432	485	obj.parent = null;
	486	+
433	487	// Object3D support = obj.support;
434	488	// obj.support = null;
435	489	if (!supports)
436	490	obj.SaveSupports();
	491	+
437	492	Object3D clone = (Object3D)Grafreed.clone(obj);
	493	+
	494	+ clone.ResetUUIDs();
	495	+
438	496	obj.parent = parent;
439	497	// obj.support = support;
440	498	// clone.support = support; // aout 2013
..	..	@@ -479,33 +537,37 @@
479	537	// menu.add("-");
480	538	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
481	539	duplicateItem.addActionListener(this);
482		- cloneItem = menu.add(new MenuItem("Clone"));
	540	+
	541	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
483	542	cloneItem.addActionListener(this);
484		- if (Globals.ADVANCED)
	543	+ //if (Globals.ADVANCED)
485	544	{
486	545	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
487	546	cloneSupportItem.addActionListener(this);
488	547	}
	548	+ oe.jTree.popup.addSeparator();
489	549	menu.add("-");
490		- cutItem = menu.add(new MenuItem("Cut"));
	550	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
491	551	cutItem.addActionListener(this);
492		- copyItem = menu.add(new MenuItem("Copy"));
	552	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
493	553	copyItem.addActionListener(this);
494	554	pasteItem = menu.add(new MenuItem("Paste"));
495	555	pasteItem.addActionListener(this);
496	556
497		- menu.add("-");
498		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	557	+ oe.jTree.popup.addSeparator();
	558	+ //menu.add("-");
	559	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
499	560	pasteIntoItem.addActionListener(this);
500		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	561	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
501	562	pasteLinkItem.addActionListener(this);
502		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	563	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
503	564	pasteCloneItem.addActionListener(this);
504		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
505		-// pasteExpandItem.addActionListener(this);
506		- menu.add("-");
507		- deleteItem = menu.add(new MenuItem("Delete"));
508		- deleteItem.addActionListener(this);
	565	+// CRASH
	566	+ pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
	567	+//
	568	+ pasteExpandItem.addActionListener(this);
	569	+ //menu.add("-");
	570	+ oe.jTree.popup.addSeparator();
509	571
510	572	if (Globals.ADVANCED)
511	573	{
..	..	@@ -591,11 +653,9 @@
591	653	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
592	654	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
593	655	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
594		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
595	656	oe.cameraMenu.add("-");
596	657	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
597	658	openWindowItem.addActionListener(this);
598		- editLeafItem.addActionListener(this);
599	659	lookAtItem.addActionListener(this);
600	660	//lookFromItem.addActinoListener(this);
601	661	//switchViewItem.addActionListener(this);
..	..	@@ -642,9 +702,8 @@
642	702	setMasterItem.addActionListener(this);
643	703	}
644	704
645		- oe.menuBar.add(menu = new Menu("Group"));
646		-// grabItem = menu.add(new MenuItem("Grab"));
647		-// grabItem.addActionListener(this);
	705	+ oe.menuBar.add(menu = new Menu("Order"));
	706	+
648	707	backItem = menu.add(new MenuItem("Back"));
649	708	backItem.addActionListener(this);
650	709	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -652,13 +711,21 @@
652	711	// compositeItem = menu.add(new MenuItem("Composite"));
653	712	// compositeItem.addActionListener(this);
654	713
	714	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	715	+ grabItem.addActionListener(this);
	716	+
655	717	if (Globals.ADVANCED)
656	718	{
657	719	hideItem = menu.add(new MenuItem("Hidden Group"));
658	720	hideItem.addActionListener(this);
659	721	}
660		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	722	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
661	723	ungroupItem.addActionListener(this);
	724	+
	725	+ oe.jTree.popup.addSeparator();
	726	+
	727	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	728	+ deleteItem.addActionListener(this);
662	729
663	730	// menu.add("-");
664	731	//
..	..	@@ -695,9 +762,9 @@
695	762	shadowYItem.addActionListener(this);
696	763	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
697	764	shadowZItem.addActionListener(this);
	765	+
698	766	attributeItem = menu.add(new MenuItem("Attribute"));
699	767	attributeItem.addActionListener(this);
700		-
701	768	if (Globals.ADVANCED)
702	769	{
703	770	menu.add("-");
..	..	@@ -709,11 +776,18 @@
709	776	pointflowItem.addActionListener(this);
710	777	}
711	778	menu.add("-");
	779	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	780	+ textureRatioRItem.addActionListener(this);
	781	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	782	+ textureRatioGItem.addActionListener(this);
	783	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	784	+ textureRatioBItem.addActionListener(this);
	785	+ menu.add("-");
712	786	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
713	787	resetTransformItem.addActionListener(this);
714	788	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
715	789	resetCentroidItem.addActionListener(this);
716		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	790	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
717	791	resetCentroidXZItem.addActionListener(this);
718	792	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
719	793	transformGeometryItem.addActionListener(this);
..	..	@@ -729,7 +803,7 @@
729	803	genNormalsCADItem.addActionListener(this);
730	804	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
731	805	genNormalsMESHItem.addActionListener(this);
732		- if (Globals.ADVANCED)
	806	+ //if (Globals.ADVANCED)
733	807	{
734	808	genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
735	809	genNormalsMINEItem.addActionListener(this);
..	..	@@ -765,6 +839,8 @@
765	839	}
766	840
767	841	oe.menuBar.add(menu = new Menu("Attributes"));
	842	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	843	+ clearVersionsItem.addActionListener(this);
768	844	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
769	845	clearMaterialsItem.addActionListener(this);
770	846	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -787,9 +863,9 @@
787	863	hideleavesItem.addActionListener(this);
788	864	showleavesItem = menu.add(new MenuItem("Show Leaves"));
789	865	showleavesItem.addActionListener(this);
790		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	866	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
791	867	markleavesItem.addActionListener(this);
792		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	868	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
793	869	unmarkleavesItem.addActionListener(this);
794	870	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
795	871	rewindleavesItem.addActionListener(this);
..	..	@@ -843,6 +919,9 @@
843	919	shareGeometriesItem.addActionListener(this);
844	920	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
845	921	mergeGeometriesItem.addActionListener(this);
	922	+ menu.add("-");
	923	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	924	+ editLeafItem.addActionListener(this);
846	925	if (Globals.ADVANCED)
847	926	{
848	927	// Pretty much the same as duplicate and clone.
..	..	@@ -859,6 +938,84 @@
859	938	buildToolsMenu(menu);
860	939	}
861	940
	941	+ JTabbedPane resourcecontainer;
	942	+ cGridBag currenttab;
	943	+ //boolean added; // patch for jar
	944	+
	945	+ int totalcount = 0;
	946	+
	947	+ int tabcount = 0;
	948	+ int colcount = 0;
	949	+ int rowcount = 0;
	950	+ int texturecount = 0;
	951	+
	952	+ int columns = 5;
	953	+ int rows = 7;
	954	+
	955	+ public void ResourceCallBack(String[] path)
	956	+ {
	957	+// for (int i = 0; i < path.length; i++)
	958	+// System.out.print(path[i] + "/");
	959	+// System.out.println();
	960	+
	961	+ if (//rowcount == 0 \|\|
	962	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	963	+ {
	964	+ currenttab = new cGridBag();
	965	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	966	+ currenttab.setName(tabname);
	967	+ //added = false;
	968	+ resourcecontainer.add(currenttab);
	969	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
	970	+ rowcount = 1;
	971	+ colcount = 0;
	972	+ texturecount = 0;
	973	+ }
	974	+
	975	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	976	+ {
	977	+ //if (!added)
	978	+ {
	979	+ //added = true;
	980	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	981	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	982	+ }
	983	+
	984	+ columns = 5;
	985	+
	986	+ if (path[0].contains("D&R") \|\| path[0].contains("Paint"))
	987	+ columns = 4;
	988	+
	989	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	990	+ totalcount++;
	991	+
	992	+ if (++colcount >= columns)
	993	+ {
	994	+ colcount = 0;
	995	+ currenttab.Return();
	996	+
	997	+ if (rowcount++ >= rows)
	998	+ {
	999	+ rowcount = 0;
	1000	+ }
	1001	+ }
	1002	+ }
	1003	+ else
	1004	+ {
	1005	+// if (!path[path.length-1].equals("icons"))
	1006	+// resourcecontainer.Return();
	1007	+ }
	1008	+ }
	1009	+
	1010	+ void CreateTexturePanel(cGridBag container)
	1011	+ {
	1012	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1013	+ container.add(resourcecontainer);
	1014	+
	1015	+ Grafreed.ParseResources("textures", this);
	1016	+
	1017	+ // 935. System.out.println("Total = " + totalcount);
	1018	+ }
862	1019
863	1020	void SetupUI2(ObjEditor oe)
864	1021	{
..	..	@@ -877,11 +1034,6 @@
877	1034	//new Exception().printStackTrace();
878	1035
879	1036	oe.radioPanel = new JPanel(new GridBagLayout());
880		- oe.aConstraints.weightx = 1;
881		- oe.aConstraints.weighty = 0;
882		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
883		- oe.aConstraints.gridwidth = 100;
884		- oe.aConstraints.gridheight = 1;
885	1037	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
886	1038
887	1039	oe.buttonGroup = new ButtonGroup();
..	..	@@ -902,9 +1054,9 @@
902	1054	oe.radioPanel.add(dummyButton);
903	1055	oe.buttonGroup.add(dummyButton);
904	1056	*/
905		- cGridBag copyOptionsPanel = new cGridBag();
	1057	+ cGridBag versionManagerPanel = new cGridBag();
906	1058
907		- copyOptionsPanel.preferredHeight = 2;
	1059	+ versionManagerPanel.preferredHeight = 4;
908	1060
909	1061	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
910	1062
..	..	@@ -914,58 +1066,102 @@
914	1066
915	1067	if (Globals.ADVANCED)
916	1068	{
917		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
918		- maxButton.setToolTipText("Maximize window");
919		- maxButton.addActionListener(this);
	1069	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1070	+// maxButton.setToolTipText("Maximize window");
	1071	+// maxButton.addActionListener(this);
920	1072	}
921	1073
922		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
923		- fullButton.setToolTipText("Full-screen window");
924		- fullButton.addActionListener(this);
	1074	+ cButton gcButton;
925	1075
926		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1076	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+// gcButton.setToolTipText("Garbage collect");
	1078	+// gcButton.addActionListener(new ActionListener()
	1079	+// {
	1080	+// public void actionPerformed(ActionEvent e)
	1081	+// {
	1082	+// System.gc();
	1083	+// }
	1084	+// });
	1085	+
	1086	+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ fullScreenButton.setToolTipText("Full-screen window");
	1088	+ fullScreenButton.addActionListener(this);
	1089	+
	1090	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1091	+ collapseButton.setToolTipText("Collapse toolbar");
	1092	+ collapseButton.addActionListener(this);
	1093	+
	1094	+// oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1095	+// maximize3DButton.setToolTipText("Maximize 3D view");
	1096	+// maximize3DButton.addActionListener(this);
	1097	+
	1098	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1099	+ twoButton.setToolTipText("Show 3D view only");
	1100	+ twoButton.addActionListener(this);
	1101	+ this.fullscreenLayout = twoButton;
	1102	+
	1103	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ threeButton.setToolTipText("Show controls and 3D view");
	1105	+ threeButton.addActionListener(this);
	1106	+ if (Globals.ADVANCED)
	1107	+ {
	1108	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ sixButton.setToolTipText("Show 3D view and controls");
	1110	+ sixButton.addActionListener(this);
	1111	+ }
	1112	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+// sevenButton.setToolTipText("3-column layout");
	1114	+// sevenButton.addActionListener(this);
	1115	+ //
	1116	+
	1117	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
927	1118	screenfitButton.setToolTipText("Screen fit");
928	1119	screenfitButton.addActionListener(this);
929	1120
930		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1121	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
931	1122	restoreCameraButton.setToolTipText("Restore viewpoint");
932	1123	restoreCameraButton.addActionListener(this);
933	1124
934		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
935		- saveButton.setToolTipText("New version");
936		- saveButton.addActionListener(this);
	1125	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ saveVersionButton.setToolTipText("Duplicate current version");
	1127	+ saveVersionButton.addActionListener(this);
937	1128
938		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
939		- undoButton.setToolTipText("Previous version");
940		- undoButton.addActionListener(this);
941		- undoButton.setEnabled(false);
	1129	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ deleteVersionButton.setToolTipText("Delete current version");
	1131	+ deleteVersionButton.addActionListener(this);
	1132	+ deleteVersionButton.setEnabled(false);
	1133	+
	1134	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ previousVersionButton.setToolTipText("Previous version");
	1136	+ previousVersionButton.addActionListener(this);
	1137	+ previousVersionButton.setEnabled(false);
942	1138
943	1139	cGridBag updown = new cGridBag().setVertical(true);
944		- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
945		- restoreButton.setToolTipText("Restore current");
	1140	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1141	+ restoreButton.setToolTipText("Undo (restore current version)");
946	1142	restoreButton.addActionListener(this);
947	1143	restoreButton.setEnabled(false);
948	1144
949		- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
950		- replaceButton.setToolTipText("Replace current");
	1145	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1146	+ replaceButton.setToolTipText("Save (replace current version)");
951	1147	replaceButton.addActionListener(this);
952	1148	replaceButton.setEnabled(false);
953	1149
954		- copyOptionsPanel.add(updown);
	1150	+ versionManagerPanel.add(updown);
955	1151
956		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
957		- redoButton.setToolTipText("Next version");
958		- redoButton.addActionListener(this);
959		- redoButton.setEnabled(false);
	1152	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1153	+ nextVersionButton.setToolTipText("Next version");
	1154	+ nextVersionButton.addActionListener(this);
	1155	+ nextVersionButton.setEnabled(false);
	1156	+
	1157	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1158	+ oneStepButton.setToolTipText("Animate one step forward");
	1159	+ oneStepButton.addActionListener(this);
960	1160
961	1161	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
962	1162	liveCB.setToolTipText("Enable animation");
963	1163	liveCB.addItemListener(this);
964	1164
965		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
966		- oneStepButton.setToolTipText("Animate one step forward");
967		- oneStepButton.addActionListener(this);
968		-
969	1165	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
970	1166	fastCB.setToolTipText("Fast mode");
971	1167	fastCB.addItemListener(this);
..	..	@@ -981,151 +1177,139 @@
981	1177
982	1178	if (Globals.ADVANCED)
983	1179	{
984		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
985	1181	snapobjectButton.addActionListener(this);
986	1182	snapobjectButton.setToolTipText("Snap Object");
987	1183
988		- oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
989	1185	fourButton.addActionListener(this);
990	1186	fourButton.setToolTipText("Show control panel only");
991	1187	}
992	1188
993	1189	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
994	1190
995		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
996		- twoButton.setToolTipText("Show 3D view only");
997		- twoButton.addActionListener(this);
998		- this.fullscreenLayout = twoButton;
999		-
1000		- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1001		- threeButton.setToolTipText("Show controls and 3D view");
1002		- threeButton.addActionListener(this);
1003		- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1004		- sixButton.setToolTipText("Show 3D view and controls");
1005		- sixButton.addActionListener(this);
1006		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1007		-// sevenButton.setToolTipText("3-column layout");
1008		-// sevenButton.addActionListener(this);
1009		- //
1010	1191
1011		- oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1192	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1012	1193	rootButton.setToolTipText("Open selection in new tab");
1013	1194	rootButton.addActionListener(this);
1014	1195
1015		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1196	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1016	1197	closeButton.setToolTipText("Close tab");
1017	1198	closeButton.addActionListener(this);
1018	1199	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
1019	1200	//clearButton.addActionListener(this);
1020	1201
1021	1202	cGridBag row1 = new cGridBag();
	1203	+ row1.preferredHeight = 8;
1022	1204
1023	1205	// INSERT
1024		- row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1025		- gridButton.setToolTipText("Create grid");
	1206	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ gridButton.setToolTipText("Create ground");
1026	1208	gridButton.addActionListener(this);
1027	1209
1028		- row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1029	1211	boxButton.setToolTipText("Create box");
1030	1212	boxButton.addActionListener(this);
1031	1213
1032		- row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1033		- sphereButton.setToolTipText("Create sphere");
1034		- sphereButton.addActionListener(this);
1035		-
1036		- row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1037		- coneButton.setToolTipText("Create cone");
1038		- coneButton.addActionListener(this);
1039		-
1040		- row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1041		- torusButton.setToolTipText("Create torus");
1042		- torusButton.addActionListener(this);
1043		-
1044		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1045	1215	superButton.setToolTipText("Create superellipsoid");
1046	1216	superButton.addActionListener(this);
1047	1217
1048		- if (Globals.ADVANCED)
	1218	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ sphereButton.setToolTipText("Create sphere");
	1220	+ sphereButton.addActionListener(this);
	1221	+
	1222	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ coneButton.setToolTipText("Create cone");
	1224	+ coneButton.addActionListener(this);
	1225	+
	1226	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ torusButton.setToolTipText("Create torus");
	1228	+ torusButton.addActionListener(this);
	1229	+
	1230	+ if (false) //Globals.ADVANCED)
1049	1231	{
1050		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1051	1233	kleinButton.setToolTipText("Create Klein bottle");
1052	1234	kleinButton.addActionListener(this);
1053	1235	}
1054	1236
1055		- row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1056	1238	particlesButton.setToolTipText("Create particle system");
1057	1239	particlesButton.addActionListener(this);
1058	1240
1059	1241	oe.toolboxPanel.add(row1);
1060	1242
1061	1243	cGridBag row2 = new cGridBag();
	1244	+ row2.preferredHeight = 8;
1062	1245
1063		- row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1064	1247	groupButton.setToolTipText("Create group");
1065	1248	groupButton.addActionListener(this);
1066	1249
1067		- row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1068	1251	compositeButton.setToolTipText("Create composite");
1069	1252	compositeButton.addActionListener(this);
1070	1253
1071		- row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1254	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1072	1255	switchButton.setToolTipText("Create item switcher");
1073	1256	switchButton.addActionListener(this);
1074	1257
1075		- row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1258	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1076	1259	loopButton.setToolTipText("Create loop");
1077	1260	loopButton.addActionListener(this);
1078	1261
1079		- row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1262	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1080	1263	textureButton.setToolTipText("Create texture");
1081	1264	textureButton.addActionListener(this);
1082	1265
1083		- row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1084	1267	overlayButton.setToolTipText("Create overlay");
1085	1268	overlayButton.addActionListener(this);
1086	1269
1087		- row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1270	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1088	1271	lightButton.setToolTipText("Create light");
1089	1272	lightButton.addActionListener(this);
1090	1273
1091	1274	oe.toolboxPanel.add(row2);
1092	1275
1093		- // ENVYMAPS
1094		- cGridBag skyboxpane = new cGridBag();
1095		- skyboxpane.preferredHeight = 100;
	1276	+ cGridBag textures = new cGridBag();
1096	1277
1097		- oe.toolboxPanel.add(skyboxpane);
	1278	+ CreateTexturePanel(textures);
1098	1279
1099		- JTabbedPane skyboxpanel = new JTabbedPane();
1100		- skyboxpane.add(skyboxpanel);
	1280	+ int tabCount = resourcecontainer.getTabCount();
1101	1281
1102		- AddSkyboxTab0(skyboxpanel);
1103		- AddSkyboxTab1(skyboxpanel);
1104		- AddSkyboxTab2(skyboxpanel);
1105		- AddSkyboxTab3(skyboxpanel);
	1282	+ if (tabCount > 0)
	1283	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1284	+
	1285	+ oe.toolboxPanel.add(textures);
	1286	+
	1287	+ textures.preferredHeight = 100;
	1288	+
	1289	+ CreateSkyboxPanel(oe.skyboxPanel);
1106	1290
1107	1291	// EDIT panel
1108		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1109	1293	editButton.setToolTipText("Pin selection controls");
1110	1294	editButton.addActionListener(this);
1111	1295
1112		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1113		- uneditButton.setToolTipText("Remove selection controls");
	1296	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1297	+ uneditButton.setToolTipText("Unpin and remove selection controls");
1114	1298	uneditButton.addActionListener(this);
1115	1299
1116	1300	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1117		- allParamsButton.setToolTipText("Show all controle");
	1301	+ allParamsButton.setToolTipText("Show all controls");
1118	1302	allParamsButton.addActionListener(this);
1119	1303
1120		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1121		- clearPanelButton.setToolTipText("Clear edit panel");
	1304	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1305	+ clearPanelButton.setToolTipText("Clear all controls");
1122	1306	clearPanelButton.addActionListener(this);
1123	1307
1124		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1125		- unselectButton.setToolTipText("Unselect");
1126		- unselectButton.addActionListener(this);
	1308	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1309	+ //unselectButton.setToolTipText("Unselect");
	1310	+ //unselectButton.addActionListener(this);
1127	1311
1128		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1312	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1129	1313	flashSelectionButton.setToolTipText("Highlight selection");
1130	1314	flashSelectionButton.addActionListener(this);
1131	1315
..	..	@@ -1148,6 +1332,8 @@
1148	1332
1149	1333	cGridBag jSPPanel = new cGridBag();
1150	1334
	1335	+ jSPPanel.preferredHeight = 20;
	1336	+
1151	1337	JScrollPane jSP;
1152	1338	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1153	1339	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -1156,11 +1342,12 @@
1156	1342	oe.treePanel.add(jSPPanel);
1157	1343	oe.treePanel.Return();
1158	1344
1159		- oe.treePanel.add(copyOptionsPanel);
	1345	+ oe.treePanel.add(versionManagerPanel);
1160	1346	oe.treePanel.Return();
1161		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1162		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1163		- sliderPane.preferredHeight = 1;
	1347	+
	1348	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1349	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1350	+ versionSliderPane.preferredHeight = 3;
1164	1351
1165	1352	// mainPanel.setDividerLocation(0.1); //1.0);
1166	1353	mainPanel.setResizeWeight(0.4);
..	..	@@ -1183,7 +1370,7 @@
1183	1370	dgr.addDragGestureListener(this);
1184	1371	}catch(Exception e) {}
1185	1372	*/
1186		- radio.layout = sixButton; // sevenButton;
	1373	+ radio.layout = threeButton; // sixButton;
1187	1374	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1188	1375	}
1189	1376
..	..	@@ -1217,7 +1404,7 @@
1217	1404	// supportCB.setToolTipText("Enable rigging");
1218	1405	// supportCB.addItemListener(this);
1219	1406
1220		- panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1407	+ panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
1221	1408	freezeCB.setToolTipText("Fast moving camera");
1222	1409	freezeCB.addItemListener(this);
1223	1410
..	..	@@ -1226,9 +1413,12 @@
1226	1413
1227	1414	panel.Return();
1228	1415
	1416	+ if (Globals.ADVANCED)
	1417	+ {
1229	1418	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
1230	1419	crowdCB.setToolTipText("Used for crowds");
1231	1420	crowdCB.addItemListener(this);
	1421	+ }
1232	1422
1233	1423	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
1234	1424	smoothCB.setToolTipText("Snapping delay");
..	..	@@ -1241,30 +1431,26 @@
1241	1431	minshaderCB.setToolTipText("Minimal fast shader");
1242	1432	minshaderCB.addItemListener(this);
1243	1433
1244		-// constraints.gridy += 1;
1245	1434	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
1246	1435	// speakerMocapCB.addItemListener(this);
1247	1436
1248		- panel.Return();
1249		-
1250	1437	if (false)
1251	1438	{
1252	1439	// handled in scripts
1253		- //constraints.gridy += 1;
1254	1440	panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
1255	1441	speakerCameraCB.addItemListener(this);
1256	1442
1257		- //constraints.gridy += 1;
1258	1443	panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
1259	1444	speakerFocusCB.addItemListener(this);
1260	1445
1261		- //constraints.gridy += 1;
1262		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
1263		- smoothfocusCB.addItemListener(this);
1264	1446	panel.Return();
1265	1447	}
1266	1448
1267		-//constraints.gridx += 1;
	1449	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1450	+ smoothfocusCB.addItemListener(this);
	1451	+
	1452	+ panel.Return();
	1453	+
1268	1454	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
1269	1455	// debugCB.addItemListener(this);
1270	1456
..	..	@@ -1318,6 +1504,14 @@
1318	1504
1319	1505	void EditObject(Object3D obj)
1320	1506	{
	1507	+ //assert(obj instanceof Composite);
	1508	+
	1509	+// if (obj.versionlist == null)
	1510	+// {
	1511	+// obj.versionlist = new Object3D[100];
	1512	+// obj.versionindex = -1;
	1513	+// }
	1514	+
1321	1515	cRadio radioButton = new cRadio(obj.name);
1322	1516
1323	1517	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1328,7 +1522,7 @@
1328	1522	}
1329	1523
1330	1524	radioButton.SetObject(obj);
1331		- radioButton.layout = sixButton; // sevenButton;
	1525	+ radioButton.layout = threeButton; // sixButton;
1332	1526	radioButton.SetCamera(cameraView.renderCamera, false);
1333	1527	radioButton.addActionListener(this);
1334	1528	radioPanel.add(radioButton);
..	..	@@ -1342,6 +1536,7 @@
1342	1536
1343	1537	oe.SetupViews();
1344	1538
	1539	+ if (Globals.DEBUG)
1345	1540	System.out.println("SetupViews");
1346	1541	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1347	1542	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1708,7 +1903,12 @@
1708	1903	TreePath path;
1709	1904
1710	1905	public TransferableTreePath(TreePath tp) {
1711		- path = tp;
	1906	+ Object[] objs = new Object[tp.getPathCount()];
	1907	+ for (int i=0; i<objs.length; i++)
	1908	+ {
	1909	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1910	+ }
	1911	+ path = new TreePath(objs);
1712	1912	}
1713	1913
1714	1914	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1889,7 +2089,7 @@
1889	2089	Object3D obj = (Object3D)group.selection.elementAt(0);
1890	2090	objEditor.ScreenFit(obj, false);
1891	2091
1892		- cameraView.pingthread.StepToTarget(true);
	2092	+ cameraView.pingthread.StepToTarget(); //true);
1893	2093	refreshContents();
1894	2094	}
1895	2095
..	..	@@ -1926,7 +2126,7 @@
1926	2126	obj.parent.TransformToWorld(maxima); //, maxima);
1927	2127	}
1928	2128
1929		- Object3D shadow = new Object3D("Shadow " + obj.name);
	2129	+ Object3D shadow = new Object3D("Shadow" + obj.name);
1930	2130
1931	2131	shadow.toParent = LA.newMatrix();
1932	2132	shadow.fromParent = LA.newMatrix();
..	..	@@ -1940,24 +2140,24 @@
1940	2140	switch(axis)
1941	2141	{
1942	2142	case 0 :
1943		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1944		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1945		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1946		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2143	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2144	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2145	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2146	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1947	2147	norm = cVector.X;
1948	2148	break;
1949	2149	case 1 :
1950		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1951		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1952		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1953		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2150	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2151	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2152	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2153	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1954	2154	norm = cVector.Y;
1955	2155	break;
1956	2156	case 2 :
1957		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1958		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1959		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1960		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2157	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2158	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2159	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2160	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1961	2161	norm = cVector.Z;
1962	2162	break;
1963	2163	}
..	..	@@ -1998,7 +2198,11 @@
1998	2198	shadow.material = new cMaterial(obj.material);
1999	2199	shadow.material.diffuse = 0.0001f;
2000	2200	shadow.material.specular = 0.0001f;
2001		- //shadow.projectedVertices[1].x = 300;
	2201	+ shadow.material.opacity = 0.75f;
	2202	+
	2203	+ AllocProjectedVertices(shadow);
	2204	+
	2205	+ shadow.projectedVertices[1].x = 300;
2002	2206
2003	2207	makeSomething(shadow);
2004	2208	}
..	..	@@ -2519,27 +2723,35 @@
2519	2723	} else
2520	2724	if (source == loopItem \|\| source == loopButton)
2521	2725	{
	2726	+ if (!group.selection.isEmpty())
	2727	+ {
2522	2728	Composite csg = new GroupLeaf();
2523		- csg.count = 5;
2524	2729	group(csg);
	2730	+ csg.count = 5;
2525	2731	Composite child = new cGroup("Branch");
2526	2732	csg.addChild(child);
2527	2733	child.addChild(csg);
	2734	+ }
2528	2735	} else
2529	2736	if (source == doubleItem)
2530	2737	{
	2738	+ if (!group.selection.isEmpty())
	2739	+ {
2531	2740	Composite csg = new GroupLeaf("Fork");
2532		- csg.count = 5;
2533	2741	group(csg);
	2742	+ csg.count = 5;
2534	2743	Composite child = new cGroup("Branch A");
2535	2744	csg.addChild(child);
2536	2745	child.addChild(csg);
2537	2746	child = new cGroup("Branch B");
2538	2747	csg.addChild(child);
2539	2748	child.addChild(csg);
	2749	+ }
2540	2750	} else
2541	2751	if (source == tripleItem)
2542	2752	{
	2753	+ if (!group.selection.isEmpty())
	2754	+ {
2543	2755	Composite csg = new GroupLeaf("Trident");
2544	2756	csg.count = 4;
2545	2757	group(csg);
..	..	@@ -2552,6 +2764,7 @@
2552	2764	child = new cGroup();
2553	2765	csg.addChild(child);
2554	2766	child.addChild(csg);
	2767	+ }
2555	2768	} else
2556	2769	if (source == computeAOItem)
2557	2770	{
..	..	@@ -2571,7 +2784,7 @@
2571	2784	if (source == invariantsItem)
2572	2785	{
2573	2786	System.out.println("Invariants:");
2574		- Grafreed.grafreeD.universe.invariants();
	2787	+ Grafreed.grafreed.universe.invariants();
2575	2788	} else
2576	2789	if (source == memoryItem)
2577	2790	{
..	..	@@ -2598,37 +2811,56 @@
2598	2811	{
2599	2812	Maximize();
2600	2813	} else
2601		- if (source == fullButton)
	2814	+ if (source == fullScreenButton)
2602	2815	{
2603	2816	ToggleFullScreen();
2604	2817	} else
2605		- if (source == undoButton)
	2818	+ if (source == collapseButton)
	2819	+ {
	2820	+ this.expandedLayout = radio.layout;
	2821	+ CollapseToolbar();
	2822	+ } else
	2823	+// if (source == maximize3DButton)
	2824	+// {
	2825	+// this.expandedLayout = radio.layout;
	2826	+// radio.layout = twoButton;
	2827	+// CollapseToolbar();
	2828	+// Show3DView();
	2829	+// } else
	2830	+ if (source == previousVersionButton)
2606	2831	{
2607	2832	// Go to previous version
2608	2833	//if (!Undo())
2609	2834	//java.awt.Toolkit.getDefaultToolkit().beep();
2610		- Undo();
	2835	+ PreviousVersion();
2611	2836	} else
2612	2837	if (source == restoreButton)
2613	2838	{
2614	2839	// Restore current version
2615	2840	Restore();
	2841	+ //restoreButton.setEnabled(false);
2616	2842	} else
2617	2843	if (source == replaceButton)
2618	2844	{
2619	2845	// Overwrite current version
2620	2846	Replace();
	2847	+ //replaceButton.setEnabled(false);
2621	2848	} else
2622		- if (source == redoButton)
	2849	+ if (source == nextVersionButton)
2623	2850	{
2624	2851	// Go to next version
2625		- Redo();
	2852	+ NextVersion();
2626	2853	} else
2627		- if (source == saveButton)
	2854	+ if (source == saveVersionButton)
2628	2855	{
2629	2856	// Save a new version
2630		- if (!Save(true))
	2857	+ if (!DuplicateVersion()) //true))
2631	2858	java.awt.Toolkit.getDefaultToolkit().beep();
	2859	+ } else
	2860	+ if (source == deleteVersionButton)
	2861	+ {
	2862	+ // Delete a new version
	2863	+ DeleteVersion();
2632	2864	} else
2633	2865	if (source == oneStepButton)
2634	2866	{
..	..	@@ -2683,11 +2915,11 @@
2683	2915	} else
2684	2916	if (source == undoItem)
2685	2917	{
2686		- Undo();
	2918	+ PreviousVersion();
2687	2919	} else
2688	2920	if (source == redoItem)
2689	2921	{
2690		- Redo();
	2922	+ NextVersion();
2691	2923	} else
2692	2924	if (source == duplicateItem)
2693	2925	{
..	..	@@ -3168,22 +3400,34 @@
3168	3400	} else
3169	3401	if (source == ungroupItem \|\| source == ungroupButton)
3170	3402	{
3171		- boolean hasRoot = false;
	3403	+ boolean canUngroup = true;
3172	3404
3173	3405	for (int i=0; i<group.selection.size(); i++)
3174	3406	{
3175		- if (group.selection.get(i) == group)
	3407	+ Object3D selectedItem = group.selection.get(i);
	3408	+
	3409	+ if (selectedItem.Size() == 0)
3176	3410	{
3177		- hasRoot = true;
	3411	+ // Cannot ungroup leaves
	3412	+ canUngroup = false;
	3413	+ break;
	3414	+ }
	3415	+
	3416	+ if (selectedItem == group)
	3417	+ {
	3418	+ // Cannot ungroup root
	3419	+ canUngroup = false;
3178	3420	break;
3179	3421	}
3180	3422	}
3181	3423
3182		- if (!hasRoot)
	3424	+ if (canUngroup)
3183	3425	{
3184	3426	for (int i=0; i<group.selection.size(); i++)
3185	3427	{
3186		- Ungroup(group.selection.get(i));
	3428	+ Object3D selectedItem = group.selection.get(i);
	3429	+
	3430	+ Ungroup(selectedItem);
3187	3431	}
3188	3432
3189	3433	ClearSelection(false);
..	..	@@ -3234,6 +3478,10 @@
3234	3478	if (source == clearMaterialsItem)
3235	3479	{
3236	3480	ClearMaterials();
	3481	+ } else
	3482	+ if (source == clearVersionsItem)
	3483	+ {
	3484	+ ClearVersions();
3237	3485	} else
3238	3486	if (source == liveleavesItem)
3239	3487	{
..	..	@@ -3374,6 +3622,18 @@
3374	3622	if (source == transformChildrenItem)
3375	3623	{
3376	3624	TransformChildren();
	3625	+ } else
	3626	+ if (source == textureRatioRItem)
	3627	+ {
	3628	+ TextureRatio(0);
	3629	+ } else
	3630	+ if (source == textureRatioGItem)
	3631	+ {
	3632	+ TextureRatio(1);
	3633	+ } else
	3634	+ if (source == textureRatioBItem)
	3635	+ {
	3636	+ TextureRatio(2);
3377	3637	} else
3378	3638	if (source == resetTransformItem)
3379	3639	{
..	..	@@ -3546,38 +3806,7 @@
3546	3806	if (CameraPane.FULLSCREEN)
3547	3807	fullscreenLayout = radio.layout;
3548	3808
3549		- // bug
3550		- //gridPanel.setDividerLocation(1.0);
3551		- //bigPanel.setDividerLocation(0.0);
3552		-// bigThree.remove(scenePanel);
3553		-// bigThree.remove(centralPanel);
3554		-// bigThree.remove(XYZPanel);
3555		-// aWindowConstraints.gridx = 0;
3556		-// aWindowConstraints.gridy = 0;
3557		-// aWindowConstraints.gridwidth = 1;
3558		-// // aConstraints.gridheight = 3;
3559		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3560		-// aWindowConstraints.weightx = 0;
3561		-// aWindowConstraints.weighty = 1;
3562		-// //bigThree.add(jtp, aWindowConstraints);
3563		-// aWindowConstraints.weightx = 1;
3564		-// aWindowConstraints.gridwidth = 3;
3565		-// // aConstraints.gridheight = 3;
3566		-// aWindowConstraints.gridx = 1;
3567		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3568		-// bigThree.add(centralPanel, aWindowConstraints);
3569		-// aWindowConstraints.weightx = 0;
3570		-// aWindowConstraints.gridx = 4;
3571		-// aWindowConstraints.gridwidth = 1;
3572		-// // aConstraints.gridheight = 3;
3573		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3574		-// //bigThree.add(XYZPanel, aWindowConstraints);
3575		-// scenePanel.setVisible(false);
3576		-// centralPanel.setVisible(true);
3577		-// XYZPanel.setVisible(false);
3578		- bigThree.ClearUI();
3579		- bigThree.add(centralPanel);
3580		- bigThree.FlushUI();
	3809	+ Show3DView();
3581	3810
3582	3811	cameraView.requestFocusInWindow();
3583	3812
..	..	@@ -3763,6 +3992,7 @@
3763	3992	} else
3764	3993	if (source == rootButton)
3765	3994	{
	3995	+ Replace();
3766	3996	Object3D obj;
3767	3997	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3768	3998	{
..	..	@@ -3777,6 +4007,9 @@
3777	4007	if (source == closeButton)
3778	4008	{
3779	4009	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4010	+ if (copy.versionlist != null)
	4011	+ Replace();
	4012	+
3780	4013	cRadio ab;
3781	4014	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3782	4015	{
..	..	@@ -3820,10 +4053,10 @@
3820	4053	{
3821	4054	Object3D child = (Object3D)e.nextElement();
3822	4055	if(child.editWindow != null)
3823		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3824	4056	child.pinned = false;
3825	4057	child.CloseUI();
3826	4058	listUI.remove(child);
	4059	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3827	4060
3828	4061	//child.editWindow = null; // ???????????
3829	4062	}
..	..	@@ -3842,6 +4075,7 @@
3842	4075	obj.CloseUI();
3843	4076	}
3844	4077	listUI.clear();
	4078	+ SetPinStates(group.selection.size() > 0);
3845	4079	refreshContents(true);
3846	4080	} else
3847	4081	if (source == allParamsButton)
..	..	@@ -3874,6 +4108,9 @@
3874	4108	} else
3875	4109	if(source instanceof cRadio)
3876	4110	{
	4111	+ if (copy.versionlist != null)
	4112	+ Replace();
	4113	+
3877	4114	group.parent = keepparent;
3878	4115	group.attributes = 0;
3879	4116	//group.editWindow = null;
..	..	@@ -3898,8 +4135,6 @@
3898	4135
3899	4136	copy = group;
3900	4137
3901		- SetUndoStates();
3902		-
3903	4138	//Globals.theRenderer.object = group;
3904	4139	if(!useclient)
3905	4140	{
..	..	@@ -3927,7 +4162,34 @@
3927	4162	*/
3928	4163	radio.layout.doClick();
3929	4164
	4165	+ //assert(copy instanceof Composite);
	4166	+
	4167	+ if (copy.versionlist == null)
	4168	+ {
	4169	+ copy.versionindex = -1;
	4170	+
	4171	+ // Cannot work with loops
	4172	+ // To fix this issue, we first mark all nodes above the root,
	4173	+ // and check if any of these nodes are reachable below the root.
	4174	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4175	+
	4176	+ if (copy instanceof Composite && !copy.HasTags())
	4177	+ {
	4178	+ if (copy.versionlist == null)
	4179	+ copy.versionlist = new Object3D[100];
	4180	+
	4181	+ //Save(true);
	4182	+ }
	4183	+ else
	4184	+ copy.versionindex = -2;
	4185	+
	4186	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4187	+ }
	4188	+
	4189	+ SetVersionStates();
	4190	+
3930	4191	ClearUnpinned();
	4192	+
3931	4193	//Grafreed.Assert(group != null);
3932	4194	//Grafreed.Assert(group.selection != null);
3933	4195	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3944,11 +4206,13 @@
3944	4206	} else if (event.getSource() == editCameraItem)
3945	4207	{
3946	4208	cameraView.ProtectCamera();
	4209	+ cameraView.requestFocusInWindow();
3947	4210	cameraView.repaint();
3948	4211	return;
3949	4212	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3950	4213	{
3951	4214	cameraView.RevertCamera();
	4215	+ cameraView.requestFocusInWindow();
3952	4216	cameraView.repaint();
3953	4217	return;
3954	4218	// } else if (event.getSource() == textureButton)
..	..	@@ -4037,9 +4301,46 @@
4037	4301	refreshContents();
4038	4302	}
4039	4303
	4304	+ void TextureRatio(int axis)
	4305	+ {
	4306	+ Object3D obj;
	4307	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4308	+ {
	4309	+ obj = (Object3D)e.nextElement();
	4310	+ obj.TextureRatio(axis);
	4311	+ }
	4312	+
	4313	+ refreshContents();
	4314	+ }
	4315	+
4040	4316	void ResetTransform()
4041	4317	{
4042	4318	ResetTransform(-1);
	4319	+ }
	4320	+
	4321	+ void ScaleSelection(int scale)
	4322	+ {
	4323	+ Object3D obj;
	4324	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4325	+ {
	4326	+ obj = (Object3D)e.nextElement();
	4327	+
	4328	+ if (obj.toParent == null)
	4329	+ continue;
	4330	+
	4331	+ obj.Scale(scale);
	4332	+
	4333	+ if (obj.parent == null)
	4334	+ {
	4335	+ System.out.println("NULL PARENT!");
	4336	+ // new Exception().printStackTrace();
	4337	+ }
	4338	+ else
	4339	+ TouchTransform(obj);
	4340	+ //obj.parent.Touch();
	4341	+ }
	4342	+
	4343	+ refreshContents();
4043	4344	}
4044	4345
4045	4346	void ResetTransform(int mask)
..	..	@@ -4052,42 +4353,8 @@
4052	4353	if (obj.toParent == null)
4053	4354	continue;
4054	4355
4055		- if (mask == -1)
4056		- {
4057		- if (obj instanceof Camera) // jan 2014
4058		- {
4059		- LA.matIdentity(obj.toParent);
4060		- LA.matIdentity(obj.fromParent);
4061		- }
4062		- else
4063		- {
4064		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
4065		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
4066		- }
4067		- TouchTransform(obj);
4068		- continue;
4069		- }
4070		- if ((mask&2) != 0) // Scale
4071		- {
4072		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4073		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
4074		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
4075		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4076		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4077		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4078		- }
4079		- if ((mask&4) != 0) // Rotation
4080		- {
4081		- // ?
4082		- }
4083		- if ((mask&1) != 0) // Translation
4084		- {
4085		- if (obj.toParent != null)
4086		- {
4087		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
4088		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
4089		- }
4090		- }
	4356	+ obj.ResetTransform(mask);
	4357	+
4091	4358	if (obj.parent == null)
4092	4359	{
4093	4360	System.out.println("NULL PARENT!");
..	..	@@ -4596,10 +4863,17 @@
4596	4863	{
4597	4864	Object3D obj = group.selection.get(i);
4598	4865
	4866	+ if (obj.toParent == null)
	4867	+ {
	4868	+ obj.toParent = LA.newMatrix();
	4869	+ obj.fromParent = LA.newMatrix();
	4870	+ }
	4871	+
4599	4872	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4600	4873	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4601	4874	}
4602	4875
	4876	+ Globals.lighttouched = true;
4603	4877	refreshContents();
4604	4878	}
4605	4879
..	..	@@ -4887,6 +5161,12 @@
4887	5161	refreshContents();
4888	5162	}
4889	5163
	5164	+ void ClearVersions()
	5165	+ {
	5166	+ group.selection.ClearVersions();
	5167	+ refreshContents();
	5168	+ }
	5169	+
4890	5170	void FlipV(boolean flip)
4891	5171	{
4892	5172	group.selection.FlipV(flip);
..	..	@@ -5081,9 +5361,7 @@
5081	5361
5082	5362	freezemodel = false;
5083	5363	}
5084		-
5085		- boolean flashIt = true;
5086		-
	5364	+
5087	5365	public void valueChanged(TreeSelectionEvent e)
5088	5366	//public boolean handleEvent(Event event)
5089	5367	{
..	..	@@ -5127,10 +5405,10 @@
5127	5405	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
5128	5406	// a camera
5129	5407	{
5130		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5408	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
5131	5409	{
5132	5410	CameraPane.camerachangeframe = 0; // don't refuse it
5133		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5411	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
5134	5412	}
5135	5413	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
5136	5414	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
..	..	@@ -5156,13 +5434,31 @@
5156	5434	{
5157	5435	editButton.setEnabled(enabled);
5158	5436	uneditButton.setEnabled(enabled);
5159		- unselectButton.setEnabled(enabled);
	5437	+ //unselectButton.setEnabled(enabled);
5160	5438	flashSelectionButton.setEnabled(enabled);
	5439	+
	5440	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5441	+
	5442	+ boolean allComposites = true;
	5443	+
	5444	+ if (group.selection != null)
	5445	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5446	+ {
	5447	+ Object next = e.nextElement();
	5448	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5449	+ {
	5450	+ allComposites = false;
	5451	+ break;
	5452	+ }
	5453	+ }
	5454	+
	5455	+ rootButton.setEnabled(true); // allComposites);
5161	5456	}
5162	5457
5163	5458	void refreshContents(boolean cp)
5164	5459	{
5165		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5460	+ if (Globals.SHOWINFO)
	5461	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5166	5462	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5167	5463	{
5168	5464	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5172,7 +5468,7 @@
5172	5468	Object3D child = (Object3D) group.selection.get(i);
5173	5469
5174	5470	objEditor.AddInfo(child, this, true);
5175		- System.err.println("info : " + child.GetPath());
	5471	+// System.err.println("info : " + child.GetPath());
5176	5472	}
5177	5473
5178	5474	objEditor.SetText(); // jan 2014
..	..	@@ -5998,7 +6294,6 @@
5998	6294
5999	6295	cButton restoreCameraButton;
6000	6296
6001		- cButton saveButton;
6002	6297	cButton oneStepButton;
6003	6298
6004	6299	cButton groupButton;
..	..	@@ -6056,11 +6351,11 @@
6056	6351	private MenuItem lookAtItem;
6057	6352	private MenuItem lookFromItem;
6058	6353	private MenuItem switchViewItem;
6059		- private MenuItem cutItem;
	6354	+ private JMenuItem cutItem;
6060	6355	private MenuItem undoItem;
6061	6356	private MenuItem redoItem;
6062	6357	private JMenuItem duplicateItem;
6063		- private MenuItem cloneItem;
	6358	+ private JMenuItem cloneItem;
6064	6359	private MenuItem cloneSupportItem;
6065	6360	private MenuItem overwriteGeoItem;
6066	6361	private MenuItem overwriteMatItem;
..	..	@@ -6081,13 +6376,13 @@
6081	6376	private MenuItem cloneGeometriesItem;
6082	6377	private MenuItem shareGeometriesItem;
6083	6378	private MenuItem mergeGeometriesItem;
6084		- private MenuItem copyItem;
	6379	+ private JMenuItem copyItem;
6085	6380	private MenuItem pasteItem;
6086		- private MenuItem pasteIntoItem;
6087		- private MenuItem pasteLinkItem;
6088		- private MenuItem pasteCloneItem;
6089		- private MenuItem pasteExpandItem;
6090		- private MenuItem deleteItem;
	6381	+ private JMenuItem pasteIntoItem;
	6382	+ private JMenuItem pasteLinkItem;
	6383	+ private JMenuItem pasteCloneItem;
	6384	+ private JMenuItem pasteExpandItem;
	6385	+ private JMenuItem deleteItem;
6091	6386	private MenuItem clearAllItem;
6092	6387	private MenuItem genUVItem;
6093	6388	private MenuItem genNormalsMESHItem;
..	..	@@ -6113,6 +6408,7 @@
6113	6408	private MenuItem clipMeshItem;
6114	6409	private MenuItem smoothMeshItem;
6115	6410	private MenuItem clearMaterialsItem;
	6411	+ private MenuItem clearVersionsItem;
6116	6412
6117	6413	private MenuItem liveleavesItem;
6118	6414	private MenuItem unliveleavesItem;
..	..	@@ -6136,13 +6432,16 @@
6136	6432	private MenuItem maxTexturesItem;
6137	6433	private MenuItem panoTexturesItem;
6138	6434
	6435	+ private MenuItem textureRatioRItem;
	6436	+ private MenuItem textureRatioGItem;
	6437	+ private MenuItem textureRatioBItem;
6139	6438	private MenuItem resetCentroidItem;
6140	6439	private MenuItem resetCentroidXZItem;
6141	6440	private MenuItem resetTransformItem;
6142	6441	private MenuItem transformGeometryItem;
6143	6442	private MenuItem transformChildrenItem;
6144	6443	private MenuItem hideItem;
6145		- private MenuItem grabItem;
	6444	+ private JMenuItem grabItem;
6146	6445	private MenuItem backItem;
6147	6446	private MenuItem frontItem;
6148	6447	private MenuItem cameraItem;
..	..	@@ -6155,7 +6454,7 @@
6155	6454	private MenuItem switchTransfoItem;
6156	6455	private MenuItem morphItem;
6157	6456	private MenuItem linkerItem;
6158		- private MenuItem ungroupItem;
	6457	+ private JMenuItem ungroupItem;
6159	6458	private MenuItem editItem;
6160	6459	private MenuItem openWindowItem;
6161	6460	private MenuItem editLeafItem;