~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,11 +73,11 @@
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);
63		- AddSkyboxButton("default", "skycube", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
64	81
65	82	AddSkyboxButton("default", "uffizi", row1);
66	83	AddSkyboxButton("bridge", "Bridge", row1);
..	..	@@ -90,7 +107,7 @@
90	107	AddSkyboxButton("park", "Skansen3", row6);
91	108	AddSkyboxButton("park", "Skansen4", row6);
92	109	AddSkyboxButton("park", "Skansen5", row6);
93		- AddSkyboxButton("park", "Stairs", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
94	111
95	112	tab0.add(row0);
96	113	tab0.add(row1);
..	..	@@ -144,21 +161,18 @@
144	161
145	162	AddSkyboxButton("mountain", "Maskonaive2", row4);
146	163	AddSkyboxButton("mountain", "Maskonaive3", row4);
147		- AddSkyboxButton("mountain", "Ryfjallet", row4);
148	164	AddSkyboxButton("mountain", "Teide", row4);
149	165	AddSkyboxButton("park", "Tantolunden4", row4);
150	166
151		- AddSkyboxButton("penguins", "wrath", row5);
152		- AddSkyboxButton("penguins", "yonder", row5);
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
153	169	AddSkyboxButton("rocky", "Langholmen", row5);
154	170	AddSkyboxButton("rocky", "Skinnarviksberget", row5);
155		- AddSkyboxButton("rocky", "Tantolunden6", row5);
156	171
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
157	173	AddSkyboxButton("default", "CloudyHills", row6);
158	174	AddSkyboxButton("daz", "Autumn", row6);
159		- AddSkyboxButton("daz", "Greenlands", row6);
160	175	AddSkyboxButton("daz", "MountainTrail", row6);
161		- AddSkyboxButton("daz", "Oasis", row6);
162	176	/*
163	177	Autumn
164	178	Greenlands
..	..	@@ -210,8 +224,8 @@
210	224	AddSkyboxButton("penguins", "sleepyhollow", row1);
211	225
212	226	AddSkyboxButton("penguins", "kenon_star", row2);
213		- AddSkyboxButton("indoors", "DallasW", row2);
214		- AddSkyboxButton("indoors", "MarriottMadisonWest", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
215	229	AddSkyboxButton("indoors", "Vasa", row2);
216	230
217	231	AddSkyboxButton("winter", "Backyard", row3);
..	..	@@ -232,7 +246,7 @@
232	246	AddSkyboxButton("daz", "TheRock", row6);
233	247	AddSkyboxButton("daz", "TopOfTheWorld", row6);
234	248	AddSkyboxButton("daz", "Winter", row6);
235		- AddSkyboxButton("penguins", "desertdawn", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
236	250
237	251	tab0.add(row0);
238	252	tab0.add(row1);
..	..	@@ -248,15 +262,122 @@
248	262	//tab0.add(new cGridBag());
249	263	}
250	264	}
251		-
252		- public void ChangeSkybox(String name)
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
253	267	{
254		- cameraView.envyoff = false;
255		- cameraView.skyboxname = name;
256		- cameraView.skyboxext = "jpg";
257		- cameraView.repaint();
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	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);
258	358	}
259	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	+
260	381	//ObjEditor objEditor;
261	382	public void closeUI2()
262	383	{
..	..	@@ -294,10 +415,12 @@
294	415	this.copy = this.group = group;
295	416	//selectees = this.group.selectees;
296	417
297		- if (copy.versions == null)
	418	+ if (copy.versionlist == null)
298	419	{
299		- copy.versions = new byte[100][];
	420	+ copy.versionlist = new Object3D[100];
300	421	copy.versionindex = -1;
	422	+
	423	+ Save(true);
301	424	}
302	425
303	426	if(ui)
..	..	@@ -321,9 +444,9 @@
321	444
322	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
323	446
324		- if (copy.versions == null)
	447	+ if (copy.versionlist == null)
325	448	{
326		- copy.versions = new byte[100][];
	449	+ copy.versionlist = new Object3D[100];
327	450	copy.versionindex = -1;
328	451
329	452	Save(true);
..	..	@@ -529,11 +652,9 @@
529	652	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
530	653	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
531	654	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
532		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
533	655	oe.cameraMenu.add("-");
534	656	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
535	657	openWindowItem.addActionListener(this);
536		- editLeafItem.addActionListener(this);
537	658	lookAtItem.addActionListener(this);
538	659	//lookFromItem.addActinoListener(this);
539	660	//switchViewItem.addActionListener(this);
..	..	@@ -781,6 +902,9 @@
781	902	shareGeometriesItem.addActionListener(this);
782	903	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
783	904	mergeGeometriesItem.addActionListener(this);
	905	+ menu.add("-");
	906	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	907	+ editLeafItem.addActionListener(this);
784	908	if (Globals.ADVANCED)
785	909	{
786	910	// Pretty much the same as duplicate and clone.
..	..	@@ -797,6 +921,73 @@
797	921	buildToolsMenu(menu);
798	922	}
799	923
	924	+ JTabbedPane resourcecontainer;
	925	+ cGridBag currenttab;
	926	+ boolean added; // patch for jar
	927	+
	928	+ int tabcount = 0;
	929	+ int colcount = 0;
	930	+ int rowcount = 0;
	931	+ int texturecount = 0;
	932	+
	933	+ int columns = 5;
	934	+ int rows = 7;
	935	+
	936	+ public void ResourceCallBack(String[] path)
	937	+ {
	938	+// for (int i = 0; i < path.length; i++)
	939	+// System.out.print(path[i] + "/");
	940	+// System.out.println();
	941	+
	942	+ if (//rowcount == 0 \|\|
	943	+ path.length == 1)
	944	+ {
	945	+ currenttab = new cGridBag();
	946	+ added = false;
	947	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	948	+ currenttab.setName(tabname);
	949	+ rowcount = 1;
	950	+ colcount = 0;
	951	+ texturecount = 0;
	952	+ }
	953	+
	954	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	955	+ {
	956	+ if (!added)
	957	+ {
	958	+ added = true;
	959	+ resourcecontainer.add(currenttab);
	960	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ }
	963	+
	964	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	965	+
	966	+ if (++colcount >= columns)
	967	+ {
	968	+ colcount = 0;
	969	+ currenttab.Return();
	970	+
	971	+ if (rowcount++ >= rows)
	972	+ {
	973	+ rowcount = 0;
	974	+ }
	975	+ }
	976	+ }
	977	+ else
	978	+ {
	979	+// if (!path[path.length-1].equals("icons"))
	980	+// resourcecontainer.Return();
	981	+ }
	982	+ }
	983	+
	984	+ void CreateTexturePanel(cGridBag container)
	985	+ {
	986	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	987	+ container.add(resourcecontainer);
	988	+
	989	+ Grafreed.ParseResources("textures", this);
	990	+ }
800	991
801	992	void SetupUI2(ObjEditor oe)
802	993	{
..	..	@@ -815,11 +1006,6 @@
815	1006	//new Exception().printStackTrace();
816	1007
817	1008	oe.radioPanel = new JPanel(new GridBagLayout());
818		- oe.aConstraints.weightx = 1;
819		- oe.aConstraints.weighty = 0;
820		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
821		- oe.aConstraints.gridwidth = 100;
822		- oe.aConstraints.gridheight = 1;
823	1009	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
824	1010
825	1011	oe.buttonGroup = new ButtonGroup();
..	..	@@ -852,10 +1038,49 @@
852	1038
853	1039	if (Globals.ADVANCED)
854	1040	{
855		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
856		- maxButton.setToolTipText("Maximize window");
857		- maxButton.addActionListener(this);
	1041	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+// maxButton.setToolTipText("Maximize window");
	1043	+// maxButton.addActionListener(this);
858	1044	}
	1045	+
	1046	+// cButton gcButton;
	1047	+//
	1048	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1049	+// gcButton.setToolTipText("Garbage collect");
	1050	+// gcButton.addActionListener(new ActionListener()
	1051	+// {
	1052	+// public void actionPerformed(ActionEvent e)
	1053	+// {
	1054	+// System.gc();
	1055	+// }
	1056	+// });
	1057	+
	1058	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+ collapseButton.setToolTipText("Collapse toolbar");
	1060	+ collapseButton.addActionListener(this);
	1061	+
	1062	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1064	+ maximize3DButton.addActionListener(this);
	1065	+
	1066	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1067	+ twoButton.setToolTipText("Show 3D view only");
	1068	+ twoButton.addActionListener(this);
	1069	+ this.fullscreenLayout = twoButton;
	1070	+
	1071	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ threeButton.setToolTipText("Show controls and 3D view");
	1073	+ threeButton.addActionListener(this);
	1074	+ if (Globals.ADVANCED)
	1075	+ {
	1076	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ sixButton.setToolTipText("Show 3D view and controls");
	1078	+ sixButton.addActionListener(this);
	1079	+ }
	1080	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+// sevenButton.setToolTipText("3-column layout");
	1082	+// sevenButton.addActionListener(this);
	1083	+ //
859	1084
860	1085	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
861	1086	fullButton.setToolTipText("Full-screen window");
..	..	@@ -869,41 +1094,45 @@
869	1094	restoreCameraButton.setToolTipText("Restore viewpoint");
870	1095	restoreCameraButton.addActionListener(this);
871	1096
872		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
873		- saveButton.setToolTipText("New version");
874		- saveButton.addActionListener(this);
	1097	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ saveVersionButton.setToolTipText("Duplicate current version");
	1099	+ saveVersionButton.addActionListener(this);
875	1100
876		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
877		- undoButton.setToolTipText("Previous version");
878		- undoButton.addActionListener(this);
879		- undoButton.setEnabled(false);
	1101	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ deleteVersionButton.setToolTipText("Delete current version");
	1103	+ deleteVersionButton.addActionListener(this);
	1104	+
	1105	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ previousVersionButton.setToolTipText("Previous version");
	1107	+ previousVersionButton.addActionListener(this);
	1108	+ previousVersionButton.setEnabled(false);
880	1109
881	1110	cGridBag updown = new cGridBag().setVertical(true);
882	1111	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
883		- restoreButton.setToolTipText("Restore current");
	1112	+ restoreButton.setToolTipText("Undo (restore current version)");
884	1113	restoreButton.addActionListener(this);
885		- restoreButton.setEnabled(false);
	1114	+ //restoreButton.setEnabled(false);
886	1115
887	1116	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
888		- replaceButton.setToolTipText("Replace current");
	1117	+ replaceButton.setToolTipText("Save (replace current version)");
889	1118	replaceButton.addActionListener(this);
890		- replaceButton.setEnabled(false);
	1119	+ //replaceButton.setEnabled(false);
891	1120
892	1121	copyOptionsPanel.add(updown);
893	1122
894		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
895		- redoButton.setToolTipText("Next version");
896		- redoButton.addActionListener(this);
897		- redoButton.setEnabled(false);
	1123	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ nextVersionButton.setToolTipText("Next version");
	1125	+ nextVersionButton.addActionListener(this);
	1126	+ nextVersionButton.setEnabled(false);
	1127	+
	1128	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ oneStepButton.setToolTipText("Animate one step forward");
	1130	+ oneStepButton.addActionListener(this);
898	1131
899	1132	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
900	1133	liveCB.setToolTipText("Enable animation");
901	1134	liveCB.addItemListener(this);
902	1135
903		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
904		- oneStepButton.setToolTipText("Animate one step forward");
905		- oneStepButton.addActionListener(this);
906		-
907	1136	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
908	1137	fastCB.setToolTipText("Fast mode");
909	1138	fastCB.addItemListener(this);
..	..	@@ -930,21 +1159,6 @@
930	1159
931	1160	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
932	1161
933		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
934		- twoButton.setToolTipText("Show 3D view only");
935		- twoButton.addActionListener(this);
936		- this.fullscreenLayout = twoButton;
937		-
938		- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
939		- threeButton.setToolTipText("Show controls and 3D view");
940		- threeButton.addActionListener(this);
941		- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
942		- sixButton.setToolTipText("Show 3D view and controls");
943		- sixButton.addActionListener(this);
944		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
945		-// sevenButton.setToolTipText("3-column layout");
946		-// sevenButton.addActionListener(this);
947		- //
948	1162
949	1163	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
950	1164	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -960,7 +1174,7 @@
960	1174
961	1175	// INSERT
962	1176	row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
963		- gridButton.setToolTipText("Create grid");
	1177	+ gridButton.setToolTipText("Create ground");
964	1178	gridButton.addActionListener(this);
965	1179
966	1180	row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -1028,18 +1242,15 @@
1028	1242
1029	1243	oe.toolboxPanel.add(row2);
1030	1244
1031		- // ENVYMAPS
1032		- cGridBag skyboxpane = new cGridBag();
1033		- skyboxpane.preferredHeight = 100;
	1245	+ cGridBag textures = new cGridBag();
1034	1246
1035		- oe.toolboxPanel.add(skyboxpane);
	1247	+ CreateTexturePanel(textures);
1036	1248
1037		- JTabbedPane skyboxpanel = new JTabbedPane();
1038		- skyboxpane.add(skyboxpanel);
	1249	+ oe.toolboxPanel.add(textures);
1039	1250
1040		- AddSkyboxTab0(skyboxpanel);
1041		- AddSkyboxTab1(skyboxpanel);
1042		- AddSkyboxTab2(skyboxpanel);
	1251	+ textures.preferredHeight = 100;
	1252	+
	1253	+ CreateSkyboxPanel(oe.skyboxPanel);
1043	1254
1044	1255	// EDIT panel
1045	1256	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -1047,20 +1258,20 @@
1047	1258	editButton.addActionListener(this);
1048	1259
1049	1260	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1050		- uneditButton.setToolTipText("Remove selection controls");
	1261	+ uneditButton.setToolTipText("Unpin and remove selection controls");
1051	1262	uneditButton.addActionListener(this);
1052	1263
1053	1264	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1054		- allParamsButton.setToolTipText("Show all controle");
	1265	+ allParamsButton.setToolTipText("Show all controls");
1055	1266	allParamsButton.addActionListener(this);
1056	1267
1057		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1058		- clearPanelButton.setToolTipText("Clear edit panel");
	1268	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1269	+ clearPanelButton.setToolTipText("Clear all controls");
1059	1270	clearPanelButton.addActionListener(this);
1060	1271
1061		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1062		- unselectButton.setToolTipText("Unselect");
1063		- unselectButton.addActionListener(this);
	1272	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1273	+ //unselectButton.setToolTipText("Unselect");
	1274	+ //unselectButton.addActionListener(this);
1064	1275
1065	1276	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1066	1277	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -1120,7 +1331,7 @@
1120	1331	dgr.addDragGestureListener(this);
1121	1332	}catch(Exception e) {}
1122	1333	*/
1123		- radio.layout = sixButton; // sevenButton;
	1334	+ radio.layout = threeButton; // sixButton;
1124	1335	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1125	1336	}
1126	1337
..	..	@@ -1171,9 +1382,12 @@
1171	1382	smoothCB.setToolTipText("Snapping delay");
1172	1383	smoothCB.addItemListener(this);
1173	1384
1174		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1175		- slowCB.setToolTipText("Smooth interpolation");
1176		- slowCB.addItemListener(this);
	1385	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1386	+// slowCB.setToolTipText("Smooth interpolation");
	1387	+// slowCB.addItemListener(this);
	1388	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1389	+ minshaderCB.setToolTipText("Minimal fast shader");
	1390	+ minshaderCB.addItemListener(this);
1177	1391
1178	1392	// constraints.gridy += 1;
1179	1393	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1252,6 +1466,14 @@
1252	1466
1253	1467	void EditObject(Object3D obj)
1254	1468	{
	1469	+ assert(obj instanceof Composite);
	1470	+
	1471	+// if (obj.versionlist == null)
	1472	+// {
	1473	+// obj.versionlist = new Object3D[100];
	1474	+// obj.versionindex = -1;
	1475	+// }
	1476	+
1255	1477	cRadio radioButton = new cRadio(obj.name);
1256	1478
1257	1479	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1262,7 +1484,7 @@
1262	1484	}
1263	1485
1264	1486	radioButton.SetObject(obj);
1265		- radioButton.layout = sixButton; // sevenButton;
	1487	+ radioButton.layout = threeButton; // sixButton;
1266	1488	radioButton.SetCamera(cameraView.renderCamera, false);
1267	1489	radioButton.addActionListener(this);
1268	1490	radioPanel.add(radioButton);
..	..	@@ -1287,6 +1509,8 @@
1287	1509	cCheckBox localCB;
1288	1510	cCheckBox crowdCB;
1289	1511	cCheckBox smoothCB;
	1512	+ cCheckBox minshaderCB;
	1513	+
1290	1514	cToggleButton fastCB;
1291	1515	cCheckBox slowCB;
1292	1516	cCheckBox boxCB;
..	..	@@ -1357,6 +1581,12 @@
1357	1581	{
1358	1582	cameraView.ToggleInertia();
1359	1583	cameraView.repaint();
	1584	+ }
	1585	+ else if(e.getSource() == minshaderCB)
	1586	+ {
	1587	+ Globals.MINSHADER ^= true;
	1588	+ cameraView.programInitialized = false;
	1589	+ cameraView.repaint();
1360	1590	}
1361	1591	else if(e.getSource() == localCB)
1362	1592	{
..	..	@@ -1634,7 +1864,12 @@
1634	1864	TreePath path;
1635	1865
1636	1866	public TransferableTreePath(TreePath tp) {
1637		- path = tp;
	1867	+ Object[] objs = new Object[tp.getPathCount()];
	1868	+ for (int i=0; i<objs.length; i++)
	1869	+ {
	1870	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1871	+ }
	1872	+ path = new TreePath(objs);
1638	1873	}
1639	1874
1640	1875	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -2497,7 +2732,7 @@
2497	2732	if (source == invariantsItem)
2498	2733	{
2499	2734	System.out.println("Invariants:");
2500		- Grafreed.grafreeD.universe.invariants();
	2735	+ Grafreed.grafreed.universe.invariants();
2501	2736	} else
2502	2737	if (source == memoryItem)
2503	2738	{
..	..	@@ -2528,33 +2763,52 @@
2528	2763	{
2529	2764	ToggleFullScreen();
2530	2765	} else
2531		- if (source == undoButton)
	2766	+ if (source == collapseButton)
	2767	+ {
	2768	+ this.expandedLayout = radio.layout;
	2769	+ CollapseToolbar();
	2770	+ } else
	2771	+ if (source == maximize3DButton)
	2772	+ {
	2773	+ this.expandedLayout = radio.layout;
	2774	+ radio.layout = twoButton;
	2775	+ Show3DView();
	2776	+ CollapseToolbar();
	2777	+ } else
	2778	+ if (source == previousVersionButton)
2532	2779	{
2533	2780	// Go to previous version
2534	2781	//if (!Undo())
2535	2782	//java.awt.Toolkit.getDefaultToolkit().beep();
2536		- Undo();
	2783	+ PreviousVersion();
2537	2784	} else
2538	2785	if (source == restoreButton)
2539	2786	{
2540	2787	// Restore current version
2541	2788	Restore();
	2789	+ //restoreButton.setEnabled(false);
2542	2790	} else
2543	2791	if (source == replaceButton)
2544	2792	{
2545	2793	// Overwrite current version
2546	2794	Replace();
	2795	+ //replaceButton.setEnabled(false);
2547	2796	} else
2548		- if (source == redoButton)
	2797	+ if (source == nextVersionButton)
2549	2798	{
2550	2799	// Go to next version
2551		- Redo();
	2800	+ NextVersion();
2552	2801	} else
2553		- if (source == saveButton)
	2802	+ if (source == saveVersionButton)
2554	2803	{
2555	2804	// Save a new version
2556	2805	if (!Save(true))
2557	2806	java.awt.Toolkit.getDefaultToolkit().beep();
	2807	+ } else
	2808	+ if (source == deleteVersionButton)
	2809	+ {
	2810	+ // Delete a new version
	2811	+ DeleteVersion();
2558	2812	} else
2559	2813	if (source == oneStepButton)
2560	2814	{
..	..	@@ -2609,11 +2863,11 @@
2609	2863	} else
2610	2864	if (source == undoItem)
2611	2865	{
2612		- Undo();
	2866	+ PreviousVersion();
2613	2867	} else
2614	2868	if (source == redoItem)
2615	2869	{
2616		- Redo();
	2870	+ NextVersion();
2617	2871	} else
2618	2872	if (source == duplicateItem)
2619	2873	{
..	..	@@ -3472,38 +3726,7 @@
3472	3726	if (CameraPane.FULLSCREEN)
3473	3727	fullscreenLayout = radio.layout;
3474	3728
3475		- // bug
3476		- //gridPanel.setDividerLocation(1.0);
3477		- //bigPanel.setDividerLocation(0.0);
3478		-// bigThree.remove(scenePanel);
3479		-// bigThree.remove(centralPanel);
3480		-// bigThree.remove(XYZPanel);
3481		-// aWindowConstraints.gridx = 0;
3482		-// aWindowConstraints.gridy = 0;
3483		-// aWindowConstraints.gridwidth = 1;
3484		-// // aConstraints.gridheight = 3;
3485		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3486		-// aWindowConstraints.weightx = 0;
3487		-// aWindowConstraints.weighty = 1;
3488		-// //bigThree.add(jtp, aWindowConstraints);
3489		-// aWindowConstraints.weightx = 1;
3490		-// aWindowConstraints.gridwidth = 3;
3491		-// // aConstraints.gridheight = 3;
3492		-// aWindowConstraints.gridx = 1;
3493		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3494		-// bigThree.add(centralPanel, aWindowConstraints);
3495		-// aWindowConstraints.weightx = 0;
3496		-// aWindowConstraints.gridx = 4;
3497		-// aWindowConstraints.gridwidth = 1;
3498		-// // aConstraints.gridheight = 3;
3499		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3500		-// //bigThree.add(XYZPanel, aWindowConstraints);
3501		-// scenePanel.setVisible(false);
3502		-// centralPanel.setVisible(true);
3503		-// XYZPanel.setVisible(false);
3504		- bigThree.ClearUI();
3505		- bigThree.add(centralPanel);
3506		- bigThree.FlushUI();
	3729	+ Show3DView();
3507	3730
3508	3731	cameraView.requestFocusInWindow();
3509	3732
..	..	@@ -3689,6 +3912,7 @@
3689	3912	} else
3690	3913	if (source == rootButton)
3691	3914	{
	3915	+ Replace();
3692	3916	Object3D obj;
3693	3917	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3694	3918	{
..	..	@@ -3746,10 +3970,10 @@
3746	3970	{
3747	3971	Object3D child = (Object3D)e.nextElement();
3748	3972	if(child.editWindow != null)
3749		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3750	3973	child.pinned = false;
3751	3974	child.CloseUI();
3752	3975	listUI.remove(child);
	3976	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3753	3977
3754	3978	//child.editWindow = null; // ???????????
3755	3979	}
..	..	@@ -3768,6 +3992,7 @@
3768	3992	obj.CloseUI();
3769	3993	}
3770	3994	listUI.clear();
	3995	+ SetPinStates(group.selection.size() > 0);
3771	3996	refreshContents(true);
3772	3997	} else
3773	3998	if (source == allParamsButton)
..	..	@@ -3824,8 +4049,6 @@
3824	4049
3825	4050	copy = group;
3826	4051
3827		- SetUndoStates();
3828		-
3829	4052	//Globals.theRenderer.object = group;
3830	4053	if(!useclient)
3831	4054	{
..	..	@@ -3853,7 +4076,20 @@
3853	4076	*/
3854	4077	radio.layout.doClick();
3855	4078
	4079	+ assert(copy instanceof Composite);
	4080	+
	4081	+ if (copy.versionlist == null)
	4082	+ {
	4083	+ copy.versionlist = new Object3D[100];
	4084	+ copy.versionindex = -1;
	4085	+
	4086	+ Save(true);
	4087	+ }
	4088	+
	4089	+ SetVersionStates();
	4090	+
3856	4091	ClearUnpinned();
	4092	+
3857	4093	//Grafreed.Assert(group != null);
3858	4094	//Grafreed.Assert(group.selection != null);
3859	4095	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3870,11 +4106,13 @@
3870	4106	} else if (event.getSource() == editCameraItem)
3871	4107	{
3872	4108	cameraView.ProtectCamera();
	4109	+ cameraView.requestFocusInWindow();
3873	4110	cameraView.repaint();
3874	4111	return;
3875	4112	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3876	4113	{
3877	4114	cameraView.RevertCamera();
	4115	+ cameraView.requestFocusInWindow();
3878	4116	cameraView.repaint();
3879	4117	return;
3880	4118	// } else if (event.getSource() == textureButton)
..	..	@@ -5007,9 +5245,7 @@
5007	5245
5008	5246	freezemodel = false;
5009	5247	}
5010		-
5011		- boolean flashIt = true;
5012		-
	5248	+
5013	5249	public void valueChanged(TreeSelectionEvent e)
5014	5250	//public boolean handleEvent(Event event)
5015	5251	{
..	..	@@ -5082,13 +5318,28 @@
5082	5318	{
5083	5319	editButton.setEnabled(enabled);
5084	5320	uneditButton.setEnabled(enabled);
5085		- unselectButton.setEnabled(enabled);
	5321	+ //unselectButton.setEnabled(enabled);
5086	5322	flashSelectionButton.setEnabled(enabled);
	5323	+
	5324	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5325	+
	5326	+ boolean allComposites = true;
	5327	+
	5328	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5329	+ {
	5330	+ if (!(e.nextElement() instanceof Composite))
	5331	+ {
	5332	+ allComposites = false;
	5333	+ break;
	5334	+ }
	5335	+ }
	5336	+
	5337	+ rootButton.setEnabled(allComposites);
5087	5338	}
5088	5339
5089	5340	void refreshContents(boolean cp)
5090	5341	{
5091		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5342	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5092	5343	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5093	5344	{
5094	5345	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5098,7 +5349,7 @@
5098	5349	Object3D child = (Object3D) group.selection.get(i);
5099	5350
5100	5351	objEditor.AddInfo(child, this, true);
5101		- System.err.println("info : " + child.GetPath());
	5352	+// System.err.println("info : " + child.GetPath());
5102	5353	}
5103	5354
5104	5355	objEditor.SetText(); // jan 2014
..	..	@@ -5924,7 +6175,6 @@
5924	6175
5925	6176	cButton restoreCameraButton;
5926	6177
5927		- cButton saveButton;
5928	6178	cButton oneStepButton;
5929	6179
5930	6180	cButton groupButton;