~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -31,7 +31,7 @@
31	31	final String path = "cubemaps/" + f + "-skyboxes/" + s;
32	32	row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
33	33	//row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
34		- skyboxButton.setToolTipText(s);
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
35	35	skyboxButton.addActionListener(new ActionListener()
36	36	{
37	37	@Override
..	..	@@ -42,12 +42,12 @@
42	42	});
43	43	}
44	44
45		- public void AddTextureButton(String f, final String t, cGridBag row)
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
46	46	{
47	47	cButton textureButton;
48		- final String path = "textures/" + f + "/"; // + t;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
49	49	row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
50		- textureButton.setToolTipText(f + "s");
	50	+ textureButton.setToolTipText(c + count);
51	51	textureButton.addActionListener(new ActionListener()
52	52	{
53	53	@Override
..	..	@@ -73,7 +73,7 @@
73	73	cGridBag row5 = new cGridBag();
74	74	cGridBag row6 = new cGridBag();
75	75
76		- AddSkyboxButton("default", "rgb", row0);
	76	+ AddSkyboxButton("default", "", row0);
77	77	//AddSkyboxButton("default", "cornell", row0);
78	78	AddSkyboxButton("penguins", "dust", row0);
79	79	AddSkyboxButton("penguins", "tropic", row0);
..	..	@@ -330,10 +330,19 @@
330	330
331	331	public void ChangeSkybox(String skybox)
332	332	{
333		- //cameraView.envyoff = false;
334		- group.skyboxname = skybox;
335		- group.skyboxext = "jpg";
336		- cameraView.repaint();
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
337	346	}
338	347
339	348	public void CreateSkyboxPanel(cGridBag skyboxPanel)
..	..	@@ -350,7 +359,23 @@
350	359
351	360	public void ChangeTexture(String texture)
352	361	{
353		- cameraView.repaint();
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
354	379	}
355	380
356	381	//ObjEditor objEditor;
..	..	@@ -390,10 +415,14 @@
390	415	this.copy = this.group = group;
391	416	//selectees = this.group.selectees;
392	417
	418	+ assert(false);
	419	+
393	420	if (copy.versionlist == null)
394	421	{
395	422	copy.versionlist = new Object3D[100];
396	423	copy.versionindex = -1;
	424	+
	425	+ //Save(true);
397	426	}
398	427
399	428	if(ui)
..	..	@@ -422,7 +451,7 @@
422	451	copy.versionlist = new Object3D[100];
423	452	copy.versionindex = -1;
424	453
425		- Save(true);
	454	+ //Save(true);
426	455	}
427	456	}
428	457
..	..	@@ -513,33 +542,35 @@
513	542	// menu.add("-");
514	543	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
515	544	duplicateItem.addActionListener(this);
516		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
517	547	cloneItem.addActionListener(this);
518		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
519	549	{
520	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
521	551	cloneSupportItem.addActionListener(this);
522	552	}
	553	+ oe.jTree.popup.addSeparator();
523	554	menu.add("-");
524		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
525	556	cutItem.addActionListener(this);
526		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
527	558	copyItem.addActionListener(this);
528	559	pasteItem = menu.add(new MenuItem("Paste"));
529	560	pasteItem.addActionListener(this);
530	561
531		- menu.add("-");
532		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
533	565	pasteIntoItem.addActionListener(this);
534		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
535	567	pasteLinkItem.addActionListener(this);
536		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
537	569	pasteCloneItem.addActionListener(this);
538		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
539	571	// pasteExpandItem.addActionListener(this);
540		- menu.add("-");
541		- deleteItem = menu.add(new MenuItem("Delete"));
542		- deleteItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
543	574
544	575	if (Globals.ADVANCED)
545	576	{
..	..	@@ -625,11 +656,9 @@
625	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
626	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
627	658	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
628		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
629	659	oe.cameraMenu.add("-");
630	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
631	661	openWindowItem.addActionListener(this);
632		- editLeafItem.addActionListener(this);
633	662	lookAtItem.addActionListener(this);
634	663	//lookFromItem.addActinoListener(this);
635	664	//switchViewItem.addActionListener(this);
..	..	@@ -676,9 +705,8 @@
676	705	setMasterItem.addActionListener(this);
677	706	}
678	707
679		- oe.menuBar.add(menu = new Menu("Group"));
680		-// grabItem = menu.add(new MenuItem("Grab"));
681		-// grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
682	710	backItem = menu.add(new MenuItem("Back"));
683	711	backItem.addActionListener(this);
684	712	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -686,13 +714,21 @@
686	714	// compositeItem = menu.add(new MenuItem("Composite"));
687	715	// compositeItem.addActionListener(this);
688	716
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
689	720	if (Globals.ADVANCED)
690	721	{
691	722	hideItem = menu.add(new MenuItem("Hidden Group"));
692	723	hideItem.addActionListener(this);
693	724	}
694		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
695	726	ungroupItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
696	732
697	733	// menu.add("-");
698	734	//
..	..	@@ -877,6 +913,9 @@
877	913	shareGeometriesItem.addActionListener(this);
878	914	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
879	915	mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
880	919	if (Globals.ADVANCED)
881	920	{
882	921	// Pretty much the same as duplicate and clone.
..	..	@@ -895,40 +934,47 @@
895	934
896	935	JTabbedPane resourcecontainer;
897	936	cGridBag currenttab;
898		- boolean added; // patch for jar
	937	+ //boolean added; // patch for jar
899	938
900	939	int tabcount = 0;
901	940	int colcount = 0;
902	941	int rowcount = 0;
	942	+ int texturecount = 0;
903	943
904	944	int columns = 5;
905	945	int rows = 7;
906	946
907	947	public void ResourceCallBack(String[] path)
908	948	{
909		- for (int i = 0; i < path.length; i++)
910		- System.out.print(path[i] + "/");
911		- System.out.println();
912		- if (rowcount == 0)
	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"))
913	955	{
914	956	currenttab = new cGridBag();
915		- added = false;
916		- String tabname = String.valueOf((char)('A'+tabcount));
	957	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
917	958	currenttab.setName(tabname);
	959	+ //added = false;
	960	+ resourcecontainer.add(currenttab);
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
918	962	rowcount = 1;
	963	+ colcount = 0;
	964	+ texturecount = 0;
919	965	}
920	966
921		- if (path.length > 1 && path[1].toLowerCase().endsWith(".jpg"))
	967	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
922	968	{
923		- if (!added)
	969	+ //if (!added)
924	970	{
925		- added = true;
926		- resourcecontainer.add(currenttab);
927		- String tabname = String.valueOf((char)('A'+tabcount));
928		- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	971	+ //added = true;
	972	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	973	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
929	974	}
930	975
931		- AddTextureButton(path[0], path[1], currenttab);
	976	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	977	+
932	978	if (++colcount >= columns)
933	979	{
934	980	colcount = 0;
..	..	@@ -949,7 +995,7 @@
949	995
950	996	void CreateTexturePanel(cGridBag container)
951	997	{
952		- resourcecontainer = new JTabbedPane();
	998	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
953	999	container.add(resourcecontainer);
954	1000
955	1001	Grafreed.ParseResources("textures", this);
..	..	@@ -972,11 +1018,6 @@
972	1018	//new Exception().printStackTrace();
973	1019
974	1020	oe.radioPanel = new JPanel(new GridBagLayout());
975		- oe.aConstraints.weightx = 1;
976		- oe.aConstraints.weighty = 0;
977		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
978		- oe.aConstraints.gridwidth = 100;
979		- oe.aConstraints.gridheight = 1;
980	1021	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
981	1022
982	1023	oe.buttonGroup = new ButtonGroup();
..	..	@@ -997,9 +1038,9 @@
997	1038	oe.radioPanel.add(dummyButton);
998	1039	oe.buttonGroup.add(dummyButton);
999	1040	*/
1000		- cGridBag copyOptionsPanel = new cGridBag();
	1041	+ cGridBag versionManagerPanel = new cGridBag();
1001	1042
1002		- copyOptionsPanel.preferredHeight = 2;
	1043	+ versionManagerPanel.preferredHeight = 4;
1003	1044
1004	1045	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1005	1046
..	..	@@ -1009,10 +1050,49 @@
1009	1050
1010	1051	if (Globals.ADVANCED)
1011	1052	{
1012		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1013		- maxButton.setToolTipText("Maximize window");
1014		- 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);
1015	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	+ //
1016	1096
1017	1097	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1018	1098	fullButton.setToolTipText("Full-screen window");
..	..	@@ -1026,15 +1106,16 @@
1026	1106	restoreCameraButton.setToolTipText("Restore viewpoint");
1027	1107	restoreCameraButton.addActionListener(this);
1028	1108
1029		- 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);
1030	1110	saveVersionButton.setToolTipText("Duplicate current version");
1031	1111	saveVersionButton.addActionListener(this);
1032	1112
1033		- copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1034	1114	deleteVersionButton.setToolTipText("Delete current version");
1035	1115	deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
1036	1117
1037		- copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1038	1119	previousVersionButton.setToolTipText("Previous version");
1039	1120	previousVersionButton.addActionListener(this);
1040	1121	previousVersionButton.setEnabled(false);
..	..	@@ -1043,28 +1124,28 @@
1043	1124	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1044	1125	restoreButton.setToolTipText("Undo (restore current version)");
1045	1126	restoreButton.addActionListener(this);
1046		- //restoreButton.setEnabled(false);
	1127	+ restoreButton.setEnabled(false);
1047	1128
1048	1129	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1049	1130	replaceButton.setToolTipText("Save (replace current version)");
1050	1131	replaceButton.addActionListener(this);
1051		- //replaceButton.setEnabled(false);
	1132	+ replaceButton.setEnabled(false);
1052	1133
1053		- copyOptionsPanel.add(updown);
	1134	+ versionManagerPanel.add(updown);
1054	1135
1055		- copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1136	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1056	1137	nextVersionButton.setToolTipText("Next version");
1057	1138	nextVersionButton.addActionListener(this);
1058	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);
1059	1144
1060	1145	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1061	1146	liveCB.setToolTipText("Enable animation");
1062	1147	liveCB.addItemListener(this);
1063	1148
1064		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1065		- oneStepButton.setToolTipText("Animate one step forward");
1066		- oneStepButton.addActionListener(this);
1067		-
1068	1149	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1069	1150	fastCB.setToolTipText("Fast mode");
1070	1151	fastCB.addItemListener(this);
..	..	@@ -1091,21 +1172,6 @@
1091	1172
1092	1173	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1093	1174
1094		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1095		- twoButton.setToolTipText("Show 3D view only");
1096		- twoButton.addActionListener(this);
1097		- this.fullscreenLayout = twoButton;
1098		-
1099		- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1100		- threeButton.setToolTipText("Show controls and 3D view");
1101		- threeButton.addActionListener(this);
1102		- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1103		- sixButton.setToolTipText("Show 3D view and controls");
1104		- sixButton.addActionListener(this);
1105		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1106		-// sevenButton.setToolTipText("3-column layout");
1107		-// sevenButton.addActionListener(this);
1108		- //
1109	1175
1110	1176	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1111	1177	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -1121,12 +1187,16 @@
1121	1187
1122	1188	// INSERT
1123	1189	row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1124		- gridButton.setToolTipText("Create grid");
	1190	+ gridButton.setToolTipText("Create ground");
1125	1191	gridButton.addActionListener(this);
1126	1192
1127	1193	row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1128	1194	boxButton.setToolTipText("Create box");
1129	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);
1130	1200
1131	1201	row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1132	1202	sphereButton.setToolTipText("Create sphere");
..	..	@@ -1139,10 +1209,6 @@
1139	1209	row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1140	1210	torusButton.setToolTipText("Create torus");
1141	1211	torusButton.addActionListener(this);
1142		-
1143		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1144		- superButton.setToolTipText("Create superellipsoid");
1145		- superButton.addActionListener(this);
1146	1212
1147	1213	if (Globals.ADVANCED)
1148	1214	{
..	..	@@ -1192,6 +1258,8 @@
1192	1258	cGridBag textures = new cGridBag();
1193	1259
1194	1260	CreateTexturePanel(textures);
	1261	+
	1262	+ resourcecontainer.setSelectedIndex((int)(Math.random() * resourcecontainer.getTabCount()));
1195	1263
1196	1264	oe.toolboxPanel.add(textures);
1197	1265
..	..	@@ -1243,6 +1311,8 @@
1243	1311
1244	1312	cGridBag jSPPanel = new cGridBag();
1245	1313
	1314	+ jSPPanel.preferredHeight = 20;
	1315	+
1246	1316	JScrollPane jSP;
1247	1317	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1248	1318	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -1251,11 +1321,11 @@
1251	1321	oe.treePanel.add(jSPPanel);
1252	1322	oe.treePanel.Return();
1253	1323
1254		- oe.treePanel.add(copyOptionsPanel);
	1324	+ oe.treePanel.add(versionManagerPanel);
1255	1325	oe.treePanel.Return();
1256		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1257		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1258		- sliderPane.preferredHeight = 1;
	1326	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1327	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1328	+ versionSliderPane.preferredHeight = 3;
1259	1329
1260	1330	// mainPanel.setDividerLocation(0.1); //1.0);
1261	1331	mainPanel.setResizeWeight(0.4);
..	..	@@ -1413,6 +1483,14 @@
1413	1483
1414	1484	void EditObject(Object3D obj)
1415	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	+
1416	1494	cRadio radioButton = new cRadio(obj.name);
1417	1495
1418	1496	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1437,6 +1515,7 @@
1437	1515
1438	1516	oe.SetupViews();
1439	1517
	1518	+ if (Globals.DEBUG)
1440	1519	System.out.println("SetupViews");
1441	1520	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1442	1521	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1803,7 +1882,12 @@
1803	1882	TreePath path;
1804	1883
1805	1884	public TransferableTreePath(TreePath tp) {
1806		- 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);
1807	1891	}
1808	1892
1809	1893	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -2093,7 +2177,11 @@
2093	2177	shadow.material = new cMaterial(obj.material);
2094	2178	shadow.material.diffuse = 0.0001f;
2095	2179	shadow.material.specular = 0.0001f;
2096		- //shadow.projectedVertices[1].x = 300;
	2180	+ shadow.material.opacity = 0.75f;
	2181	+
	2182	+ AllocProjectedVertices(shadow);
	2183	+
	2184	+ shadow.projectedVertices[1].x = 300;
2097	2185
2098	2186	makeSomething(shadow);
2099	2187	}
..	..	@@ -2614,27 +2702,35 @@
2614	2702	} else
2615	2703	if (source == loopItem \|\| source == loopButton)
2616	2704	{
	2705	+ if (!group.selection.isEmpty())
	2706	+ {
2617	2707	Composite csg = new GroupLeaf();
2618	2708	csg.count = 5;
2619		- group(csg);
2620	2709	Composite child = new cGroup("Branch");
2621	2710	csg.addChild(child);
2622	2711	child.addChild(csg);
	2712	+ group(csg);
	2713	+ }
2623	2714	} else
2624	2715	if (source == doubleItem)
2625	2716	{
	2717	+ if (!group.selection.isEmpty())
	2718	+ {
2626	2719	Composite csg = new GroupLeaf("Fork");
2627	2720	csg.count = 5;
2628		- group(csg);
2629	2721	Composite child = new cGroup("Branch A");
2630	2722	csg.addChild(child);
2631	2723	child.addChild(csg);
2632	2724	child = new cGroup("Branch B");
2633	2725	csg.addChild(child);
2634	2726	child.addChild(csg);
	2727	+ group(csg);
	2728	+ }
2635	2729	} else
2636	2730	if (source == tripleItem)
2637	2731	{
	2732	+ if (!group.selection.isEmpty())
	2733	+ {
2638	2734	Composite csg = new GroupLeaf("Trident");
2639	2735	csg.count = 4;
2640	2736	group(csg);
..	..	@@ -2647,6 +2743,7 @@
2647	2743	child = new cGroup();
2648	2744	csg.addChild(child);
2649	2745	child.addChild(csg);
	2746	+ }
2650	2747	} else
2651	2748	if (source == computeAOItem)
2652	2749	{
..	..	@@ -2696,6 +2793,18 @@
2696	2793	if (source == fullButton)
2697	2794	{
2698	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();
2699	2808	} else
2700	2809	if (source == previousVersionButton)
2701	2810	{
..	..	@@ -3270,22 +3379,34 @@
3270	3379	} else
3271	3380	if (source == ungroupItem \|\| source == ungroupButton)
3272	3381	{
3273		- boolean hasRoot = false;
	3382	+ boolean canUngroup = true;
3274	3383
3275	3384	for (int i=0; i<group.selection.size(); i++)
3276	3385	{
3277		- if (group.selection.get(i) == group)
	3386	+ Object3D selectedItem = group.selection.get(i);
	3387	+
	3388	+ if (selectedItem.Size() == 0)
3278	3389	{
3279		- 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;
3280	3399	break;
3281	3400	}
3282	3401	}
3283	3402
3284		- if (!hasRoot)
	3403	+ if (canUngroup)
3285	3404	{
3286	3405	for (int i=0; i<group.selection.size(); i++)
3287	3406	{
3288		- Ungroup(group.selection.get(i));
	3407	+ Object3D selectedItem = group.selection.get(i);
	3408	+
	3409	+ Ungroup(selectedItem);
3289	3410	}
3290	3411
3291	3412	ClearSelection(false);
..	..	@@ -3648,38 +3769,7 @@
3648	3769	if (CameraPane.FULLSCREEN)
3649	3770	fullscreenLayout = radio.layout;
3650	3771
3651		- // bug
3652		- //gridPanel.setDividerLocation(1.0);
3653		- //bigPanel.setDividerLocation(0.0);
3654		-// bigThree.remove(scenePanel);
3655		-// bigThree.remove(centralPanel);
3656		-// bigThree.remove(XYZPanel);
3657		-// aWindowConstraints.gridx = 0;
3658		-// aWindowConstraints.gridy = 0;
3659		-// aWindowConstraints.gridwidth = 1;
3660		-// // aConstraints.gridheight = 3;
3661		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3662		-// aWindowConstraints.weightx = 0;
3663		-// aWindowConstraints.weighty = 1;
3664		-// //bigThree.add(jtp, aWindowConstraints);
3665		-// aWindowConstraints.weightx = 1;
3666		-// aWindowConstraints.gridwidth = 3;
3667		-// // aConstraints.gridheight = 3;
3668		-// aWindowConstraints.gridx = 1;
3669		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3670		-// bigThree.add(centralPanel, aWindowConstraints);
3671		-// aWindowConstraints.weightx = 0;
3672		-// aWindowConstraints.gridx = 4;
3673		-// aWindowConstraints.gridwidth = 1;
3674		-// // aConstraints.gridheight = 3;
3675		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3676		-// //bigThree.add(XYZPanel, aWindowConstraints);
3677		-// scenePanel.setVisible(false);
3678		-// centralPanel.setVisible(true);
3679		-// XYZPanel.setVisible(false);
3680		- bigThree.ClearUI();
3681		- bigThree.add(centralPanel);
3682		- bigThree.FlushUI();
	3772	+ Show3DView();
3683	3773
3684	3774	cameraView.requestFocusInWindow();
3685	3775
..	..	@@ -3865,6 +3955,7 @@
3865	3955	} else
3866	3956	if (source == rootButton)
3867	3957	{
	3958	+ Replace();
3868	3959	Object3D obj;
3869	3960	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3870	3961	{
..	..	@@ -3879,6 +3970,8 @@
3879	3970	if (source == closeButton)
3880	3971	{
3881	3972	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3973	+ Replace();
	3974	+
3882	3975	cRadio ab;
3883	3976	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3884	3977	{
..	..	@@ -3977,6 +4070,8 @@
3977	4070	} else
3978	4071	if(source instanceof cRadio)
3979	4072	{
	4073	+ Replace();
	4074	+
3980	4075	group.parent = keepparent;
3981	4076	group.attributes = 0;
3982	4077	//group.editWindow = null;
..	..	@@ -4001,8 +4096,6 @@
4001	4096
4002	4097	copy = group;
4003	4098
4004		- SetUndoStates();
4005		-
4006	4099	//Globals.theRenderer.object = group;
4007	4100	if(!useclient)
4008	4101	{
..	..	@@ -4030,6 +4123,29 @@
4030	4123	*/
4031	4124	radio.layout.doClick();
4032	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	+
4033	4149	ClearUnpinned();
4034	4150
4035	4151	//Grafreed.Assert(group != null);
..	..	@@ -4173,7 +4289,7 @@
4173	4289	TouchTransform(obj);
4174	4290	continue;
4175	4291	}
4176		- if ((mask&2) != 0) // Scale
	4292	+ if ((mask&2) != 0) // Scale/rotation
4177	4293	{
4178	4294	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4179	4295	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -4181,10 +4297,6 @@
4181	4297	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4182	4298	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4183	4299	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4184		- }
4185		- if ((mask&4) != 0) // Rotation
4186		- {
4187		- // ?
4188	4300	}
4189	4301	if ((mask&1) != 0) // Translation
4190	4302	{
..	..	@@ -5264,10 +5376,26 @@
5264	5376	flashSelectionButton.setEnabled(enabled);
5265	5377
5266	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);
5267	5394	}
5268	5395
5269	5396	void refreshContents(boolean cp)
5270	5397	{
	5398	+ if (false)
5271	5399	//if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5272	5400	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5273	5401	{
..	..	@@ -5278,7 +5406,7 @@
5278	5406	Object3D child = (Object3D) group.selection.get(i);
5279	5407
5280	5408	objEditor.AddInfo(child, this, true);
5281		- System.err.println("info : " + child.GetPath());
	5409	+// System.err.println("info : " + child.GetPath());
5282	5410	}
5283	5411
5284	5412	objEditor.SetText(); // jan 2014
..	..	@@ -6161,11 +6289,11 @@
6161	6289	private MenuItem lookAtItem;
6162	6290	private MenuItem lookFromItem;
6163	6291	private MenuItem switchViewItem;
6164		- private MenuItem cutItem;
	6292	+ private JMenuItem cutItem;
6165	6293	private MenuItem undoItem;
6166	6294	private MenuItem redoItem;
6167	6295	private JMenuItem duplicateItem;
6168		- private MenuItem cloneItem;
	6296	+ private JMenuItem cloneItem;
6169	6297	private MenuItem cloneSupportItem;
6170	6298	private MenuItem overwriteGeoItem;
6171	6299	private MenuItem overwriteMatItem;
..	..	@@ -6186,13 +6314,13 @@
6186	6314	private MenuItem cloneGeometriesItem;
6187	6315	private MenuItem shareGeometriesItem;
6188	6316	private MenuItem mergeGeometriesItem;
6189		- private MenuItem copyItem;
	6317	+ private JMenuItem copyItem;
6190	6318	private MenuItem pasteItem;
6191		- private MenuItem pasteIntoItem;
6192		- private MenuItem pasteLinkItem;
6193		- private MenuItem pasteCloneItem;
6194		- private MenuItem pasteExpandItem;
6195		- private MenuItem deleteItem;
	6319	+ private JMenuItem pasteIntoItem;
	6320	+ private JMenuItem pasteLinkItem;
	6321	+ private JMenuItem pasteCloneItem;
	6322	+ private JMenuItem pasteExpandItem;
	6323	+ private JMenuItem deleteItem;
6196	6324	private MenuItem clearAllItem;
6197	6325	private MenuItem genUVItem;
6198	6326	private MenuItem genNormalsMESHItem;
..	..	@@ -6247,7 +6375,7 @@
6247	6375	private MenuItem transformGeometryItem;
6248	6376	private MenuItem transformChildrenItem;
6249	6377	private MenuItem hideItem;
6250		- private MenuItem grabItem;
	6378	+ private JMenuItem grabItem;
6251	6379	private MenuItem backItem;
6252	6380	private MenuItem frontItem;
6253	6381	private MenuItem cameraItem;
..	..	@@ -6260,7 +6388,7 @@
6260	6388	private MenuItem switchTransfoItem;
6261	6389	private MenuItem morphItem;
6262	6390	private MenuItem linkerItem;
6263		- private MenuItem ungroupItem;
	6391	+ private JMenuItem ungroupItem;
6264	6392	private MenuItem editItem;
6265	6393	private MenuItem openWindowItem;
6266	6394	private MenuItem editLeafItem;