~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -29,9 +29,9 @@
29	29	{
30	30	cButton skyboxButton;
31	31	final String path = "cubemaps/" + f + "-skyboxes/" + s;
32		- row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
33	33	//row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
34		- skyboxButton.setToolTipText(s);
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
35	35	skyboxButton.addActionListener(new ActionListener()
36	36	{
37	37	@Override
..	..	@@ -42,12 +42,12 @@
42	42	});
43	43	}
44	44
45		- public void AddTextureButton(String f, final String t, cGridBag row)
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
46	46	{
47	47	cButton textureButton;
48		- final String path = "textures/" + f + "/"; // + t;
49		- row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
50		- textureButton.setToolTipText(f + "s");
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
51	51	textureButton.addActionListener(new ActionListener()
52	52	{
53	53	@Override
..	..	@@ -73,7 +73,7 @@
73	73	cGridBag row5 = new cGridBag();
74	74	cGridBag row6 = new cGridBag();
75	75
76		- AddSkyboxButton("default", "rgb", row0);
	76	+ AddSkyboxButton("default", "", row0);
77	77	//AddSkyboxButton("default", "cornell", row0);
78	78	AddSkyboxButton("penguins", "dust", row0);
79	79	AddSkyboxButton("penguins", "tropic", row0);
..	..	@@ -330,15 +330,24 @@
330	330
331	331	public void ChangeSkybox(String skybox)
332	332	{
333		- //cameraView.envyoff = false;
334		- group.skyboxname = skybox;
335		- group.skyboxext = "jpg";
336		- 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	+ }
337	346	}
338	347
339	348	public void CreateSkyboxPanel(cGridBag skyboxPanel)
340	349	{
341		- JTabbedPane skyboxpane = new JTabbedPane();
	350	+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
342	351
343	352	AddSkyboxTab0(skyboxpane);
344	353	AddSkyboxTab1(skyboxpane);
..	..	@@ -350,7 +359,23 @@
350	359
351	360	public void ChangeTexture(String texture)
352	361	{
353		- cameraView.repaint();
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
354	379	}
355	380
356	381	//ObjEditor objEditor;
..	..	@@ -390,11 +415,15 @@
390	415	this.copy = this.group = group;
391	416	//selectees = this.group.selectees;
392	417
393		- if (copy.versionlist == null)
394		- {
395		- copy.versionlist = new Object3D[100];
396		- copy.versionindex = -1;
397		- }
	418	+ assert(false);
	419	+
	420	+// if (copy.versionlist == null)
	421	+// {
	422	+// copy.versionlist = new Object3D[100];
	423	+// copy.versionindex = -1;
	424	+//
	425	+// //Save(true);
	426	+// }
398	427
399	428	if(ui)
400	429	SetupUI(objEditor);
..	..	@@ -417,13 +446,13 @@
417	446
418	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
419	448
420		- if (copy.versionlist == null)
421		- {
422		- copy.versionlist = new Object3D[100];
423		- copy.versionindex = -1;
424		-
425		- Save(true);
426		- }
	449	+// if (copy.versionlist == null)
	450	+// {
	451	+// copy.versionlist = new Object3D[100];
	452	+// copy.versionindex = -1;
	453	+//
	454	+// //Save(true);
	455	+// }
427	456	}
428	457
429	458	void CloneSelection(boolean supports)
..	..	@@ -513,33 +542,35 @@
513	542	// menu.add("-");
514	543	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
515	544	duplicateItem.addActionListener(this);
516		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
517	547	cloneItem.addActionListener(this);
518		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
519	549	{
520	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
521	551	cloneSupportItem.addActionListener(this);
522	552	}
	553	+ oe.jTree.popup.addSeparator();
523	554	menu.add("-");
524		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
525	556	cutItem.addActionListener(this);
526		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
527	558	copyItem.addActionListener(this);
528	559	pasteItem = menu.add(new MenuItem("Paste"));
529	560	pasteItem.addActionListener(this);
530	561
531		- menu.add("-");
532		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
533	565	pasteIntoItem.addActionListener(this);
534		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
535	567	pasteLinkItem.addActionListener(this);
536		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
537	569	pasteCloneItem.addActionListener(this);
538		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
539	571	// pasteExpandItem.addActionListener(this);
540		- menu.add("-");
541		- deleteItem = menu.add(new MenuItem("Delete"));
542		- deleteItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
543	574
544	575	if (Globals.ADVANCED)
545	576	{
..	..	@@ -625,11 +656,9 @@
625	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
626	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
627	658	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
628		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
629	659	oe.cameraMenu.add("-");
630	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
631	661	openWindowItem.addActionListener(this);
632		- editLeafItem.addActionListener(this);
633	662	lookAtItem.addActionListener(this);
634	663	//lookFromItem.addActinoListener(this);
635	664	//switchViewItem.addActionListener(this);
..	..	@@ -676,9 +705,8 @@
676	705	setMasterItem.addActionListener(this);
677	706	}
678	707
679		- oe.menuBar.add(menu = new Menu("Group"));
680		-// grabItem = menu.add(new MenuItem("Grab"));
681		-// grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
682	710	backItem = menu.add(new MenuItem("Back"));
683	711	backItem.addActionListener(this);
684	712	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -686,13 +714,21 @@
686	714	// compositeItem = menu.add(new MenuItem("Composite"));
687	715	// compositeItem.addActionListener(this);
688	716
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
689	720	if (Globals.ADVANCED)
690	721	{
691	722	hideItem = menu.add(new MenuItem("Hidden Group"));
692	723	hideItem.addActionListener(this);
693	724	}
694		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
695	726	ungroupItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
696	732
697	733	// menu.add("-");
698	734	//
..	..	@@ -729,11 +765,11 @@
729	765	shadowYItem.addActionListener(this);
730	766	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
731	767	shadowZItem.addActionListener(this);
732		- attributeItem = menu.add(new MenuItem("Attribute"));
733		- attributeItem.addActionListener(this);
734	768
735	769	if (Globals.ADVANCED)
736	770	{
	771	+ attributeItem = menu.add(new MenuItem("Attribute"));
	772	+ attributeItem.addActionListener(this);
737	773	menu.add("-");
738	774	linkerItem = menu.add(new MenuItem("Linker"));
739	775	linkerItem.addActionListener(this);
..	..	@@ -743,11 +779,18 @@
743	779	pointflowItem.addActionListener(this);
744	780	}
745	781	menu.add("-");
	782	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	783	+ textureRatioRItem.addActionListener(this);
	784	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	785	+ textureRatioGItem.addActionListener(this);
	786	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	787	+ textureRatioBItem.addActionListener(this);
	788	+ menu.add("-");
746	789	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
747	790	resetTransformItem.addActionListener(this);
748	791	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
749	792	resetCentroidItem.addActionListener(this);
750		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	793	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
751	794	resetCentroidXZItem.addActionListener(this);
752	795	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
753	796	transformGeometryItem.addActionListener(this);
..	..	@@ -799,6 +842,8 @@
799	842	}
800	843
801	844	oe.menuBar.add(menu = new Menu("Attributes"));
	845	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	846	+ clearVersionsItem.addActionListener(this);
802	847	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
803	848	clearMaterialsItem.addActionListener(this);
804	849	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -821,9 +866,9 @@
821	866	hideleavesItem.addActionListener(this);
822	867	showleavesItem = menu.add(new MenuItem("Show Leaves"));
823	868	showleavesItem.addActionListener(this);
824		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	869	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
825	870	markleavesItem.addActionListener(this);
826		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	871	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
827	872	unmarkleavesItem.addActionListener(this);
828	873	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
829	874	rewindleavesItem.addActionListener(this);
..	..	@@ -877,6 +922,9 @@
877	922	shareGeometriesItem.addActionListener(this);
878	923	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
879	924	mergeGeometriesItem.addActionListener(this);
	925	+ menu.add("-");
	926	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	927	+ editLeafItem.addActionListener(this);
880	928	if (Globals.ADVANCED)
881	929	{
882	930	// Pretty much the same as duplicate and clone.
..	..	@@ -895,40 +943,50 @@
895	943
896	944	JTabbedPane resourcecontainer;
897	945	cGridBag currenttab;
898		- boolean added; // patch for jar
	946	+ //boolean added; // patch for jar
899	947
	948	+ int totalcount = 0;
	949	+
900	950	int tabcount = 0;
901	951	int colcount = 0;
902	952	int rowcount = 0;
	953	+ int texturecount = 0;
903	954
904	955	int columns = 5;
905	956	int rows = 7;
906	957
907	958	public void ResourceCallBack(String[] path)
908	959	{
909		- for (int i = 0; i < path.length; i++)
910		- System.out.print(path[i] + "/");
911		- System.out.println();
912		- if (rowcount == 0)
	960	+// for (int i = 0; i < path.length; i++)
	961	+// System.out.print(path[i] + "/");
	962	+// System.out.println();
	963	+
	964	+ if (//rowcount == 0 \|\|
	965	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
913	966	{
914	967	currenttab = new cGridBag();
915		- added = false;
916		- String tabname = String.valueOf((char)('A'+tabcount));
	968	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
917	969	currenttab.setName(tabname);
	970	+ //added = false;
	971	+ resourcecontainer.add(currenttab);
	972	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
918	973	rowcount = 1;
	974	+ colcount = 0;
	975	+ texturecount = 0;
919	976	}
920	977
921		- if (path.length > 1 && path[1].toLowerCase().endsWith(".jpg"))
	978	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
922	979	{
923		- if (!added)
	980	+ //if (!added)
924	981	{
925		- added = true;
926		- resourcecontainer.add(currenttab);
927		- String tabname = String.valueOf((char)('A'+tabcount));
928		- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	982	+ //added = true;
	983	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	984	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
929	985	}
930	986
931		- AddTextureButton(path[0], path[1], currenttab);
	987	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	988	+ totalcount++;
	989	+
932	990	if (++colcount >= columns)
933	991	{
934	992	colcount = 0;
..	..	@@ -949,10 +1007,12 @@
949	1007
950	1008	void CreateTexturePanel(cGridBag container)
951	1009	{
952		- resourcecontainer = new JTabbedPane();
	1010	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
953	1011	container.add(resourcecontainer);
954	1012
955	1013	Grafreed.ParseResources("textures", this);
	1014	+
	1015	+ // 935. System.out.println("Total = " + totalcount);
956	1016	}
957	1017
958	1018	void SetupUI2(ObjEditor oe)
..	..	@@ -972,11 +1032,6 @@
972	1032	//new Exception().printStackTrace();
973	1033
974	1034	oe.radioPanel = new JPanel(new GridBagLayout());
975		- oe.aConstraints.weightx = 1;
976		- oe.aConstraints.weighty = 0;
977		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
978		- oe.aConstraints.gridwidth = 100;
979		- oe.aConstraints.gridheight = 1;
980	1035	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
981	1036
982	1037	oe.buttonGroup = new ButtonGroup();
..	..	@@ -997,9 +1052,9 @@
997	1052	oe.radioPanel.add(dummyButton);
998	1053	oe.buttonGroup.add(dummyButton);
999	1054	*/
1000		- cGridBag copyOptionsPanel = new cGridBag();
	1055	+ cGridBag versionManagerPanel = new cGridBag();
1001	1056
1002		- copyOptionsPanel.preferredHeight = 2;
	1057	+ versionManagerPanel.preferredHeight = 4;
1003	1058
1004	1059	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1005	1060
..	..	@@ -1009,62 +1064,102 @@
1009	1064
1010	1065	if (Globals.ADVANCED)
1011	1066	{
1012		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1013		- maxButton.setToolTipText("Maximize window");
1014		- maxButton.addActionListener(this);
	1067	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+// maxButton.setToolTipText("Maximize window");
	1069	+// maxButton.addActionListener(this);
1015	1070	}
1016	1071
1017		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ cButton gcButton;
	1073	+
	1074	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+// gcButton.setToolTipText("Garbage collect");
	1076	+// gcButton.addActionListener(new ActionListener()
	1077	+// {
	1078	+// public void actionPerformed(ActionEvent e)
	1079	+// {
	1080	+// System.gc();
	1081	+// }
	1082	+// });
	1083	+
	1084	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ collapseButton.setToolTipText("Collapse toolbar");
	1086	+ collapseButton.addActionListener(this);
	1087	+
	1088	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1090	+ maximize3DButton.addActionListener(this);
	1091	+
	1092	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ twoButton.setToolTipText("Show 3D view only");
	1094	+ twoButton.addActionListener(this);
	1095	+ this.fullscreenLayout = twoButton;
	1096	+
	1097	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ threeButton.setToolTipText("Show controls and 3D view");
	1099	+ threeButton.addActionListener(this);
	1100	+ if (Globals.ADVANCED)
	1101	+ {
	1102	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ sixButton.setToolTipText("Show 3D view and controls");
	1104	+ sixButton.addActionListener(this);
	1105	+ }
	1106	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+// sevenButton.setToolTipText("3-column layout");
	1108	+// sevenButton.addActionListener(this);
	1109	+ //
	1110	+
	1111	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1018	1112	fullButton.setToolTipText("Full-screen window");
1019	1113	fullButton.addActionListener(this);
1020	1114
1021		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1022	1116	screenfitButton.setToolTipText("Screen fit");
1023	1117	screenfitButton.addActionListener(this);
1024	1118
1025		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1026	1120	restoreCameraButton.setToolTipText("Restore viewpoint");
1027	1121	restoreCameraButton.addActionListener(this);
1028	1122
1029		- copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1030	1124	saveVersionButton.setToolTipText("Duplicate current version");
1031	1125	saveVersionButton.addActionListener(this);
1032	1126
1033		- copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1127	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1034	1128	deleteVersionButton.setToolTipText("Delete current version");
1035	1129	deleteVersionButton.addActionListener(this);
	1130	+ deleteVersionButton.setEnabled(false);
1036	1131
1037		- copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1132	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1038	1133	previousVersionButton.setToolTipText("Previous version");
1039	1134	previousVersionButton.addActionListener(this);
1040	1135	previousVersionButton.setEnabled(false);
1041	1136
1042	1137	cGridBag updown = new cGridBag().setVertical(true);
1043		- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1138	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1044	1139	restoreButton.setToolTipText("Undo (restore current version)");
1045	1140	restoreButton.addActionListener(this);
1046		- //restoreButton.setEnabled(false);
	1141	+ restoreButton.setEnabled(false);
1047	1142
1048		- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1143	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1049	1144	replaceButton.setToolTipText("Save (replace current version)");
1050	1145	replaceButton.addActionListener(this);
1051		- //replaceButton.setEnabled(false);
	1146	+ replaceButton.setEnabled(false);
1052	1147
1053		- copyOptionsPanel.add(updown);
	1148	+ versionManagerPanel.add(updown);
1054	1149
1055		- copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1150	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1056	1151	nextVersionButton.setToolTipText("Next version");
1057	1152	nextVersionButton.addActionListener(this);
1058	1153	nextVersionButton.setEnabled(false);
	1154	+
	1155	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1156	+ oneStepButton.setToolTipText("Animate one step forward");
	1157	+ oneStepButton.addActionListener(this);
1059	1158
1060	1159	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1061	1160	liveCB.setToolTipText("Enable animation");
1062	1161	liveCB.addItemListener(this);
1063	1162
1064		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1065		- oneStepButton.setToolTipText("Animate one step forward");
1066		- oneStepButton.addActionListener(this);
1067		-
1068	1163	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1069	1164	fastCB.setToolTipText("Fast mode");
1070	1165	fastCB.addItemListener(this);
..	..	@@ -1080,38 +1175,23 @@
1080	1175
1081	1176	if (Globals.ADVANCED)
1082	1177	{
1083		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1178	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1084	1179	snapobjectButton.addActionListener(this);
1085	1180	snapobjectButton.setToolTipText("Snap Object");
1086	1181
1087		- oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1088	1183	fourButton.addActionListener(this);
1089	1184	fourButton.setToolTipText("Show control panel only");
1090	1185	}
1091	1186
1092	1187	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1093	1188
1094		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1095		- twoButton.setToolTipText("Show 3D view only");
1096		- twoButton.addActionListener(this);
1097		- this.fullscreenLayout = twoButton;
1098		-
1099		- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1100		- threeButton.setToolTipText("Show controls and 3D view");
1101		- threeButton.addActionListener(this);
1102		- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1103		- sixButton.setToolTipText("Show 3D view and controls");
1104		- sixButton.addActionListener(this);
1105		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1106		-// sevenButton.setToolTipText("3-column layout");
1107		-// sevenButton.addActionListener(this);
1108		- //
1109	1189
1110		- oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1111	1191	rootButton.setToolTipText("Open selection in new tab");
1112	1192	rootButton.addActionListener(this);
1113	1193
1114		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1115	1195	closeButton.setToolTipText("Close tab");
1116	1196	closeButton.addActionListener(this);
1117	1197	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..	..	@@ -1120,38 +1200,38 @@
1120	1200	cGridBag row1 = new cGridBag();
1121	1201
1122	1202	// INSERT
1123		- row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1124		- gridButton.setToolTipText("Create grid");
	1203	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ gridButton.setToolTipText("Create ground");
1125	1205	gridButton.addActionListener(this);
1126	1206
1127		- row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1128	1208	boxButton.setToolTipText("Create box");
1129	1209	boxButton.addActionListener(this);
1130	1210
1131		- row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1132		- sphereButton.setToolTipText("Create sphere");
1133		- sphereButton.addActionListener(this);
1134		-
1135		- row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1136		- coneButton.setToolTipText("Create cone");
1137		- coneButton.addActionListener(this);
1138		-
1139		- row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1140		- torusButton.setToolTipText("Create torus");
1141		- torusButton.addActionListener(this);
1142		-
1143		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1144	1212	superButton.setToolTipText("Create superellipsoid");
1145	1213	superButton.addActionListener(this);
1146	1214
1147		- if (Globals.ADVANCED)
	1215	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ sphereButton.setToolTipText("Create sphere");
	1217	+ sphereButton.addActionListener(this);
	1218	+
	1219	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ coneButton.setToolTipText("Create cone");
	1221	+ coneButton.addActionListener(this);
	1222	+
	1223	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ torusButton.setToolTipText("Create torus");
	1225	+ torusButton.addActionListener(this);
	1226	+
	1227	+ if (false) //Globals.ADVANCED)
1148	1228	{
1149		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1150	1230	kleinButton.setToolTipText("Create Klein bottle");
1151	1231	kleinButton.addActionListener(this);
1152	1232	}
1153	1233
1154		- row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1155	1235	particlesButton.setToolTipText("Create particle system");
1156	1236	particlesButton.addActionListener(this);
1157	1237
..	..	@@ -1159,31 +1239,31 @@
1159	1239
1160	1240	cGridBag row2 = new cGridBag();
1161	1241
1162		- row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1242	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1163	1243	groupButton.setToolTipText("Create group");
1164	1244	groupButton.addActionListener(this);
1165	1245
1166		- row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1167	1247	compositeButton.setToolTipText("Create composite");
1168	1248	compositeButton.addActionListener(this);
1169	1249
1170		- row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1171	1251	switchButton.setToolTipText("Create item switcher");
1172	1252	switchButton.addActionListener(this);
1173	1253
1174		- row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1254	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1175	1255	loopButton.setToolTipText("Create loop");
1176	1256	loopButton.addActionListener(this);
1177	1257
1178		- row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1258	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1179	1259	textureButton.setToolTipText("Create texture");
1180	1260	textureButton.addActionListener(this);
1181	1261
1182		- row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1262	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1183	1263	overlayButton.setToolTipText("Create overlay");
1184	1264	overlayButton.addActionListener(this);
1185	1265
1186		- row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1187	1267	lightButton.setToolTipText("Create light");
1188	1268	lightButton.addActionListener(this);
1189	1269
..	..	@@ -1193,6 +1273,11 @@
1193	1273
1194	1274	CreateTexturePanel(textures);
1195	1275
	1276	+ int tabCount = resourcecontainer.getTabCount();
	1277	+
	1278	+ if (tabCount > 0)
	1279	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1280	+
1196	1281	oe.toolboxPanel.add(textures);
1197	1282
1198	1283	textures.preferredHeight = 100;
..	..	@@ -1200,11 +1285,11 @@
1200	1285	CreateSkyboxPanel(oe.skyboxPanel);
1201	1286
1202	1287	// EDIT panel
1203		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1288	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1204	1289	editButton.setToolTipText("Pin selection controls");
1205	1290	editButton.addActionListener(this);
1206	1291
1207		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1208	1293	uneditButton.setToolTipText("Unpin and remove selection controls");
1209	1294	uneditButton.addActionListener(this);
1210	1295
..	..	@@ -1212,7 +1297,7 @@
1212	1297	allParamsButton.setToolTipText("Show all controls");
1213	1298	allParamsButton.addActionListener(this);
1214	1299
1215		- editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1300	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1216	1301	clearPanelButton.setToolTipText("Clear all controls");
1217	1302	clearPanelButton.addActionListener(this);
1218	1303
..	..	@@ -1220,7 +1305,7 @@
1220	1305	//unselectButton.setToolTipText("Unselect");
1221	1306	//unselectButton.addActionListener(this);
1222	1307
1223		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1308	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1224	1309	flashSelectionButton.setToolTipText("Highlight selection");
1225	1310	flashSelectionButton.addActionListener(this);
1226	1311
..	..	@@ -1243,6 +1328,8 @@
1243	1328
1244	1329	cGridBag jSPPanel = new cGridBag();
1245	1330
	1331	+ jSPPanel.preferredHeight = 20;
	1332	+
1246	1333	JScrollPane jSP;
1247	1334	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1248	1335	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -1251,11 +1338,11 @@
1251	1338	oe.treePanel.add(jSPPanel);
1252	1339	oe.treePanel.Return();
1253	1340
1254		- oe.treePanel.add(copyOptionsPanel);
	1341	+ oe.treePanel.add(versionManagerPanel);
1255	1342	oe.treePanel.Return();
1256		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1257		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1258		- sliderPane.preferredHeight = 1;
	1343	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1344	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1345	+ versionSliderPane.preferredHeight = 3;
1259	1346
1260	1347	// mainPanel.setDividerLocation(0.1); //1.0);
1261	1348	mainPanel.setResizeWeight(0.4);
..	..	@@ -1413,6 +1500,14 @@
1413	1500
1414	1501	void EditObject(Object3D obj)
1415	1502	{
	1503	+ //assert(obj instanceof Composite);
	1504	+
	1505	+// if (obj.versionlist == null)
	1506	+// {
	1507	+// obj.versionlist = new Object3D[100];
	1508	+// obj.versionindex = -1;
	1509	+// }
	1510	+
1416	1511	cRadio radioButton = new cRadio(obj.name);
1417	1512
1418	1513	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1437,6 +1532,7 @@
1437	1532
1438	1533	oe.SetupViews();
1439	1534
	1535	+ if (Globals.DEBUG)
1440	1536	System.out.println("SetupViews");
1441	1537	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1442	1538	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1803,7 +1899,12 @@
1803	1899	TreePath path;
1804	1900
1805	1901	public TransferableTreePath(TreePath tp) {
1806		- path = tp;
	1902	+ Object[] objs = new Object[tp.getPathCount()];
	1903	+ for (int i=0; i<objs.length; i++)
	1904	+ {
	1905	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1906	+ }
	1907	+ path = new TreePath(objs);
1807	1908	}
1808	1909
1809	1910	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -2035,24 +2136,24 @@
2035	2136	switch(axis)
2036	2137	{
2037	2138	case 0 :
2038		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2039		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
2040		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2041		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2139	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2140	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2141	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2142	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
2042	2143	norm = cVector.X;
2043	2144	break;
2044	2145	case 1 :
2045		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2046		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2047		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2048		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2146	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2147	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2148	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2149	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
2049	2150	norm = cVector.Y;
2050	2151	break;
2051	2152	case 2 :
2052		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2053		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2054		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
2055		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2153	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2154	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2155	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2156	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
2056	2157	norm = cVector.Z;
2057	2158	break;
2058	2159	}
..	..	@@ -2093,7 +2194,11 @@
2093	2194	shadow.material = new cMaterial(obj.material);
2094	2195	shadow.material.diffuse = 0.0001f;
2095	2196	shadow.material.specular = 0.0001f;
2096		- //shadow.projectedVertices[1].x = 300;
	2197	+ shadow.material.opacity = 0.75f;
	2198	+
	2199	+ AllocProjectedVertices(shadow);
	2200	+
	2201	+ shadow.projectedVertices[1].x = 300;
2097	2202
2098	2203	makeSomething(shadow);
2099	2204	}
..	..	@@ -2614,27 +2719,35 @@
2614	2719	} else
2615	2720	if (source == loopItem \|\| source == loopButton)
2616	2721	{
	2722	+ if (!group.selection.isEmpty())
	2723	+ {
2617	2724	Composite csg = new GroupLeaf();
2618	2725	csg.count = 5;
2619		- group(csg);
2620	2726	Composite child = new cGroup("Branch");
2621	2727	csg.addChild(child);
2622	2728	child.addChild(csg);
	2729	+ group(csg);
	2730	+ }
2623	2731	} else
2624	2732	if (source == doubleItem)
2625	2733	{
	2734	+ if (!group.selection.isEmpty())
	2735	+ {
2626	2736	Composite csg = new GroupLeaf("Fork");
2627	2737	csg.count = 5;
2628		- group(csg);
2629	2738	Composite child = new cGroup("Branch A");
2630	2739	csg.addChild(child);
2631	2740	child.addChild(csg);
2632	2741	child = new cGroup("Branch B");
2633	2742	csg.addChild(child);
2634	2743	child.addChild(csg);
	2744	+ group(csg);
	2745	+ }
2635	2746	} else
2636	2747	if (source == tripleItem)
2637	2748	{
	2749	+ if (!group.selection.isEmpty())
	2750	+ {
2638	2751	Composite csg = new GroupLeaf("Trident");
2639	2752	csg.count = 4;
2640	2753	group(csg);
..	..	@@ -2647,6 +2760,7 @@
2647	2760	child = new cGroup();
2648	2761	csg.addChild(child);
2649	2762	child.addChild(csg);
	2763	+ }
2650	2764	} else
2651	2765	if (source == computeAOItem)
2652	2766	{
..	..	@@ -2696,6 +2810,18 @@
2696	2810	if (source == fullButton)
2697	2811	{
2698	2812	ToggleFullScreen();
	2813	+ } else
	2814	+ if (source == collapseButton)
	2815	+ {
	2816	+ this.expandedLayout = radio.layout;
	2817	+ CollapseToolbar();
	2818	+ } else
	2819	+ if (source == maximize3DButton)
	2820	+ {
	2821	+ this.expandedLayout = radio.layout;
	2822	+ radio.layout = twoButton;
	2823	+ Show3DView();
	2824	+ CollapseToolbar();
2699	2825	} else
2700	2826	if (source == previousVersionButton)
2701	2827	{
..	..	@@ -3270,22 +3396,34 @@
3270	3396	} else
3271	3397	if (source == ungroupItem \|\| source == ungroupButton)
3272	3398	{
3273		- boolean hasRoot = false;
	3399	+ boolean canUngroup = true;
3274	3400
3275	3401	for (int i=0; i<group.selection.size(); i++)
3276	3402	{
3277		- if (group.selection.get(i) == group)
	3403	+ Object3D selectedItem = group.selection.get(i);
	3404	+
	3405	+ if (selectedItem.Size() == 0)
3278	3406	{
3279		- hasRoot = true;
	3407	+ // Cannot ungroup leaves
	3408	+ canUngroup = false;
	3409	+ break;
	3410	+ }
	3411	+
	3412	+ if (selectedItem == group)
	3413	+ {
	3414	+ // Cannot ungroup root
	3415	+ canUngroup = false;
3280	3416	break;
3281	3417	}
3282	3418	}
3283	3419
3284		- if (!hasRoot)
	3420	+ if (canUngroup)
3285	3421	{
3286	3422	for (int i=0; i<group.selection.size(); i++)
3287	3423	{
3288		- Ungroup(group.selection.get(i));
	3424	+ Object3D selectedItem = group.selection.get(i);
	3425	+
	3426	+ Ungroup(selectedItem);
3289	3427	}
3290	3428
3291	3429	ClearSelection(false);
..	..	@@ -3336,6 +3474,10 @@
3336	3474	if (source == clearMaterialsItem)
3337	3475	{
3338	3476	ClearMaterials();
	3477	+ } else
	3478	+ if (source == clearVersionsItem)
	3479	+ {
	3480	+ ClearVersions();
3339	3481	} else
3340	3482	if (source == liveleavesItem)
3341	3483	{
..	..	@@ -3476,6 +3618,18 @@
3476	3618	if (source == transformChildrenItem)
3477	3619	{
3478	3620	TransformChildren();
	3621	+ } else
	3622	+ if (source == textureRatioRItem)
	3623	+ {
	3624	+ TextureRatio(0);
	3625	+ } else
	3626	+ if (source == textureRatioGItem)
	3627	+ {
	3628	+ TextureRatio(1);
	3629	+ } else
	3630	+ if (source == textureRatioBItem)
	3631	+ {
	3632	+ TextureRatio(2);
3479	3633	} else
3480	3634	if (source == resetTransformItem)
3481	3635	{
..	..	@@ -3648,38 +3802,7 @@
3648	3802	if (CameraPane.FULLSCREEN)
3649	3803	fullscreenLayout = radio.layout;
3650	3804
3651		- // bug
3652		- //gridPanel.setDividerLocation(1.0);
3653		- //bigPanel.setDividerLocation(0.0);
3654		-// bigThree.remove(scenePanel);
3655		-// bigThree.remove(centralPanel);
3656		-// bigThree.remove(XYZPanel);
3657		-// aWindowConstraints.gridx = 0;
3658		-// aWindowConstraints.gridy = 0;
3659		-// aWindowConstraints.gridwidth = 1;
3660		-// // aConstraints.gridheight = 3;
3661		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3662		-// aWindowConstraints.weightx = 0;
3663		-// aWindowConstraints.weighty = 1;
3664		-// //bigThree.add(jtp, aWindowConstraints);
3665		-// aWindowConstraints.weightx = 1;
3666		-// aWindowConstraints.gridwidth = 3;
3667		-// // aConstraints.gridheight = 3;
3668		-// aWindowConstraints.gridx = 1;
3669		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3670		-// bigThree.add(centralPanel, aWindowConstraints);
3671		-// aWindowConstraints.weightx = 0;
3672		-// aWindowConstraints.gridx = 4;
3673		-// aWindowConstraints.gridwidth = 1;
3674		-// // aConstraints.gridheight = 3;
3675		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3676		-// //bigThree.add(XYZPanel, aWindowConstraints);
3677		-// scenePanel.setVisible(false);
3678		-// centralPanel.setVisible(true);
3679		-// XYZPanel.setVisible(false);
3680		- bigThree.ClearUI();
3681		- bigThree.add(centralPanel);
3682		- bigThree.FlushUI();
	3805	+ Show3DView();
3683	3806
3684	3807	cameraView.requestFocusInWindow();
3685	3808
..	..	@@ -3865,6 +3988,7 @@
3865	3988	} else
3866	3989	if (source == rootButton)
3867	3990	{
	3991	+ Replace();
3868	3992	Object3D obj;
3869	3993	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3870	3994	{
..	..	@@ -3879,6 +4003,9 @@
3879	4003	if (source == closeButton)
3880	4004	{
3881	4005	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4006	+ if (copy.versionlist != null)
	4007	+ Replace();
	4008	+
3882	4009	cRadio ab;
3883	4010	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3884	4011	{
..	..	@@ -3977,6 +4104,9 @@
3977	4104	} else
3978	4105	if(source instanceof cRadio)
3979	4106	{
	4107	+ if (copy.versionlist != null)
	4108	+ Replace();
	4109	+
3980	4110	group.parent = keepparent;
3981	4111	group.attributes = 0;
3982	4112	//group.editWindow = null;
..	..	@@ -4001,8 +4131,6 @@
4001	4131
4002	4132	copy = group;
4003	4133
4004		- SetUndoStates();
4005		-
4006	4134	//Globals.theRenderer.object = group;
4007	4135	if(!useclient)
4008	4136	{
..	..	@@ -4030,6 +4158,31 @@
4030	4158	*/
4031	4159	radio.layout.doClick();
4032	4160
	4161	+ //assert(copy instanceof Composite);
	4162	+
	4163	+ if (copy.versionlist == null)
	4164	+ {
	4165	+ copy.versionindex = -1;
	4166	+
	4167	+ // Cannot work with loops
	4168	+ // To fix this issue, we first mark all nodes above the root,
	4169	+ // and check if any of these nodes are reachable below the root.
	4170	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4171	+
	4172	+ if (copy instanceof Composite && copy.versionlist == null && !copy.HasTags())
	4173	+ {
	4174	+ copy.versionlist = new Object3D[100];
	4175	+
	4176	+ //Save(true);
	4177	+ }
	4178	+ else
	4179	+ copy.versionindex = -2;
	4180	+
	4181	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4182	+ }
	4183	+
	4184	+ SetVersionStates();
	4185	+
4033	4186	ClearUnpinned();
4034	4187
4035	4188	//Grafreed.Assert(group != null);
..	..	@@ -4143,6 +4296,18 @@
4143	4296	refreshContents();
4144	4297	}
4145	4298
	4299	+ void TextureRatio(int axis)
	4300	+ {
	4301	+ Object3D obj;
	4302	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4303	+ {
	4304	+ obj = (Object3D)e.nextElement();
	4305	+ obj.TextureRatio(axis);
	4306	+ }
	4307	+
	4308	+ refreshContents();
	4309	+ }
	4310	+
4146	4311	void ResetTransform()
4147	4312	{
4148	4313	ResetTransform(-1);
..	..	@@ -4158,42 +4323,8 @@
4158	4323	if (obj.toParent == null)
4159	4324	continue;
4160	4325
4161		- if (mask == -1)
4162		- {
4163		- if (obj instanceof Camera) // jan 2014
4164		- {
4165		- LA.matIdentity(obj.toParent);
4166		- LA.matIdentity(obj.fromParent);
4167		- }
4168		- else
4169		- {
4170		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
4171		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
4172		- }
4173		- TouchTransform(obj);
4174		- continue;
4175		- }
4176		- if ((mask&2) != 0) // Scale
4177		- {
4178		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4179		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
4180		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
4181		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4182		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4183		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4184		- }
4185		- if ((mask&4) != 0) // Rotation
4186		- {
4187		- // ?
4188		- }
4189		- if ((mask&1) != 0) // Translation
4190		- {
4191		- if (obj.toParent != null)
4192		- {
4193		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
4194		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
4195		- }
4196		- }
	4326	+ obj.ResetTransform(mask);
	4327	+
4197	4328	if (obj.parent == null)
4198	4329	{
4199	4330	System.out.println("NULL PARENT!");
..	..	@@ -4702,6 +4833,12 @@
4702	4833	{
4703	4834	Object3D obj = group.selection.get(i);
4704	4835
	4836	+ if (obj.toParent == null)
	4837	+ {
	4838	+ obj.toParent = LA.newMatrix();
	4839	+ obj.fromParent = LA.newMatrix();
	4840	+ }
	4841	+
4705	4842	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4706	4843	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4707	4844	}
..	..	@@ -4993,6 +5130,12 @@
4993	5130	refreshContents();
4994	5131	}
4995	5132
	5133	+ void ClearVersions()
	5134	+ {
	5135	+ group.selection.ClearVersions();
	5136	+ refreshContents();
	5137	+ }
	5138	+
4996	5139	void FlipV(boolean flip)
4997	5140	{
4998	5141	group.selection.FlipV(flip);
..	..	@@ -5264,10 +5407,26 @@
5264	5407	flashSelectionButton.setEnabled(enabled);
5265	5408
5266	5409	clearPanelButton.setEnabled(!listUI.isEmpty());
	5410	+
	5411	+ boolean allComposites = true;
	5412	+
	5413	+ if (group.selection != null)
	5414	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5415	+ {
	5416	+ Object next = e.nextElement();
	5417	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5418	+ {
	5419	+ allComposites = false;
	5420	+ break;
	5421	+ }
	5422	+ }
	5423	+
	5424	+ rootButton.setEnabled(true); // allComposites);
5267	5425	}
5268	5426
5269	5427	void refreshContents(boolean cp)
5270	5428	{
	5429	+ if (Globals.ADVANCED)
5271	5430	//if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5272	5431	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5273	5432	{
..	..	@@ -5278,7 +5437,7 @@
5278	5437	Object3D child = (Object3D) group.selection.get(i);
5279	5438
5280	5439	objEditor.AddInfo(child, this, true);
5281		- System.err.println("info : " + child.GetPath());
	5440	+// System.err.println("info : " + child.GetPath());
5282	5441	}
5283	5442
5284	5443	objEditor.SetText(); // jan 2014
..	..	@@ -6161,11 +6320,11 @@
6161	6320	private MenuItem lookAtItem;
6162	6321	private MenuItem lookFromItem;
6163	6322	private MenuItem switchViewItem;
6164		- private MenuItem cutItem;
	6323	+ private JMenuItem cutItem;
6165	6324	private MenuItem undoItem;
6166	6325	private MenuItem redoItem;
6167	6326	private JMenuItem duplicateItem;
6168		- private MenuItem cloneItem;
	6327	+ private JMenuItem cloneItem;
6169	6328	private MenuItem cloneSupportItem;
6170	6329	private MenuItem overwriteGeoItem;
6171	6330	private MenuItem overwriteMatItem;
..	..	@@ -6186,13 +6345,13 @@
6186	6345	private MenuItem cloneGeometriesItem;
6187	6346	private MenuItem shareGeometriesItem;
6188	6347	private MenuItem mergeGeometriesItem;
6189		- private MenuItem copyItem;
	6348	+ private JMenuItem copyItem;
6190	6349	private MenuItem pasteItem;
6191		- private MenuItem pasteIntoItem;
6192		- private MenuItem pasteLinkItem;
6193		- private MenuItem pasteCloneItem;
6194		- private MenuItem pasteExpandItem;
6195		- private MenuItem deleteItem;
	6350	+ private JMenuItem pasteIntoItem;
	6351	+ private JMenuItem pasteLinkItem;
	6352	+ private JMenuItem pasteCloneItem;
	6353	+ private JMenuItem pasteExpandItem;
	6354	+ private JMenuItem deleteItem;
6196	6355	private MenuItem clearAllItem;
6197	6356	private MenuItem genUVItem;
6198	6357	private MenuItem genNormalsMESHItem;
..	..	@@ -6218,6 +6377,7 @@
6218	6377	private MenuItem clipMeshItem;
6219	6378	private MenuItem smoothMeshItem;
6220	6379	private MenuItem clearMaterialsItem;
	6380	+ private MenuItem clearVersionsItem;
6221	6381
6222	6382	private MenuItem liveleavesItem;
6223	6383	private MenuItem unliveleavesItem;
..	..	@@ -6241,13 +6401,16 @@
6241	6401	private MenuItem maxTexturesItem;
6242	6402	private MenuItem panoTexturesItem;
6243	6403
	6404	+ private MenuItem textureRatioRItem;
	6405	+ private MenuItem textureRatioGItem;
	6406	+ private MenuItem textureRatioBItem;
6244	6407	private MenuItem resetCentroidItem;
6245	6408	private MenuItem resetCentroidXZItem;
6246	6409	private MenuItem resetTransformItem;
6247	6410	private MenuItem transformGeometryItem;
6248	6411	private MenuItem transformChildrenItem;
6249	6412	private MenuItem hideItem;
6250		- private MenuItem grabItem;
	6413	+ private JMenuItem grabItem;
6251	6414	private MenuItem backItem;
6252	6415	private MenuItem frontItem;
6253	6416	private MenuItem cameraItem;
..	..	@@ -6260,7 +6423,7 @@
6260	6423	private MenuItem switchTransfoItem;
6261	6424	private MenuItem morphItem;
6262	6425	private MenuItem linkerItem;
6263		- private MenuItem ungroupItem;
	6426	+ private JMenuItem ungroupItem;
6264	6427	private MenuItem editItem;
6265	6428	private MenuItem openWindowItem;
6266	6429	private MenuItem editLeafItem;