~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,14 @@
291	415	this.copy = this.group = group;
292	416	//selectees = this.group.selectees;
293	417
294		- if (copy.versions == null)
	418	+ assert(false);
	419	+
	420	+ if (copy.versionlist == null)
295	421	{
296		- copy.versions = new byte[100][];
	422	+ copy.versionlist = new Object3D[100];
297	423	copy.versionindex = -1;
	424	+
	425	+ //Save(true);
298	426	}
299	427
300	428	if(ui)
..	..	@@ -318,12 +446,12 @@
318	446
319	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
320	448
321		- if (copy.versions == null)
	449	+ if (copy.versionlist == null)
322	450	{
323		- copy.versions = new byte[100][];
	451	+ copy.versionlist = new Object3D[100];
324	452	copy.versionindex = -1;
325	453
326		- Save(true);
	454	+ //Save(true);
327	455	}
328	456	}
329	457
..	..	@@ -414,33 +542,35 @@
414	542	// menu.add("-");
415	543	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
416	544	duplicateItem.addActionListener(this);
417		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
418	547	cloneItem.addActionListener(this);
419		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
420	549	{
421	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
422	551	cloneSupportItem.addActionListener(this);
423	552	}
	553	+ oe.jTree.popup.addSeparator();
424	554	menu.add("-");
425		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
426	556	cutItem.addActionListener(this);
427		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
428	558	copyItem.addActionListener(this);
429	559	pasteItem = menu.add(new MenuItem("Paste"));
430	560	pasteItem.addActionListener(this);
431	561
432		- menu.add("-");
433		- 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"));
434	565	pasteIntoItem.addActionListener(this);
435		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
436	567	pasteLinkItem.addActionListener(this);
437		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
438	569	pasteCloneItem.addActionListener(this);
439		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
440	571	// pasteExpandItem.addActionListener(this);
441		- menu.add("-");
442		- deleteItem = menu.add(new MenuItem("Delete"));
443		- deleteItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
444	574
445	575	if (Globals.ADVANCED)
446	576	{
..	..	@@ -526,11 +656,9 @@
526	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
527	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
528	658	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
529		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
530	659	oe.cameraMenu.add("-");
531	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
532	661	openWindowItem.addActionListener(this);
533		- editLeafItem.addActionListener(this);
534	662	lookAtItem.addActionListener(this);
535	663	//lookFromItem.addActinoListener(this);
536	664	//switchViewItem.addActionListener(this);
..	..	@@ -577,9 +705,8 @@
577	705	setMasterItem.addActionListener(this);
578	706	}
579	707
580		- oe.menuBar.add(menu = new Menu("Group"));
581		-// grabItem = menu.add(new MenuItem("Grab"));
582		-// grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
583	710	backItem = menu.add(new MenuItem("Back"));
584	711	backItem.addActionListener(this);
585	712	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -587,13 +714,21 @@
587	714	// compositeItem = menu.add(new MenuItem("Composite"));
588	715	// compositeItem.addActionListener(this);
589	716
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
590	720	if (Globals.ADVANCED)
591	721	{
592	722	hideItem = menu.add(new MenuItem("Hidden Group"));
593	723	hideItem.addActionListener(this);
594	724	}
595		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
596	726	ungroupItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
597	732
598	733	// menu.add("-");
599	734	//
..	..	@@ -778,6 +913,9 @@
778	913	shareGeometriesItem.addActionListener(this);
779	914	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
780	915	mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
781	919	if (Globals.ADVANCED)
782	920	{
783	921	// Pretty much the same as duplicate and clone.
..	..	@@ -794,6 +932,74 @@
794	932	buildToolsMenu(menu);
795	933	}
796	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	+ }
797	1003
798	1004	void SetupUI2(ObjEditor oe)
799	1005	{
..	..	@@ -812,11 +1018,6 @@
812	1018	//new Exception().printStackTrace();
813	1019
814	1020	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	1021	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
821	1022
822	1023	oe.buttonGroup = new ButtonGroup();
..	..	@@ -849,10 +1050,49 @@
849	1050
850	1051	if (Globals.ADVANCED)
851	1052	{
852		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
853		- maxButton.setToolTipText("Maximize window");
854		- 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);
855	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	+ //
856	1096
857	1097	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
858	1098	fullButton.setToolTipText("Full-screen window");
..	..	@@ -866,41 +1106,46 @@
866	1106	restoreCameraButton.setToolTipText("Restore viewpoint");
867	1107	restoreCameraButton.addActionListener(this);
868	1108
869		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
870		- saveButton.setToolTipText("New version");
871		- 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);
872	1112
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);
	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);
877	1122
878	1123	cGridBag updown = new cGridBag().setVertical(true);
879	1124	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
880		- restoreButton.setToolTipText("Restore current");
	1125	+ restoreButton.setToolTipText("Undo (restore current version)");
881	1126	restoreButton.addActionListener(this);
882	1127	restoreButton.setEnabled(false);
883	1128
884	1129	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
885		- replaceButton.setToolTipText("Replace current");
	1130	+ replaceButton.setToolTipText("Save (replace current version)");
886	1131	replaceButton.addActionListener(this);
887	1132	replaceButton.setEnabled(false);
888	1133
889	1134	copyOptionsPanel.add(updown);
890	1135
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);
	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);
895	1144
896	1145	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
897	1146	liveCB.setToolTipText("Enable animation");
898	1147	liveCB.addItemListener(this);
899	1148
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	1149	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
905	1150	fastCB.setToolTipText("Fast mode");
906	1151	fastCB.addItemListener(this);
..	..	@@ -927,21 +1172,6 @@
927	1172
928	1173	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
929	1174
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	1175
946	1176	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
947	1177	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -957,12 +1187,16 @@
957	1187
958	1188	// INSERT
959	1189	row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
960		- gridButton.setToolTipText("Create grid");
	1190	+ gridButton.setToolTipText("Create ground");
961	1191	gridButton.addActionListener(this);
962	1192
963	1193	row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
964	1194	boxButton.setToolTipText("Create box");
965	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);
966	1200
967	1201	row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
968	1202	sphereButton.setToolTipText("Create sphere");
..	..	@@ -975,10 +1209,6 @@
975	1209	row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
976	1210	torusButton.setToolTipText("Create torus");
977	1211	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	1212
983	1213	if (Globals.ADVANCED)
984	1214	{
..	..	@@ -1025,18 +1255,15 @@
1025	1255
1026	1256	oe.toolboxPanel.add(row2);
1027	1257
1028		- // ENVYMAPS
1029		- cGridBag skyboxpane = new cGridBag();
1030		- skyboxpane.preferredHeight = 100;
	1258	+ cGridBag textures = new cGridBag();
1031	1259
1032		- oe.toolboxPanel.add(skyboxpane);
	1260	+ CreateTexturePanel(textures);
1033	1261
1034		- JTabbedPane skyboxpanel = new JTabbedPane();
1035		- skyboxpane.add(skyboxpanel);
	1262	+ oe.toolboxPanel.add(textures);
1036	1263
1037		- AddSkyboxTab0(skyboxpanel);
1038		- AddSkyboxTab1(skyboxpanel);
1039		- AddSkyboxTab2(skyboxpanel);
	1264	+ textures.preferredHeight = 100;
	1265	+
	1266	+ CreateSkyboxPanel(oe.skyboxPanel);
1040	1267
1041	1268	// EDIT panel
1042	1269	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -1044,20 +1271,20 @@
1044	1271	editButton.addActionListener(this);
1045	1272
1046	1273	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1047		- uneditButton.setToolTipText("Remove selection controls");
	1274	+ uneditButton.setToolTipText("Unpin and remove selection controls");
1048	1275	uneditButton.addActionListener(this);
1049	1276
1050	1277	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1051		- allParamsButton.setToolTipText("Show all controle");
	1278	+ allParamsButton.setToolTipText("Show all controls");
1052	1279	allParamsButton.addActionListener(this);
1053	1280
1054		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1055		- clearPanelButton.setToolTipText("Clear edit panel");
	1281	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1282	+ clearPanelButton.setToolTipText("Clear all controls");
1056	1283	clearPanelButton.addActionListener(this);
1057	1284
1058		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1059		- unselectButton.setToolTipText("Unselect");
1060		- unselectButton.addActionListener(this);
	1285	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1286	+ //unselectButton.setToolTipText("Unselect");
	1287	+ //unselectButton.addActionListener(this);
1061	1288
1062	1289	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1063	1290	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -1117,7 +1344,7 @@
1117	1344	dgr.addDragGestureListener(this);
1118	1345	}catch(Exception e) {}
1119	1346	*/
1120		- radio.layout = sixButton; // sevenButton;
	1347	+ radio.layout = threeButton; // sixButton;
1121	1348	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1122	1349	}
1123	1350
..	..	@@ -1168,9 +1395,12 @@
1168	1395	smoothCB.setToolTipText("Snapping delay");
1169	1396	smoothCB.addItemListener(this);
1170	1397
1171		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1172		- slowCB.setToolTipText("Smooth interpolation");
1173		- slowCB.addItemListener(this);
	1398	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1399	+// slowCB.setToolTipText("Smooth interpolation");
	1400	+// slowCB.addItemListener(this);
	1401	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1402	+ minshaderCB.setToolTipText("Minimal fast shader");
	1403	+ minshaderCB.addItemListener(this);
1174	1404
1175	1405	// constraints.gridy += 1;
1176	1406	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1249,6 +1479,14 @@
1249	1479
1250	1480	void EditObject(Object3D obj)
1251	1481	{
	1482	+ assert(obj instanceof Composite);
	1483	+
	1484	+// if (obj.versionlist == null)
	1485	+// {
	1486	+// obj.versionlist = new Object3D[100];
	1487	+// obj.versionindex = -1;
	1488	+// }
	1489	+
1252	1490	cRadio radioButton = new cRadio(obj.name);
1253	1491
1254	1492	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1259,7 +1497,7 @@
1259	1497	}
1260	1498
1261	1499	radioButton.SetObject(obj);
1262		- radioButton.layout = sixButton; // sevenButton;
	1500	+ radioButton.layout = threeButton; // sixButton;
1263	1501	radioButton.SetCamera(cameraView.renderCamera, false);
1264	1502	radioButton.addActionListener(this);
1265	1503	radioPanel.add(radioButton);
..	..	@@ -1273,6 +1511,7 @@
1273	1511
1274	1512	oe.SetupViews();
1275	1513
	1514	+ if (Globals.DEBUG)
1276	1515	System.out.println("SetupViews");
1277	1516	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1278	1517	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1284,6 +1523,8 @@
1284	1523	cCheckBox localCB;
1285	1524	cCheckBox crowdCB;
1286	1525	cCheckBox smoothCB;
	1526	+ cCheckBox minshaderCB;
	1527	+
1287	1528	cToggleButton fastCB;
1288	1529	cCheckBox slowCB;
1289	1530	cCheckBox boxCB;
..	..	@@ -1354,6 +1595,12 @@
1354	1595	{
1355	1596	cameraView.ToggleInertia();
1356	1597	cameraView.repaint();
	1598	+ }
	1599	+ else if(e.getSource() == minshaderCB)
	1600	+ {
	1601	+ Globals.MINSHADER ^= true;
	1602	+ cameraView.programInitialized = false;
	1603	+ cameraView.repaint();
1357	1604	}
1358	1605	else if(e.getSource() == localCB)
1359	1606	{
..	..	@@ -1631,7 +1878,12 @@
1631	1878	TreePath path;
1632	1879
1633	1880	public TransferableTreePath(TreePath tp) {
1634		- path = tp;
	1881	+ Object[] objs = new Object[tp.getPathCount()];
	1882	+ for (int i=0; i<objs.length; i++)
	1883	+ {
	1884	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1885	+ }
	1886	+ path = new TreePath(objs);
1635	1887	}
1636	1888
1637	1889	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1921,7 +2173,11 @@
1921	2173	shadow.material = new cMaterial(obj.material);
1922	2174	shadow.material.diffuse = 0.0001f;
1923	2175	shadow.material.specular = 0.0001f;
1924		- //shadow.projectedVertices[1].x = 300;
	2176	+ shadow.material.opacity = 0.75f;
	2177	+
	2178	+ AllocProjectedVertices(shadow);
	2179	+
	2180	+ shadow.projectedVertices[1].x = 300;
1925	2181
1926	2182	makeSomething(shadow);
1927	2183	}
..	..	@@ -2442,27 +2698,35 @@
2442	2698	} else
2443	2699	if (source == loopItem \|\| source == loopButton)
2444	2700	{
	2701	+ if (!group.selection.isEmpty())
	2702	+ {
2445	2703	Composite csg = new GroupLeaf();
2446	2704	csg.count = 5;
2447		- group(csg);
2448	2705	Composite child = new cGroup("Branch");
2449	2706	csg.addChild(child);
2450	2707	child.addChild(csg);
	2708	+ group(csg);
	2709	+ }
2451	2710	} else
2452	2711	if (source == doubleItem)
2453	2712	{
	2713	+ if (!group.selection.isEmpty())
	2714	+ {
2454	2715	Composite csg = new GroupLeaf("Fork");
2455	2716	csg.count = 5;
2456		- group(csg);
2457	2717	Composite child = new cGroup("Branch A");
2458	2718	csg.addChild(child);
2459	2719	child.addChild(csg);
2460	2720	child = new cGroup("Branch B");
2461	2721	csg.addChild(child);
2462	2722	child.addChild(csg);
	2723	+ group(csg);
	2724	+ }
2463	2725	} else
2464	2726	if (source == tripleItem)
2465	2727	{
	2728	+ if (!group.selection.isEmpty())
	2729	+ {
2466	2730	Composite csg = new GroupLeaf("Trident");
2467	2731	csg.count = 4;
2468	2732	group(csg);
..	..	@@ -2475,6 +2739,7 @@
2475	2739	child = new cGroup();
2476	2740	csg.addChild(child);
2477	2741	child.addChild(csg);
	2742	+ }
2478	2743	} else
2479	2744	if (source == computeAOItem)
2480	2745	{
..	..	@@ -2494,7 +2759,7 @@
2494	2759	if (source == invariantsItem)
2495	2760	{
2496	2761	System.out.println("Invariants:");
2497		- Grafreed.grafreeD.universe.invariants();
	2762	+ Grafreed.grafreed.universe.invariants();
2498	2763	} else
2499	2764	if (source == memoryItem)
2500	2765	{
..	..	@@ -2525,33 +2790,52 @@
2525	2790	{
2526	2791	ToggleFullScreen();
2527	2792	} else
2528		- if (source == undoButton)
	2793	+ if (source == collapseButton)
	2794	+ {
	2795	+ this.expandedLayout = radio.layout;
	2796	+ CollapseToolbar();
	2797	+ } else
	2798	+ if (source == maximize3DButton)
	2799	+ {
	2800	+ this.expandedLayout = radio.layout;
	2801	+ radio.layout = twoButton;
	2802	+ Show3DView();
	2803	+ CollapseToolbar();
	2804	+ } else
	2805	+ if (source == previousVersionButton)
2529	2806	{
2530	2807	// Go to previous version
2531	2808	//if (!Undo())
2532	2809	//java.awt.Toolkit.getDefaultToolkit().beep();
2533		- Undo();
	2810	+ PreviousVersion();
2534	2811	} else
2535	2812	if (source == restoreButton)
2536	2813	{
2537	2814	// Restore current version
2538	2815	Restore();
	2816	+ //restoreButton.setEnabled(false);
2539	2817	} else
2540	2818	if (source == replaceButton)
2541	2819	{
2542	2820	// Overwrite current version
2543	2821	Replace();
	2822	+ //replaceButton.setEnabled(false);
2544	2823	} else
2545		- if (source == redoButton)
	2824	+ if (source == nextVersionButton)
2546	2825	{
2547	2826	// Go to next version
2548		- Redo();
	2827	+ NextVersion();
2549	2828	} else
2550		- if (source == saveButton)
	2829	+ if (source == saveVersionButton)
2551	2830	{
2552	2831	// Save a new version
2553	2832	if (!Save(true))
2554	2833	java.awt.Toolkit.getDefaultToolkit().beep();
	2834	+ } else
	2835	+ if (source == deleteVersionButton)
	2836	+ {
	2837	+ // Delete a new version
	2838	+ DeleteVersion();
2555	2839	} else
2556	2840	if (source == oneStepButton)
2557	2841	{
..	..	@@ -2606,11 +2890,11 @@
2606	2890	} else
2607	2891	if (source == undoItem)
2608	2892	{
2609		- Undo();
	2893	+ PreviousVersion();
2610	2894	} else
2611	2895	if (source == redoItem)
2612	2896	{
2613		- Redo();
	2897	+ NextVersion();
2614	2898	} else
2615	2899	if (source == duplicateItem)
2616	2900	{
..	..	@@ -3091,22 +3375,34 @@
3091	3375	} else
3092	3376	if (source == ungroupItem \|\| source == ungroupButton)
3093	3377	{
3094		- boolean hasRoot = false;
	3378	+ boolean canUngroup = true;
3095	3379
3096	3380	for (int i=0; i<group.selection.size(); i++)
3097	3381	{
3098		- if (group.selection.get(i) == group)
	3382	+ Object3D selectedItem = group.selection.get(i);
	3383	+
	3384	+ if (selectedItem.Size() == 0)
3099	3385	{
3100		- hasRoot = true;
	3386	+ // Cannot ungroup leaves
	3387	+ canUngroup = false;
	3388	+ break;
	3389	+ }
	3390	+
	3391	+ if (selectedItem == group)
	3392	+ {
	3393	+ // Cannot ungroup root
	3394	+ canUngroup = false;
3101	3395	break;
3102	3396	}
3103	3397	}
3104	3398
3105		- if (!hasRoot)
	3399	+ if (canUngroup)
3106	3400	{
3107	3401	for (int i=0; i<group.selection.size(); i++)
3108	3402	{
3109		- Ungroup(group.selection.get(i));
	3403	+ Object3D selectedItem = group.selection.get(i);
	3404	+
	3405	+ Ungroup(selectedItem);
3110	3406	}
3111	3407
3112	3408	ClearSelection(false);
..	..	@@ -3469,38 +3765,7 @@
3469	3765	if (CameraPane.FULLSCREEN)
3470	3766	fullscreenLayout = radio.layout;
3471	3767
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();
	3768	+ Show3DView();
3504	3769
3505	3770	cameraView.requestFocusInWindow();
3506	3771
..	..	@@ -3686,6 +3951,7 @@
3686	3951	} else
3687	3952	if (source == rootButton)
3688	3953	{
	3954	+ Replace();
3689	3955	Object3D obj;
3690	3956	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3691	3957	{
..	..	@@ -3743,10 +4009,10 @@
3743	4009	{
3744	4010	Object3D child = (Object3D)e.nextElement();
3745	4011	if(child.editWindow != null)
3746		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3747	4012	child.pinned = false;
3748	4013	child.CloseUI();
3749	4014	listUI.remove(child);
	4015	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3750	4016
3751	4017	//child.editWindow = null; // ???????????
3752	4018	}
..	..	@@ -3765,6 +4031,7 @@
3765	4031	obj.CloseUI();
3766	4032	}
3767	4033	listUI.clear();
	4034	+ SetPinStates(group.selection.size() > 0);
3768	4035	refreshContents(true);
3769	4036	} else
3770	4037	if (source == allParamsButton)
..	..	@@ -3821,8 +4088,6 @@
3821	4088
3822	4089	copy = group;
3823	4090
3824		- SetUndoStates();
3825		-
3826	4091	//Globals.theRenderer.object = group;
3827	4092	if(!useclient)
3828	4093	{
..	..	@@ -3850,7 +4115,23 @@
3850	4115	*/
3851	4116	radio.layout.doClick();
3852	4117
	4118	+ assert(copy instanceof Composite);
	4119	+
	4120	+ if (copy.versionlist == null)
	4121	+ {
	4122	+ copy.versionlist = new Object3D[100];
	4123	+ copy.versionindex = -1;
	4124	+
	4125	+ // Cannot work with loops
	4126	+ // To fix this issue, first mark all nodes above the root,
	4127	+ // and check if any of these nodes are reachable below the root.
	4128	+ //Save(true);
	4129	+ }
	4130	+
	4131	+ SetVersionStates();
	4132	+
3853	4133	ClearUnpinned();
	4134	+
3854	4135	//Grafreed.Assert(group != null);
3855	4136	//Grafreed.Assert(group.selection != null);
3856	4137	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3867,11 +4148,13 @@
3867	4148	} else if (event.getSource() == editCameraItem)
3868	4149	{
3869	4150	cameraView.ProtectCamera();
	4151	+ cameraView.requestFocusInWindow();
3870	4152	cameraView.repaint();
3871	4153	return;
3872	4154	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3873	4155	{
3874	4156	cameraView.RevertCamera();
	4157	+ cameraView.requestFocusInWindow();
3875	4158	cameraView.repaint();
3876	4159	return;
3877	4160	// } else if (event.getSource() == textureButton)
..	..	@@ -5004,9 +5287,7 @@
5004	5287
5005	5288	freezemodel = false;
5006	5289	}
5007		-
5008		- boolean flashIt = true;
5009		-
	5290	+
5010	5291	public void valueChanged(TreeSelectionEvent e)
5011	5292	//public boolean handleEvent(Event event)
5012	5293	{
..	..	@@ -5079,13 +5360,30 @@
5079	5360	{
5080	5361	editButton.setEnabled(enabled);
5081	5362	uneditButton.setEnabled(enabled);
5082		- unselectButton.setEnabled(enabled);
	5363	+ //unselectButton.setEnabled(enabled);
5083	5364	flashSelectionButton.setEnabled(enabled);
	5365	+
	5366	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5367	+
	5368	+ boolean allComposites = true;
	5369	+
	5370	+ if (group.selection != null)
	5371	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5372	+ {
	5373	+ Object next = e.nextElement();
	5374	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5375	+ {
	5376	+ allComposites = false;
	5377	+ break;
	5378	+ }
	5379	+ }
	5380	+
	5381	+ rootButton.setEnabled(allComposites);
5084	5382	}
5085	5383
5086	5384	void refreshContents(boolean cp)
5087	5385	{
5088		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5386	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5089	5387	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5090	5388	{
5091	5389	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5095,7 +5393,7 @@
5095	5393	Object3D child = (Object3D) group.selection.get(i);
5096	5394
5097	5395	objEditor.AddInfo(child, this, true);
5098		- System.err.println("info : " + child.GetPath());
	5396	+// System.err.println("info : " + child.GetPath());
5099	5397	}
5100	5398
5101	5399	objEditor.SetText(); // jan 2014
..	..	@@ -5921,7 +6219,6 @@
5921	6219
5922	6220	cButton restoreCameraButton;
5923	6221
5924		- cButton saveButton;
5925	6222	cButton oneStepButton;
5926	6223
5927	6224	cButton groupButton;
..	..	@@ -5979,11 +6276,11 @@
5979	6276	private MenuItem lookAtItem;
5980	6277	private MenuItem lookFromItem;
5981	6278	private MenuItem switchViewItem;
5982		- private MenuItem cutItem;
	6279	+ private JMenuItem cutItem;
5983	6280	private MenuItem undoItem;
5984	6281	private MenuItem redoItem;
5985	6282	private JMenuItem duplicateItem;
5986		- private MenuItem cloneItem;
	6283	+ private JMenuItem cloneItem;
5987	6284	private MenuItem cloneSupportItem;
5988	6285	private MenuItem overwriteGeoItem;
5989	6286	private MenuItem overwriteMatItem;
..	..	@@ -6004,13 +6301,13 @@
6004	6301	private MenuItem cloneGeometriesItem;
6005	6302	private MenuItem shareGeometriesItem;
6006	6303	private MenuItem mergeGeometriesItem;
6007		- private MenuItem copyItem;
	6304	+ private JMenuItem copyItem;
6008	6305	private MenuItem pasteItem;
6009		- private MenuItem pasteIntoItem;
6010		- private MenuItem pasteLinkItem;
6011		- private MenuItem pasteCloneItem;
6012		- private MenuItem pasteExpandItem;
6013		- private MenuItem deleteItem;
	6306	+ private JMenuItem pasteIntoItem;
	6307	+ private JMenuItem pasteLinkItem;
	6308	+ private JMenuItem pasteCloneItem;
	6309	+ private JMenuItem pasteExpandItem;
	6310	+ private JMenuItem deleteItem;
6014	6311	private MenuItem clearAllItem;
6015	6312	private MenuItem genUVItem;
6016	6313	private MenuItem genNormalsMESHItem;
..	..	@@ -6065,7 +6362,7 @@
6065	6362	private MenuItem transformGeometryItem;
6066	6363	private MenuItem transformChildrenItem;
6067	6364	private MenuItem hideItem;
6068		- private MenuItem grabItem;
	6365	+ private JMenuItem grabItem;
6069	6366	private MenuItem backItem;
6070	6367	private MenuItem frontItem;
6071	6368	private MenuItem cameraItem;
..	..	@@ -6078,7 +6375,7 @@
6078	6375	private MenuItem switchTransfoItem;
6079	6376	private MenuItem morphItem;
6080	6377	private MenuItem linkerItem;
6081		- private MenuItem ungroupItem;
	6378	+ private JMenuItem ungroupItem;
6082	6379	private MenuItem editItem;
6083	6380	private MenuItem openWindowItem;
6084	6381	private MenuItem editLeafItem;