~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,
..	..	@@ -28,9 +29,9 @@
28	29	{
29	30	cButton skyboxButton;
30	31	final String path = "cubemaps/" + f + "-skyboxes/" + s;
31		- //row.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
32		- row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
33		- skyboxButton.setToolTipText(s);
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	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,12 +73,13 @@
56	73	cGridBag row5 = new cGridBag();
57	74	cGridBag row6 = new cGridBag();
58	75
59		- AddSkyboxButton("default", "rgb", row0);
60		- AddSkyboxButton("default", "cornell", row0);
61		- AddSkyboxButton("default", "uffizi", row0);
62		- AddSkyboxButton("default", "CloudyHills", row0);
63		-
64		- AddSkyboxButton("default", "skycube", row1);
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
65	83	AddSkyboxButton("bridge", "Bridge", row1);
66	84	AddSkyboxButton("bridge", "Bridge2", row1);
67	85	AddSkyboxButton("urban", "GamlaStan2", row1);
..	..	@@ -73,23 +91,23 @@
73	91
74	92	AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
75	93	AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
76	95	AddSkyboxButton("park", "BerzeliiPark", row3);
77		- AddSkyboxButton("park", "Buddha", row3);
78	96
	97	+ AddSkyboxButton("park", "Buddha", row4);
79	98	AddSkyboxButton("park", "CNTower2", row4);
80	99	AddSkyboxButton("park", "NiagaraFalls1", row4);
81	100	AddSkyboxButton("park", "NiagaraFalls3", row4);
82		- AddSkyboxButton("park", "Park", row4);
83	101
	102	+ AddSkyboxButton("park", "Park", row5);
84	103	AddSkyboxButton("park", "Pond", row5);
85	104	AddSkyboxButton("park", "Skansen", row5);
86	105	AddSkyboxButton("park", "Skansen2", row5);
87		- AddSkyboxButton("park", "Skansen3", row5);
88	106
	107	+ AddSkyboxButton("park", "Skansen3", row6);
89	108	AddSkyboxButton("park", "Skansen4", row6);
90	109	AddSkyboxButton("park", "Skansen5", row6);
91		- AddSkyboxButton("park", "Stairs", row6);
92		- AddSkyboxButton("park", "Tantolunden4", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
93	111
94	112	tab0.add(row0);
95	113	tab0.add(row1);
..	..	@@ -140,24 +158,29 @@
140	158	AddSkyboxButton("forest", "Langholmen2", row3);
141	159	AddSkyboxButton("forest", "Plants", row3);
142	160	AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
143	162	AddSkyboxButton("mountain", "Maskonaive2", row4);
144		-
145	163	AddSkyboxButton("mountain", "Maskonaive3", row4);
146		- AddSkyboxButton("mountain", "Ryfjallet", row4);
147		- AddSkyboxButton("mountain", "Teide", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
148	166
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
149	169	AddSkyboxButton("rocky", "Langholmen", row5);
150		- AddSkyboxButton("rocky", "Riddarfjarden", row5);
151	170	AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
152	172	AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
153	176	/*
154		-Kastellholmen
155		-Langholmen
156		-Riddarfjarden
157		-Skinnarviksberget
158		-Tanto
159		-Tantolunden2
160		-Tantolunden6
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
161	184	*/
162	185
163	186	tab0.add(row0);
..	..	@@ -197,39 +220,33 @@
197	220
198	221	AddSkyboxButton("urban", "CNTower", row1);
199	222	AddSkyboxButton("bridge", "ArstaBridge", row1);
200		- AddSkyboxButton("indoors", "DallasW", row1);
201		- AddSkyboxButton("indoors", "MarriottMadisonWest", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
202	225
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
203	229	AddSkyboxButton("indoors", "Vasa", row2);
204		- AddSkyboxButton("winter", "Backyard", row2);
205		- AddSkyboxButton("winter", "Creek", row2);
206		- AddSkyboxButton("winter", "FootballField3", row2);
207	230
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
208	234	AddSkyboxButton("winter", "Forest", row3);
209		- AddSkyboxButton("winter", "HornstullsStrand2", row3);
210		- AddSkyboxButton("winter", "House", row3);
211		- AddSkyboxButton("winter", "IceLake", row3);
212	235
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
213	239	AddSkyboxButton("winter", "IceRiver", row4);
214		- AddSkyboxButton("winter", "Park3", row4);
215		- AddSkyboxButton("winter", "PondWinter", row4);
216	240
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
217	243	AddSkyboxButton("winter", "Tantolunden5", row5);
218	244	AddSkyboxButton("winter", "Vindelalven", row5);
219		- /*
220		-Backyard
221		-Creek
222		-FootballField3
223		-Forest
224		-HornstullsStrand2
225		-House
226		-IceLake
227		-IceRiver
228		-Park3
229		-PondWinter
230		-Tantolunden5
231		-Vindelalven *
232		- */
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
233	250
234	251	tab0.add(row0);
235	252	tab0.add(row1);
..	..	@@ -245,15 +262,122 @@
245	262	//tab0.add(new cGridBag());
246	263	}
247	264	}
248		-
249		- public void ChangeSkybox(String name)
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
250	267	{
251		- cameraView.envyoff = false;
252		- cameraView.skyboxname = name;
253		- cameraView.skyboxext = "jpg";
254		- 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);
255	358	}
256	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	+
257	381	//ObjEditor objEditor;
258	382	public void closeUI2()
259	383	{
..	..	@@ -291,10 +415,12 @@
291	415	this.copy = this.group = group;
292	416	//selectees = this.group.selectees;
293	417
294		- if (copy.versions == null)
	418	+ if (copy.versionlist == null)
295	419	{
296		- copy.versions = new byte[100][];
	420	+ copy.versionlist = new Object3D[100];
297	421	copy.versionindex = -1;
	422	+
	423	+ Save(true);
298	424	}
299	425
300	426	if(ui)
..	..	@@ -318,9 +444,9 @@
318	444
319	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
320	446
321		- if (copy.versions == null)
	447	+ if (copy.versionlist == null)
322	448	{
323		- copy.versions = new byte[100][];
	449	+ copy.versionlist = new Object3D[100];
324	450	copy.versionindex = -1;
325	451
326	452	Save(true);
..	..	@@ -414,33 +540,35 @@
414	540	// menu.add("-");
415	541	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
416	542	duplicateItem.addActionListener(this);
417		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
418	545	cloneItem.addActionListener(this);
419		- if (Globals.ADVANCED)
	546	+ //if (Globals.ADVANCED)
420	547	{
421	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
422	549	cloneSupportItem.addActionListener(this);
423	550	}
	551	+ oe.jTree.popup.addSeparator();
424	552	menu.add("-");
425		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
426	554	cutItem.addActionListener(this);
427		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
428	556	copyItem.addActionListener(this);
429	557	pasteItem = menu.add(new MenuItem("Paste"));
430	558	pasteItem.addActionListener(this);
431	559
432		- menu.add("-");
433		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	560	+ oe.jTree.popup.addSeparator();
	561	+ //menu.add("-");
	562	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
434	563	pasteIntoItem.addActionListener(this);
435		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
436	565	pasteLinkItem.addActionListener(this);
437		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
438	567	pasteCloneItem.addActionListener(this);
439		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
440	569	// pasteExpandItem.addActionListener(this);
441		- menu.add("-");
442		- deleteItem = menu.add(new MenuItem("Delete"));
443		- deleteItem.addActionListener(this);
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
444	572
445	573	if (Globals.ADVANCED)
446	574	{
..	..	@@ -526,11 +654,9 @@
526	654	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
527	655	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
528	656	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
529		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
530	657	oe.cameraMenu.add("-");
531	658	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
532	659	openWindowItem.addActionListener(this);
533		- editLeafItem.addActionListener(this);
534	660	lookAtItem.addActionListener(this);
535	661	//lookFromItem.addActinoListener(this);
536	662	//switchViewItem.addActionListener(this);
..	..	@@ -577,9 +703,8 @@
577	703	setMasterItem.addActionListener(this);
578	704	}
579	705
580		- oe.menuBar.add(menu = new Menu("Group"));
581		-// grabItem = menu.add(new MenuItem("Grab"));
582		-// grabItem.addActionListener(this);
	706	+ oe.menuBar.add(menu = new Menu("Order"));
	707	+
583	708	backItem = menu.add(new MenuItem("Back"));
584	709	backItem.addActionListener(this);
585	710	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -587,13 +712,21 @@
587	712	// compositeItem = menu.add(new MenuItem("Composite"));
588	713	// compositeItem.addActionListener(this);
589	714
	715	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	716	+ grabItem.addActionListener(this);
	717	+
590	718	if (Globals.ADVANCED)
591	719	{
592	720	hideItem = menu.add(new MenuItem("Hidden Group"));
593	721	hideItem.addActionListener(this);
594	722	}
595		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	723	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
596	724	ungroupItem.addActionListener(this);
	725	+
	726	+ oe.jTree.popup.addSeparator();
	727	+
	728	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	729	+ deleteItem.addActionListener(this);
597	730
598	731	// menu.add("-");
599	732	//
..	..	@@ -778,6 +911,9 @@
778	911	shareGeometriesItem.addActionListener(this);
779	912	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
780	913	mergeGeometriesItem.addActionListener(this);
	914	+ menu.add("-");
	915	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	916	+ editLeafItem.addActionListener(this);
781	917	if (Globals.ADVANCED)
782	918	{
783	919	// Pretty much the same as duplicate and clone.
..	..	@@ -794,6 +930,74 @@
794	930	buildToolsMenu(menu);
795	931	}
796	932
	933	+ JTabbedPane resourcecontainer;
	934	+ cGridBag currenttab;
	935	+ //boolean added; // patch for jar
	936	+
	937	+ int tabcount = 0;
	938	+ int colcount = 0;
	939	+ int rowcount = 0;
	940	+ int texturecount = 0;
	941	+
	942	+ int columns = 5;
	943	+ int rows = 7;
	944	+
	945	+ public void ResourceCallBack(String[] path)
	946	+ {
	947	+// for (int i = 0; i < path.length; i++)
	948	+// System.out.print(path[i] + "/");
	949	+// System.out.println();
	950	+
	951	+ if (//rowcount == 0 \|\|
	952	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	953	+ {
	954	+ currenttab = new cGridBag();
	955	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	956	+ currenttab.setName(tabname);
	957	+ //added = false;
	958	+ resourcecontainer.add(currenttab);
	959	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	960	+ rowcount = 1;
	961	+ colcount = 0;
	962	+ texturecount = 0;
	963	+ }
	964	+
	965	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	966	+ {
	967	+ //if (!added)
	968	+ {
	969	+ //added = true;
	970	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	971	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	972	+ }
	973	+
	974	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	975	+
	976	+ if (++colcount >= columns)
	977	+ {
	978	+ colcount = 0;
	979	+ currenttab.Return();
	980	+
	981	+ if (rowcount++ >= rows)
	982	+ {
	983	+ rowcount = 0;
	984	+ }
	985	+ }
	986	+ }
	987	+ else
	988	+ {
	989	+// if (!path[path.length-1].equals("icons"))
	990	+// resourcecontainer.Return();
	991	+ }
	992	+ }
	993	+
	994	+ void CreateTexturePanel(cGridBag container)
	995	+ {
	996	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	997	+ container.add(resourcecontainer);
	998	+
	999	+ Grafreed.ParseResources("textures", this);
	1000	+ }
797	1001
798	1002	void SetupUI2(ObjEditor oe)
799	1003	{
..	..	@@ -812,11 +1016,6 @@
812	1016	//new Exception().printStackTrace();
813	1017
814	1018	oe.radioPanel = new JPanel(new GridBagLayout());
815		- oe.aConstraints.weightx = 1;
816		- oe.aConstraints.weighty = 0;
817		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
818		- oe.aConstraints.gridwidth = 100;
819		- oe.aConstraints.gridheight = 1;
820	1019	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
821	1020
822	1021	oe.buttonGroup = new ButtonGroup();
..	..	@@ -849,10 +1048,49 @@
849	1048
850	1049	if (Globals.ADVANCED)
851	1050	{
852		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
853		- maxButton.setToolTipText("Maximize window");
854		- maxButton.addActionListener(this);
	1051	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1052	+// maxButton.setToolTipText("Maximize window");
	1053	+// maxButton.addActionListener(this);
855	1054	}
	1055	+
	1056	+ cButton gcButton;
	1057	+
	1058	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+// gcButton.setToolTipText("Garbage collect");
	1060	+// gcButton.addActionListener(new ActionListener()
	1061	+// {
	1062	+// public void actionPerformed(ActionEvent e)
	1063	+// {
	1064	+// System.gc();
	1065	+// }
	1066	+// });
	1067	+
	1068	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+ collapseButton.setToolTipText("Collapse toolbar");
	1070	+ collapseButton.addActionListener(this);
	1071	+
	1072	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1074	+ maximize3DButton.addActionListener(this);
	1075	+
	1076	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ twoButton.setToolTipText("Show 3D view only");
	1078	+ twoButton.addActionListener(this);
	1079	+ this.fullscreenLayout = twoButton;
	1080	+
	1081	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ threeButton.setToolTipText("Show controls and 3D view");
	1083	+ threeButton.addActionListener(this);
	1084	+ if (Globals.ADVANCED)
	1085	+ {
	1086	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ sixButton.setToolTipText("Show 3D view and controls");
	1088	+ sixButton.addActionListener(this);
	1089	+ }
	1090	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1091	+// sevenButton.setToolTipText("3-column layout");
	1092	+// sevenButton.addActionListener(this);
	1093	+ //
856	1094
857	1095	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
858	1096	fullButton.setToolTipText("Full-screen window");
..	..	@@ -866,41 +1104,45 @@
866	1104	restoreCameraButton.setToolTipText("Restore viewpoint");
867	1105	restoreCameraButton.addActionListener(this);
868	1106
869		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
870		- saveButton.setToolTipText("New version");
871		- saveButton.addActionListener(this);
	1107	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ saveVersionButton.setToolTipText("Duplicate current version");
	1109	+ saveVersionButton.addActionListener(this);
872	1110
873		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
874		- undoButton.setToolTipText("Previous version");
875		- undoButton.addActionListener(this);
876		- undoButton.setEnabled(false);
	1111	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ deleteVersionButton.setToolTipText("Delete current version");
	1113	+ deleteVersionButton.addActionListener(this);
	1114	+
	1115	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1116	+ previousVersionButton.setToolTipText("Previous version");
	1117	+ previousVersionButton.addActionListener(this);
	1118	+ previousVersionButton.setEnabled(false);
877	1119
878	1120	cGridBag updown = new cGridBag().setVertical(true);
879	1121	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
880		- restoreButton.setToolTipText("Restore current");
	1122	+ restoreButton.setToolTipText("Undo (restore current version)");
881	1123	restoreButton.addActionListener(this);
882		- restoreButton.setEnabled(false);
	1124	+ //restoreButton.setEnabled(false);
883	1125
884	1126	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
885		- replaceButton.setToolTipText("Replace current");
	1127	+ replaceButton.setToolTipText("Save (replace current version)");
886	1128	replaceButton.addActionListener(this);
887		- replaceButton.setEnabled(false);
	1129	+ //replaceButton.setEnabled(false);
888	1130
889	1131	copyOptionsPanel.add(updown);
890	1132
891		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
892		- redoButton.setToolTipText("Next version");
893		- redoButton.addActionListener(this);
894		- redoButton.setEnabled(false);
	1133	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ nextVersionButton.setToolTipText("Next version");
	1135	+ nextVersionButton.addActionListener(this);
	1136	+ nextVersionButton.setEnabled(false);
	1137	+
	1138	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1139	+ oneStepButton.setToolTipText("Animate one step forward");
	1140	+ oneStepButton.addActionListener(this);
895	1141
896	1142	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
897	1143	liveCB.setToolTipText("Enable animation");
898	1144	liveCB.addItemListener(this);
899	1145
900		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
901		- oneStepButton.setToolTipText("Animate one step forward");
902		- oneStepButton.addActionListener(this);
903		-
904	1146	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
905	1147	fastCB.setToolTipText("Fast mode");
906	1148	fastCB.addItemListener(this);
..	..	@@ -927,21 +1169,6 @@
927	1169
928	1170	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
929	1171
930		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
931		- twoButton.setToolTipText("Show 3D view only");
932		- twoButton.addActionListener(this);
933		- this.fullscreenLayout = twoButton;
934		-
935		- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
936		- threeButton.setToolTipText("Show controls and 3D view");
937		- threeButton.addActionListener(this);
938		- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
939		- sixButton.setToolTipText("Show 3D view and controls");
940		- sixButton.addActionListener(this);
941		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
942		-// sevenButton.setToolTipText("3-column layout");
943		-// sevenButton.addActionListener(this);
944		- //
945	1172
946	1173	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
947	1174	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -957,12 +1184,16 @@
957	1184
958	1185	// INSERT
959	1186	row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
960		- gridButton.setToolTipText("Create grid");
	1187	+ gridButton.setToolTipText("Create ground");
961	1188	gridButton.addActionListener(this);
962	1189
963	1190	row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
964	1191	boxButton.setToolTipText("Create box");
965	1192	boxButton.addActionListener(this);
	1193	+
	1194	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ superButton.setToolTipText("Create superellipsoid");
	1196	+ superButton.addActionListener(this);
966	1197
967	1198	row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
968	1199	sphereButton.setToolTipText("Create sphere");
..	..	@@ -975,10 +1206,6 @@
975	1206	row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
976	1207	torusButton.setToolTipText("Create torus");
977	1208	torusButton.addActionListener(this);
978		-
979		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
980		- superButton.setToolTipText("Create superellipsoid");
981		- superButton.addActionListener(this);
982	1209
983	1210	if (Globals.ADVANCED)
984	1211	{
..	..	@@ -1025,18 +1252,15 @@
1025	1252
1026	1253	oe.toolboxPanel.add(row2);
1027	1254
1028		- // ENVYMAPS
1029		- cGridBag skyboxpane = new cGridBag();
1030		- skyboxpane.preferredHeight = 100;
	1255	+ cGridBag textures = new cGridBag();
1031	1256
1032		- oe.toolboxPanel.add(skyboxpane);
	1257	+ CreateTexturePanel(textures);
1033	1258
1034		- JTabbedPane skyboxpanel = new JTabbedPane();
1035		- skyboxpane.add(skyboxpanel);
	1259	+ oe.toolboxPanel.add(textures);
1036	1260
1037		- AddSkyboxTab0(skyboxpanel);
1038		- AddSkyboxTab1(skyboxpanel);
1039		- AddSkyboxTab2(skyboxpanel);
	1261	+ textures.preferredHeight = 100;
	1262	+
	1263	+ CreateSkyboxPanel(oe.skyboxPanel);
1040	1264
1041	1265	// EDIT panel
1042	1266	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -1044,20 +1268,20 @@
1044	1268	editButton.addActionListener(this);
1045	1269
1046	1270	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1047		- uneditButton.setToolTipText("Remove selection controls");
	1271	+ uneditButton.setToolTipText("Unpin and remove selection controls");
1048	1272	uneditButton.addActionListener(this);
1049	1273
1050	1274	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1051		- allParamsButton.setToolTipText("Show all controle");
	1275	+ allParamsButton.setToolTipText("Show all controls");
1052	1276	allParamsButton.addActionListener(this);
1053	1277
1054		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1055		- clearPanelButton.setToolTipText("Clear edit panel");
	1278	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ clearPanelButton.setToolTipText("Clear all controls");
1056	1280	clearPanelButton.addActionListener(this);
1057	1281
1058		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1059		- unselectButton.setToolTipText("Unselect");
1060		- unselectButton.addActionListener(this);
	1282	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ //unselectButton.setToolTipText("Unselect");
	1284	+ //unselectButton.addActionListener(this);
1061	1285
1062	1286	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1063	1287	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -1117,7 +1341,7 @@
1117	1341	dgr.addDragGestureListener(this);
1118	1342	}catch(Exception e) {}
1119	1343	*/
1120		- radio.layout = sixButton; // sevenButton;
	1344	+ radio.layout = threeButton; // sixButton;
1121	1345	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1122	1346	}
1123	1347
..	..	@@ -1168,9 +1392,12 @@
1168	1392	smoothCB.setToolTipText("Snapping delay");
1169	1393	smoothCB.addItemListener(this);
1170	1394
1171		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1172		- slowCB.setToolTipText("Smooth interpolation");
1173		- slowCB.addItemListener(this);
	1395	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1396	+// slowCB.setToolTipText("Smooth interpolation");
	1397	+// slowCB.addItemListener(this);
	1398	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1399	+ minshaderCB.setToolTipText("Minimal fast shader");
	1400	+ minshaderCB.addItemListener(this);
1174	1401
1175	1402	// constraints.gridy += 1;
1176	1403	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1249,6 +1476,14 @@
1249	1476
1250	1477	void EditObject(Object3D obj)
1251	1478	{
	1479	+ assert(obj instanceof Composite);
	1480	+
	1481	+// if (obj.versionlist == null)
	1482	+// {
	1483	+// obj.versionlist = new Object3D[100];
	1484	+// obj.versionindex = -1;
	1485	+// }
	1486	+
1252	1487	cRadio radioButton = new cRadio(obj.name);
1253	1488
1254	1489	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1259,7 +1494,7 @@
1259	1494	}
1260	1495
1261	1496	radioButton.SetObject(obj);
1262		- radioButton.layout = sixButton; // sevenButton;
	1497	+ radioButton.layout = threeButton; // sixButton;
1263	1498	radioButton.SetCamera(cameraView.renderCamera, false);
1264	1499	radioButton.addActionListener(this);
1265	1500	radioPanel.add(radioButton);
..	..	@@ -1273,6 +1508,7 @@
1273	1508
1274	1509	oe.SetupViews();
1275	1510
	1511	+ if (Globals.DEBUG)
1276	1512	System.out.println("SetupViews");
1277	1513	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1278	1514	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1284,6 +1520,8 @@
1284	1520	cCheckBox localCB;
1285	1521	cCheckBox crowdCB;
1286	1522	cCheckBox smoothCB;
	1523	+ cCheckBox minshaderCB;
	1524	+
1287	1525	cToggleButton fastCB;
1288	1526	cCheckBox slowCB;
1289	1527	cCheckBox boxCB;
..	..	@@ -1354,6 +1592,12 @@
1354	1592	{
1355	1593	cameraView.ToggleInertia();
1356	1594	cameraView.repaint();
	1595	+ }
	1596	+ else if(e.getSource() == minshaderCB)
	1597	+ {
	1598	+ Globals.MINSHADER ^= true;
	1599	+ cameraView.programInitialized = false;
	1600	+ cameraView.repaint();
1357	1601	}
1358	1602	else if(e.getSource() == localCB)
1359	1603	{
..	..	@@ -1631,7 +1875,12 @@
1631	1875	TreePath path;
1632	1876
1633	1877	public TransferableTreePath(TreePath tp) {
1634		- path = tp;
	1878	+ Object[] objs = new Object[tp.getPathCount()];
	1879	+ for (int i=0; i<objs.length; i++)
	1880	+ {
	1881	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1882	+ }
	1883	+ path = new TreePath(objs);
1635	1884	}
1636	1885
1637	1886	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1921,7 +2170,11 @@
1921	2170	shadow.material = new cMaterial(obj.material);
1922	2171	shadow.material.diffuse = 0.0001f;
1923	2172	shadow.material.specular = 0.0001f;
1924		- //shadow.projectedVertices[1].x = 300;
	2173	+ shadow.material.opacity = 0.75f;
	2174	+
	2175	+ AllocProjectedVertices(shadow);
	2176	+
	2177	+ shadow.projectedVertices[1].x = 300;
1925	2178
1926	2179	makeSomething(shadow);
1927	2180	}
..	..	@@ -2442,27 +2695,35 @@
2442	2695	} else
2443	2696	if (source == loopItem \|\| source == loopButton)
2444	2697	{
	2698	+ if (!group.selection.isEmpty())
	2699	+ {
2445	2700	Composite csg = new GroupLeaf();
2446	2701	csg.count = 5;
2447		- group(csg);
2448	2702	Composite child = new cGroup("Branch");
2449	2703	csg.addChild(child);
2450	2704	child.addChild(csg);
	2705	+ group(csg);
	2706	+ }
2451	2707	} else
2452	2708	if (source == doubleItem)
2453	2709	{
	2710	+ if (!group.selection.isEmpty())
	2711	+ {
2454	2712	Composite csg = new GroupLeaf("Fork");
2455	2713	csg.count = 5;
2456		- group(csg);
2457	2714	Composite child = new cGroup("Branch A");
2458	2715	csg.addChild(child);
2459	2716	child.addChild(csg);
2460	2717	child = new cGroup("Branch B");
2461	2718	csg.addChild(child);
2462	2719	child.addChild(csg);
	2720	+ group(csg);
	2721	+ }
2463	2722	} else
2464	2723	if (source == tripleItem)
2465	2724	{
	2725	+ if (!group.selection.isEmpty())
	2726	+ {
2466	2727	Composite csg = new GroupLeaf("Trident");
2467	2728	csg.count = 4;
2468	2729	group(csg);
..	..	@@ -2475,6 +2736,7 @@
2475	2736	child = new cGroup();
2476	2737	csg.addChild(child);
2477	2738	child.addChild(csg);
	2739	+ }
2478	2740	} else
2479	2741	if (source == computeAOItem)
2480	2742	{
..	..	@@ -2494,7 +2756,7 @@
2494	2756	if (source == invariantsItem)
2495	2757	{
2496	2758	System.out.println("Invariants:");
2497		- Grafreed.grafreeD.universe.invariants();
	2759	+ Grafreed.grafreed.universe.invariants();
2498	2760	} else
2499	2761	if (source == memoryItem)
2500	2762	{
..	..	@@ -2525,33 +2787,52 @@
2525	2787	{
2526	2788	ToggleFullScreen();
2527	2789	} else
2528		- if (source == undoButton)
	2790	+ if (source == collapseButton)
	2791	+ {
	2792	+ this.expandedLayout = radio.layout;
	2793	+ CollapseToolbar();
	2794	+ } else
	2795	+ if (source == maximize3DButton)
	2796	+ {
	2797	+ this.expandedLayout = radio.layout;
	2798	+ radio.layout = twoButton;
	2799	+ Show3DView();
	2800	+ CollapseToolbar();
	2801	+ } else
	2802	+ if (source == previousVersionButton)
2529	2803	{
2530	2804	// Go to previous version
2531	2805	//if (!Undo())
2532	2806	//java.awt.Toolkit.getDefaultToolkit().beep();
2533		- Undo();
	2807	+ PreviousVersion();
2534	2808	} else
2535	2809	if (source == restoreButton)
2536	2810	{
2537	2811	// Restore current version
2538	2812	Restore();
	2813	+ //restoreButton.setEnabled(false);
2539	2814	} else
2540	2815	if (source == replaceButton)
2541	2816	{
2542	2817	// Overwrite current version
2543	2818	Replace();
	2819	+ //replaceButton.setEnabled(false);
2544	2820	} else
2545		- if (source == redoButton)
	2821	+ if (source == nextVersionButton)
2546	2822	{
2547	2823	// Go to next version
2548		- Redo();
	2824	+ NextVersion();
2549	2825	} else
2550		- if (source == saveButton)
	2826	+ if (source == saveVersionButton)
2551	2827	{
2552	2828	// Save a new version
2553	2829	if (!Save(true))
2554	2830	java.awt.Toolkit.getDefaultToolkit().beep();
	2831	+ } else
	2832	+ if (source == deleteVersionButton)
	2833	+ {
	2834	+ // Delete a new version
	2835	+ DeleteVersion();
2555	2836	} else
2556	2837	if (source == oneStepButton)
2557	2838	{
..	..	@@ -2606,11 +2887,11 @@
2606	2887	} else
2607	2888	if (source == undoItem)
2608	2889	{
2609		- Undo();
	2890	+ PreviousVersion();
2610	2891	} else
2611	2892	if (source == redoItem)
2612	2893	{
2613		- Redo();
	2894	+ NextVersion();
2614	2895	} else
2615	2896	if (source == duplicateItem)
2616	2897	{
..	..	@@ -3091,22 +3372,34 @@
3091	3372	} else
3092	3373	if (source == ungroupItem \|\| source == ungroupButton)
3093	3374	{
3094		- boolean hasRoot = false;
	3375	+ boolean canUngroup = true;
3095	3376
3096	3377	for (int i=0; i<group.selection.size(); i++)
3097	3378	{
3098		- if (group.selection.get(i) == group)
	3379	+ Object3D selectedItem = group.selection.get(i);
	3380	+
	3381	+ if (selectedItem.Size() == 0)
3099	3382	{
3100		- hasRoot = true;
	3383	+ // Cannot ungroup leaves
	3384	+ canUngroup = false;
	3385	+ break;
	3386	+ }
	3387	+
	3388	+ if (selectedItem == group)
	3389	+ {
	3390	+ // Cannot ungroup root
	3391	+ canUngroup = false;
3101	3392	break;
3102	3393	}
3103	3394	}
3104	3395
3105		- if (!hasRoot)
	3396	+ if (canUngroup)
3106	3397	{
3107	3398	for (int i=0; i<group.selection.size(); i++)
3108	3399	{
3109		- Ungroup(group.selection.get(i));
	3400	+ Object3D selectedItem = group.selection.get(i);
	3401	+
	3402	+ Ungroup(selectedItem);
3110	3403	}
3111	3404
3112	3405	ClearSelection(false);
..	..	@@ -3469,38 +3762,7 @@
3469	3762	if (CameraPane.FULLSCREEN)
3470	3763	fullscreenLayout = radio.layout;
3471	3764
3472		- // bug
3473		- //gridPanel.setDividerLocation(1.0);
3474		- //bigPanel.setDividerLocation(0.0);
3475		-// bigThree.remove(scenePanel);
3476		-// bigThree.remove(centralPanel);
3477		-// bigThree.remove(XYZPanel);
3478		-// aWindowConstraints.gridx = 0;
3479		-// aWindowConstraints.gridy = 0;
3480		-// aWindowConstraints.gridwidth = 1;
3481		-// // aConstraints.gridheight = 3;
3482		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3483		-// aWindowConstraints.weightx = 0;
3484		-// aWindowConstraints.weighty = 1;
3485		-// //bigThree.add(jtp, aWindowConstraints);
3486		-// aWindowConstraints.weightx = 1;
3487		-// aWindowConstraints.gridwidth = 3;
3488		-// // aConstraints.gridheight = 3;
3489		-// aWindowConstraints.gridx = 1;
3490		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3491		-// bigThree.add(centralPanel, aWindowConstraints);
3492		-// aWindowConstraints.weightx = 0;
3493		-// aWindowConstraints.gridx = 4;
3494		-// aWindowConstraints.gridwidth = 1;
3495		-// // aConstraints.gridheight = 3;
3496		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3497		-// //bigThree.add(XYZPanel, aWindowConstraints);
3498		-// scenePanel.setVisible(false);
3499		-// centralPanel.setVisible(true);
3500		-// XYZPanel.setVisible(false);
3501		- bigThree.ClearUI();
3502		- bigThree.add(centralPanel);
3503		- bigThree.FlushUI();
	3765	+ Show3DView();
3504	3766
3505	3767	cameraView.requestFocusInWindow();
3506	3768
..	..	@@ -3686,6 +3948,7 @@
3686	3948	} else
3687	3949	if (source == rootButton)
3688	3950	{
	3951	+ Replace();
3689	3952	Object3D obj;
3690	3953	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3691	3954	{
..	..	@@ -3743,10 +4006,10 @@
3743	4006	{
3744	4007	Object3D child = (Object3D)e.nextElement();
3745	4008	if(child.editWindow != null)
3746		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3747	4009	child.pinned = false;
3748	4010	child.CloseUI();
3749	4011	listUI.remove(child);
	4012	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3750	4013
3751	4014	//child.editWindow = null; // ???????????
3752	4015	}
..	..	@@ -3765,6 +4028,7 @@
3765	4028	obj.CloseUI();
3766	4029	}
3767	4030	listUI.clear();
	4031	+ SetPinStates(group.selection.size() > 0);
3768	4032	refreshContents(true);
3769	4033	} else
3770	4034	if (source == allParamsButton)
..	..	@@ -3821,8 +4085,6 @@
3821	4085
3822	4086	copy = group;
3823	4087
3824		- SetUndoStates();
3825		-
3826	4088	//Globals.theRenderer.object = group;
3827	4089	if(!useclient)
3828	4090	{
..	..	@@ -3850,7 +4112,23 @@
3850	4112	*/
3851	4113	radio.layout.doClick();
3852	4114
	4115	+ assert(copy instanceof Composite);
	4116	+
	4117	+ if (copy.versionlist == null)
	4118	+ {
	4119	+ copy.versionlist = new Object3D[100];
	4120	+ copy.versionindex = -1;
	4121	+
	4122	+ // Cannot work with loops
	4123	+ // To fix this issue, first mark all nodes above the root,
	4124	+ // and check if any of these nodes are reachable below the root.
	4125	+ //Save(true);
	4126	+ }
	4127	+
	4128	+ SetVersionStates();
	4129	+
3853	4130	ClearUnpinned();
	4131	+
3854	4132	//Grafreed.Assert(group != null);
3855	4133	//Grafreed.Assert(group.selection != null);
3856	4134	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3867,11 +4145,13 @@
3867	4145	} else if (event.getSource() == editCameraItem)
3868	4146	{
3869	4147	cameraView.ProtectCamera();
	4148	+ cameraView.requestFocusInWindow();
3870	4149	cameraView.repaint();
3871	4150	return;
3872	4151	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3873	4152	{
3874	4153	cameraView.RevertCamera();
	4154	+ cameraView.requestFocusInWindow();
3875	4155	cameraView.repaint();
3876	4156	return;
3877	4157	// } else if (event.getSource() == textureButton)
..	..	@@ -5004,9 +5284,7 @@
5004	5284
5005	5285	freezemodel = false;
5006	5286	}
5007		-
5008		- boolean flashIt = true;
5009		-
	5287	+
5010	5288	public void valueChanged(TreeSelectionEvent e)
5011	5289	//public boolean handleEvent(Event event)
5012	5290	{
..	..	@@ -5079,13 +5357,30 @@
5079	5357	{
5080	5358	editButton.setEnabled(enabled);
5081	5359	uneditButton.setEnabled(enabled);
5082		- unselectButton.setEnabled(enabled);
	5360	+ //unselectButton.setEnabled(enabled);
5083	5361	flashSelectionButton.setEnabled(enabled);
	5362	+
	5363	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5364	+
	5365	+ boolean allComposites = true;
	5366	+
	5367	+ if (group.selection != null)
	5368	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5369	+ {
	5370	+ Object next = e.nextElement();
	5371	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5372	+ {
	5373	+ allComposites = false;
	5374	+ break;
	5375	+ }
	5376	+ }
	5377	+
	5378	+ rootButton.setEnabled(allComposites);
5084	5379	}
5085	5380
5086	5381	void refreshContents(boolean cp)
5087	5382	{
5088		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5383	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5089	5384	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5090	5385	{
5091	5386	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5095,7 +5390,7 @@
5095	5390	Object3D child = (Object3D) group.selection.get(i);
5096	5391
5097	5392	objEditor.AddInfo(child, this, true);
5098		- System.err.println("info : " + child.GetPath());
	5393	+// System.err.println("info : " + child.GetPath());
5099	5394	}
5100	5395
5101	5396	objEditor.SetText(); // jan 2014
..	..	@@ -5921,7 +6216,6 @@
5921	6216
5922	6217	cButton restoreCameraButton;
5923	6218
5924		- cButton saveButton;
5925	6219	cButton oneStepButton;
5926	6220
5927	6221	cButton groupButton;
..	..	@@ -5979,11 +6273,11 @@
5979	6273	private MenuItem lookAtItem;
5980	6274	private MenuItem lookFromItem;
5981	6275	private MenuItem switchViewItem;
5982		- private MenuItem cutItem;
	6276	+ private JMenuItem cutItem;
5983	6277	private MenuItem undoItem;
5984	6278	private MenuItem redoItem;
5985	6279	private JMenuItem duplicateItem;
5986		- private MenuItem cloneItem;
	6280	+ private JMenuItem cloneItem;
5987	6281	private MenuItem cloneSupportItem;
5988	6282	private MenuItem overwriteGeoItem;
5989	6283	private MenuItem overwriteMatItem;
..	..	@@ -6004,13 +6298,13 @@
6004	6298	private MenuItem cloneGeometriesItem;
6005	6299	private MenuItem shareGeometriesItem;
6006	6300	private MenuItem mergeGeometriesItem;
6007		- private MenuItem copyItem;
	6301	+ private JMenuItem copyItem;
6008	6302	private MenuItem pasteItem;
6009		- private MenuItem pasteIntoItem;
6010		- private MenuItem pasteLinkItem;
6011		- private MenuItem pasteCloneItem;
6012		- private MenuItem pasteExpandItem;
6013		- private MenuItem deleteItem;
	6303	+ private JMenuItem pasteIntoItem;
	6304	+ private JMenuItem pasteLinkItem;
	6305	+ private JMenuItem pasteCloneItem;
	6306	+ private JMenuItem pasteExpandItem;
	6307	+ private JMenuItem deleteItem;
6014	6308	private MenuItem clearAllItem;
6015	6309	private MenuItem genUVItem;
6016	6310	private MenuItem genNormalsMESHItem;
..	..	@@ -6065,7 +6359,7 @@
6065	6359	private MenuItem transformGeometryItem;
6066	6360	private MenuItem transformChildrenItem;
6067	6361	private MenuItem hideItem;
6068		- private MenuItem grabItem;
	6362	+ private JMenuItem grabItem;
6069	6363	private MenuItem backItem;
6070	6364	private MenuItem frontItem;
6071	6365	private MenuItem cameraItem;
..	..	@@ -6078,7 +6372,7 @@
6078	6372	private MenuItem switchTransfoItem;
6079	6373	private MenuItem morphItem;
6080	6374	private MenuItem linkerItem;
6081		- private MenuItem ungroupItem;
	6375	+ private JMenuItem ungroupItem;
6082	6376	private MenuItem editItem;
6083	6377	private MenuItem openWindowItem;
6084	6378	private MenuItem editLeafItem;