~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("New 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");
	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");
	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,12 +1180,16 @@
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);
1029	1187	boxButton.setToolTipText("Create box");
1030	1188	boxButton.addActionListener(this);
	1189	+
	1190	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ superButton.setToolTipText("Create superellipsoid");
	1192	+ superButton.addActionListener(this);
1031	1193
1032	1194	row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1033	1195	sphereButton.setToolTipText("Create sphere");
..	..	@@ -1040,10 +1202,6 @@
1040	1202	row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1041	1203	torusButton.setToolTipText("Create torus");
1042	1204	torusButton.addActionListener(this);
1043		-
1044		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1045		- superButton.setToolTipText("Create superellipsoid");
1046		- superButton.addActionListener(this);
1047	1205
1048	1206	if (Globals.ADVANCED)
1049	1207	{
..	..	@@ -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");
..	..	@@ -1183,7 +1337,7 @@
1183	1337	dgr.addDragGestureListener(this);
1184	1338	}catch(Exception e) {}
1185	1339	*/
1186		- radio.layout = sixButton; // sevenButton;
	1340	+ radio.layout = threeButton; // sixButton;
1187	1341	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1188	1342	}
1189	1343
..	..	@@ -1234,9 +1388,12 @@
1234	1388	smoothCB.setToolTipText("Snapping delay");
1235	1389	smoothCB.addItemListener(this);
1236	1390
1237		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1238		- slowCB.setToolTipText("Smooth interpolation");
1239		- slowCB.addItemListener(this);
	1391	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1392	+// slowCB.setToolTipText("Smooth interpolation");
	1393	+// slowCB.addItemListener(this);
	1394	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1395	+ minshaderCB.setToolTipText("Minimal fast shader");
	1396	+ minshaderCB.addItemListener(this);
1240	1397
1241	1398	// constraints.gridy += 1;
1242	1399	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1315,6 +1472,14 @@
1315	1472
1316	1473	void EditObject(Object3D obj)
1317	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	+
1318	1483	cRadio radioButton = new cRadio(obj.name);
1319	1484
1320	1485	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1325,7 +1490,7 @@
1325	1490	}
1326	1491
1327	1492	radioButton.SetObject(obj);
1328		- radioButton.layout = sixButton; // sevenButton;
	1493	+ radioButton.layout = threeButton; // sixButton;
1329	1494	radioButton.SetCamera(cameraView.renderCamera, false);
1330	1495	radioButton.addActionListener(this);
1331	1496	radioPanel.add(radioButton);
..	..	@@ -1350,6 +1515,8 @@
1350	1515	cCheckBox localCB;
1351	1516	cCheckBox crowdCB;
1352	1517	cCheckBox smoothCB;
	1518	+ cCheckBox minshaderCB;
	1519	+
1353	1520	cToggleButton fastCB;
1354	1521	cCheckBox slowCB;
1355	1522	cCheckBox boxCB;
..	..	@@ -1420,6 +1587,12 @@
1420	1587	{
1421	1588	cameraView.ToggleInertia();
1422	1589	cameraView.repaint();
	1590	+ }
	1591	+ else if(e.getSource() == minshaderCB)
	1592	+ {
	1593	+ Globals.MINSHADER ^= true;
	1594	+ cameraView.programInitialized = false;
	1595	+ cameraView.repaint();
1423	1596	}
1424	1597	else if(e.getSource() == localCB)
1425	1598	{
..	..	@@ -1697,7 +1870,12 @@
1697	1870	TreePath path;
1698	1871
1699	1872	public TransferableTreePath(TreePath tp) {
1700		- 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);
1701	1879	}
1702	1880
1703	1881	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1987,7 +2165,11 @@
1987	2165	shadow.material = new cMaterial(obj.material);
1988	2166	shadow.material.diffuse = 0.0001f;
1989	2167	shadow.material.specular = 0.0001f;
1990		- //shadow.projectedVertices[1].x = 300;
	2168	+ shadow.material.opacity = 0.75f;
	2169	+
	2170	+ AllocProjectedVertices(shadow);
	2171	+
	2172	+ shadow.projectedVertices[1].x = 300;
1991	2173
1992	2174	makeSomething(shadow);
1993	2175	}
..	..	@@ -2508,27 +2690,35 @@
2508	2690	} else
2509	2691	if (source == loopItem \|\| source == loopButton)
2510	2692	{
	2693	+ if (!group.selection.isEmpty())
	2694	+ {
2511	2695	Composite csg = new GroupLeaf();
2512	2696	csg.count = 5;
2513		- group(csg);
2514	2697	Composite child = new cGroup("Branch");
2515	2698	csg.addChild(child);
2516	2699	child.addChild(csg);
	2700	+ group(csg);
	2701	+ }
2517	2702	} else
2518	2703	if (source == doubleItem)
2519	2704	{
	2705	+ if (!group.selection.isEmpty())
	2706	+ {
2520	2707	Composite csg = new GroupLeaf("Fork");
2521	2708	csg.count = 5;
2522		- group(csg);
2523	2709	Composite child = new cGroup("Branch A");
2524	2710	csg.addChild(child);
2525	2711	child.addChild(csg);
2526	2712	child = new cGroup("Branch B");
2527	2713	csg.addChild(child);
2528	2714	child.addChild(csg);
	2715	+ group(csg);
	2716	+ }
2529	2717	} else
2530	2718	if (source == tripleItem)
2531	2719	{
	2720	+ if (!group.selection.isEmpty())
	2721	+ {
2532	2722	Composite csg = new GroupLeaf("Trident");
2533	2723	csg.count = 4;
2534	2724	group(csg);
..	..	@@ -2541,6 +2731,7 @@
2541	2731	child = new cGroup();
2542	2732	csg.addChild(child);
2543	2733	child.addChild(csg);
	2734	+ }
2544	2735	} else
2545	2736	if (source == computeAOItem)
2546	2737	{
..	..	@@ -2560,7 +2751,7 @@
2560	2751	if (source == invariantsItem)
2561	2752	{
2562	2753	System.out.println("Invariants:");
2563		- Grafreed.grafreeD.universe.invariants();
	2754	+ Grafreed.grafreed.universe.invariants();
2564	2755	} else
2565	2756	if (source == memoryItem)
2566	2757	{
..	..	@@ -2591,33 +2782,52 @@
2591	2782	{
2592	2783	ToggleFullScreen();
2593	2784	} else
2594		- if (source == undoButton)
	2785	+ if (source == collapseButton)
	2786	+ {
	2787	+ this.expandedLayout = radio.layout;
	2788	+ CollapseToolbar();
	2789	+ } else
	2790	+ if (source == maximize3DButton)
	2791	+ {
	2792	+ this.expandedLayout = radio.layout;
	2793	+ radio.layout = twoButton;
	2794	+ Show3DView();
	2795	+ CollapseToolbar();
	2796	+ } else
	2797	+ if (source == previousVersionButton)
2595	2798	{
2596	2799	// Go to previous version
2597	2800	//if (!Undo())
2598	2801	//java.awt.Toolkit.getDefaultToolkit().beep();
2599		- Undo();
	2802	+ PreviousVersion();
2600	2803	} else
2601	2804	if (source == restoreButton)
2602	2805	{
2603	2806	// Restore current version
2604	2807	Restore();
	2808	+ //restoreButton.setEnabled(false);
2605	2809	} else
2606	2810	if (source == replaceButton)
2607	2811	{
2608	2812	// Overwrite current version
2609	2813	Replace();
	2814	+ //replaceButton.setEnabled(false);
2610	2815	} else
2611		- if (source == redoButton)
	2816	+ if (source == nextVersionButton)
2612	2817	{
2613	2818	// Go to next version
2614		- Redo();
	2819	+ NextVersion();
2615	2820	} else
2616		- if (source == saveButton)
	2821	+ if (source == saveVersionButton)
2617	2822	{
2618	2823	// Save a new version
2619	2824	if (!Save(true))
2620	2825	java.awt.Toolkit.getDefaultToolkit().beep();
	2826	+ } else
	2827	+ if (source == deleteVersionButton)
	2828	+ {
	2829	+ // Delete a new version
	2830	+ DeleteVersion();
2621	2831	} else
2622	2832	if (source == oneStepButton)
2623	2833	{
..	..	@@ -2672,11 +2882,11 @@
2672	2882	} else
2673	2883	if (source == undoItem)
2674	2884	{
2675		- Undo();
	2885	+ PreviousVersion();
2676	2886	} else
2677	2887	if (source == redoItem)
2678	2888	{
2679		- Redo();
	2889	+ NextVersion();
2680	2890	} else
2681	2891	if (source == duplicateItem)
2682	2892	{
..	..	@@ -3157,22 +3367,34 @@
3157	3367	} else
3158	3368	if (source == ungroupItem \|\| source == ungroupButton)
3159	3369	{
3160		- boolean hasRoot = false;
	3370	+ boolean canUngroup = true;
3161	3371
3162	3372	for (int i=0; i<group.selection.size(); i++)
3163	3373	{
3164		- if (group.selection.get(i) == group)
	3374	+ Object3D selectedItem = group.selection.get(i);
	3375	+
	3376	+ if (selectedItem.Size() == 0)
3165	3377	{
3166		- hasRoot = true;
	3378	+ // Cannot ungroup leaves
	3379	+ canUngroup = false;
	3380	+ break;
	3381	+ }
	3382	+
	3383	+ if (selectedItem == group)
	3384	+ {
	3385	+ // Cannot ungroup root
	3386	+ canUngroup = false;
3167	3387	break;
3168	3388	}
3169	3389	}
3170	3390
3171		- if (!hasRoot)
	3391	+ if (canUngroup)
3172	3392	{
3173	3393	for (int i=0; i<group.selection.size(); i++)
3174	3394	{
3175		- Ungroup(group.selection.get(i));
	3395	+ Object3D selectedItem = group.selection.get(i);
	3396	+
	3397	+ Ungroup(selectedItem);
3176	3398	}
3177	3399
3178	3400	ClearSelection(false);
..	..	@@ -3535,38 +3757,7 @@
3535	3757	if (CameraPane.FULLSCREEN)
3536	3758	fullscreenLayout = radio.layout;
3537	3759
3538		- // bug
3539		- //gridPanel.setDividerLocation(1.0);
3540		- //bigPanel.setDividerLocation(0.0);
3541		-// bigThree.remove(scenePanel);
3542		-// bigThree.remove(centralPanel);
3543		-// bigThree.remove(XYZPanel);
3544		-// aWindowConstraints.gridx = 0;
3545		-// aWindowConstraints.gridy = 0;
3546		-// aWindowConstraints.gridwidth = 1;
3547		-// // aConstraints.gridheight = 3;
3548		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3549		-// aWindowConstraints.weightx = 0;
3550		-// aWindowConstraints.weighty = 1;
3551		-// //bigThree.add(jtp, aWindowConstraints);
3552		-// aWindowConstraints.weightx = 1;
3553		-// aWindowConstraints.gridwidth = 3;
3554		-// // aConstraints.gridheight = 3;
3555		-// aWindowConstraints.gridx = 1;
3556		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3557		-// bigThree.add(centralPanel, aWindowConstraints);
3558		-// aWindowConstraints.weightx = 0;
3559		-// aWindowConstraints.gridx = 4;
3560		-// aWindowConstraints.gridwidth = 1;
3561		-// // aConstraints.gridheight = 3;
3562		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3563		-// //bigThree.add(XYZPanel, aWindowConstraints);
3564		-// scenePanel.setVisible(false);
3565		-// centralPanel.setVisible(true);
3566		-// XYZPanel.setVisible(false);
3567		- bigThree.ClearUI();
3568		- bigThree.add(centralPanel);
3569		- bigThree.FlushUI();
	3760	+ Show3DView();
3570	3761
3571	3762	cameraView.requestFocusInWindow();
3572	3763
..	..	@@ -3752,6 +3943,7 @@
3752	3943	} else
3753	3944	if (source == rootButton)
3754	3945	{
	3946	+ Replace();
3755	3947	Object3D obj;
3756	3948	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3757	3949	{
..	..	@@ -3809,10 +4001,10 @@
3809	4001	{
3810	4002	Object3D child = (Object3D)e.nextElement();
3811	4003	if(child.editWindow != null)
3812		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3813	4004	child.pinned = false;
3814	4005	child.CloseUI();
3815	4006	listUI.remove(child);
	4007	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3816	4008
3817	4009	//child.editWindow = null; // ???????????
3818	4010	}
..	..	@@ -3831,6 +4023,7 @@
3831	4023	obj.CloseUI();
3832	4024	}
3833	4025	listUI.clear();
	4026	+ SetPinStates(group.selection.size() > 0);
3834	4027	refreshContents(true);
3835	4028	} else
3836	4029	if (source == allParamsButton)
..	..	@@ -3887,8 +4080,6 @@
3887	4080
3888	4081	copy = group;
3889	4082
3890		- SetUndoStates();
3891		-
3892	4083	//Globals.theRenderer.object = group;
3893	4084	if(!useclient)
3894	4085	{
..	..	@@ -3916,7 +4107,20 @@
3916	4107	*/
3917	4108	radio.layout.doClick();
3918	4109
	4110	+ assert(copy instanceof Composite);
	4111	+
	4112	+ if (copy.versionlist == null)
	4113	+ {
	4114	+ copy.versionlist = new Object3D[100];
	4115	+ copy.versionindex = -1;
	4116	+
	4117	+ Save(true);
	4118	+ }
	4119	+
	4120	+ SetVersionStates();
	4121	+
3919	4122	ClearUnpinned();
	4123	+
3920	4124	//Grafreed.Assert(group != null);
3921	4125	//Grafreed.Assert(group.selection != null);
3922	4126	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3933,11 +4137,13 @@
3933	4137	} else if (event.getSource() == editCameraItem)
3934	4138	{
3935	4139	cameraView.ProtectCamera();
	4140	+ cameraView.requestFocusInWindow();
3936	4141	cameraView.repaint();
3937	4142	return;
3938	4143	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3939	4144	{
3940	4145	cameraView.RevertCamera();
	4146	+ cameraView.requestFocusInWindow();
3941	4147	cameraView.repaint();
3942	4148	return;
3943	4149	// } else if (event.getSource() == textureButton)
..	..	@@ -5070,9 +5276,7 @@
5070	5276
5071	5277	freezemodel = false;
5072	5278	}
5073		-
5074		- boolean flashIt = true;
5075		-
	5279	+
5076	5280	public void valueChanged(TreeSelectionEvent e)
5077	5281	//public boolean handleEvent(Event event)
5078	5282	{
..	..	@@ -5145,13 +5349,29 @@
5145	5349	{
5146	5350	editButton.setEnabled(enabled);
5147	5351	uneditButton.setEnabled(enabled);
5148		- unselectButton.setEnabled(enabled);
	5352	+ //unselectButton.setEnabled(enabled);
5149	5353	flashSelectionButton.setEnabled(enabled);
	5354	+
	5355	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5356	+
	5357	+ boolean allComposites = true;
	5358	+
	5359	+ if (group.selection != null)
	5360	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5361	+ {
	5362	+ if (!(e.nextElement() instanceof Composite))
	5363	+ {
	5364	+ allComposites = false;
	5365	+ break;
	5366	+ }
	5367	+ }
	5368	+
	5369	+ rootButton.setEnabled(allComposites);
5150	5370	}
5151	5371
5152	5372	void refreshContents(boolean cp)
5153	5373	{
5154		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5374	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5155	5375	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5156	5376	{
5157	5377	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5161,7 +5381,7 @@
5161	5381	Object3D child = (Object3D) group.selection.get(i);
5162	5382
5163	5383	objEditor.AddInfo(child, this, true);
5164		- System.err.println("info : " + child.GetPath());
	5384	+// System.err.println("info : " + child.GetPath());
5165	5385	}
5166	5386
5167	5387	objEditor.SetText(); // jan 2014
..	..	@@ -5987,7 +6207,6 @@
5987	6207
5988	6208	cButton restoreCameraButton;
5989	6209
5990		- cButton saveButton;
5991	6210	cButton oneStepButton;
5992	6211
5993	6212	cButton groupButton;
..	..	@@ -6045,11 +6264,11 @@
6045	6264	private MenuItem lookAtItem;
6046	6265	private MenuItem lookFromItem;
6047	6266	private MenuItem switchViewItem;
6048		- private MenuItem cutItem;
	6267	+ private JMenuItem cutItem;
6049	6268	private MenuItem undoItem;
6050	6269	private MenuItem redoItem;
6051	6270	private JMenuItem duplicateItem;
6052		- private MenuItem cloneItem;
	6271	+ private JMenuItem cloneItem;
6053	6272	private MenuItem cloneSupportItem;
6054	6273	private MenuItem overwriteGeoItem;
6055	6274	private MenuItem overwriteMatItem;
..	..	@@ -6070,13 +6289,13 @@
6070	6289	private MenuItem cloneGeometriesItem;
6071	6290	private MenuItem shareGeometriesItem;
6072	6291	private MenuItem mergeGeometriesItem;
6073		- private MenuItem copyItem;
	6292	+ private JMenuItem copyItem;
6074	6293	private MenuItem pasteItem;
6075		- private MenuItem pasteIntoItem;
6076		- private MenuItem pasteLinkItem;
6077		- private MenuItem pasteCloneItem;
6078		- private MenuItem pasteExpandItem;
6079		- private MenuItem deleteItem;
	6294	+ private JMenuItem pasteIntoItem;
	6295	+ private JMenuItem pasteLinkItem;
	6296	+ private JMenuItem pasteCloneItem;
	6297	+ private JMenuItem pasteExpandItem;
	6298	+ private JMenuItem deleteItem;
6080	6299	private MenuItem clearAllItem;
6081	6300	private MenuItem genUVItem;
6082	6301	private MenuItem genNormalsMESHItem;
..	..	@@ -6144,7 +6363,7 @@
6144	6363	private MenuItem switchTransfoItem;
6145	6364	private MenuItem morphItem;
6146	6365	private MenuItem linkerItem;
6147		- private MenuItem ungroupItem;
	6366	+ private JMenuItem ungroupItem;
6148	6367	private MenuItem editItem;
6149	6368	private MenuItem openWindowItem;
6150	6369	private MenuItem editLeafItem;