~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
359		- if (copy.versions == null)
	418	+ assert(false);
	419	+
	420	+ if (copy.versionlist == null)
360	421	{
361		- copy.versions = new byte[100][];
	422	+ copy.versionlist = new Object3D[100];
362	423	copy.versionindex = -1;
	424	+
	425	+ //Save(true);
363	426	}
364	427
365	428	if(ui)
..	..	@@ -383,12 +446,12 @@
383	446
384	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
385	448
386		- if (copy.versions == null)
	449	+ if (copy.versionlist == null)
387	450	{
388		- copy.versions = new byte[100][];
	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();
..	..	@@ -904,7 +1040,7 @@
904	1040	*/
905	1041	cGridBag copyOptionsPanel = new cGridBag();
906	1042
907		- copyOptionsPanel.preferredHeight = 2;
	1043	+ copyOptionsPanel.preferredHeight = 3;
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/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1076	+ maximize3DButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ twoButton.setToolTipText("Show 3D view only");
	1080	+ twoButton.addActionListener(this);
	1081	+ this.fullscreenLayout = twoButton;
	1082	+
	1083	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ threeButton.setToolTipText("Show controls and 3D view");
	1085	+ threeButton.addActionListener(this);
	1086	+ if (Globals.ADVANCED)
	1087	+ {
	1088	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ sixButton.setToolTipText("Show 3D view and controls");
	1090	+ sixButton.addActionListener(this);
	1091	+ }
	1092	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+// sevenButton.setToolTipText("3-column layout");
	1094	+// sevenButton.addActionListener(this);
	1095	+ //
921	1096
922	1097	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
923	1098	fullButton.setToolTipText("Full-screen window");
..	..	@@ -931,41 +1106,46 @@
931	1106	restoreCameraButton.setToolTipText("Restore viewpoint");
932	1107	restoreCameraButton.addActionListener(this);
933	1108
934		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
935		- saveButton.setToolTipText("New version");
936		- saveButton.addActionListener(this);
	1109	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ saveVersionButton.setToolTipText("Duplicate current version");
	1111	+ saveVersionButton.addActionListener(this);
937	1112
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);
	1113	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ deleteVersionButton.setToolTipText("Delete current version");
	1115	+ deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
	1117	+
	1118	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ previousVersionButton.setToolTipText("Previous version");
	1120	+ previousVersionButton.addActionListener(this);
	1121	+ previousVersionButton.setEnabled(false);
942	1122
943	1123	cGridBag updown = new cGridBag().setVertical(true);
944	1124	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
945		- restoreButton.setToolTipText("Restore current");
	1125	+ restoreButton.setToolTipText("Undo (restore current version)");
946	1126	restoreButton.addActionListener(this);
947	1127	restoreButton.setEnabled(false);
948	1128
949	1129	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
950		- replaceButton.setToolTipText("Replace current");
	1130	+ replaceButton.setToolTipText("Save (replace current version)");
951	1131	replaceButton.addActionListener(this);
952	1132	replaceButton.setEnabled(false);
953	1133
954	1134	copyOptionsPanel.add(updown);
955	1135
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);
	1136	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ nextVersionButton.setToolTipText("Next version");
	1138	+ nextVersionButton.addActionListener(this);
	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);
960	1144
961	1145	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
962	1146	liveCB.setToolTipText("Enable animation");
963	1147	liveCB.addItemListener(this);
964	1148
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	1149	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
970	1150	fastCB.setToolTipText("Fast mode");
971	1151	fastCB.addItemListener(this);
..	..	@@ -992,21 +1172,6 @@
992	1172
993	1173	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
994	1174
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	1175
1011	1176	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1012	1177	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -1022,12 +1187,16 @@
1022	1187
1023	1188	// INSERT
1024	1189	row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1025		- gridButton.setToolTipText("Create grid");
	1190	+ gridButton.setToolTipText("Create ground");
1026	1191	gridButton.addActionListener(this);
1027	1192
1028	1193	row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1029	1194	boxButton.setToolTipText("Create box");
1030	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);
1031	1200
1032	1201	row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1033	1202	sphereButton.setToolTipText("Create sphere");
..	..	@@ -1040,10 +1209,6 @@
1040	1209	row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1041	1210	torusButton.setToolTipText("Create torus");
1042	1211	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	1212
1048	1213	if (Globals.ADVANCED)
1049	1214	{
..	..	@@ -1090,19 +1255,17 @@
1090	1255
1091	1256	oe.toolboxPanel.add(row2);
1092	1257
1093		- // ENVYMAPS
1094		- cGridBag skyboxpane = new cGridBag();
1095		- skyboxpane.preferredHeight = 100;
	1258	+ cGridBag textures = new cGridBag();
1096	1259
1097		- oe.toolboxPanel.add(skyboxpane);
	1260	+ CreateTexturePanel(textures);
1098	1261
1099		- JTabbedPane skyboxpanel = new JTabbedPane();
1100		- skyboxpane.add(skyboxpanel);
	1262	+ resourcecontainer.setSelectedIndex((int)(Math.random() * resourcecontainer.getTabCount()));
1101	1263
1102		- AddSkyboxTab0(skyboxpanel);
1103		- AddSkyboxTab1(skyboxpanel);
1104		- AddSkyboxTab2(skyboxpanel);
1105		- AddSkyboxTab3(skyboxpanel);
	1264	+ oe.toolboxPanel.add(textures);
	1265	+
	1266	+ textures.preferredHeight = 100;
	1267	+
	1268	+ CreateSkyboxPanel(oe.skyboxPanel);
1106	1269
1107	1270	// EDIT panel
1108	1271	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -1110,20 +1273,20 @@
1110	1273	editButton.addActionListener(this);
1111	1274
1112	1275	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1113		- uneditButton.setToolTipText("Remove selection controls");
	1276	+ uneditButton.setToolTipText("Unpin and remove selection controls");
1114	1277	uneditButton.addActionListener(this);
1115	1278
1116	1279	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1117		- allParamsButton.setToolTipText("Show all controle");
	1280	+ allParamsButton.setToolTipText("Show all controls");
1118	1281	allParamsButton.addActionListener(this);
1119	1282
1120		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1121		- clearPanelButton.setToolTipText("Clear edit panel");
	1283	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1284	+ clearPanelButton.setToolTipText("Clear all controls");
1122	1285	clearPanelButton.addActionListener(this);
1123	1286
1124		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1125		- unselectButton.setToolTipText("Unselect");
1126		- unselectButton.addActionListener(this);
	1287	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1288	+ //unselectButton.setToolTipText("Unselect");
	1289	+ //unselectButton.addActionListener(this);
1127	1290
1128	1291	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129	1292	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -1160,7 +1323,7 @@
1160	1323	oe.treePanel.Return();
1161	1324	cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1162	1325	versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1163		- sliderPane.preferredHeight = 1;
	1326	+ sliderPane.preferredHeight = 2;
1164	1327
1165	1328	// mainPanel.setDividerLocation(0.1); //1.0);
1166	1329	mainPanel.setResizeWeight(0.4);
..	..	@@ -1183,7 +1346,7 @@
1183	1346	dgr.addDragGestureListener(this);
1184	1347	}catch(Exception e) {}
1185	1348	*/
1186		- radio.layout = sixButton; // sevenButton;
	1349	+ radio.layout = threeButton; // sixButton;
1187	1350	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1188	1351	}
1189	1352
..	..	@@ -1318,6 +1481,14 @@
1318	1481
1319	1482	void EditObject(Object3D obj)
1320	1483	{
	1484	+ assert(obj instanceof Composite);
	1485	+
	1486	+// if (obj.versionlist == null)
	1487	+// {
	1488	+// obj.versionlist = new Object3D[100];
	1489	+// obj.versionindex = -1;
	1490	+// }
	1491	+
1321	1492	cRadio radioButton = new cRadio(obj.name);
1322	1493
1323	1494	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1328,7 +1499,7 @@
1328	1499	}
1329	1500
1330	1501	radioButton.SetObject(obj);
1331		- radioButton.layout = sixButton; // sevenButton;
	1502	+ radioButton.layout = threeButton; // sixButton;
1332	1503	radioButton.SetCamera(cameraView.renderCamera, false);
1333	1504	radioButton.addActionListener(this);
1334	1505	radioPanel.add(radioButton);
..	..	@@ -1342,6 +1513,7 @@
1342	1513
1343	1514	oe.SetupViews();
1344	1515
	1516	+ if (Globals.DEBUG)
1345	1517	System.out.println("SetupViews");
1346	1518	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1347	1519	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1708,7 +1880,12 @@
1708	1880	TreePath path;
1709	1881
1710	1882	public TransferableTreePath(TreePath tp) {
1711		- path = tp;
	1883	+ Object[] objs = new Object[tp.getPathCount()];
	1884	+ for (int i=0; i<objs.length; i++)
	1885	+ {
	1886	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1887	+ }
	1888	+ path = new TreePath(objs);
1712	1889	}
1713	1890
1714	1891	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1998,7 +2175,11 @@
1998	2175	shadow.material = new cMaterial(obj.material);
1999	2176	shadow.material.diffuse = 0.0001f;
2000	2177	shadow.material.specular = 0.0001f;
2001		- //shadow.projectedVertices[1].x = 300;
	2178	+ shadow.material.opacity = 0.75f;
	2179	+
	2180	+ AllocProjectedVertices(shadow);
	2181	+
	2182	+ shadow.projectedVertices[1].x = 300;
2002	2183
2003	2184	makeSomething(shadow);
2004	2185	}
..	..	@@ -2519,27 +2700,35 @@
2519	2700	} else
2520	2701	if (source == loopItem \|\| source == loopButton)
2521	2702	{
	2703	+ if (!group.selection.isEmpty())
	2704	+ {
2522	2705	Composite csg = new GroupLeaf();
2523	2706	csg.count = 5;
2524		- group(csg);
2525	2707	Composite child = new cGroup("Branch");
2526	2708	csg.addChild(child);
2527	2709	child.addChild(csg);
	2710	+ group(csg);
	2711	+ }
2528	2712	} else
2529	2713	if (source == doubleItem)
2530	2714	{
	2715	+ if (!group.selection.isEmpty())
	2716	+ {
2531	2717	Composite csg = new GroupLeaf("Fork");
2532	2718	csg.count = 5;
2533		- group(csg);
2534	2719	Composite child = new cGroup("Branch A");
2535	2720	csg.addChild(child);
2536	2721	child.addChild(csg);
2537	2722	child = new cGroup("Branch B");
2538	2723	csg.addChild(child);
2539	2724	child.addChild(csg);
	2725	+ group(csg);
	2726	+ }
2540	2727	} else
2541	2728	if (source == tripleItem)
2542	2729	{
	2730	+ if (!group.selection.isEmpty())
	2731	+ {
2543	2732	Composite csg = new GroupLeaf("Trident");
2544	2733	csg.count = 4;
2545	2734	group(csg);
..	..	@@ -2552,6 +2741,7 @@
2552	2741	child = new cGroup();
2553	2742	csg.addChild(child);
2554	2743	child.addChild(csg);
	2744	+ }
2555	2745	} else
2556	2746	if (source == computeAOItem)
2557	2747	{
..	..	@@ -2571,7 +2761,7 @@
2571	2761	if (source == invariantsItem)
2572	2762	{
2573	2763	System.out.println("Invariants:");
2574		- Grafreed.grafreeD.universe.invariants();
	2764	+ Grafreed.grafreed.universe.invariants();
2575	2765	} else
2576	2766	if (source == memoryItem)
2577	2767	{
..	..	@@ -2602,33 +2792,52 @@
2602	2792	{
2603	2793	ToggleFullScreen();
2604	2794	} else
2605		- if (source == undoButton)
	2795	+ if (source == collapseButton)
	2796	+ {
	2797	+ this.expandedLayout = radio.layout;
	2798	+ CollapseToolbar();
	2799	+ } else
	2800	+ if (source == maximize3DButton)
	2801	+ {
	2802	+ this.expandedLayout = radio.layout;
	2803	+ radio.layout = twoButton;
	2804	+ Show3DView();
	2805	+ CollapseToolbar();
	2806	+ } else
	2807	+ if (source == previousVersionButton)
2606	2808	{
2607	2809	// Go to previous version
2608	2810	//if (!Undo())
2609	2811	//java.awt.Toolkit.getDefaultToolkit().beep();
2610		- Undo();
	2812	+ PreviousVersion();
2611	2813	} else
2612	2814	if (source == restoreButton)
2613	2815	{
2614	2816	// Restore current version
2615	2817	Restore();
	2818	+ //restoreButton.setEnabled(false);
2616	2819	} else
2617	2820	if (source == replaceButton)
2618	2821	{
2619	2822	// Overwrite current version
2620	2823	Replace();
	2824	+ //replaceButton.setEnabled(false);
2621	2825	} else
2622		- if (source == redoButton)
	2826	+ if (source == nextVersionButton)
2623	2827	{
2624	2828	// Go to next version
2625		- Redo();
	2829	+ NextVersion();
2626	2830	} else
2627		- if (source == saveButton)
	2831	+ if (source == saveVersionButton)
2628	2832	{
2629	2833	// Save a new version
2630	2834	if (!Save(true))
2631	2835	java.awt.Toolkit.getDefaultToolkit().beep();
	2836	+ } else
	2837	+ if (source == deleteVersionButton)
	2838	+ {
	2839	+ // Delete a new version
	2840	+ DeleteVersion();
2632	2841	} else
2633	2842	if (source == oneStepButton)
2634	2843	{
..	..	@@ -2683,11 +2892,11 @@
2683	2892	} else
2684	2893	if (source == undoItem)
2685	2894	{
2686		- Undo();
	2895	+ PreviousVersion();
2687	2896	} else
2688	2897	if (source == redoItem)
2689	2898	{
2690		- Redo();
	2899	+ NextVersion();
2691	2900	} else
2692	2901	if (source == duplicateItem)
2693	2902	{
..	..	@@ -3168,22 +3377,34 @@
3168	3377	} else
3169	3378	if (source == ungroupItem \|\| source == ungroupButton)
3170	3379	{
3171		- boolean hasRoot = false;
	3380	+ boolean canUngroup = true;
3172	3381
3173	3382	for (int i=0; i<group.selection.size(); i++)
3174	3383	{
3175		- if (group.selection.get(i) == group)
	3384	+ Object3D selectedItem = group.selection.get(i);
	3385	+
	3386	+ if (selectedItem.Size() == 0)
3176	3387	{
3177		- hasRoot = true;
	3388	+ // Cannot ungroup leaves
	3389	+ canUngroup = false;
	3390	+ break;
	3391	+ }
	3392	+
	3393	+ if (selectedItem == group)
	3394	+ {
	3395	+ // Cannot ungroup root
	3396	+ canUngroup = false;
3178	3397	break;
3179	3398	}
3180	3399	}
3181	3400
3182		- if (!hasRoot)
	3401	+ if (canUngroup)
3183	3402	{
3184	3403	for (int i=0; i<group.selection.size(); i++)
3185	3404	{
3186		- Ungroup(group.selection.get(i));
	3405	+ Object3D selectedItem = group.selection.get(i);
	3406	+
	3407	+ Ungroup(selectedItem);
3187	3408	}
3188	3409
3189	3410	ClearSelection(false);
..	..	@@ -3546,38 +3767,7 @@
3546	3767	if (CameraPane.FULLSCREEN)
3547	3768	fullscreenLayout = radio.layout;
3548	3769
3549		- // bug
3550		- //gridPanel.setDividerLocation(1.0);
3551		- //bigPanel.setDividerLocation(0.0);
3552		-// bigThree.remove(scenePanel);
3553		-// bigThree.remove(centralPanel);
3554		-// bigThree.remove(XYZPanel);
3555		-// aWindowConstraints.gridx = 0;
3556		-// aWindowConstraints.gridy = 0;
3557		-// aWindowConstraints.gridwidth = 1;
3558		-// // aConstraints.gridheight = 3;
3559		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3560		-// aWindowConstraints.weightx = 0;
3561		-// aWindowConstraints.weighty = 1;
3562		-// //bigThree.add(jtp, aWindowConstraints);
3563		-// aWindowConstraints.weightx = 1;
3564		-// aWindowConstraints.gridwidth = 3;
3565		-// // aConstraints.gridheight = 3;
3566		-// aWindowConstraints.gridx = 1;
3567		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3568		-// bigThree.add(centralPanel, aWindowConstraints);
3569		-// aWindowConstraints.weightx = 0;
3570		-// aWindowConstraints.gridx = 4;
3571		-// aWindowConstraints.gridwidth = 1;
3572		-// // aConstraints.gridheight = 3;
3573		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3574		-// //bigThree.add(XYZPanel, aWindowConstraints);
3575		-// scenePanel.setVisible(false);
3576		-// centralPanel.setVisible(true);
3577		-// XYZPanel.setVisible(false);
3578		- bigThree.ClearUI();
3579		- bigThree.add(centralPanel);
3580		- bigThree.FlushUI();
	3770	+ Show3DView();
3581	3771
3582	3772	cameraView.requestFocusInWindow();
3583	3773
..	..	@@ -3763,6 +3953,7 @@
3763	3953	} else
3764	3954	if (source == rootButton)
3765	3955	{
	3956	+ Replace();
3766	3957	Object3D obj;
3767	3958	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3768	3959	{
..	..	@@ -3820,10 +4011,10 @@
3820	4011	{
3821	4012	Object3D child = (Object3D)e.nextElement();
3822	4013	if(child.editWindow != null)
3823		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3824	4014	child.pinned = false;
3825	4015	child.CloseUI();
3826	4016	listUI.remove(child);
	4017	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3827	4018
3828	4019	//child.editWindow = null; // ???????????
3829	4020	}
..	..	@@ -3842,6 +4033,7 @@
3842	4033	obj.CloseUI();
3843	4034	}
3844	4035	listUI.clear();
	4036	+ SetPinStates(group.selection.size() > 0);
3845	4037	refreshContents(true);
3846	4038	} else
3847	4039	if (source == allParamsButton)
..	..	@@ -3898,8 +4090,6 @@
3898	4090
3899	4091	copy = group;
3900	4092
3901		- SetUndoStates();
3902		-
3903	4093	//Globals.theRenderer.object = group;
3904	4094	if(!useclient)
3905	4095	{
..	..	@@ -3927,7 +4117,23 @@
3927	4117	*/
3928	4118	radio.layout.doClick();
3929	4119
	4120	+ assert(copy instanceof Composite);
	4121	+
	4122	+ if (copy.versionlist == null)
	4123	+ {
	4124	+ copy.versionlist = new Object3D[100];
	4125	+ copy.versionindex = -1;
	4126	+
	4127	+ // Cannot work with loops
	4128	+ // To fix this issue, first mark all nodes above the root,
	4129	+ // and check if any of these nodes are reachable below the root.
	4130	+ //Save(true);
	4131	+ }
	4132	+
	4133	+ SetVersionStates();
	4134	+
3930	4135	ClearUnpinned();
	4136	+
3931	4137	//Grafreed.Assert(group != null);
3932	4138	//Grafreed.Assert(group.selection != null);
3933	4139	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3944,11 +4150,13 @@
3944	4150	} else if (event.getSource() == editCameraItem)
3945	4151	{
3946	4152	cameraView.ProtectCamera();
	4153	+ cameraView.requestFocusInWindow();
3947	4154	cameraView.repaint();
3948	4155	return;
3949	4156	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3950	4157	{
3951	4158	cameraView.RevertCamera();
	4159	+ cameraView.requestFocusInWindow();
3952	4160	cameraView.repaint();
3953	4161	return;
3954	4162	// } else if (event.getSource() == textureButton)
..	..	@@ -5081,9 +5289,7 @@
5081	5289
5082	5290	freezemodel = false;
5083	5291	}
5084		-
5085		- boolean flashIt = true;
5086		-
	5292	+
5087	5293	public void valueChanged(TreeSelectionEvent e)
5088	5294	//public boolean handleEvent(Event event)
5089	5295	{
..	..	@@ -5156,13 +5362,30 @@
5156	5362	{
5157	5363	editButton.setEnabled(enabled);
5158	5364	uneditButton.setEnabled(enabled);
5159		- unselectButton.setEnabled(enabled);
	5365	+ //unselectButton.setEnabled(enabled);
5160	5366	flashSelectionButton.setEnabled(enabled);
	5367	+
	5368	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5369	+
	5370	+ boolean allComposites = true;
	5371	+
	5372	+ if (group.selection != null)
	5373	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5374	+ {
	5375	+ Object next = e.nextElement();
	5376	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5377	+ {
	5378	+ allComposites = false;
	5379	+ break;
	5380	+ }
	5381	+ }
	5382	+
	5383	+ rootButton.setEnabled(allComposites);
5161	5384	}
5162	5385
5163	5386	void refreshContents(boolean cp)
5164	5387	{
5165		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5388	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5166	5389	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5167	5390	{
5168	5391	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5172,7 +5395,7 @@
5172	5395	Object3D child = (Object3D) group.selection.get(i);
5173	5396
5174	5397	objEditor.AddInfo(child, this, true);
5175		- System.err.println("info : " + child.GetPath());
	5398	+// System.err.println("info : " + child.GetPath());
5176	5399	}
5177	5400
5178	5401	objEditor.SetText(); // jan 2014
..	..	@@ -5998,7 +6221,6 @@
5998	6221
5999	6222	cButton restoreCameraButton;
6000	6223
6001		- cButton saveButton;
6002	6224	cButton oneStepButton;
6003	6225
6004	6226	cButton groupButton;
..	..	@@ -6056,11 +6278,11 @@
6056	6278	private MenuItem lookAtItem;
6057	6279	private MenuItem lookFromItem;
6058	6280	private MenuItem switchViewItem;
6059		- private MenuItem cutItem;
	6281	+ private JMenuItem cutItem;
6060	6282	private MenuItem undoItem;
6061	6283	private MenuItem redoItem;
6062	6284	private JMenuItem duplicateItem;
6063		- private MenuItem cloneItem;
	6285	+ private JMenuItem cloneItem;
6064	6286	private MenuItem cloneSupportItem;
6065	6287	private MenuItem overwriteGeoItem;
6066	6288	private MenuItem overwriteMatItem;
..	..	@@ -6081,13 +6303,13 @@
6081	6303	private MenuItem cloneGeometriesItem;
6082	6304	private MenuItem shareGeometriesItem;
6083	6305	private MenuItem mergeGeometriesItem;
6084		- private MenuItem copyItem;
	6306	+ private JMenuItem copyItem;
6085	6307	private MenuItem pasteItem;
6086		- private MenuItem pasteIntoItem;
6087		- private MenuItem pasteLinkItem;
6088		- private MenuItem pasteCloneItem;
6089		- private MenuItem pasteExpandItem;
6090		- private MenuItem deleteItem;
	6308	+ private JMenuItem pasteIntoItem;
	6309	+ private JMenuItem pasteLinkItem;
	6310	+ private JMenuItem pasteCloneItem;
	6311	+ private JMenuItem pasteExpandItem;
	6312	+ private JMenuItem deleteItem;
6091	6313	private MenuItem clearAllItem;
6092	6314	private MenuItem genUVItem;
6093	6315	private MenuItem genNormalsMESHItem;
..	..	@@ -6142,7 +6364,7 @@
6142	6364	private MenuItem transformGeometryItem;
6143	6365	private MenuItem transformChildrenItem;
6144	6366	private MenuItem hideItem;
6145		- private MenuItem grabItem;
	6367	+ private JMenuItem grabItem;
6146	6368	private MenuItem backItem;
6147	6369	private MenuItem frontItem;
6148	6370	private MenuItem cameraItem;
..	..	@@ -6155,7 +6377,7 @@
6155	6377	private MenuItem switchTransfoItem;
6156	6378	private MenuItem morphItem;
6157	6379	private MenuItem linkerItem;
6158		- private MenuItem ungroupItem;
	6380	+ private JMenuItem ungroupItem;
6159	6381	private MenuItem editItem;
6160	6382	private MenuItem openWindowItem;
6161	6383	private MenuItem editLeafItem;