~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,10 +415,14 @@
390	415	this.copy = this.group = group;
391	416	//selectees = this.group.selectees;
392	417
	418	+ assert(false);
	419	+
393	420	if (copy.versionlist == null)
394	421	{
395	422	copy.versionlist = new Object3D[100];
396	423	copy.versionindex = -1;
	424	+
	425	+ //Save(true);
397	426	}
398	427
399	428	if(ui)
..	..	@@ -422,7 +451,7 @@
422	451	copy.versionlist = new Object3D[100];
423	452	copy.versionindex = -1;
424	453
425		- Save(true);
	454	+ //Save(true);
426	455	}
427	456	}
428	457
..	..	@@ -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	//
..	..	@@ -821,9 +857,9 @@
821	857	hideleavesItem.addActionListener(this);
822	858	showleavesItem = menu.add(new MenuItem("Show Leaves"));
823	859	showleavesItem.addActionListener(this);
824		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	860	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
825	861	markleavesItem.addActionListener(this);
826		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	862	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
827	863	unmarkleavesItem.addActionListener(this);
828	864	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
829	865	rewindleavesItem.addActionListener(this);
..	..	@@ -877,6 +913,9 @@
877	913	shareGeometriesItem.addActionListener(this);
878	914	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
879	915	mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
880	919	if (Globals.ADVANCED)
881	920	{
882	921	// Pretty much the same as duplicate and clone.
..	..	@@ -895,40 +934,50 @@
895	934
896	935	JTabbedPane resourcecontainer;
897	936	cGridBag currenttab;
898		- boolean added; // patch for jar
	937	+ //boolean added; // patch for jar
899	938
	939	+ int totalcount = 0;
	940	+
900	941	int tabcount = 0;
901	942	int colcount = 0;
902	943	int rowcount = 0;
	944	+ int texturecount = 0;
903	945
904	946	int columns = 5;
905	947	int rows = 7;
906	948
907	949	public void ResourceCallBack(String[] path)
908	950	{
909		- for (int i = 0; i < path.length; i++)
910		- System.out.print(path[i] + "/");
911		- System.out.println();
912		- if (rowcount == 0)
	951	+// for (int i = 0; i < path.length; i++)
	952	+// System.out.print(path[i] + "/");
	953	+// System.out.println();
	954	+
	955	+ if (//rowcount == 0 \|\|
	956	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
913	957	{
914	958	currenttab = new cGridBag();
915		- added = false;
916		- String tabname = String.valueOf((char)('A'+tabcount));
	959	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
917	960	currenttab.setName(tabname);
	961	+ //added = false;
	962	+ resourcecontainer.add(currenttab);
	963	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
918	964	rowcount = 1;
	965	+ colcount = 0;
	966	+ texturecount = 0;
919	967	}
920	968
921		- if (path.length > 1 && path[1].toLowerCase().endsWith(".jpg"))
	969	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
922	970	{
923		- if (!added)
	971	+ //if (!added)
924	972	{
925		- added = true;
926		- resourcecontainer.add(currenttab);
927		- String tabname = String.valueOf((char)('A'+tabcount));
928		- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	973	+ //added = true;
	974	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	975	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
929	976	}
930	977
931		- AddTextureButton(path[0], path[1], currenttab);
	978	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	979	+ totalcount++;
	980	+
932	981	if (++colcount >= columns)
933	982	{
934	983	colcount = 0;
..	..	@@ -949,10 +998,12 @@
949	998
950	999	void CreateTexturePanel(cGridBag container)
951	1000	{
952		- resourcecontainer = new JTabbedPane();
	1001	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
953	1002	container.add(resourcecontainer);
954	1003
955	1004	Grafreed.ParseResources("textures", this);
	1005	+
	1006	+ // 935. System.out.println("Total = " + totalcount);
956	1007	}
957	1008
958	1009	void SetupUI2(ObjEditor oe)
..	..	@@ -972,11 +1023,6 @@
972	1023	//new Exception().printStackTrace();
973	1024
974	1025	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	1026	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
981	1027
982	1028	oe.buttonGroup = new ButtonGroup();
..	..	@@ -997,9 +1043,9 @@
997	1043	oe.radioPanel.add(dummyButton);
998	1044	oe.buttonGroup.add(dummyButton);
999	1045	*/
1000		- cGridBag copyOptionsPanel = new cGridBag();
	1046	+ cGridBag versionManagerPanel = new cGridBag();
1001	1047
1002		- copyOptionsPanel.preferredHeight = 2;
	1048	+ versionManagerPanel.preferredHeight = 4;
1003	1049
1004	1050	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1005	1051
..	..	@@ -1009,62 +1055,102 @@
1009	1055
1010	1056	if (Globals.ADVANCED)
1011	1057	{
1012		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1013		- maxButton.setToolTipText("Maximize window");
1014		- maxButton.addActionListener(this);
	1058	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+// maxButton.setToolTipText("Maximize window");
	1060	+// maxButton.addActionListener(this);
1015	1061	}
1016	1062
1017		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ cButton gcButton;
	1064	+
	1065	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1066	+// gcButton.setToolTipText("Garbage collect");
	1067	+// gcButton.addActionListener(new ActionListener()
	1068	+// {
	1069	+// public void actionPerformed(ActionEvent e)
	1070	+// {
	1071	+// System.gc();
	1072	+// }
	1073	+// });
	1074	+
	1075	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ collapseButton.setToolTipText("Collapse toolbar");
	1077	+ collapseButton.addActionListener(this);
	1078	+
	1079	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1080	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1081	+ maximize3DButton.addActionListener(this);
	1082	+
	1083	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ twoButton.setToolTipText("Show 3D view only");
	1085	+ twoButton.addActionListener(this);
	1086	+ this.fullscreenLayout = twoButton;
	1087	+
	1088	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ threeButton.setToolTipText("Show controls and 3D view");
	1090	+ threeButton.addActionListener(this);
	1091	+ if (Globals.ADVANCED)
	1092	+ {
	1093	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1094	+ sixButton.setToolTipText("Show 3D view and controls");
	1095	+ sixButton.addActionListener(this);
	1096	+ }
	1097	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+// sevenButton.setToolTipText("3-column layout");
	1099	+// sevenButton.addActionListener(this);
	1100	+ //
	1101	+
	1102	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1018	1103	fullButton.setToolTipText("Full-screen window");
1019	1104	fullButton.addActionListener(this);
1020	1105
1021		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1022	1107	screenfitButton.setToolTipText("Screen fit");
1023	1108	screenfitButton.addActionListener(this);
1024	1109
1025		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1026	1111	restoreCameraButton.setToolTipText("Restore viewpoint");
1027	1112	restoreCameraButton.addActionListener(this);
1028	1113
1029		- copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1030	1115	saveVersionButton.setToolTipText("Duplicate current version");
1031	1116	saveVersionButton.addActionListener(this);
1032	1117
1033		- copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1034	1119	deleteVersionButton.setToolTipText("Delete current version");
1035	1120	deleteVersionButton.addActionListener(this);
	1121	+ deleteVersionButton.setEnabled(false);
1036	1122
1037		- copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1038	1124	previousVersionButton.setToolTipText("Previous version");
1039	1125	previousVersionButton.addActionListener(this);
1040	1126	previousVersionButton.setEnabled(false);
1041	1127
1042	1128	cGridBag updown = new cGridBag().setVertical(true);
1043		- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1044	1130	restoreButton.setToolTipText("Undo (restore current version)");
1045	1131	restoreButton.addActionListener(this);
1046		- //restoreButton.setEnabled(false);
	1132	+ restoreButton.setEnabled(false);
1047	1133
1048		- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1049	1135	replaceButton.setToolTipText("Save (replace current version)");
1050	1136	replaceButton.addActionListener(this);
1051		- //replaceButton.setEnabled(false);
	1137	+ replaceButton.setEnabled(false);
1052	1138
1053		- copyOptionsPanel.add(updown);
	1139	+ versionManagerPanel.add(updown);
1054	1140
1055		- copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1141	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1056	1142	nextVersionButton.setToolTipText("Next version");
1057	1143	nextVersionButton.addActionListener(this);
1058	1144	nextVersionButton.setEnabled(false);
	1145	+
	1146	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1147	+ oneStepButton.setToolTipText("Animate one step forward");
	1148	+ oneStepButton.addActionListener(this);
1059	1149
1060	1150	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1061	1151	liveCB.setToolTipText("Enable animation");
1062	1152	liveCB.addItemListener(this);
1063	1153
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	1154	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1069	1155	fastCB.setToolTipText("Fast mode");
1070	1156	fastCB.addItemListener(this);
..	..	@@ -1080,38 +1166,23 @@
1080	1166
1081	1167	if (Globals.ADVANCED)
1082	1168	{
1083		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1084	1170	snapobjectButton.addActionListener(this);
1085	1171	snapobjectButton.setToolTipText("Snap Object");
1086	1172
1087		- oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1173	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1088	1174	fourButton.addActionListener(this);
1089	1175	fourButton.setToolTipText("Show control panel only");
1090	1176	}
1091	1177
1092	1178	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1093	1179
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	1180
1110		- oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1181	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1111	1182	rootButton.setToolTipText("Open selection in new tab");
1112	1183	rootButton.addActionListener(this);
1113	1184
1114		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1115	1186	closeButton.setToolTipText("Close tab");
1116	1187	closeButton.addActionListener(this);
1117	1188	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..	..	@@ -1120,38 +1191,38 @@
1120	1191	cGridBag row1 = new cGridBag();
1121	1192
1122	1193	// INSERT
1123		- row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1124		- gridButton.setToolTipText("Create grid");
	1194	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ gridButton.setToolTipText("Create ground");
1125	1196	gridButton.addActionListener(this);
1126	1197
1127		- row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1128	1199	boxButton.setToolTipText("Create box");
1129	1200	boxButton.addActionListener(this);
1130	1201
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);
	1202	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1144	1203	superButton.setToolTipText("Create superellipsoid");
1145	1204	superButton.addActionListener(this);
1146	1205
	1206	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ sphereButton.setToolTipText("Create sphere");
	1208	+ sphereButton.addActionListener(this);
	1209	+
	1210	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ coneButton.setToolTipText("Create cone");
	1212	+ coneButton.addActionListener(this);
	1213	+
	1214	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ torusButton.setToolTipText("Create torus");
	1216	+ torusButton.addActionListener(this);
	1217	+
1147	1218	if (Globals.ADVANCED)
1148	1219	{
1149		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1150	1221	kleinButton.setToolTipText("Create Klein bottle");
1151	1222	kleinButton.addActionListener(this);
1152	1223	}
1153	1224
1154		- row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1225	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1155	1226	particlesButton.setToolTipText("Create particle system");
1156	1227	particlesButton.addActionListener(this);
1157	1228
..	..	@@ -1159,31 +1230,31 @@
1159	1230
1160	1231	cGridBag row2 = new cGridBag();
1161	1232
1162		- row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1163	1234	groupButton.setToolTipText("Create group");
1164	1235	groupButton.addActionListener(this);
1165	1236
1166		- row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1167	1238	compositeButton.setToolTipText("Create composite");
1168	1239	compositeButton.addActionListener(this);
1169	1240
1170		- row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1171	1242	switchButton.setToolTipText("Create item switcher");
1172	1243	switchButton.addActionListener(this);
1173	1244
1174		- row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1175	1246	loopButton.setToolTipText("Create loop");
1176	1247	loopButton.addActionListener(this);
1177	1248
1178		- row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1179	1250	textureButton.setToolTipText("Create texture");
1180	1251	textureButton.addActionListener(this);
1181	1252
1182		- row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1253	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1183	1254	overlayButton.setToolTipText("Create overlay");
1184	1255	overlayButton.addActionListener(this);
1185	1256
1186		- row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1257	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1187	1258	lightButton.setToolTipText("Create light");
1188	1259	lightButton.addActionListener(this);
1189	1260
..	..	@@ -1193,6 +1264,11 @@
1193	1264
1194	1265	CreateTexturePanel(textures);
1195	1266
	1267	+ int tabCount = resourcecontainer.getTabCount();
	1268	+
	1269	+ if (tabCount > 0)
	1270	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1271	+
1196	1272	oe.toolboxPanel.add(textures);
1197	1273
1198	1274	textures.preferredHeight = 100;
..	..	@@ -1200,11 +1276,11 @@
1200	1276	CreateSkyboxPanel(oe.skyboxPanel);
1201	1277
1202	1278	// EDIT panel
1203		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1204	1280	editButton.setToolTipText("Pin selection controls");
1205	1281	editButton.addActionListener(this);
1206	1282
1207		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1208	1284	uneditButton.setToolTipText("Unpin and remove selection controls");
1209	1285	uneditButton.addActionListener(this);
1210	1286
..	..	@@ -1212,7 +1288,7 @@
1212	1288	allParamsButton.setToolTipText("Show all controls");
1213	1289	allParamsButton.addActionListener(this);
1214	1290
1215		- editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1291	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1216	1292	clearPanelButton.setToolTipText("Clear all controls");
1217	1293	clearPanelButton.addActionListener(this);
1218	1294
..	..	@@ -1220,7 +1296,7 @@
1220	1296	//unselectButton.setToolTipText("Unselect");
1221	1297	//unselectButton.addActionListener(this);
1222	1298
1223		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1299	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1224	1300	flashSelectionButton.setToolTipText("Highlight selection");
1225	1301	flashSelectionButton.addActionListener(this);
1226	1302
..	..	@@ -1243,6 +1319,8 @@
1243	1319
1244	1320	cGridBag jSPPanel = new cGridBag();
1245	1321
	1322	+ jSPPanel.preferredHeight = 20;
	1323	+
1246	1324	JScrollPane jSP;
1247	1325	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1248	1326	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -1251,11 +1329,11 @@
1251	1329	oe.treePanel.add(jSPPanel);
1252	1330	oe.treePanel.Return();
1253	1331
1254		- oe.treePanel.add(copyOptionsPanel);
	1332	+ oe.treePanel.add(versionManagerPanel);
1255	1333	oe.treePanel.Return();
1256		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1257		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1258		- sliderPane.preferredHeight = 1;
	1334	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1335	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1336	+ versionSliderPane.preferredHeight = 3;
1259	1337
1260	1338	// mainPanel.setDividerLocation(0.1); //1.0);
1261	1339	mainPanel.setResizeWeight(0.4);
..	..	@@ -1413,6 +1491,14 @@
1413	1491
1414	1492	void EditObject(Object3D obj)
1415	1493	{
	1494	+ assert(obj instanceof Composite);
	1495	+
	1496	+// if (obj.versionlist == null)
	1497	+// {
	1498	+// obj.versionlist = new Object3D[100];
	1499	+// obj.versionindex = -1;
	1500	+// }
	1501	+
1416	1502	cRadio radioButton = new cRadio(obj.name);
1417	1503
1418	1504	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1437,6 +1523,7 @@
1437	1523
1438	1524	oe.SetupViews();
1439	1525
	1526	+ if (Globals.DEBUG)
1440	1527	System.out.println("SetupViews");
1441	1528	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1442	1529	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1803,7 +1890,12 @@
1803	1890	TreePath path;
1804	1891
1805	1892	public TransferableTreePath(TreePath tp) {
1806		- path = tp;
	1893	+ Object[] objs = new Object[tp.getPathCount()];
	1894	+ for (int i=0; i<objs.length; i++)
	1895	+ {
	1896	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1897	+ }
	1898	+ path = new TreePath(objs);
1807	1899	}
1808	1900
1809	1901	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -2093,7 +2185,11 @@
2093	2185	shadow.material = new cMaterial(obj.material);
2094	2186	shadow.material.diffuse = 0.0001f;
2095	2187	shadow.material.specular = 0.0001f;
2096		- //shadow.projectedVertices[1].x = 300;
	2188	+ shadow.material.opacity = 0.75f;
	2189	+
	2190	+ AllocProjectedVertices(shadow);
	2191	+
	2192	+ shadow.projectedVertices[1].x = 300;
2097	2193
2098	2194	makeSomething(shadow);
2099	2195	}
..	..	@@ -2614,27 +2710,35 @@
2614	2710	} else
2615	2711	if (source == loopItem \|\| source == loopButton)
2616	2712	{
	2713	+ if (!group.selection.isEmpty())
	2714	+ {
2617	2715	Composite csg = new GroupLeaf();
2618	2716	csg.count = 5;
2619		- group(csg);
2620	2717	Composite child = new cGroup("Branch");
2621	2718	csg.addChild(child);
2622	2719	child.addChild(csg);
	2720	+ group(csg);
	2721	+ }
2623	2722	} else
2624	2723	if (source == doubleItem)
2625	2724	{
	2725	+ if (!group.selection.isEmpty())
	2726	+ {
2626	2727	Composite csg = new GroupLeaf("Fork");
2627	2728	csg.count = 5;
2628		- group(csg);
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	+ group(csg);
	2736	+ }
2635	2737	} else
2636	2738	if (source == tripleItem)
2637	2739	{
	2740	+ if (!group.selection.isEmpty())
	2741	+ {
2638	2742	Composite csg = new GroupLeaf("Trident");
2639	2743	csg.count = 4;
2640	2744	group(csg);
..	..	@@ -2647,6 +2751,7 @@
2647	2751	child = new cGroup();
2648	2752	csg.addChild(child);
2649	2753	child.addChild(csg);
	2754	+ }
2650	2755	} else
2651	2756	if (source == computeAOItem)
2652	2757	{
..	..	@@ -2696,6 +2801,18 @@
2696	2801	if (source == fullButton)
2697	2802	{
2698	2803	ToggleFullScreen();
	2804	+ } else
	2805	+ if (source == collapseButton)
	2806	+ {
	2807	+ this.expandedLayout = radio.layout;
	2808	+ CollapseToolbar();
	2809	+ } else
	2810	+ if (source == maximize3DButton)
	2811	+ {
	2812	+ this.expandedLayout = radio.layout;
	2813	+ radio.layout = twoButton;
	2814	+ Show3DView();
	2815	+ CollapseToolbar();
2699	2816	} else
2700	2817	if (source == previousVersionButton)
2701	2818	{
..	..	@@ -3270,22 +3387,34 @@
3270	3387	} else
3271	3388	if (source == ungroupItem \|\| source == ungroupButton)
3272	3389	{
3273		- boolean hasRoot = false;
	3390	+ boolean canUngroup = true;
3274	3391
3275	3392	for (int i=0; i<group.selection.size(); i++)
3276	3393	{
3277		- if (group.selection.get(i) == group)
	3394	+ Object3D selectedItem = group.selection.get(i);
	3395	+
	3396	+ if (selectedItem.Size() == 0)
3278	3397	{
3279		- hasRoot = true;
	3398	+ // Cannot ungroup leaves
	3399	+ canUngroup = false;
	3400	+ break;
	3401	+ }
	3402	+
	3403	+ if (selectedItem == group)
	3404	+ {
	3405	+ // Cannot ungroup root
	3406	+ canUngroup = false;
3280	3407	break;
3281	3408	}
3282	3409	}
3283	3410
3284		- if (!hasRoot)
	3411	+ if (canUngroup)
3285	3412	{
3286	3413	for (int i=0; i<group.selection.size(); i++)
3287	3414	{
3288		- Ungroup(group.selection.get(i));
	3415	+ Object3D selectedItem = group.selection.get(i);
	3416	+
	3417	+ Ungroup(selectedItem);
3289	3418	}
3290	3419
3291	3420	ClearSelection(false);
..	..	@@ -3648,38 +3777,7 @@
3648	3777	if (CameraPane.FULLSCREEN)
3649	3778	fullscreenLayout = radio.layout;
3650	3779
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();
	3780	+ Show3DView();
3683	3781
3684	3782	cameraView.requestFocusInWindow();
3685	3783
..	..	@@ -3865,6 +3963,7 @@
3865	3963	} else
3866	3964	if (source == rootButton)
3867	3965	{
	3966	+ Replace();
3868	3967	Object3D obj;
3869	3968	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3870	3969	{
..	..	@@ -3879,6 +3978,8 @@
3879	3978	if (source == closeButton)
3880	3979	{
3881	3980	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3981	+ Replace();
	3982	+
3882	3983	cRadio ab;
3883	3984	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3884	3985	{
..	..	@@ -3977,6 +4078,8 @@
3977	4078	} else
3978	4079	if(source instanceof cRadio)
3979	4080	{
	4081	+ Replace();
	4082	+
3980	4083	group.parent = keepparent;
3981	4084	group.attributes = 0;
3982	4085	//group.editWindow = null;
..	..	@@ -4001,8 +4104,6 @@
4001	4104
4002	4105	copy = group;
4003	4106
4004		- SetUndoStates();
4005		-
4006	4107	//Globals.theRenderer.object = group;
4007	4108	if(!useclient)
4008	4109	{
..	..	@@ -4030,6 +4131,29 @@
4030	4131	*/
4031	4132	radio.layout.doClick();
4032	4133
	4134	+ assert(copy instanceof Composite);
	4135	+
	4136	+ if (copy.versionlist == null)
	4137	+ {
	4138	+ copy.versionindex = -1;
	4139	+
	4140	+ // Cannot work with loops
	4141	+ // To fix this issue, we first mark all nodes above the root,
	4142	+ // and check if any of these nodes are reachable below the root.
	4143	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4144	+
	4145	+ if (!copy.HasTags())
	4146	+ {
	4147	+ copy.versionlist = new Object3D[100];
	4148	+
	4149	+ Save(true);
	4150	+ }
	4151	+
	4152	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4153	+ }
	4154	+
	4155	+ SetVersionStates();
	4156	+
4033	4157	ClearUnpinned();
4034	4158
4035	4159	//Grafreed.Assert(group != null);
..	..	@@ -4173,7 +4297,7 @@
4173	4297	TouchTransform(obj);
4174	4298	continue;
4175	4299	}
4176		- if ((mask&2) != 0) // Scale
	4300	+ if ((mask&2) != 0) // Scale/rotation
4177	4301	{
4178	4302	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4179	4303	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -4181,10 +4305,6 @@
4181	4305	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4182	4306	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4183	4307	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4184		- }
4185		- if ((mask&4) != 0) // Rotation
4186		- {
4187		- // ?
4188	4308	}
4189	4309	if ((mask&1) != 0) // Translation
4190	4310	{
..	..	@@ -5264,10 +5384,26 @@
5264	5384	flashSelectionButton.setEnabled(enabled);
5265	5385
5266	5386	clearPanelButton.setEnabled(!listUI.isEmpty());
	5387	+
	5388	+ boolean allComposites = true;
	5389	+
	5390	+ if (group.selection != null)
	5391	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5392	+ {
	5393	+ Object next = e.nextElement();
	5394	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5395	+ {
	5396	+ allComposites = false;
	5397	+ break;
	5398	+ }
	5399	+ }
	5400	+
	5401	+ rootButton.setEnabled(allComposites);
5267	5402	}
5268	5403
5269	5404	void refreshContents(boolean cp)
5270	5405	{
	5406	+ if (Globals.ADVANCED)
5271	5407	//if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5272	5408	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5273	5409	{
..	..	@@ -5278,7 +5414,7 @@
5278	5414	Object3D child = (Object3D) group.selection.get(i);
5279	5415
5280	5416	objEditor.AddInfo(child, this, true);
5281		- System.err.println("info : " + child.GetPath());
	5417	+// System.err.println("info : " + child.GetPath());
5282	5418	}
5283	5419
5284	5420	objEditor.SetText(); // jan 2014
..	..	@@ -6161,11 +6297,11 @@
6161	6297	private MenuItem lookAtItem;
6162	6298	private MenuItem lookFromItem;
6163	6299	private MenuItem switchViewItem;
6164		- private MenuItem cutItem;
	6300	+ private JMenuItem cutItem;
6165	6301	private MenuItem undoItem;
6166	6302	private MenuItem redoItem;
6167	6303	private JMenuItem duplicateItem;
6168		- private MenuItem cloneItem;
	6304	+ private JMenuItem cloneItem;
6169	6305	private MenuItem cloneSupportItem;
6170	6306	private MenuItem overwriteGeoItem;
6171	6307	private MenuItem overwriteMatItem;
..	..	@@ -6186,13 +6322,13 @@
6186	6322	private MenuItem cloneGeometriesItem;
6187	6323	private MenuItem shareGeometriesItem;
6188	6324	private MenuItem mergeGeometriesItem;
6189		- private MenuItem copyItem;
	6325	+ private JMenuItem copyItem;
6190	6326	private MenuItem pasteItem;
6191		- private MenuItem pasteIntoItem;
6192		- private MenuItem pasteLinkItem;
6193		- private MenuItem pasteCloneItem;
6194		- private MenuItem pasteExpandItem;
6195		- private MenuItem deleteItem;
	6327	+ private JMenuItem pasteIntoItem;
	6328	+ private JMenuItem pasteLinkItem;
	6329	+ private JMenuItem pasteCloneItem;
	6330	+ private JMenuItem pasteExpandItem;
	6331	+ private JMenuItem deleteItem;
6196	6332	private MenuItem clearAllItem;
6197	6333	private MenuItem genUVItem;
6198	6334	private MenuItem genNormalsMESHItem;
..	..	@@ -6247,7 +6383,7 @@
6247	6383	private MenuItem transformGeometryItem;
6248	6384	private MenuItem transformChildrenItem;
6249	6385	private MenuItem hideItem;
6250		- private MenuItem grabItem;
	6386	+ private JMenuItem grabItem;
6251	6387	private MenuItem backItem;
6252	6388	private MenuItem frontItem;
6253	6389	private MenuItem cameraItem;
..	..	@@ -6260,7 +6396,7 @@
6260	6396	private MenuItem switchTransfoItem;
6261	6397	private MenuItem morphItem;
6262	6398	private MenuItem linkerItem;
6263		- private MenuItem ungroupItem;
	6399	+ private JMenuItem ungroupItem;
6264	6400	private MenuItem editItem;
6265	6401	private MenuItem openWindowItem;
6266	6402	private MenuItem editLeafItem;