~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();
..	..	@@ -902,9 +1038,9 @@
902	1038	oe.radioPanel.add(dummyButton);
903	1039	oe.buttonGroup.add(dummyButton);
904	1040	*/
905		- cGridBag copyOptionsPanel = new cGridBag();
	1041	+ cGridBag versionManagerPanel = new cGridBag();
906	1042
907		- copyOptionsPanel.preferredHeight = 2;
	1043	+ versionManagerPanel.preferredHeight = 4;
908	1044
909	1045	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
910	1046
..	..	@@ -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/square.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");
..	..	@@ -931,15 +1106,16 @@
931	1106	restoreCameraButton.setToolTipText("Restore viewpoint");
932	1107	restoreCameraButton.addActionListener(this);
933	1108
934		- copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
935	1110	saveVersionButton.setToolTipText("Duplicate current version");
936	1111	saveVersionButton.addActionListener(this);
937	1112
938		- copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ versionManagerPanel.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		- copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
943	1119	previousVersionButton.setToolTipText("Previous version");
944	1120	previousVersionButton.addActionListener(this);
945	1121	previousVersionButton.setEnabled(false);
..	..	@@ -948,28 +1124,28 @@
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		- copyOptionsPanel.add(updown);
	1134	+ versionManagerPanel.add(updown);
959	1135
960		- copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1136	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
961	1137	nextVersionButton.setToolTipText("Next version");
962	1138	nextVersionButton.addActionListener(this);
963	1139	nextVersionButton.setEnabled(false);
	1140	+
	1141	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ oneStepButton.setToolTipText("Animate one step forward");
	1143	+ oneStepButton.addActionListener(this);
964	1144
965	1145	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
966	1146	liveCB.setToolTipText("Enable animation");
967	1147	liveCB.addItemListener(this);
968	1148
969		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
970		- oneStepButton.setToolTipText("Animate one step forward");
971		- oneStepButton.addActionListener(this);
972		-
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,17 @@
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	+ resourcecontainer.setSelectedIndex((int)(Math.random() * resourcecontainer.getTabCount()));
1105	1263
1106		- AddSkyboxTab0(skyboxpanel);
1107		- AddSkyboxTab1(skyboxpanel);
1108		- AddSkyboxTab2(skyboxpanel);
1109		- AddSkyboxTab3(skyboxpanel);
	1264	+ oe.toolboxPanel.add(textures);
	1265	+
	1266	+ textures.preferredHeight = 100;
	1267	+
	1268	+ CreateSkyboxPanel(oe.skyboxPanel);
1110	1269
1111	1270	// EDIT panel
1112	1271	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -1118,16 +1277,16 @@
1118	1277	uneditButton.addActionListener(this);
1119	1278
1120	1279	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1121		- allParamsButton.setToolTipText("Show all controle");
	1280	+ allParamsButton.setToolTipText("Show all controls");
1122	1281	allParamsButton.addActionListener(this);
1123	1282
1124	1283	editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1125		- clearPanelButton.setToolTipText("Clear edit panel");
	1284	+ clearPanelButton.setToolTipText("Clear all controls");
1126	1285	clearPanelButton.addActionListener(this);
1127	1286
1128		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129		- unselectButton.setToolTipText("Unselect");
1130		- unselectButton.addActionListener(this);
	1287	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1288	+ //unselectButton.setToolTipText("Unselect");
	1289	+ //unselectButton.addActionListener(this);
1131	1290
1132	1291	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1133	1292	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -1152,6 +1311,8 @@
1152	1311
1153	1312	cGridBag jSPPanel = new cGridBag();
1154	1313
	1314	+ jSPPanel.preferredHeight = 20;
	1315	+
1155	1316	JScrollPane jSP;
1156	1317	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1157	1318	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -1160,11 +1321,11 @@
1160	1321	oe.treePanel.add(jSPPanel);
1161	1322	oe.treePanel.Return();
1162	1323
1163		- oe.treePanel.add(copyOptionsPanel);
	1324	+ oe.treePanel.add(versionManagerPanel);
1164	1325	oe.treePanel.Return();
1165		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1166		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1167		- sliderPane.preferredHeight = 1;
	1326	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1327	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1328	+ versionSliderPane.preferredHeight = 3;
1168	1329
1169	1330	// mainPanel.setDividerLocation(0.1); //1.0);
1170	1331	mainPanel.setResizeWeight(0.4);
..	..	@@ -1322,6 +1483,14 @@
1322	1483
1323	1484	void EditObject(Object3D obj)
1324	1485	{
	1486	+ assert(obj instanceof Composite);
	1487	+
	1488	+// if (obj.versionlist == null)
	1489	+// {
	1490	+// obj.versionlist = new Object3D[100];
	1491	+// obj.versionindex = -1;
	1492	+// }
	1493	+
1325	1494	cRadio radioButton = new cRadio(obj.name);
1326	1495
1327	1496	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1346,6 +1515,7 @@
1346	1515
1347	1516	oe.SetupViews();
1348	1517
	1518	+ if (Globals.DEBUG)
1349	1519	System.out.println("SetupViews");
1350	1520	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1351	1521	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1712,7 +1882,12 @@
1712	1882	TreePath path;
1713	1883
1714	1884	public TransferableTreePath(TreePath tp) {
1715		- path = tp;
	1885	+ Object[] objs = new Object[tp.getPathCount()];
	1886	+ for (int i=0; i<objs.length; i++)
	1887	+ {
	1888	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1889	+ }
	1890	+ path = new TreePath(objs);
1716	1891	}
1717	1892
1718	1893	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -2002,7 +2177,11 @@
2002	2177	shadow.material = new cMaterial(obj.material);
2003	2178	shadow.material.diffuse = 0.0001f;
2004	2179	shadow.material.specular = 0.0001f;
2005		- //shadow.projectedVertices[1].x = 300;
	2180	+ shadow.material.opacity = 0.75f;
	2181	+
	2182	+ AllocProjectedVertices(shadow);
	2183	+
	2184	+ shadow.projectedVertices[1].x = 300;
2006	2185
2007	2186	makeSomething(shadow);
2008	2187	}
..	..	@@ -2523,27 +2702,35 @@
2523	2702	} else
2524	2703	if (source == loopItem \|\| source == loopButton)
2525	2704	{
	2705	+ if (!group.selection.isEmpty())
	2706	+ {
2526	2707	Composite csg = new GroupLeaf();
2527	2708	csg.count = 5;
2528		- group(csg);
2529	2709	Composite child = new cGroup("Branch");
2530	2710	csg.addChild(child);
2531	2711	child.addChild(csg);
	2712	+ group(csg);
	2713	+ }
2532	2714	} else
2533	2715	if (source == doubleItem)
2534	2716	{
	2717	+ if (!group.selection.isEmpty())
	2718	+ {
2535	2719	Composite csg = new GroupLeaf("Fork");
2536	2720	csg.count = 5;
2537		- group(csg);
2538	2721	Composite child = new cGroup("Branch A");
2539	2722	csg.addChild(child);
2540	2723	child.addChild(csg);
2541	2724	child = new cGroup("Branch B");
2542	2725	csg.addChild(child);
2543	2726	child.addChild(csg);
	2727	+ group(csg);
	2728	+ }
2544	2729	} else
2545	2730	if (source == tripleItem)
2546	2731	{
	2732	+ if (!group.selection.isEmpty())
	2733	+ {
2547	2734	Composite csg = new GroupLeaf("Trident");
2548	2735	csg.count = 4;
2549	2736	group(csg);
..	..	@@ -2556,6 +2743,7 @@
2556	2743	child = new cGroup();
2557	2744	csg.addChild(child);
2558	2745	child.addChild(csg);
	2746	+ }
2559	2747	} else
2560	2748	if (source == computeAOItem)
2561	2749	{
..	..	@@ -2605,6 +2793,18 @@
2605	2793	if (source == fullButton)
2606	2794	{
2607	2795	ToggleFullScreen();
	2796	+ } else
	2797	+ if (source == collapseButton)
	2798	+ {
	2799	+ this.expandedLayout = radio.layout;
	2800	+ CollapseToolbar();
	2801	+ } else
	2802	+ if (source == maximize3DButton)
	2803	+ {
	2804	+ this.expandedLayout = radio.layout;
	2805	+ radio.layout = twoButton;
	2806	+ Show3DView();
	2807	+ CollapseToolbar();
2608	2808	} else
2609	2809	if (source == previousVersionButton)
2610	2810	{
..	..	@@ -3179,22 +3379,34 @@
3179	3379	} else
3180	3380	if (source == ungroupItem \|\| source == ungroupButton)
3181	3381	{
3182		- boolean hasRoot = false;
	3382	+ boolean canUngroup = true;
3183	3383
3184	3384	for (int i=0; i<group.selection.size(); i++)
3185	3385	{
3186		- if (group.selection.get(i) == group)
	3386	+ Object3D selectedItem = group.selection.get(i);
	3387	+
	3388	+ if (selectedItem.Size() == 0)
3187	3389	{
3188		- hasRoot = true;
	3390	+ // Cannot ungroup leaves
	3391	+ canUngroup = false;
	3392	+ break;
	3393	+ }
	3394	+
	3395	+ if (selectedItem == group)
	3396	+ {
	3397	+ // Cannot ungroup root
	3398	+ canUngroup = false;
3189	3399	break;
3190	3400	}
3191	3401	}
3192	3402
3193		- if (!hasRoot)
	3403	+ if (canUngroup)
3194	3404	{
3195	3405	for (int i=0; i<group.selection.size(); i++)
3196	3406	{
3197		- Ungroup(group.selection.get(i));
	3407	+ Object3D selectedItem = group.selection.get(i);
	3408	+
	3409	+ Ungroup(selectedItem);
3198	3410	}
3199	3411
3200	3412	ClearSelection(false);
..	..	@@ -3557,38 +3769,7 @@
3557	3769	if (CameraPane.FULLSCREEN)
3558	3770	fullscreenLayout = radio.layout;
3559	3771
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();
	3772	+ Show3DView();
3592	3773
3593	3774	cameraView.requestFocusInWindow();
3594	3775
..	..	@@ -3774,6 +3955,7 @@
3774	3955	} else
3775	3956	if (source == rootButton)
3776	3957	{
	3958	+ Replace();
3777	3959	Object3D obj;
3778	3960	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3779	3961	{
..	..	@@ -3788,6 +3970,8 @@
3788	3970	if (source == closeButton)
3789	3971	{
3790	3972	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3973	+ Replace();
	3974	+
3791	3975	cRadio ab;
3792	3976	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3793	3977	{
..	..	@@ -3886,6 +4070,8 @@
3886	4070	} else
3887	4071	if(source instanceof cRadio)
3888	4072	{
	4073	+ Replace();
	4074	+
3889	4075	group.parent = keepparent;
3890	4076	group.attributes = 0;
3891	4077	//group.editWindow = null;
..	..	@@ -3910,8 +4096,6 @@
3910	4096
3911	4097	copy = group;
3912	4098
3913		- SetUndoStates();
3914		-
3915	4099	//Globals.theRenderer.object = group;
3916	4100	if(!useclient)
3917	4101	{
..	..	@@ -3939,6 +4123,29 @@
3939	4123	*/
3940	4124	radio.layout.doClick();
3941	4125
	4126	+ assert(copy instanceof Composite);
	4127	+
	4128	+ if (copy.versionlist == null)
	4129	+ {
	4130	+ copy.versionindex = -1;
	4131	+
	4132	+ // Cannot work with loops
	4133	+ // To fix this issue, we first mark all nodes above the root,
	4134	+ // and check if any of these nodes are reachable below the root.
	4135	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4136	+
	4137	+ if (!copy.HasTags())
	4138	+ {
	4139	+ copy.versionlist = new Object3D[100];
	4140	+
	4141	+ Save(true);
	4142	+ }
	4143	+
	4144	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4145	+ }
	4146	+
	4147	+ SetVersionStates();
	4148	+
3942	4149	ClearUnpinned();
3943	4150
3944	4151	//Grafreed.Assert(group != null);
..	..	@@ -4082,7 +4289,7 @@
4082	4289	TouchTransform(obj);
4083	4290	continue;
4084	4291	}
4085		- if ((mask&2) != 0) // Scale
	4292	+ if ((mask&2) != 0) // Scale/rotation
4086	4293	{
4087	4294	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4088	4295	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -4090,10 +4297,6 @@
4090	4297	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4091	4298	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4092	4299	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4093		- }
4094		- if ((mask&4) != 0) // Rotation
4095		- {
4096		- // ?
4097	4300	}
4098	4301	if ((mask&1) != 0) // Translation
4099	4302	{
..	..	@@ -5169,15 +5372,31 @@
5169	5372	{
5170	5373	editButton.setEnabled(enabled);
5171	5374	uneditButton.setEnabled(enabled);
5172		- unselectButton.setEnabled(enabled);
	5375	+ //unselectButton.setEnabled(enabled);
5173	5376	flashSelectionButton.setEnabled(enabled);
5174	5377
5175	5378	clearPanelButton.setEnabled(!listUI.isEmpty());
	5379	+
	5380	+ boolean allComposites = true;
	5381	+
	5382	+ if (group.selection != null)
	5383	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5384	+ {
	5385	+ Object next = e.nextElement();
	5386	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5387	+ {
	5388	+ allComposites = false;
	5389	+ break;
	5390	+ }
	5391	+ }
	5392	+
	5393	+ rootButton.setEnabled(allComposites);
5176	5394	}
5177	5395
5178	5396	void refreshContents(boolean cp)
5179	5397	{
5180		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5398	+ if (false)
	5399	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5181	5400	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5182	5401	{
5183	5402	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5187,7 +5406,7 @@
5187	5406	Object3D child = (Object3D) group.selection.get(i);
5188	5407
5189	5408	objEditor.AddInfo(child, this, true);
5190		- System.err.println("info : " + child.GetPath());
	5409	+// System.err.println("info : " + child.GetPath());
5191	5410	}
5192	5411
5193	5412	objEditor.SetText(); // jan 2014
..	..	@@ -6070,11 +6289,11 @@
6070	6289	private MenuItem lookAtItem;
6071	6290	private MenuItem lookFromItem;
6072	6291	private MenuItem switchViewItem;
6073		- private MenuItem cutItem;
	6292	+ private JMenuItem cutItem;
6074	6293	private MenuItem undoItem;
6075	6294	private MenuItem redoItem;
6076	6295	private JMenuItem duplicateItem;
6077		- private MenuItem cloneItem;
	6296	+ private JMenuItem cloneItem;
6078	6297	private MenuItem cloneSupportItem;
6079	6298	private MenuItem overwriteGeoItem;
6080	6299	private MenuItem overwriteMatItem;
..	..	@@ -6095,13 +6314,13 @@
6095	6314	private MenuItem cloneGeometriesItem;
6096	6315	private MenuItem shareGeometriesItem;
6097	6316	private MenuItem mergeGeometriesItem;
6098		- private MenuItem copyItem;
	6317	+ private JMenuItem copyItem;
6099	6318	private MenuItem pasteItem;
6100		- private MenuItem pasteIntoItem;
6101		- private MenuItem pasteLinkItem;
6102		- private MenuItem pasteCloneItem;
6103		- private MenuItem pasteExpandItem;
6104		- private MenuItem deleteItem;
	6319	+ private JMenuItem pasteIntoItem;
	6320	+ private JMenuItem pasteLinkItem;
	6321	+ private JMenuItem pasteCloneItem;
	6322	+ private JMenuItem pasteExpandItem;
	6323	+ private JMenuItem deleteItem;
6105	6324	private MenuItem clearAllItem;
6106	6325	private MenuItem genUVItem;
6107	6326	private MenuItem genNormalsMESHItem;
..	..	@@ -6156,7 +6375,7 @@
6156	6375	private MenuItem transformGeometryItem;
6157	6376	private MenuItem transformChildrenItem;
6158	6377	private MenuItem hideItem;
6159		- private MenuItem grabItem;
	6378	+ private JMenuItem grabItem;
6160	6379	private MenuItem backItem;
6161	6380	private MenuItem frontItem;
6162	6381	private MenuItem cameraItem;
..	..	@@ -6169,7 +6388,7 @@
6169	6388	private MenuItem switchTransfoItem;
6170	6389	private MenuItem morphItem;
6171	6390	private MenuItem linkerItem;
6172		- private MenuItem ungroupItem;
	6391	+ private JMenuItem ungroupItem;
6173	6392	private MenuItem editItem;
6174	6393	private MenuItem openWindowItem;
6175	6394	private MenuItem editLeafItem;