~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,13 @@
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();
354	369	}
355	370
356	371	//ObjEditor objEditor;
..	..	@@ -390,11 +405,15 @@
390	405	this.copy = this.group = group;
391	406	//selectees = this.group.selectees;
392	407
393		- if (copy.versionlist == null)
394		- {
395		- copy.versionlist = new Object3D[100];
396		- copy.versionindex = -1;
397		- }
	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	+// }
398	417
399	418	if(ui)
400	419	SetupUI(objEditor);
..	..	@@ -417,13 +436,13 @@
417	436
418	437	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
419	438
420		- if (copy.versionlist == null)
421		- {
422		- copy.versionlist = new Object3D[100];
423		- copy.versionindex = -1;
424		-
425		- Save(true);
426		- }
	439	+// if (copy.versionlist == null)
	440	+// {
	441	+// copy.versionlist = new Object3D[100];
	442	+// copy.versionindex = -1;
	443	+//
	444	+// //Save(true);
	445	+// }
427	446	}
428	447
429	448	void CloneSelection(boolean supports)
..	..	@@ -513,33 +532,35 @@
513	532	// menu.add("-");
514	533	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
515	534	duplicateItem.addActionListener(this);
516		- cloneItem = menu.add(new MenuItem("Clone"));
	535	+
	536	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
517	537	cloneItem.addActionListener(this);
518		- if (Globals.ADVANCED)
	538	+ //if (Globals.ADVANCED)
519	539	{
520	540	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
521	541	cloneSupportItem.addActionListener(this);
522	542	}
	543	+ oe.jTree.popup.addSeparator();
523	544	menu.add("-");
524		- cutItem = menu.add(new MenuItem("Cut"));
	545	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
525	546	cutItem.addActionListener(this);
526		- copyItem = menu.add(new MenuItem("Copy"));
	547	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
527	548	copyItem.addActionListener(this);
528	549	pasteItem = menu.add(new MenuItem("Paste"));
529	550	pasteItem.addActionListener(this);
530	551
531		- menu.add("-");
532		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	552	+ oe.jTree.popup.addSeparator();
	553	+ //menu.add("-");
	554	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
533	555	pasteIntoItem.addActionListener(this);
534		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	556	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
535	557	pasteLinkItem.addActionListener(this);
536		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	558	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
537	559	pasteCloneItem.addActionListener(this);
538		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	560	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
539	561	// pasteExpandItem.addActionListener(this);
540		- menu.add("-");
541		- deleteItem = menu.add(new MenuItem("Delete"));
542		- deleteItem.addActionListener(this);
	562	+ //menu.add("-");
	563	+ oe.jTree.popup.addSeparator();
543	564
544	565	if (Globals.ADVANCED)
545	566	{
..	..	@@ -625,11 +646,9 @@
625	646	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
626	647	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
627	648	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
628		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
629	649	oe.cameraMenu.add("-");
630	650	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
631	651	openWindowItem.addActionListener(this);
632		- editLeafItem.addActionListener(this);
633	652	lookAtItem.addActionListener(this);
634	653	//lookFromItem.addActinoListener(this);
635	654	//switchViewItem.addActionListener(this);
..	..	@@ -676,9 +695,8 @@
676	695	setMasterItem.addActionListener(this);
677	696	}
678	697
679		- oe.menuBar.add(menu = new Menu("Group"));
680		-// grabItem = menu.add(new MenuItem("Grab"));
681		-// grabItem.addActionListener(this);
	698	+ oe.menuBar.add(menu = new Menu("Order"));
	699	+
682	700	backItem = menu.add(new MenuItem("Back"));
683	701	backItem.addActionListener(this);
684	702	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -686,13 +704,21 @@
686	704	// compositeItem = menu.add(new MenuItem("Composite"));
687	705	// compositeItem.addActionListener(this);
688	706
	707	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	708	+ grabItem.addActionListener(this);
	709	+
689	710	if (Globals.ADVANCED)
690	711	{
691	712	hideItem = menu.add(new MenuItem("Hidden Group"));
692	713	hideItem.addActionListener(this);
693	714	}
694		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	715	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
695	716	ungroupItem.addActionListener(this);
	717	+
	718	+ oe.jTree.popup.addSeparator();
	719	+
	720	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	721	+ deleteItem.addActionListener(this);
696	722
697	723	// menu.add("-");
698	724	//
..	..	@@ -729,9 +755,9 @@
729	755	shadowYItem.addActionListener(this);
730	756	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
731	757	shadowZItem.addActionListener(this);
	758	+
732	759	attributeItem = menu.add(new MenuItem("Attribute"));
733	760	attributeItem.addActionListener(this);
734		-
735	761	if (Globals.ADVANCED)
736	762	{
737	763	menu.add("-");
..	..	@@ -743,11 +769,18 @@
743	769	pointflowItem.addActionListener(this);
744	770	}
745	771	menu.add("-");
	772	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	773	+ textureRatioRItem.addActionListener(this);
	774	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	775	+ textureRatioGItem.addActionListener(this);
	776	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	777	+ textureRatioBItem.addActionListener(this);
	778	+ menu.add("-");
746	779	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
747	780	resetTransformItem.addActionListener(this);
748	781	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
749	782	resetCentroidItem.addActionListener(this);
750		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	783	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
751	784	resetCentroidXZItem.addActionListener(this);
752	785	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
753	786	transformGeometryItem.addActionListener(this);
..	..	@@ -799,6 +832,8 @@
799	832	}
800	833
801	834	oe.menuBar.add(menu = new Menu("Attributes"));
	835	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	836	+ clearVersionsItem.addActionListener(this);
802	837	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
803	838	clearMaterialsItem.addActionListener(this);
804	839	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -821,9 +856,9 @@
821	856	hideleavesItem.addActionListener(this);
822	857	showleavesItem = menu.add(new MenuItem("Show Leaves"));
823	858	showleavesItem.addActionListener(this);
824		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	859	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
825	860	markleavesItem.addActionListener(this);
826		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	861	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
827	862	unmarkleavesItem.addActionListener(this);
828	863	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
829	864	rewindleavesItem.addActionListener(this);
..	..	@@ -877,6 +912,9 @@
877	912	shareGeometriesItem.addActionListener(this);
878	913	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
879	914	mergeGeometriesItem.addActionListener(this);
	915	+ menu.add("-");
	916	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	917	+ editLeafItem.addActionListener(this);
880	918	if (Globals.ADVANCED)
881	919	{
882	920	// Pretty much the same as duplicate and clone.
..	..	@@ -895,40 +933,50 @@
895	933
896	934	JTabbedPane resourcecontainer;
897	935	cGridBag currenttab;
898		- boolean added; // patch for jar
	936	+ //boolean added; // patch for jar
899	937
	938	+ int totalcount = 0;
	939	+
900	940	int tabcount = 0;
901	941	int colcount = 0;
902	942	int rowcount = 0;
	943	+ int texturecount = 0;
903	944
904	945	int columns = 5;
905	946	int rows = 7;
906	947
907	948	public void ResourceCallBack(String[] path)
908	949	{
909		- for (int i = 0; i < path.length; i++)
910		- System.out.print(path[i] + "/");
911		- System.out.println();
912		- if (rowcount == 0)
	950	+// for (int i = 0; i < path.length; i++)
	951	+// System.out.print(path[i] + "/");
	952	+// System.out.println();
	953	+
	954	+ if (//rowcount == 0 \|\|
	955	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
913	956	{
914	957	currenttab = new cGridBag();
915		- added = false;
916		- String tabname = String.valueOf((char)('A'+tabcount));
	958	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
917	959	currenttab.setName(tabname);
	960	+ //added = false;
	961	+ resourcecontainer.add(currenttab);
	962	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
918	963	rowcount = 1;
	964	+ colcount = 0;
	965	+ texturecount = 0;
919	966	}
920	967
921		- if (path.length > 1 && path[1].toLowerCase().endsWith(".jpg"))
	968	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
922	969	{
923		- if (!added)
	970	+ //if (!added)
924	971	{
925		- added = true;
926		- resourcecontainer.add(currenttab);
927		- String tabname = String.valueOf((char)('A'+tabcount));
928		- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	972	+ //added = true;
	973	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	974	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
929	975	}
930	976
931		- AddTextureButton(path[0], path[1], currenttab);
	977	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	978	+ totalcount++;
	979	+
932	980	if (++colcount >= columns)
933	981	{
934	982	colcount = 0;
..	..	@@ -949,10 +997,12 @@
949	997
950	998	void CreateTexturePanel(cGridBag container)
951	999	{
952		- resourcecontainer = new JTabbedPane();
	1000	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
953	1001	container.add(resourcecontainer);
954	1002
955	1003	Grafreed.ParseResources("textures", this);
	1004	+
	1005	+ // 935. System.out.println("Total = " + totalcount);
956	1006	}
957	1007
958	1008	void SetupUI2(ObjEditor oe)
..	..	@@ -972,11 +1022,6 @@
972	1022	//new Exception().printStackTrace();
973	1023
974	1024	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	1025	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
981	1026
982	1027	oe.buttonGroup = new ButtonGroup();
..	..	@@ -997,9 +1042,9 @@
997	1042	oe.radioPanel.add(dummyButton);
998	1043	oe.buttonGroup.add(dummyButton);
999	1044	*/
1000		- cGridBag copyOptionsPanel = new cGridBag();
	1045	+ cGridBag versionManagerPanel = new cGridBag();
1001	1046
1002		- copyOptionsPanel.preferredHeight = 2;
	1047	+ versionManagerPanel.preferredHeight = 4;
1003	1048
1004	1049	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1005	1050
..	..	@@ -1009,62 +1054,102 @@
1009	1054
1010	1055	if (Globals.ADVANCED)
1011	1056	{
1012		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1013		- maxButton.setToolTipText("Maximize window");
1014		- maxButton.addActionListener(this);
	1057	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+// maxButton.setToolTipText("Maximize window");
	1059	+// maxButton.addActionListener(this);
1015	1060	}
1016	1061
1017		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1018		- fullButton.setToolTipText("Full-screen window");
1019		- fullButton.addActionListener(this);
	1062	+ cButton gcButton;
1020	1063
1021		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+// gcButton.setToolTipText("Garbage collect");
	1066	+// gcButton.addActionListener(new ActionListener()
	1067	+// {
	1068	+// public void actionPerformed(ActionEvent e)
	1069	+// {
	1070	+// System.gc();
	1071	+// }
	1072	+// });
	1073	+
	1074	+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ fullScreenButton.setToolTipText("Full-screen window");
	1076	+ fullScreenButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ collapseButton.setToolTipText("Collapse toolbar");
	1080	+ collapseButton.addActionListener(this);
	1081	+
	1082	+// oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1083	+// maximize3DButton.setToolTipText("Maximize 3D view");
	1084	+// maximize3DButton.addActionListener(this);
	1085	+
	1086	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ twoButton.setToolTipText("Show 3D view only");
	1088	+ twoButton.addActionListener(this);
	1089	+ this.fullscreenLayout = twoButton;
	1090	+
	1091	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1092	+ threeButton.setToolTipText("Show controls and 3D view");
	1093	+ threeButton.addActionListener(this);
	1094	+ if (Globals.ADVANCED)
	1095	+ {
	1096	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ sixButton.setToolTipText("Show 3D view and controls");
	1098	+ sixButton.addActionListener(this);
	1099	+ }
	1100	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1101	+// sevenButton.setToolTipText("3-column layout");
	1102	+// sevenButton.addActionListener(this);
	1103	+ //
	1104	+
	1105	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1022	1106	screenfitButton.setToolTipText("Screen fit");
1023	1107	screenfitButton.addActionListener(this);
1024	1108
1025		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1026	1110	restoreCameraButton.setToolTipText("Restore viewpoint");
1027	1111	restoreCameraButton.addActionListener(this);
1028	1112
1029		- copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1030	1114	saveVersionButton.setToolTipText("Duplicate current version");
1031	1115	saveVersionButton.addActionListener(this);
1032	1116
1033		- copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1034	1118	deleteVersionButton.setToolTipText("Delete current version");
1035	1119	deleteVersionButton.addActionListener(this);
	1120	+ deleteVersionButton.setEnabled(false);
1036	1121
1037		- copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1122	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1038	1123	previousVersionButton.setToolTipText("Previous version");
1039	1124	previousVersionButton.addActionListener(this);
1040	1125	previousVersionButton.setEnabled(false);
1041	1126
1042	1127	cGridBag updown = new cGridBag().setVertical(true);
1043		- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1128	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1044	1129	restoreButton.setToolTipText("Undo (restore current version)");
1045	1130	restoreButton.addActionListener(this);
1046		- //restoreButton.setEnabled(false);
	1131	+ restoreButton.setEnabled(false);
1047	1132
1048		- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1133	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1049	1134	replaceButton.setToolTipText("Save (replace current version)");
1050	1135	replaceButton.addActionListener(this);
1051		- //replaceButton.setEnabled(false);
	1136	+ replaceButton.setEnabled(false);
1052	1137
1053		- copyOptionsPanel.add(updown);
	1138	+ versionManagerPanel.add(updown);
1054	1139
1055		- copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1140	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1056	1141	nextVersionButton.setToolTipText("Next version");
1057	1142	nextVersionButton.addActionListener(this);
1058	1143	nextVersionButton.setEnabled(false);
	1144	+
	1145	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1146	+ oneStepButton.setToolTipText("Animate one step forward");
	1147	+ oneStepButton.addActionListener(this);
1059	1148
1060	1149	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1061	1150	liveCB.setToolTipText("Enable animation");
1062	1151	liveCB.addItemListener(this);
1063	1152
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	1153	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1069	1154	fastCB.setToolTipText("Fast mode");
1070	1155	fastCB.addItemListener(this);
..	..	@@ -1080,38 +1165,23 @@
1080	1165
1081	1166	if (Globals.ADVANCED)
1082	1167	{
1083		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1084	1169	snapobjectButton.addActionListener(this);
1085	1170	snapobjectButton.setToolTipText("Snap Object");
1086	1171
1087		- oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1172	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1088	1173	fourButton.addActionListener(this);
1089	1174	fourButton.setToolTipText("Show control panel only");
1090	1175	}
1091	1176
1092	1177	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1093	1178
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	1179
1110		- oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1111	1181	rootButton.setToolTipText("Open selection in new tab");
1112	1182	rootButton.addActionListener(this);
1113	1183
1114		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1115	1185	closeButton.setToolTipText("Close tab");
1116	1186	closeButton.addActionListener(this);
1117	1187	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..	..	@@ -1120,38 +1190,38 @@
1120	1190	cGridBag row1 = new cGridBag();
1121	1191
1122	1192	// INSERT
1123		- row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1124		- gridButton.setToolTipText("Create grid");
	1193	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ gridButton.setToolTipText("Create ground");
1125	1195	gridButton.addActionListener(this);
1126	1196
1127		- row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1128	1198	boxButton.setToolTipText("Create box");
1129	1199	boxButton.addActionListener(this);
1130	1200
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);
	1201	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1144	1202	superButton.setToolTipText("Create superellipsoid");
1145	1203	superButton.addActionListener(this);
1146	1204
1147		- if (Globals.ADVANCED)
	1205	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ sphereButton.setToolTipText("Create sphere");
	1207	+ sphereButton.addActionListener(this);
	1208	+
	1209	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ coneButton.setToolTipText("Create cone");
	1211	+ coneButton.addActionListener(this);
	1212	+
	1213	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ torusButton.setToolTipText("Create torus");
	1215	+ torusButton.addActionListener(this);
	1216	+
	1217	+ if (false) //Globals.ADVANCED)
1148	1218	{
1149		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1150	1220	kleinButton.setToolTipText("Create Klein bottle");
1151	1221	kleinButton.addActionListener(this);
1152	1222	}
1153	1223
1154		- row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1155	1225	particlesButton.setToolTipText("Create particle system");
1156	1226	particlesButton.addActionListener(this);
1157	1227
..	..	@@ -1159,31 +1229,31 @@
1159	1229
1160	1230	cGridBag row2 = new cGridBag();
1161	1231
1162		- row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1163	1233	groupButton.setToolTipText("Create group");
1164	1234	groupButton.addActionListener(this);
1165	1235
1166		- row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1167	1237	compositeButton.setToolTipText("Create composite");
1168	1238	compositeButton.addActionListener(this);
1169	1239
1170		- row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1171	1241	switchButton.setToolTipText("Create item switcher");
1172	1242	switchButton.addActionListener(this);
1173	1243
1174		- row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1244	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1175	1245	loopButton.setToolTipText("Create loop");
1176	1246	loopButton.addActionListener(this);
1177	1247
1178		- row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1248	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1179	1249	textureButton.setToolTipText("Create texture");
1180	1250	textureButton.addActionListener(this);
1181	1251
1182		- row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1252	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1183	1253	overlayButton.setToolTipText("Create overlay");
1184	1254	overlayButton.addActionListener(this);
1185	1255
1186		- row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1256	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1187	1257	lightButton.setToolTipText("Create light");
1188	1258	lightButton.addActionListener(this);
1189	1259
..	..	@@ -1193,6 +1263,11 @@
1193	1263
1194	1264	CreateTexturePanel(textures);
1195	1265
	1266	+ int tabCount = resourcecontainer.getTabCount();
	1267	+
	1268	+ if (tabCount > 0)
	1269	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1270	+
1196	1271	oe.toolboxPanel.add(textures);
1197	1272
1198	1273	textures.preferredHeight = 100;
..	..	@@ -1200,11 +1275,11 @@
1200	1275	CreateSkyboxPanel(oe.skyboxPanel);
1201	1276
1202	1277	// EDIT panel
1203		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1278	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1204	1279	editButton.setToolTipText("Pin selection controls");
1205	1280	editButton.addActionListener(this);
1206	1281
1207		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1282	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1208	1283	uneditButton.setToolTipText("Unpin and remove selection controls");
1209	1284	uneditButton.addActionListener(this);
1210	1285
..	..	@@ -1212,7 +1287,7 @@
1212	1287	allParamsButton.setToolTipText("Show all controls");
1213	1288	allParamsButton.addActionListener(this);
1214	1289
1215		- editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1290	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1216	1291	clearPanelButton.setToolTipText("Clear all controls");
1217	1292	clearPanelButton.addActionListener(this);
1218	1293
..	..	@@ -1220,7 +1295,7 @@
1220	1295	//unselectButton.setToolTipText("Unselect");
1221	1296	//unselectButton.addActionListener(this);
1222	1297
1223		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1298	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1224	1299	flashSelectionButton.setToolTipText("Highlight selection");
1225	1300	flashSelectionButton.addActionListener(this);
1226	1301
..	..	@@ -1243,6 +1318,8 @@
1243	1318
1244	1319	cGridBag jSPPanel = new cGridBag();
1245	1320
	1321	+ jSPPanel.preferredHeight = 20;
	1322	+
1246	1323	JScrollPane jSP;
1247	1324	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1248	1325	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -1251,11 +1328,11 @@
1251	1328	oe.treePanel.add(jSPPanel);
1252	1329	oe.treePanel.Return();
1253	1330
1254		- oe.treePanel.add(copyOptionsPanel);
	1331	+ oe.treePanel.add(versionManagerPanel);
1255	1332	oe.treePanel.Return();
1256		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1257		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1258		- sliderPane.preferredHeight = 1;
	1333	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1334	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1335	+ versionSliderPane.preferredHeight = 3;
1259	1336
1260	1337	// mainPanel.setDividerLocation(0.1); //1.0);
1261	1338	mainPanel.setResizeWeight(0.4);
..	..	@@ -1413,6 +1490,14 @@
1413	1490
1414	1491	void EditObject(Object3D obj)
1415	1492	{
	1493	+ //assert(obj instanceof Composite);
	1494	+
	1495	+// if (obj.versionlist == null)
	1496	+// {
	1497	+// obj.versionlist = new Object3D[100];
	1498	+// obj.versionindex = -1;
	1499	+// }
	1500	+
1416	1501	cRadio radioButton = new cRadio(obj.name);
1417	1502
1418	1503	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1437,6 +1522,7 @@
1437	1522
1438	1523	oe.SetupViews();
1439	1524
	1525	+ if (Globals.DEBUG)
1440	1526	System.out.println("SetupViews");
1441	1527	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1442	1528	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1803,7 +1889,12 @@
1803	1889	TreePath path;
1804	1890
1805	1891	public TransferableTreePath(TreePath tp) {
1806		- path = tp;
	1892	+ Object[] objs = new Object[tp.getPathCount()];
	1893	+ for (int i=0; i<objs.length; i++)
	1894	+ {
	1895	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1896	+ }
	1897	+ path = new TreePath(objs);
1807	1898	}
1808	1899
1809	1900	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -2035,24 +2126,24 @@
2035	2126	switch(axis)
2036	2127	{
2037	2128	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;
	2129	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2130	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2131	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2132	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
2042	2133	norm = cVector.X;
2043	2134	break;
2044	2135	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;
	2136	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2137	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2138	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2139	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
2049	2140	norm = cVector.Y;
2050	2141	break;
2051	2142	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;
	2143	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2144	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2145	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2146	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
2056	2147	norm = cVector.Z;
2057	2148	break;
2058	2149	}
..	..	@@ -2093,7 +2184,11 @@
2093	2184	shadow.material = new cMaterial(obj.material);
2094	2185	shadow.material.diffuse = 0.0001f;
2095	2186	shadow.material.specular = 0.0001f;
2096		- //shadow.projectedVertices[1].x = 300;
	2187	+ shadow.material.opacity = 0.75f;
	2188	+
	2189	+ AllocProjectedVertices(shadow);
	2190	+
	2191	+ shadow.projectedVertices[1].x = 300;
2097	2192
2098	2193	makeSomething(shadow);
2099	2194	}
..	..	@@ -2614,27 +2709,35 @@
2614	2709	} else
2615	2710	if (source == loopItem \|\| source == loopButton)
2616	2711	{
	2712	+ if (!group.selection.isEmpty())
	2713	+ {
2617	2714	Composite csg = new GroupLeaf();
2618		- csg.count = 5;
2619	2715	group(csg);
	2716	+ csg.count = 5;
2620	2717	Composite child = new cGroup("Branch");
2621	2718	csg.addChild(child);
2622	2719	child.addChild(csg);
	2720	+ }
2623	2721	} else
2624	2722	if (source == doubleItem)
2625	2723	{
	2724	+ if (!group.selection.isEmpty())
	2725	+ {
2626	2726	Composite csg = new GroupLeaf("Fork");
2627		- csg.count = 5;
2628	2727	group(csg);
	2728	+ csg.count = 5;
2629	2729	Composite child = new cGroup("Branch A");
2630	2730	csg.addChild(child);
2631	2731	child.addChild(csg);
2632	2732	child = new cGroup("Branch B");
2633	2733	csg.addChild(child);
2634	2734	child.addChild(csg);
	2735	+ }
2635	2736	} else
2636	2737	if (source == tripleItem)
2637	2738	{
	2739	+ if (!group.selection.isEmpty())
	2740	+ {
2638	2741	Composite csg = new GroupLeaf("Trident");
2639	2742	csg.count = 4;
2640	2743	group(csg);
..	..	@@ -2647,6 +2750,7 @@
2647	2750	child = new cGroup();
2648	2751	csg.addChild(child);
2649	2752	child.addChild(csg);
	2753	+ }
2650	2754	} else
2651	2755	if (source == computeAOItem)
2652	2756	{
..	..	@@ -2693,10 +2797,22 @@
2693	2797	{
2694	2798	Maximize();
2695	2799	} else
2696		- if (source == fullButton)
	2800	+ if (source == fullScreenButton)
2697	2801	{
2698	2802	ToggleFullScreen();
2699	2803	} else
	2804	+ if (source == collapseButton)
	2805	+ {
	2806	+ this.expandedLayout = radio.layout;
	2807	+ CollapseToolbar();
	2808	+ } else
	2809	+// if (source == maximize3DButton)
	2810	+// {
	2811	+// this.expandedLayout = radio.layout;
	2812	+// radio.layout = twoButton;
	2813	+// CollapseToolbar();
	2814	+// Show3DView();
	2815	+// } else
2700	2816	if (source == previousVersionButton)
2701	2817	{
2702	2818	// Go to previous version
..	..	@@ -3270,22 +3386,34 @@
3270	3386	} else
3271	3387	if (source == ungroupItem \|\| source == ungroupButton)
3272	3388	{
3273		- boolean hasRoot = false;
	3389	+ boolean canUngroup = true;
3274	3390
3275	3391	for (int i=0; i<group.selection.size(); i++)
3276	3392	{
3277		- if (group.selection.get(i) == group)
	3393	+ Object3D selectedItem = group.selection.get(i);
	3394	+
	3395	+ if (selectedItem.Size() == 0)
3278	3396	{
3279		- hasRoot = true;
	3397	+ // Cannot ungroup leaves
	3398	+ canUngroup = false;
	3399	+ break;
	3400	+ }
	3401	+
	3402	+ if (selectedItem == group)
	3403	+ {
	3404	+ // Cannot ungroup root
	3405	+ canUngroup = false;
3280	3406	break;
3281	3407	}
3282	3408	}
3283	3409
3284		- if (!hasRoot)
	3410	+ if (canUngroup)
3285	3411	{
3286	3412	for (int i=0; i<group.selection.size(); i++)
3287	3413	{
3288		- Ungroup(group.selection.get(i));
	3414	+ Object3D selectedItem = group.selection.get(i);
	3415	+
	3416	+ Ungroup(selectedItem);
3289	3417	}
3290	3418
3291	3419	ClearSelection(false);
..	..	@@ -3336,6 +3464,10 @@
3336	3464	if (source == clearMaterialsItem)
3337	3465	{
3338	3466	ClearMaterials();
	3467	+ } else
	3468	+ if (source == clearVersionsItem)
	3469	+ {
	3470	+ ClearVersions();
3339	3471	} else
3340	3472	if (source == liveleavesItem)
3341	3473	{
..	..	@@ -3476,6 +3608,18 @@
3476	3608	if (source == transformChildrenItem)
3477	3609	{
3478	3610	TransformChildren();
	3611	+ } else
	3612	+ if (source == textureRatioRItem)
	3613	+ {
	3614	+ TextureRatio(0);
	3615	+ } else
	3616	+ if (source == textureRatioGItem)
	3617	+ {
	3618	+ TextureRatio(1);
	3619	+ } else
	3620	+ if (source == textureRatioBItem)
	3621	+ {
	3622	+ TextureRatio(2);
3479	3623	} else
3480	3624	if (source == resetTransformItem)
3481	3625	{
..	..	@@ -3648,38 +3792,7 @@
3648	3792	if (CameraPane.FULLSCREEN)
3649	3793	fullscreenLayout = radio.layout;
3650	3794
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();
	3795	+ Show3DView();
3683	3796
3684	3797	cameraView.requestFocusInWindow();
3685	3798
..	..	@@ -3865,6 +3978,7 @@
3865	3978	} else
3866	3979	if (source == rootButton)
3867	3980	{
	3981	+ Replace();
3868	3982	Object3D obj;
3869	3983	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3870	3984	{
..	..	@@ -3879,6 +3993,9 @@
3879	3993	if (source == closeButton)
3880	3994	{
3881	3995	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3996	+ if (copy.versionlist != null)
	3997	+ Replace();
	3998	+
3882	3999	cRadio ab;
3883	4000	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3884	4001	{
..	..	@@ -3977,6 +4094,9 @@
3977	4094	} else
3978	4095	if(source instanceof cRadio)
3979	4096	{
	4097	+ if (copy.versionlist != null)
	4098	+ Replace();
	4099	+
3980	4100	group.parent = keepparent;
3981	4101	group.attributes = 0;
3982	4102	//group.editWindow = null;
..	..	@@ -4001,8 +4121,6 @@
4001	4121
4002	4122	copy = group;
4003	4123
4004		- SetUndoStates();
4005		-
4006	4124	//Globals.theRenderer.object = group;
4007	4125	if(!useclient)
4008	4126	{
..	..	@@ -4030,6 +4148,32 @@
4030	4148	*/
4031	4149	radio.layout.doClick();
4032	4150
	4151	+ //assert(copy instanceof Composite);
	4152	+
	4153	+ if (copy.versionlist == null)
	4154	+ {
	4155	+ copy.versionindex = -1;
	4156	+
	4157	+ // Cannot work with loops
	4158	+ // To fix this issue, we first mark all nodes above the root,
	4159	+ // and check if any of these nodes are reachable below the root.
	4160	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4161	+
	4162	+ if (copy instanceof Composite && !copy.HasTags())
	4163	+ {
	4164	+ if (copy.versionlist == null)
	4165	+ copy.versionlist = new Object3D[100];
	4166	+
	4167	+ //Save(true);
	4168	+ }
	4169	+ else
	4170	+ copy.versionindex = -2;
	4171	+
	4172	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4173	+ }
	4174	+
	4175	+ SetVersionStates();
	4176	+
4033	4177	ClearUnpinned();
4034	4178
4035	4179	//Grafreed.Assert(group != null);
..	..	@@ -4143,6 +4287,18 @@
4143	4287	refreshContents();
4144	4288	}
4145	4289
	4290	+ void TextureRatio(int axis)
	4291	+ {
	4292	+ Object3D obj;
	4293	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4294	+ {
	4295	+ obj = (Object3D)e.nextElement();
	4296	+ obj.TextureRatio(axis);
	4297	+ }
	4298	+
	4299	+ refreshContents();
	4300	+ }
	4301	+
4146	4302	void ResetTransform()
4147	4303	{
4148	4304	ResetTransform(-1);
..	..	@@ -4158,42 +4314,8 @@
4158	4314	if (obj.toParent == null)
4159	4315	continue;
4160	4316
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		- }
	4317	+ obj.ResetTransform(mask);
	4318	+
4197	4319	if (obj.parent == null)
4198	4320	{
4199	4321	System.out.println("NULL PARENT!");
..	..	@@ -4702,6 +4824,12 @@
4702	4824	{
4703	4825	Object3D obj = group.selection.get(i);
4704	4826
	4827	+ if (obj.toParent == null)
	4828	+ {
	4829	+ obj.toParent = LA.newMatrix();
	4830	+ obj.fromParent = LA.newMatrix();
	4831	+ }
	4832	+
4705	4833	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4706	4834	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4707	4835	}
..	..	@@ -4993,6 +5121,12 @@
4993	5121	refreshContents();
4994	5122	}
4995	5123
	5124	+ void ClearVersions()
	5125	+ {
	5126	+ group.selection.ClearVersions();
	5127	+ refreshContents();
	5128	+ }
	5129	+
4996	5130	void FlipV(boolean flip)
4997	5131	{
4998	5132	group.selection.FlipV(flip);
..	..	@@ -5231,7 +5365,7 @@
5231	5365	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
5232	5366	// a camera
5233	5367	{
5234		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5368	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
5235	5369	{
5236	5370	CameraPane.camerachangeframe = 0; // don't refuse it
5237	5371	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -5264,10 +5398,26 @@
5264	5398	flashSelectionButton.setEnabled(enabled);
5265	5399
5266	5400	clearPanelButton.setEnabled(!listUI.isEmpty());
	5401	+
	5402	+ boolean allComposites = true;
	5403	+
	5404	+ if (group.selection != null)
	5405	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5406	+ {
	5407	+ Object next = e.nextElement();
	5408	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5409	+ {
	5410	+ allComposites = false;
	5411	+ break;
	5412	+ }
	5413	+ }
	5414	+
	5415	+ rootButton.setEnabled(true); // allComposites);
5267	5416	}
5268	5417
5269	5418	void refreshContents(boolean cp)
5270	5419	{
	5420	+ if (Globals.SHOWINFO)
5271	5421	//if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5272	5422	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5273	5423	{
..	..	@@ -5278,7 +5428,7 @@
5278	5428	Object3D child = (Object3D) group.selection.get(i);
5279	5429
5280	5430	objEditor.AddInfo(child, this, true);
5281		- System.err.println("info : " + child.GetPath());
	5431	+// System.err.println("info : " + child.GetPath());
5282	5432	}
5283	5433
5284	5434	objEditor.SetText(); // jan 2014
..	..	@@ -6161,11 +6311,11 @@
6161	6311	private MenuItem lookAtItem;
6162	6312	private MenuItem lookFromItem;
6163	6313	private MenuItem switchViewItem;
6164		- private MenuItem cutItem;
	6314	+ private JMenuItem cutItem;
6165	6315	private MenuItem undoItem;
6166	6316	private MenuItem redoItem;
6167	6317	private JMenuItem duplicateItem;
6168		- private MenuItem cloneItem;
	6318	+ private JMenuItem cloneItem;
6169	6319	private MenuItem cloneSupportItem;
6170	6320	private MenuItem overwriteGeoItem;
6171	6321	private MenuItem overwriteMatItem;
..	..	@@ -6186,13 +6336,13 @@
6186	6336	private MenuItem cloneGeometriesItem;
6187	6337	private MenuItem shareGeometriesItem;
6188	6338	private MenuItem mergeGeometriesItem;
6189		- private MenuItem copyItem;
	6339	+ private JMenuItem copyItem;
6190	6340	private MenuItem pasteItem;
6191		- private MenuItem pasteIntoItem;
6192		- private MenuItem pasteLinkItem;
6193		- private MenuItem pasteCloneItem;
6194		- private MenuItem pasteExpandItem;
6195		- private MenuItem deleteItem;
	6341	+ private JMenuItem pasteIntoItem;
	6342	+ private JMenuItem pasteLinkItem;
	6343	+ private JMenuItem pasteCloneItem;
	6344	+ private JMenuItem pasteExpandItem;
	6345	+ private JMenuItem deleteItem;
6196	6346	private MenuItem clearAllItem;
6197	6347	private MenuItem genUVItem;
6198	6348	private MenuItem genNormalsMESHItem;
..	..	@@ -6218,6 +6368,7 @@
6218	6368	private MenuItem clipMeshItem;
6219	6369	private MenuItem smoothMeshItem;
6220	6370	private MenuItem clearMaterialsItem;
	6371	+ private MenuItem clearVersionsItem;
6221	6372
6222	6373	private MenuItem liveleavesItem;
6223	6374	private MenuItem unliveleavesItem;
..	..	@@ -6241,13 +6392,16 @@
6241	6392	private MenuItem maxTexturesItem;
6242	6393	private MenuItem panoTexturesItem;
6243	6394
	6395	+ private MenuItem textureRatioRItem;
	6396	+ private MenuItem textureRatioGItem;
	6397	+ private MenuItem textureRatioBItem;
6244	6398	private MenuItem resetCentroidItem;
6245	6399	private MenuItem resetCentroidXZItem;
6246	6400	private MenuItem resetTransformItem;
6247	6401	private MenuItem transformGeometryItem;
6248	6402	private MenuItem transformChildrenItem;
6249	6403	private MenuItem hideItem;
6250		- private MenuItem grabItem;
	6404	+ private JMenuItem grabItem;
6251	6405	private MenuItem backItem;
6252	6406	private MenuItem frontItem;
6253	6407	private MenuItem cameraItem;
..	..	@@ -6260,7 +6414,7 @@
6260	6414	private MenuItem switchTransfoItem;
6261	6415	private MenuItem morphItem;
6262	6416	private MenuItem linkerItem;
6263		- private MenuItem ungroupItem;
	6417	+ private JMenuItem ungroupItem;
6264	6418	private MenuItem editItem;
6265	6419	private MenuItem openWindowItem;
6266	6420	private MenuItem editLeafItem;