~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -30,7 +31,7 @@
30	31	final String path = "cubemaps/" + f + "-skyboxes/" + s;
31	32	row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
32	33	//row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
33		- skyboxButton.setToolTipText(s);
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
34	35	skyboxButton.addActionListener(new ActionListener()
35	36	{
36	37	@Override
..	..	@@ -41,6 +42,22 @@
41	42	});
42	43	}
43	44
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
44	61	public void AddSkyboxTab0(JTabbedPane skyboxpanel)
45	62	{
46	63	cGridBag tab0 = new cGridBag().setVertical(true);
..	..	@@ -56,7 +73,7 @@
56	73	cGridBag row5 = new cGridBag();
57	74	cGridBag row6 = new cGridBag();
58	75
59		- AddSkyboxButton("default", "rgb", row0);
	76	+ AddSkyboxButton("default", "", row0);
60	77	//AddSkyboxButton("default", "cornell", row0);
61	78	AddSkyboxButton("penguins", "dust", row0);
62	79	AddSkyboxButton("penguins", "tropic", row0);
..	..	@@ -311,14 +328,56 @@
311	328	}
312	329	}
313	330
314		- public void ChangeSkybox(String name)
	331	+ public void ChangeSkybox(String skybox)
315	332	{
316		- //cameraView.envyoff = false;
317		- group.skyboxname = name;
318		- group.skyboxext = "jpg";
319		- cameraView.repaint();
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane();
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
320	358	}
321	359
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	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();
	379	+ }
	380	+
322	381	//ObjEditor objEditor;
323	382	public void closeUI2()
324	383	{
..	..	@@ -356,10 +415,14 @@
356	415	this.copy = this.group = group;
357	416	//selectees = this.group.selectees;
358	417
	418	+ assert(false);
	419	+
359	420	if (copy.versionlist == null)
360	421	{
361	422	copy.versionlist = new Object3D[100];
362	423	copy.versionindex = -1;
	424	+
	425	+ //Save(true);
363	426	}
364	427
365	428	if(ui)
..	..	@@ -388,7 +451,7 @@
388	451	copy.versionlist = new Object3D[100];
389	452	copy.versionindex = -1;
390	453
391		- Save(true);
	454	+ //Save(true);
392	455	}
393	456	}
394	457
..	..	@@ -479,33 +542,35 @@
479	542	// menu.add("-");
480	543	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
481	544	duplicateItem.addActionListener(this);
482		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
483	547	cloneItem.addActionListener(this);
484		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
485	549	{
486	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
487	551	cloneSupportItem.addActionListener(this);
488	552	}
	553	+ oe.jTree.popup.addSeparator();
489	554	menu.add("-");
490		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
491	556	cutItem.addActionListener(this);
492		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
493	558	copyItem.addActionListener(this);
494	559	pasteItem = menu.add(new MenuItem("Paste"));
495	560	pasteItem.addActionListener(this);
496	561
497		- menu.add("-");
498		- 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"));
499	565	pasteIntoItem.addActionListener(this);
500		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
501	567	pasteLinkItem.addActionListener(this);
502		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
503	569	pasteCloneItem.addActionListener(this);
504		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
505	571	// pasteExpandItem.addActionListener(this);
506		- menu.add("-");
507		- deleteItem = menu.add(new MenuItem("Delete"));
508		- deleteItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
509	574
510	575	if (Globals.ADVANCED)
511	576	{
..	..	@@ -591,11 +656,9 @@
591	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
592	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
593	658	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
594		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
595	659	oe.cameraMenu.add("-");
596	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
597	661	openWindowItem.addActionListener(this);
598		- editLeafItem.addActionListener(this);
599	662	lookAtItem.addActionListener(this);
600	663	//lookFromItem.addActinoListener(this);
601	664	//switchViewItem.addActionListener(this);
..	..	@@ -642,9 +705,8 @@
642	705	setMasterItem.addActionListener(this);
643	706	}
644	707
645		- oe.menuBar.add(menu = new Menu("Group"));
646		-// grabItem = menu.add(new MenuItem("Grab"));
647		-// grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
648	710	backItem = menu.add(new MenuItem("Back"));
649	711	backItem.addActionListener(this);
650	712	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -652,13 +714,21 @@
652	714	// compositeItem = menu.add(new MenuItem("Composite"));
653	715	// compositeItem.addActionListener(this);
654	716
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
655	720	if (Globals.ADVANCED)
656	721	{
657	722	hideItem = menu.add(new MenuItem("Hidden Group"));
658	723	hideItem.addActionListener(this);
659	724	}
660		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
661	726	ungroupItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
662	732
663	733	// menu.add("-");
664	734	//
..	..	@@ -843,6 +913,9 @@
843	913	shareGeometriesItem.addActionListener(this);
844	914	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
845	915	mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
846	919	if (Globals.ADVANCED)
847	920	{
848	921	// Pretty much the same as duplicate and clone.
..	..	@@ -859,6 +932,74 @@
859	932	buildToolsMenu(menu);
860	933	}
861	934
	935	+ JTabbedPane resourcecontainer;
	936	+ cGridBag currenttab;
	937	+ //boolean added; // patch for jar
	938	+
	939	+ int tabcount = 0;
	940	+ int colcount = 0;
	941	+ int rowcount = 0;
	942	+ int texturecount = 0;
	943	+
	944	+ int columns = 5;
	945	+ int rows = 7;
	946	+
	947	+ public void ResourceCallBack(String[] path)
	948	+ {
	949	+// for (int i = 0; i < path.length; i++)
	950	+// System.out.print(path[i] + "/");
	951	+// System.out.println();
	952	+
	953	+ if (//rowcount == 0 \|\|
	954	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	955	+ {
	956	+ currenttab = new cGridBag();
	957	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	958	+ currenttab.setName(tabname);
	959	+ //added = false;
	960	+ resourcecontainer.add(currenttab);
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ rowcount = 1;
	963	+ colcount = 0;
	964	+ texturecount = 0;
	965	+ }
	966	+
	967	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	968	+ {
	969	+ //if (!added)
	970	+ {
	971	+ //added = true;
	972	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	973	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	974	+ }
	975	+
	976	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	977	+
	978	+ if (++colcount >= columns)
	979	+ {
	980	+ colcount = 0;
	981	+ currenttab.Return();
	982	+
	983	+ if (rowcount++ >= rows)
	984	+ {
	985	+ rowcount = 0;
	986	+ }
	987	+ }
	988	+ }
	989	+ else
	990	+ {
	991	+// if (!path[path.length-1].equals("icons"))
	992	+// resourcecontainer.Return();
	993	+ }
	994	+ }
	995	+
	996	+ void CreateTexturePanel(cGridBag container)
	997	+ {
	998	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	999	+ container.add(resourcecontainer);
	1000	+
	1001	+ Grafreed.ParseResources("textures", this);
	1002	+ }
862	1003
863	1004	void SetupUI2(ObjEditor oe)
864	1005	{
..	..	@@ -877,11 +1018,6 @@
877	1018	//new Exception().printStackTrace();
878	1019
879	1020	oe.radioPanel = new JPanel(new GridBagLayout());
880		- oe.aConstraints.weightx = 1;
881		- oe.aConstraints.weighty = 0;
882		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
883		- oe.aConstraints.gridwidth = 100;
884		- oe.aConstraints.gridheight = 1;
885	1021	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
886	1022
887	1023	oe.buttonGroup = new ButtonGroup();
..	..	@@ -914,10 +1050,49 @@
914	1050
915	1051	if (Globals.ADVANCED)
916	1052	{
917		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
918		- maxButton.setToolTipText("Maximize window");
919		- maxButton.addActionListener(this);
	1053	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// maxButton.setToolTipText("Maximize window");
	1055	+// maxButton.addActionListener(this);
920	1056	}
	1057	+
	1058	+ cButton gcButton;
	1059	+
	1060	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+// gcButton.setToolTipText("Garbage collect");
	1062	+// gcButton.addActionListener(new ActionListener()
	1063	+// {
	1064	+// public void actionPerformed(ActionEvent e)
	1065	+// {
	1066	+// System.gc();
	1067	+// }
	1068	+// });
	1069	+
	1070	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1071	+ collapseButton.setToolTipText("Collapse toolbar");
	1072	+ collapseButton.addActionListener(this);
	1073	+
	1074	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1076	+ maximize3DButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ twoButton.setToolTipText("Show 3D view only");
	1080	+ twoButton.addActionListener(this);
	1081	+ this.fullscreenLayout = twoButton;
	1082	+
	1083	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ threeButton.setToolTipText("Show controls and 3D view");
	1085	+ threeButton.addActionListener(this);
	1086	+ if (Globals.ADVANCED)
	1087	+ {
	1088	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ sixButton.setToolTipText("Show 3D view and controls");
	1090	+ sixButton.addActionListener(this);
	1091	+ }
	1092	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+// sevenButton.setToolTipText("3-column layout");
	1094	+// sevenButton.addActionListener(this);
	1095	+ //
921	1096
922	1097	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
923	1098	fullButton.setToolTipText("Full-screen window");
..	..	@@ -938,6 +1113,7 @@
938	1113	copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
939	1114	deleteVersionButton.setToolTipText("Delete current version");
940	1115	deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
941	1117
942	1118	copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
943	1119	previousVersionButton.setToolTipText("Previous version");
..	..	@@ -948,12 +1124,12 @@
948	1124	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
949	1125	restoreButton.setToolTipText("Undo (restore current version)");
950	1126	restoreButton.addActionListener(this);
951		- //restoreButton.setEnabled(false);
	1127	+ restoreButton.setEnabled(false);
952	1128
953	1129	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
954	1130	replaceButton.setToolTipText("Save (replace current version)");
955	1131	replaceButton.addActionListener(this);
956		- //replaceButton.setEnabled(false);
	1132	+ replaceButton.setEnabled(false);
957	1133
958	1134	copyOptionsPanel.add(updown);
959	1135
..	..	@@ -962,14 +1138,14 @@
962	1138	nextVersionButton.addActionListener(this);
963	1139	nextVersionButton.setEnabled(false);
964	1140
965		- oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
966		- liveCB.setToolTipText("Enable animation");
967		- liveCB.addItemListener(this);
968		-
969	1141	oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
970	1142	oneStepButton.setToolTipText("Animate one step forward");
971	1143	oneStepButton.addActionListener(this);
972	1144
	1145	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1146	+ liveCB.setToolTipText("Enable animation");
	1147	+ liveCB.addItemListener(this);
	1148	+
973	1149	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
974	1150	fastCB.setToolTipText("Fast mode");
975	1151	fastCB.addItemListener(this);
..	..	@@ -996,21 +1172,6 @@
996	1172
997	1173	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
998	1174
999		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1000		- twoButton.setToolTipText("Show 3D view only");
1001		- twoButton.addActionListener(this);
1002		- this.fullscreenLayout = twoButton;
1003		-
1004		- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1005		- threeButton.setToolTipText("Show controls and 3D view");
1006		- threeButton.addActionListener(this);
1007		- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1008		- sixButton.setToolTipText("Show 3D view and controls");
1009		- sixButton.addActionListener(this);
1010		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1011		-// sevenButton.setToolTipText("3-column layout");
1012		-// sevenButton.addActionListener(this);
1013		- //
1014	1175
1015	1176	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1016	1177	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -1026,12 +1187,16 @@
1026	1187
1027	1188	// INSERT
1028	1189	row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1029		- gridButton.setToolTipText("Create grid");
	1190	+ gridButton.setToolTipText("Create ground");
1030	1191	gridButton.addActionListener(this);
1031	1192
1032	1193	row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1033	1194	boxButton.setToolTipText("Create box");
1034	1195	boxButton.addActionListener(this);
	1196	+
	1197	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ superButton.setToolTipText("Create superellipsoid");
	1199	+ superButton.addActionListener(this);
1035	1200
1036	1201	row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1037	1202	sphereButton.setToolTipText("Create sphere");
..	..	@@ -1044,10 +1209,6 @@
1044	1209	row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1045	1210	torusButton.setToolTipText("Create torus");
1046	1211	torusButton.addActionListener(this);
1047		-
1048		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1049		- superButton.setToolTipText("Create superellipsoid");
1050		- superButton.addActionListener(this);
1051	1212
1052	1213	if (Globals.ADVANCED)
1053	1214	{
..	..	@@ -1094,19 +1255,15 @@
1094	1255
1095	1256	oe.toolboxPanel.add(row2);
1096	1257
1097		- // ENVYMAPS
1098		- cGridBag skyboxpane = new cGridBag();
1099		- skyboxpane.preferredHeight = 100;
	1258	+ cGridBag textures = new cGridBag();
1100	1259
1101		- oe.toolboxPanel.add(skyboxpane);
	1260	+ CreateTexturePanel(textures);
1102	1261
1103		- JTabbedPane skyboxpanel = new JTabbedPane();
1104		- skyboxpane.add(skyboxpanel);
	1262	+ oe.toolboxPanel.add(textures);
1105	1263
1106		- AddSkyboxTab0(skyboxpanel);
1107		- AddSkyboxTab1(skyboxpanel);
1108		- AddSkyboxTab2(skyboxpanel);
1109		- AddSkyboxTab3(skyboxpanel);
	1264	+ textures.preferredHeight = 100;
	1265	+
	1266	+ CreateSkyboxPanel(oe.skyboxPanel);
1110	1267
1111	1268	// EDIT panel
1112	1269	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -1118,16 +1275,16 @@
1118	1275	uneditButton.addActionListener(this);
1119	1276
1120	1277	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1121		- allParamsButton.setToolTipText("Show all controle");
	1278	+ allParamsButton.setToolTipText("Show all controls");
1122	1279	allParamsButton.addActionListener(this);
1123	1280
1124	1281	editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1125		- clearPanelButton.setToolTipText("Clear edit panel");
	1282	+ clearPanelButton.setToolTipText("Clear all controls");
1126	1283	clearPanelButton.addActionListener(this);
1127	1284
1128		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129		- unselectButton.setToolTipText("Unselect");
1130		- unselectButton.addActionListener(this);
	1285	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1286	+ //unselectButton.setToolTipText("Unselect");
	1287	+ //unselectButton.addActionListener(this);
1131	1288
1132	1289	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1133	1290	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -1322,6 +1479,14 @@
1322	1479
1323	1480	void EditObject(Object3D obj)
1324	1481	{
	1482	+ assert(obj instanceof Composite);
	1483	+
	1484	+// if (obj.versionlist == null)
	1485	+// {
	1486	+// obj.versionlist = new Object3D[100];
	1487	+// obj.versionindex = -1;
	1488	+// }
	1489	+
1325	1490	cRadio radioButton = new cRadio(obj.name);
1326	1491
1327	1492	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1346,6 +1511,7 @@
1346	1511
1347	1512	oe.SetupViews();
1348	1513
	1514	+ if (Globals.DEBUG)
1349	1515	System.out.println("SetupViews");
1350	1516	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1351	1517	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1712,7 +1878,12 @@
1712	1878	TreePath path;
1713	1879
1714	1880	public TransferableTreePath(TreePath tp) {
1715		- path = tp;
	1881	+ Object[] objs = new Object[tp.getPathCount()];
	1882	+ for (int i=0; i<objs.length; i++)
	1883	+ {
	1884	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1885	+ }
	1886	+ path = new TreePath(objs);
1716	1887	}
1717	1888
1718	1889	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -2002,7 +2173,11 @@
2002	2173	shadow.material = new cMaterial(obj.material);
2003	2174	shadow.material.diffuse = 0.0001f;
2004	2175	shadow.material.specular = 0.0001f;
2005		- //shadow.projectedVertices[1].x = 300;
	2176	+ shadow.material.opacity = 0.75f;
	2177	+
	2178	+ AllocProjectedVertices(shadow);
	2179	+
	2180	+ shadow.projectedVertices[1].x = 300;
2006	2181
2007	2182	makeSomething(shadow);
2008	2183	}
..	..	@@ -2523,27 +2698,35 @@
2523	2698	} else
2524	2699	if (source == loopItem \|\| source == loopButton)
2525	2700	{
	2701	+ if (!group.selection.isEmpty())
	2702	+ {
2526	2703	Composite csg = new GroupLeaf();
2527	2704	csg.count = 5;
2528		- group(csg);
2529	2705	Composite child = new cGroup("Branch");
2530	2706	csg.addChild(child);
2531	2707	child.addChild(csg);
	2708	+ group(csg);
	2709	+ }
2532	2710	} else
2533	2711	if (source == doubleItem)
2534	2712	{
	2713	+ if (!group.selection.isEmpty())
	2714	+ {
2535	2715	Composite csg = new GroupLeaf("Fork");
2536	2716	csg.count = 5;
2537		- group(csg);
2538	2717	Composite child = new cGroup("Branch A");
2539	2718	csg.addChild(child);
2540	2719	child.addChild(csg);
2541	2720	child = new cGroup("Branch B");
2542	2721	csg.addChild(child);
2543	2722	child.addChild(csg);
	2723	+ group(csg);
	2724	+ }
2544	2725	} else
2545	2726	if (source == tripleItem)
2546	2727	{
	2728	+ if (!group.selection.isEmpty())
	2729	+ {
2547	2730	Composite csg = new GroupLeaf("Trident");
2548	2731	csg.count = 4;
2549	2732	group(csg);
..	..	@@ -2556,6 +2739,7 @@
2556	2739	child = new cGroup();
2557	2740	csg.addChild(child);
2558	2741	child.addChild(csg);
	2742	+ }
2559	2743	} else
2560	2744	if (source == computeAOItem)
2561	2745	{
..	..	@@ -2605,6 +2789,18 @@
2605	2789	if (source == fullButton)
2606	2790	{
2607	2791	ToggleFullScreen();
	2792	+ } else
	2793	+ if (source == collapseButton)
	2794	+ {
	2795	+ this.expandedLayout = radio.layout;
	2796	+ CollapseToolbar();
	2797	+ } else
	2798	+ if (source == maximize3DButton)
	2799	+ {
	2800	+ this.expandedLayout = radio.layout;
	2801	+ radio.layout = twoButton;
	2802	+ Show3DView();
	2803	+ CollapseToolbar();
2608	2804	} else
2609	2805	if (source == previousVersionButton)
2610	2806	{
..	..	@@ -3179,22 +3375,34 @@
3179	3375	} else
3180	3376	if (source == ungroupItem \|\| source == ungroupButton)
3181	3377	{
3182		- boolean hasRoot = false;
	3378	+ boolean canUngroup = true;
3183	3379
3184	3380	for (int i=0; i<group.selection.size(); i++)
3185	3381	{
3186		- if (group.selection.get(i) == group)
	3382	+ Object3D selectedItem = group.selection.get(i);
	3383	+
	3384	+ if (selectedItem.Size() == 0)
3187	3385	{
3188		- hasRoot = true;
	3386	+ // Cannot ungroup leaves
	3387	+ canUngroup = false;
	3388	+ break;
	3389	+ }
	3390	+
	3391	+ if (selectedItem == group)
	3392	+ {
	3393	+ // Cannot ungroup root
	3394	+ canUngroup = false;
3189	3395	break;
3190	3396	}
3191	3397	}
3192	3398
3193		- if (!hasRoot)
	3399	+ if (canUngroup)
3194	3400	{
3195	3401	for (int i=0; i<group.selection.size(); i++)
3196	3402	{
3197		- Ungroup(group.selection.get(i));
	3403	+ Object3D selectedItem = group.selection.get(i);
	3404	+
	3405	+ Ungroup(selectedItem);
3198	3406	}
3199	3407
3200	3408	ClearSelection(false);
..	..	@@ -3557,38 +3765,7 @@
3557	3765	if (CameraPane.FULLSCREEN)
3558	3766	fullscreenLayout = radio.layout;
3559	3767
3560		- // bug
3561		- //gridPanel.setDividerLocation(1.0);
3562		- //bigPanel.setDividerLocation(0.0);
3563		-// bigThree.remove(scenePanel);
3564		-// bigThree.remove(centralPanel);
3565		-// bigThree.remove(XYZPanel);
3566		-// aWindowConstraints.gridx = 0;
3567		-// aWindowConstraints.gridy = 0;
3568		-// aWindowConstraints.gridwidth = 1;
3569		-// // aConstraints.gridheight = 3;
3570		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3571		-// aWindowConstraints.weightx = 0;
3572		-// aWindowConstraints.weighty = 1;
3573		-// //bigThree.add(jtp, aWindowConstraints);
3574		-// aWindowConstraints.weightx = 1;
3575		-// aWindowConstraints.gridwidth = 3;
3576		-// // aConstraints.gridheight = 3;
3577		-// aWindowConstraints.gridx = 1;
3578		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3579		-// bigThree.add(centralPanel, aWindowConstraints);
3580		-// aWindowConstraints.weightx = 0;
3581		-// aWindowConstraints.gridx = 4;
3582		-// aWindowConstraints.gridwidth = 1;
3583		-// // aConstraints.gridheight = 3;
3584		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3585		-// //bigThree.add(XYZPanel, aWindowConstraints);
3586		-// scenePanel.setVisible(false);
3587		-// centralPanel.setVisible(true);
3588		-// XYZPanel.setVisible(false);
3589		- bigThree.ClearUI();
3590		- bigThree.add(centralPanel);
3591		- bigThree.FlushUI();
	3768	+ Show3DView();
3592	3769
3593	3770	cameraView.requestFocusInWindow();
3594	3771
..	..	@@ -3774,6 +3951,7 @@
3774	3951	} else
3775	3952	if (source == rootButton)
3776	3953	{
	3954	+ Replace();
3777	3955	Object3D obj;
3778	3956	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3779	3957	{
..	..	@@ -3910,8 +4088,6 @@
3910	4088
3911	4089	copy = group;
3912	4090
3913		- SetUndoStates();
3914		-
3915	4091	//Globals.theRenderer.object = group;
3916	4092	if(!useclient)
3917	4093	{
..	..	@@ -3939,6 +4115,21 @@
3939	4115	*/
3940	4116	radio.layout.doClick();
3941	4117
	4118	+ assert(copy instanceof Composite);
	4119	+
	4120	+ if (copy.versionlist == null)
	4121	+ {
	4122	+ copy.versionlist = new Object3D[100];
	4123	+ copy.versionindex = -1;
	4124	+
	4125	+ // Cannot work with loops
	4126	+ // To fix this issue, first mark all nodes above the root,
	4127	+ // and check if any of these nodes are reachable below the root.
	4128	+ //Save(true);
	4129	+ }
	4130	+
	4131	+ SetVersionStates();
	4132	+
3942	4133	ClearUnpinned();
3943	4134
3944	4135	//Grafreed.Assert(group != null);
..	..	@@ -5169,15 +5360,30 @@
5169	5360	{
5170	5361	editButton.setEnabled(enabled);
5171	5362	uneditButton.setEnabled(enabled);
5172		- unselectButton.setEnabled(enabled);
	5363	+ //unselectButton.setEnabled(enabled);
5173	5364	flashSelectionButton.setEnabled(enabled);
5174	5365
5175	5366	clearPanelButton.setEnabled(!listUI.isEmpty());
	5367	+
	5368	+ boolean allComposites = true;
	5369	+
	5370	+ if (group.selection != null)
	5371	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5372	+ {
	5373	+ Object next = e.nextElement();
	5374	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5375	+ {
	5376	+ allComposites = false;
	5377	+ break;
	5378	+ }
	5379	+ }
	5380	+
	5381	+ rootButton.setEnabled(allComposites);
5176	5382	}
5177	5383
5178	5384	void refreshContents(boolean cp)
5179	5385	{
5180		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5386	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5181	5387	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5182	5388	{
5183	5389	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5187,7 +5393,7 @@
5187	5393	Object3D child = (Object3D) group.selection.get(i);
5188	5394
5189	5395	objEditor.AddInfo(child, this, true);
5190		- System.err.println("info : " + child.GetPath());
	5396	+// System.err.println("info : " + child.GetPath());
5191	5397	}
5192	5398
5193	5399	objEditor.SetText(); // jan 2014
..	..	@@ -6070,11 +6276,11 @@
6070	6276	private MenuItem lookAtItem;
6071	6277	private MenuItem lookFromItem;
6072	6278	private MenuItem switchViewItem;
6073		- private MenuItem cutItem;
	6279	+ private JMenuItem cutItem;
6074	6280	private MenuItem undoItem;
6075	6281	private MenuItem redoItem;
6076	6282	private JMenuItem duplicateItem;
6077		- private MenuItem cloneItem;
	6283	+ private JMenuItem cloneItem;
6078	6284	private MenuItem cloneSupportItem;
6079	6285	private MenuItem overwriteGeoItem;
6080	6286	private MenuItem overwriteMatItem;
..	..	@@ -6095,13 +6301,13 @@
6095	6301	private MenuItem cloneGeometriesItem;
6096	6302	private MenuItem shareGeometriesItem;
6097	6303	private MenuItem mergeGeometriesItem;
6098		- private MenuItem copyItem;
	6304	+ private JMenuItem copyItem;
6099	6305	private MenuItem pasteItem;
6100		- private MenuItem pasteIntoItem;
6101		- private MenuItem pasteLinkItem;
6102		- private MenuItem pasteCloneItem;
6103		- private MenuItem pasteExpandItem;
6104		- private MenuItem deleteItem;
	6306	+ private JMenuItem pasteIntoItem;
	6307	+ private JMenuItem pasteLinkItem;
	6308	+ private JMenuItem pasteCloneItem;
	6309	+ private JMenuItem pasteExpandItem;
	6310	+ private JMenuItem deleteItem;
6105	6311	private MenuItem clearAllItem;
6106	6312	private MenuItem genUVItem;
6107	6313	private MenuItem genNormalsMESHItem;
..	..	@@ -6156,7 +6362,7 @@
6156	6362	private MenuItem transformGeometryItem;
6157	6363	private MenuItem transformChildrenItem;
6158	6364	private MenuItem hideItem;
6159		- private MenuItem grabItem;
	6365	+ private JMenuItem grabItem;
6160	6366	private MenuItem backItem;
6161	6367	private MenuItem frontItem;
6162	6368	private MenuItem cameraItem;
..	..	@@ -6169,7 +6375,7 @@
6169	6375	private MenuItem switchTransfoItem;
6170	6376	private MenuItem morphItem;
6171	6377	private MenuItem linkerItem;
6172		- private MenuItem ungroupItem;
	6378	+ private JMenuItem ungroupItem;
6173	6379	private MenuItem editItem;
6174	6380	private MenuItem openWindowItem;
6175	6381	private MenuItem editLeafItem;