~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,12 @@
356	415	this.copy = this.group = group;
357	416	//selectees = this.group.selectees;
358	417
359		- if (copy.versions == null)
	418	+ if (copy.versionlist == null)
360	419	{
361		- copy.versions = new byte[100][];
	420	+ copy.versionlist = new Object3D[100];
362	421	copy.versionindex = -1;
	422	+
	423	+ Save(true);
363	424	}
364	425
365	426	if(ui)
..	..	@@ -383,9 +444,9 @@
383	444
384	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
385	446
386		- if (copy.versions == null)
	447	+ if (copy.versionlist == null)
387	448	{
388		- copy.versions = new byte[100][];
	449	+ copy.versionlist = new Object3D[100];
389	450	copy.versionindex = -1;
390	451
391	452	Save(true);
..	..	@@ -479,32 +540,37 @@
479	540	// menu.add("-");
480	541	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
481	542	duplicateItem.addActionListener(this);
482		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
483	545	cloneItem.addActionListener(this);
484		- if (Globals.ADVANCED)
	546	+ //if (Globals.ADVANCED)
485	547	{
486	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
487	549	cloneSupportItem.addActionListener(this);
488	550	}
	551	+ oe.jTree.popup.addSeparator();
489	552	menu.add("-");
490		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
491	554	cutItem.addActionListener(this);
492		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
493	556	copyItem.addActionListener(this);
494	557	pasteItem = menu.add(new MenuItem("Paste"));
495	558	pasteItem.addActionListener(this);
496	559
497		- menu.add("-");
498		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	560	+ oe.jTree.popup.addSeparator();
	561	+ //menu.add("-");
	562	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
499	563	pasteIntoItem.addActionListener(this);
500		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
501	565	pasteLinkItem.addActionListener(this);
502		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
503	567	pasteCloneItem.addActionListener(this);
504		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
505	569	// pasteExpandItem.addActionListener(this);
506		- menu.add("-");
507		- deleteItem = menu.add(new MenuItem("Delete"));
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
	572	+
	573	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
508	574	deleteItem.addActionListener(this);
509	575
510	576	if (Globals.ADVANCED)
..	..	@@ -591,11 +657,9 @@
591	657	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
592	658	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
593	659	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
594		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
595	660	oe.cameraMenu.add("-");
596	661	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
597	662	openWindowItem.addActionListener(this);
598		- editLeafItem.addActionListener(this);
599	663	lookAtItem.addActionListener(this);
600	664	//lookFromItem.addActinoListener(this);
601	665	//switchViewItem.addActionListener(this);
..	..	@@ -657,7 +721,7 @@
657	721	hideItem = menu.add(new MenuItem("Hidden Group"));
658	722	hideItem.addActionListener(this);
659	723	}
660		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
661	725	ungroupItem.addActionListener(this);
662	726
663	727	// menu.add("-");
..	..	@@ -843,6 +907,9 @@
843	907	shareGeometriesItem.addActionListener(this);
844	908	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
845	909	mergeGeometriesItem.addActionListener(this);
	910	+ menu.add("-");
	911	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	912	+ editLeafItem.addActionListener(this);
846	913	if (Globals.ADVANCED)
847	914	{
848	915	// Pretty much the same as duplicate and clone.
..	..	@@ -859,6 +926,74 @@
859	926	buildToolsMenu(menu);
860	927	}
861	928
	929	+ JTabbedPane resourcecontainer;
	930	+ cGridBag currenttab;
	931	+ //boolean added; // patch for jar
	932	+
	933	+ int tabcount = 0;
	934	+ int colcount = 0;
	935	+ int rowcount = 0;
	936	+ int texturecount = 0;
	937	+
	938	+ int columns = 5;
	939	+ int rows = 7;
	940	+
	941	+ public void ResourceCallBack(String[] path)
	942	+ {
	943	+// for (int i = 0; i < path.length; i++)
	944	+// System.out.print(path[i] + "/");
	945	+// System.out.println();
	946	+
	947	+ if (//rowcount == 0 \|\|
	948	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	949	+ {
	950	+ currenttab = new cGridBag();
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	952	+ currenttab.setName(tabname);
	953	+ //added = false;
	954	+ resourcecontainer.add(currenttab);
	955	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	956	+ rowcount = 1;
	957	+ colcount = 0;
	958	+ texturecount = 0;
	959	+ }
	960	+
	961	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	962	+ {
	963	+ //if (!added)
	964	+ {
	965	+ //added = true;
	966	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	967	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	968	+ }
	969	+
	970	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	971	+
	972	+ if (++colcount >= columns)
	973	+ {
	974	+ colcount = 0;
	975	+ currenttab.Return();
	976	+
	977	+ if (rowcount++ >= rows)
	978	+ {
	979	+ rowcount = 0;
	980	+ }
	981	+ }
	982	+ }
	983	+ else
	984	+ {
	985	+// if (!path[path.length-1].equals("icons"))
	986	+// resourcecontainer.Return();
	987	+ }
	988	+ }
	989	+
	990	+ void CreateTexturePanel(cGridBag container)
	991	+ {
	992	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	993	+ container.add(resourcecontainer);
	994	+
	995	+ Grafreed.ParseResources("textures", this);
	996	+ }
862	997
863	998	void SetupUI2(ObjEditor oe)
864	999	{
..	..	@@ -877,11 +1012,6 @@
877	1012	//new Exception().printStackTrace();
878	1013
879	1014	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	1015	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
886	1016
887	1017	oe.buttonGroup = new ButtonGroup();
..	..	@@ -914,10 +1044,49 @@
914	1044
915	1045	if (Globals.ADVANCED)
916	1046	{
917		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
918		- maxButton.setToolTipText("Maximize window");
919		- maxButton.addActionListener(this);
	1047	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+// maxButton.setToolTipText("Maximize window");
	1049	+// maxButton.addActionListener(this);
920	1050	}
	1051	+
	1052	+ cButton gcButton;
	1053	+
	1054	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+// gcButton.setToolTipText("Garbage collect");
	1056	+// gcButton.addActionListener(new ActionListener()
	1057	+// {
	1058	+// public void actionPerformed(ActionEvent e)
	1059	+// {
	1060	+// System.gc();
	1061	+// }
	1062	+// });
	1063	+
	1064	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+ collapseButton.setToolTipText("Collapse toolbar");
	1066	+ collapseButton.addActionListener(this);
	1067	+
	1068	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1070	+ maximize3DButton.addActionListener(this);
	1071	+
	1072	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ twoButton.setToolTipText("Show 3D view only");
	1074	+ twoButton.addActionListener(this);
	1075	+ this.fullscreenLayout = twoButton;
	1076	+
	1077	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1078	+ threeButton.setToolTipText("Show controls and 3D view");
	1079	+ threeButton.addActionListener(this);
	1080	+ if (Globals.ADVANCED)
	1081	+ {
	1082	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1083	+ sixButton.setToolTipText("Show 3D view and controls");
	1084	+ sixButton.addActionListener(this);
	1085	+ }
	1086	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+// sevenButton.setToolTipText("3-column layout");
	1088	+// sevenButton.addActionListener(this);
	1089	+ //
921	1090
922	1091	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
923	1092	fullButton.setToolTipText("Full-screen window");
..	..	@@ -931,41 +1100,45 @@
931	1100	restoreCameraButton.setToolTipText("Restore viewpoint");
932	1101	restoreCameraButton.addActionListener(this);
933	1102
934		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
935		- saveButton.setToolTipText("Duplicate current version");
936		- saveButton.addActionListener(this);
	1103	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ saveVersionButton.setToolTipText("Duplicate current version");
	1105	+ saveVersionButton.addActionListener(this);
937	1106
938		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
939		- undoButton.setToolTipText("Previous version");
940		- undoButton.addActionListener(this);
941		- undoButton.setEnabled(false);
	1107	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ deleteVersionButton.setToolTipText("Delete current version");
	1109	+ deleteVersionButton.addActionListener(this);
	1110	+
	1111	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ previousVersionButton.setToolTipText("Previous version");
	1113	+ previousVersionButton.addActionListener(this);
	1114	+ previousVersionButton.setEnabled(false);
942	1115
943	1116	cGridBag updown = new cGridBag().setVertical(true);
944	1117	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
945		- restoreButton.setToolTipText("Restore current version (undo latest change)");
	1118	+ restoreButton.setToolTipText("Undo (restore current version)");
946	1119	restoreButton.addActionListener(this);
947		- restoreButton.setEnabled(false);
	1120	+ //restoreButton.setEnabled(false);
948	1121
949	1122	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
950		- replaceButton.setToolTipText("Replace current version (save latest change)");
	1123	+ replaceButton.setToolTipText("Save (replace current version)");
951	1124	replaceButton.addActionListener(this);
952		- replaceButton.setEnabled(false);
	1125	+ //replaceButton.setEnabled(false);
953	1126
954	1127	copyOptionsPanel.add(updown);
955	1128
956		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
957		- redoButton.setToolTipText("Next version");
958		- redoButton.addActionListener(this);
959		- redoButton.setEnabled(false);
	1129	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ nextVersionButton.setToolTipText("Next version");
	1131	+ nextVersionButton.addActionListener(this);
	1132	+ nextVersionButton.setEnabled(false);
	1133	+
	1134	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ oneStepButton.setToolTipText("Animate one step forward");
	1136	+ oneStepButton.addActionListener(this);
960	1137
961	1138	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
962	1139	liveCB.setToolTipText("Enable animation");
963	1140	liveCB.addItemListener(this);
964	1141
965		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
966		- oneStepButton.setToolTipText("Animate one step forward");
967		- oneStepButton.addActionListener(this);
968		-
969	1142	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
970	1143	fastCB.setToolTipText("Fast mode");
971	1144	fastCB.addItemListener(this);
..	..	@@ -992,21 +1165,6 @@
992	1165
993	1166	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
994	1167
995		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
996		- twoButton.setToolTipText("Show 3D view only");
997		- twoButton.addActionListener(this);
998		- this.fullscreenLayout = twoButton;
999		-
1000		- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1001		- threeButton.setToolTipText("Show controls and 3D view");
1002		- threeButton.addActionListener(this);
1003		- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1004		- sixButton.setToolTipText("Show 3D view and controls");
1005		- sixButton.addActionListener(this);
1006		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1007		-// sevenButton.setToolTipText("3-column layout");
1008		-// sevenButton.addActionListener(this);
1009		- //
1010	1168
1011	1169	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1012	1170	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -1022,7 +1180,7 @@
1022	1180
1023	1181	// INSERT
1024	1182	row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1025		- gridButton.setToolTipText("Create grid");
	1183	+ gridButton.setToolTipText("Create ground");
1026	1184	gridButton.addActionListener(this);
1027	1185
1028	1186	row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -1090,19 +1248,15 @@
1090	1248
1091	1249	oe.toolboxPanel.add(row2);
1092	1250
1093		- // ENVYMAPS
1094		- cGridBag skyboxpane = new cGridBag();
1095		- skyboxpane.preferredHeight = 100;
	1251	+ cGridBag textures = new cGridBag();
1096	1252
1097		- oe.toolboxPanel.add(skyboxpane);
	1253	+ CreateTexturePanel(textures);
1098	1254
1099		- JTabbedPane skyboxpanel = new JTabbedPane();
1100		- skyboxpane.add(skyboxpanel);
	1255	+ oe.toolboxPanel.add(textures);
1101	1256
1102		- AddSkyboxTab0(skyboxpanel);
1103		- AddSkyboxTab1(skyboxpanel);
1104		- AddSkyboxTab2(skyboxpanel);
1105		- AddSkyboxTab3(skyboxpanel);
	1257	+ textures.preferredHeight = 100;
	1258	+
	1259	+ CreateSkyboxPanel(oe.skyboxPanel);
1106	1260
1107	1261	// EDIT panel
1108	1262	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -1110,20 +1264,20 @@
1110	1264	editButton.addActionListener(this);
1111	1265
1112	1266	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1113		- uneditButton.setToolTipText("Remove selection controls");
	1267	+ uneditButton.setToolTipText("Unpin and remove selection controls");
1114	1268	uneditButton.addActionListener(this);
1115	1269
1116	1270	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1117		- allParamsButton.setToolTipText("Show all controle");
	1271	+ allParamsButton.setToolTipText("Show all controls");
1118	1272	allParamsButton.addActionListener(this);
1119	1273
1120		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1121		- clearPanelButton.setToolTipText("Clear edit panel");
	1274	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1275	+ clearPanelButton.setToolTipText("Clear all controls");
1122	1276	clearPanelButton.addActionListener(this);
1123	1277
1124		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1125		- unselectButton.setToolTipText("Unselect");
1126		- unselectButton.addActionListener(this);
	1278	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ //unselectButton.setToolTipText("Unselect");
	1280	+ //unselectButton.addActionListener(this);
1127	1281
1128	1282	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129	1283	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -1318,6 +1472,14 @@
1318	1472
1319	1473	void EditObject(Object3D obj)
1320	1474	{
	1475	+ assert(obj instanceof Composite);
	1476	+
	1477	+// if (obj.versionlist == null)
	1478	+// {
	1479	+// obj.versionlist = new Object3D[100];
	1480	+// obj.versionindex = -1;
	1481	+// }
	1482	+
1321	1483	cRadio radioButton = new cRadio(obj.name);
1322	1484
1323	1485	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1708,7 +1870,12 @@
1708	1870	TreePath path;
1709	1871
1710	1872	public TransferableTreePath(TreePath tp) {
1711		- path = tp;
	1873	+ Object[] objs = new Object[tp.getPathCount()];
	1874	+ for (int i=0; i<objs.length; i++)
	1875	+ {
	1876	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1877	+ }
	1878	+ path = new TreePath(objs);
1712	1879	}
1713	1880
1714	1881	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -2519,27 +2686,35 @@
2519	2686	} else
2520	2687	if (source == loopItem \|\| source == loopButton)
2521	2688	{
	2689	+ if (!group.selection.isEmpty())
	2690	+ {
2522	2691	Composite csg = new GroupLeaf();
2523	2692	csg.count = 5;
2524		- group(csg);
2525	2693	Composite child = new cGroup("Branch");
2526	2694	csg.addChild(child);
2527	2695	child.addChild(csg);
	2696	+ group(csg);
	2697	+ }
2528	2698	} else
2529	2699	if (source == doubleItem)
2530	2700	{
	2701	+ if (!group.selection.isEmpty())
	2702	+ {
2531	2703	Composite csg = new GroupLeaf("Fork");
2532	2704	csg.count = 5;
2533		- group(csg);
2534	2705	Composite child = new cGroup("Branch A");
2535	2706	csg.addChild(child);
2536	2707	child.addChild(csg);
2537	2708	child = new cGroup("Branch B");
2538	2709	csg.addChild(child);
2539	2710	child.addChild(csg);
	2711	+ group(csg);
	2712	+ }
2540	2713	} else
2541	2714	if (source == tripleItem)
2542	2715	{
	2716	+ if (!group.selection.isEmpty())
	2717	+ {
2543	2718	Composite csg = new GroupLeaf("Trident");
2544	2719	csg.count = 4;
2545	2720	group(csg);
..	..	@@ -2552,6 +2727,7 @@
2552	2727	child = new cGroup();
2553	2728	csg.addChild(child);
2554	2729	child.addChild(csg);
	2730	+ }
2555	2731	} else
2556	2732	if (source == computeAOItem)
2557	2733	{
..	..	@@ -2571,7 +2747,7 @@
2571	2747	if (source == invariantsItem)
2572	2748	{
2573	2749	System.out.println("Invariants:");
2574		- Grafreed.grafreeD.universe.invariants();
	2750	+ Grafreed.grafreed.universe.invariants();
2575	2751	} else
2576	2752	if (source == memoryItem)
2577	2753	{
..	..	@@ -2602,33 +2778,52 @@
2602	2778	{
2603	2779	ToggleFullScreen();
2604	2780	} else
2605		- if (source == undoButton)
	2781	+ if (source == collapseButton)
	2782	+ {
	2783	+ this.expandedLayout = radio.layout;
	2784	+ CollapseToolbar();
	2785	+ } else
	2786	+ if (source == maximize3DButton)
	2787	+ {
	2788	+ this.expandedLayout = radio.layout;
	2789	+ radio.layout = twoButton;
	2790	+ Show3DView();
	2791	+ CollapseToolbar();
	2792	+ } else
	2793	+ if (source == previousVersionButton)
2606	2794	{
2607	2795	// Go to previous version
2608	2796	//if (!Undo())
2609	2797	//java.awt.Toolkit.getDefaultToolkit().beep();
2610		- Undo();
	2798	+ PreviousVersion();
2611	2799	} else
2612	2800	if (source == restoreButton)
2613	2801	{
2614	2802	// Restore current version
2615	2803	Restore();
	2804	+ //restoreButton.setEnabled(false);
2616	2805	} else
2617	2806	if (source == replaceButton)
2618	2807	{
2619	2808	// Overwrite current version
2620	2809	Replace();
	2810	+ //replaceButton.setEnabled(false);
2621	2811	} else
2622		- if (source == redoButton)
	2812	+ if (source == nextVersionButton)
2623	2813	{
2624	2814	// Go to next version
2625		- Redo();
	2815	+ NextVersion();
2626	2816	} else
2627		- if (source == saveButton)
	2817	+ if (source == saveVersionButton)
2628	2818	{
2629	2819	// Save a new version
2630	2820	if (!Save(true))
2631	2821	java.awt.Toolkit.getDefaultToolkit().beep();
	2822	+ } else
	2823	+ if (source == deleteVersionButton)
	2824	+ {
	2825	+ // Delete a new version
	2826	+ DeleteVersion();
2632	2827	} else
2633	2828	if (source == oneStepButton)
2634	2829	{
..	..	@@ -2683,11 +2878,11 @@
2683	2878	} else
2684	2879	if (source == undoItem)
2685	2880	{
2686		- Undo();
	2881	+ PreviousVersion();
2687	2882	} else
2688	2883	if (source == redoItem)
2689	2884	{
2690		- Redo();
	2885	+ NextVersion();
2691	2886	} else
2692	2887	if (source == duplicateItem)
2693	2888	{
..	..	@@ -3168,22 +3363,34 @@
3168	3363	} else
3169	3364	if (source == ungroupItem \|\| source == ungroupButton)
3170	3365	{
3171		- boolean hasRoot = false;
	3366	+ boolean canUngroup = true;
3172	3367
3173	3368	for (int i=0; i<group.selection.size(); i++)
3174	3369	{
3175		- if (group.selection.get(i) == group)
	3370	+ Object3D selectedItem = group.selection.get(i);
	3371	+
	3372	+ if (selectedItem.Size() == 0)
3176	3373	{
3177		- hasRoot = true;
	3374	+ // Cannot ungroup leaves
	3375	+ canUngroup = false;
	3376	+ break;
	3377	+ }
	3378	+
	3379	+ if (selectedItem == group)
	3380	+ {
	3381	+ // Cannot ungroup root
	3382	+ canUngroup = false;
3178	3383	break;
3179	3384	}
3180	3385	}
3181	3386
3182		- if (!hasRoot)
	3387	+ if (canUngroup)
3183	3388	{
3184	3389	for (int i=0; i<group.selection.size(); i++)
3185	3390	{
3186		- Ungroup(group.selection.get(i));
	3391	+ Object3D selectedItem = group.selection.get(i);
	3392	+
	3393	+ Ungroup(selectedItem);
3187	3394	}
3188	3395
3189	3396	ClearSelection(false);
..	..	@@ -3546,38 +3753,7 @@
3546	3753	if (CameraPane.FULLSCREEN)
3547	3754	fullscreenLayout = radio.layout;
3548	3755
3549		- // bug
3550		- //gridPanel.setDividerLocation(1.0);
3551		- //bigPanel.setDividerLocation(0.0);
3552		-// bigThree.remove(scenePanel);
3553		-// bigThree.remove(centralPanel);
3554		-// bigThree.remove(XYZPanel);
3555		-// aWindowConstraints.gridx = 0;
3556		-// aWindowConstraints.gridy = 0;
3557		-// aWindowConstraints.gridwidth = 1;
3558		-// // aConstraints.gridheight = 3;
3559		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3560		-// aWindowConstraints.weightx = 0;
3561		-// aWindowConstraints.weighty = 1;
3562		-// //bigThree.add(jtp, aWindowConstraints);
3563		-// aWindowConstraints.weightx = 1;
3564		-// aWindowConstraints.gridwidth = 3;
3565		-// // aConstraints.gridheight = 3;
3566		-// aWindowConstraints.gridx = 1;
3567		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3568		-// bigThree.add(centralPanel, aWindowConstraints);
3569		-// aWindowConstraints.weightx = 0;
3570		-// aWindowConstraints.gridx = 4;
3571		-// aWindowConstraints.gridwidth = 1;
3572		-// // aConstraints.gridheight = 3;
3573		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3574		-// //bigThree.add(XYZPanel, aWindowConstraints);
3575		-// scenePanel.setVisible(false);
3576		-// centralPanel.setVisible(true);
3577		-// XYZPanel.setVisible(false);
3578		- bigThree.ClearUI();
3579		- bigThree.add(centralPanel);
3580		- bigThree.FlushUI();
	3756	+ Show3DView();
3581	3757
3582	3758	cameraView.requestFocusInWindow();
3583	3759
..	..	@@ -3763,6 +3939,7 @@
3763	3939	} else
3764	3940	if (source == rootButton)
3765	3941	{
	3942	+ Replace();
3766	3943	Object3D obj;
3767	3944	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3768	3945	{
..	..	@@ -3820,10 +3997,10 @@
3820	3997	{
3821	3998	Object3D child = (Object3D)e.nextElement();
3822	3999	if(child.editWindow != null)
3823		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3824	4000	child.pinned = false;
3825	4001	child.CloseUI();
3826	4002	listUI.remove(child);
	4003	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3827	4004
3828	4005	//child.editWindow = null; // ???????????
3829	4006	}
..	..	@@ -3842,6 +4019,7 @@
3842	4019	obj.CloseUI();
3843	4020	}
3844	4021	listUI.clear();
	4022	+ SetPinStates(group.selection.size() > 0);
3845	4023	refreshContents(true);
3846	4024	} else
3847	4025	if (source == allParamsButton)
..	..	@@ -3898,8 +4076,6 @@
3898	4076
3899	4077	copy = group;
3900	4078
3901		- SetUndoStates();
3902		-
3903	4079	//Globals.theRenderer.object = group;
3904	4080	if(!useclient)
3905	4081	{
..	..	@@ -3927,7 +4103,20 @@
3927	4103	*/
3928	4104	radio.layout.doClick();
3929	4105
	4106	+ assert(copy instanceof Composite);
	4107	+
	4108	+ if (copy.versionlist == null)
	4109	+ {
	4110	+ copy.versionlist = new Object3D[100];
	4111	+ copy.versionindex = -1;
	4112	+
	4113	+ Save(true);
	4114	+ }
	4115	+
	4116	+ SetVersionStates();
	4117	+
3930	4118	ClearUnpinned();
	4119	+
3931	4120	//Grafreed.Assert(group != null);
3932	4121	//Grafreed.Assert(group.selection != null);
3933	4122	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -5083,9 +5272,7 @@
5083	5272
5084	5273	freezemodel = false;
5085	5274	}
5086		-
5087		- boolean flashIt = true;
5088		-
	5275	+
5089	5276	public void valueChanged(TreeSelectionEvent e)
5090	5277	//public boolean handleEvent(Event event)
5091	5278	{
..	..	@@ -5158,13 +5345,29 @@
5158	5345	{
5159	5346	editButton.setEnabled(enabled);
5160	5347	uneditButton.setEnabled(enabled);
5161		- unselectButton.setEnabled(enabled);
	5348	+ //unselectButton.setEnabled(enabled);
5162	5349	flashSelectionButton.setEnabled(enabled);
	5350	+
	5351	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5352	+
	5353	+ boolean allComposites = true;
	5354	+
	5355	+ if (group.selection != null)
	5356	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5357	+ {
	5358	+ if (!(e.nextElement() instanceof Composite))
	5359	+ {
	5360	+ allComposites = false;
	5361	+ break;
	5362	+ }
	5363	+ }
	5364	+
	5365	+ rootButton.setEnabled(allComposites);
5163	5366	}
5164	5367
5165	5368	void refreshContents(boolean cp)
5166	5369	{
5167		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5370	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5168	5371	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5169	5372	{
5170	5373	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5174,7 +5377,7 @@
5174	5377	Object3D child = (Object3D) group.selection.get(i);
5175	5378
5176	5379	objEditor.AddInfo(child, this, true);
5177		- System.err.println("info : " + child.GetPath());
	5380	+// System.err.println("info : " + child.GetPath());
5178	5381	}
5179	5382
5180	5383	objEditor.SetText(); // jan 2014
..	..	@@ -6000,7 +6203,6 @@
6000	6203
6001	6204	cButton restoreCameraButton;
6002	6205
6003		- cButton saveButton;
6004	6206	cButton oneStepButton;
6005	6207
6006	6208	cButton groupButton;
..	..	@@ -6058,11 +6260,11 @@
6058	6260	private MenuItem lookAtItem;
6059	6261	private MenuItem lookFromItem;
6060	6262	private MenuItem switchViewItem;
6061		- private MenuItem cutItem;
	6263	+ private JMenuItem cutItem;
6062	6264	private MenuItem undoItem;
6063	6265	private MenuItem redoItem;
6064	6266	private JMenuItem duplicateItem;
6065		- private MenuItem cloneItem;
	6267	+ private JMenuItem cloneItem;
6066	6268	private MenuItem cloneSupportItem;
6067	6269	private MenuItem overwriteGeoItem;
6068	6270	private MenuItem overwriteMatItem;
..	..	@@ -6083,13 +6285,13 @@
6083	6285	private MenuItem cloneGeometriesItem;
6084	6286	private MenuItem shareGeometriesItem;
6085	6287	private MenuItem mergeGeometriesItem;
6086		- private MenuItem copyItem;
	6288	+ private JMenuItem copyItem;
6087	6289	private MenuItem pasteItem;
6088		- private MenuItem pasteIntoItem;
6089		- private MenuItem pasteLinkItem;
6090		- private MenuItem pasteCloneItem;
6091		- private MenuItem pasteExpandItem;
6092		- private MenuItem deleteItem;
	6290	+ private JMenuItem pasteIntoItem;
	6291	+ private JMenuItem pasteLinkItem;
	6292	+ private JMenuItem pasteCloneItem;
	6293	+ private JMenuItem pasteExpandItem;
	6294	+ private JMenuItem deleteItem;
6093	6295	private MenuItem clearAllItem;
6094	6296	private MenuItem genUVItem;
6095	6297	private MenuItem genNormalsMESHItem;
..	..	@@ -6157,7 +6359,7 @@
6157	6359	private MenuItem switchTransfoItem;
6158	6360	private MenuItem morphItem;
6159	6361	private MenuItem linkerItem;
6160		- private MenuItem ungroupItem;
	6362	+ private JMenuItem ungroupItem;
6161	6363	private MenuItem editItem;
6162	6364	private MenuItem openWindowItem;
6163	6365	private MenuItem editLeafItem;