~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,
..	..	@@ -23,6 +24,360 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + 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);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	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	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	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);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	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);
	358	+ }
	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	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,14 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ if (copy.versionlist == null)
	419	+ {
	420	+ copy.versionlist = new Object3D[100];
	421	+ copy.versionindex = -1;
	422	+
	423	+ Save(true);
	424	+ }
	425	+
63	426	if(ui)
64	427	SetupUI(objEditor);
65	428	}
..	..	@@ -80,10 +443,22 @@
80	443	SetupViews(objEditor);
81	444
82	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	446	+
	447	+ if (copy.versionlist == null)
	448	+ {
	449	+ copy.versionlist = new Object3D[100];
	450	+ copy.versionindex = -1;
	451	+
	452	+ Save(true);
	453	+ }
83	454	}
84	455
85	456	void CloneSelection(boolean supports)
86	457	{
	458	+ if (Globals.REPLACEONMAKE)
	459	+ Save();
	460	+ boolean keep = Globals.REPLACEONMAKE;
	461	+ Globals.REPLACEONMAKE = false;
87	462	// Object3D keep = GrafreeD.clipboard;
88	463	//Object3D obj;
89	464	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +469,7 @@
94	469
95	470	makeSomething(clone, i==group.selection.size()-1);
96	471	}
	472	+ Globals.REPLACEONMAKE = keep;
97	473	}
98	474
99	475	void CloneClipboard(boolean supports)
..	..	@@ -189,8 +565,8 @@
189	565	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190	566	// pasteExpandItem.addActionListener(this);
191	567	menu.add("-");
192		- clearItem = menu.add(new MenuItem("Clear"));
193		- clearItem.addActionListener(this);
	568	+ deleteItem = menu.add(new MenuItem("Delete"));
	569	+ deleteItem.addActionListener(this);
194	570
195	571	if (Globals.ADVANCED)
196	572	{
..	..	@@ -220,7 +596,7 @@
220	596	// toggleSwitchItem.addItemListener(this);
221	597	// toggleSwitchItem.setState(CameraPane.SWITCH);
222	598
223		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	599	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	600	toggleHandleItem.addItemListener(this);
225	601	toggleHandleItem.setState(CameraPane.HANDLES);
226	602
..	..	@@ -276,11 +652,9 @@
276	652	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
277	653	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
278	654	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
280	655	oe.cameraMenu.add("-");
281	656	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
282	657	openWindowItem.addActionListener(this);
283		- editLeafItem.addActionListener(this);
284	658	lookAtItem.addActionListener(this);
285	659	//lookFromItem.addActinoListener(this);
286	660	//switchViewItem.addActionListener(this);
..	..	@@ -380,13 +754,14 @@
380	754	shadowYItem.addActionListener(this);
381	755	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382	756	shadowZItem.addActionListener(this);
	757	+ attributeItem = menu.add(new MenuItem("Attribute"));
	758	+ attributeItem.addActionListener(this);
	759	+
383	760	if (Globals.ADVANCED)
384	761	{
385	762	menu.add("-");
386	763	linkerItem = menu.add(new MenuItem("Linker"));
387	764	linkerItem.addActionListener(this);
388		- attributeItem = menu.add(new MenuItem("Attribute"));
389		- attributeItem.addActionListener(this);
390	765	templateItem = menu.add(new MenuItem("Template"));
391	766	templateItem.addActionListener(this);
392	767	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -415,7 +790,7 @@
415	790	genNormalsMESHItem.addActionListener(this);
416	791	if (Globals.ADVANCED)
417	792	{
418		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	793	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419	794	genNormalsMINEItem.addActionListener(this);
420	795	}
421	796	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -508,10 +883,15 @@
508	883	attachBumpItem.addActionListener(this);
509	884	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
510	885	pigmentBumpItem.addActionListener(this);
	886	+ //embedTexturesItem
511	887	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
512	888	detachPigmentItem.addActionListener(this);
513	889	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
514	890	detachBumpItem.addActionListener(this);
	891	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	892	+ embedTexturesItem.addActionListener(this);
	893	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	894	+ deEmbedTexturesItem.addActionListener(this);
515	895	menu.add("-");
516	896	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
517	897	sortbysizeItem.addActionListener(this);
..	..	@@ -522,6 +902,9 @@
522	902	shareGeometriesItem.addActionListener(this);
523	903	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
524	904	mergeGeometriesItem.addActionListener(this);
	905	+ menu.add("-");
	906	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	907	+ editLeafItem.addActionListener(this);
525	908	if (Globals.ADVANCED)
526	909	{
527	910	// Pretty much the same as duplicate and clone.
..	..	@@ -538,6 +921,74 @@
538	921	buildToolsMenu(menu);
539	922	}
540	923
	924	+ JTabbedPane resourcecontainer;
	925	+ cGridBag currenttab;
	926	+ boolean added; // patch for jar
	927	+
	928	+ int tabcount = 0;
	929	+ int colcount = 0;
	930	+ int rowcount = 0;
	931	+ int texturecount = 0;
	932	+
	933	+ int columns = 5;
	934	+ int rows = 7;
	935	+
	936	+ public void ResourceCallBack(String[] path)
	937	+ {
	938	+// for (int i = 0; i < path.length; i++)
	939	+// System.out.print(path[i] + "/");
	940	+// System.out.println();
	941	+
	942	+ if (//rowcount == 0 \|\|
	943	+ path.length == 1)
	944	+ {
	945	+ currenttab = new cGridBag();
	946	+ added = false;
	947	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	948	+ currenttab.setName(tabname);
	949	+ rowcount = 1;
	950	+ colcount = 0;
	951	+ texturecount = 0;
	952	+ }
	953	+
	954	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	955	+ {
	956	+ if (!added)
	957	+ {
	958	+ added = true;
	959	+ resourcecontainer.add(currenttab);
	960	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ }
	963	+
	964	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	965	+
	966	+ if (++colcount >= columns)
	967	+ {
	968	+ colcount = 0;
	969	+ currenttab.Return();
	970	+
	971	+ if (rowcount++ >= rows)
	972	+ {
	973	+ rowcount = 0;
	974	+ }
	975	+ }
	976	+ }
	977	+ else
	978	+ {
	979	+// if (!path[path.length-1].equals("icons"))
	980	+// resourcecontainer.Return();
	981	+ }
	982	+ }
	983	+
	984	+ void CreateTexturePanel(cGridBag container)
	985	+ {
	986	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	987	+ container.add(resourcecontainer);
	988	+
	989	+ Grafreed.ParseResources("textures", this);
	990	+ }
	991	+
541	992	void SetupUI2(ObjEditor oe)
542	993	{
543	994	// June 2019
..	..	@@ -555,11 +1006,6 @@
555	1006	//new Exception().printStackTrace();
556	1007
557	1008	oe.radioPanel = new JPanel(new GridBagLayout());
558		- oe.aConstraints.weightx = 1;
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
561		- oe.aConstraints.gridwidth = 100;
562		- oe.aConstraints.gridheight = 1;
563	1009	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
564	1010
565	1011	oe.buttonGroup = new ButtonGroup();
..	..	@@ -590,48 +1036,109 @@
590	1036	//minButton.setToolTipText("Minimize window");
591	1037	//minButton.addActionListener(this);
592	1038
593		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- maxButton.setToolTipText("Maximize window");
595		- maxButton.addActionListener(this);
	1039	+ if (Globals.ADVANCED)
	1040	+ {
	1041	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+// maxButton.setToolTipText("Maximize window");
	1043	+// maxButton.addActionListener(this);
	1044	+ }
	1045	+
	1046	+// cButton gcButton;
	1047	+//
	1048	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1049	+// gcButton.setToolTipText("Garbage collect");
	1050	+// gcButton.addActionListener(new ActionListener()
	1051	+// {
	1052	+// public void actionPerformed(ActionEvent e)
	1053	+// {
	1054	+// System.gc();
	1055	+// }
	1056	+// });
	1057	+
	1058	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+ collapseButton.setToolTipText("Collapse toolbar");
	1060	+ collapseButton.addActionListener(this);
	1061	+
	1062	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1064	+ maximize3DButton.addActionListener(this);
	1065	+
	1066	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1067	+ twoButton.setToolTipText("Show 3D view only");
	1068	+ twoButton.addActionListener(this);
	1069	+ this.fullscreenLayout = twoButton;
	1070	+
	1071	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ threeButton.setToolTipText("Show controls and 3D view");
	1073	+ threeButton.addActionListener(this);
	1074	+ if (Globals.ADVANCED)
	1075	+ {
	1076	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ sixButton.setToolTipText("Show 3D view and controls");
	1078	+ sixButton.addActionListener(this);
	1079	+ }
	1080	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+// sevenButton.setToolTipText("3-column layout");
	1082	+// sevenButton.addActionListener(this);
	1083	+ //
596	1084
597	1085	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598	1086	fullButton.setToolTipText("Full-screen window");
599	1087	fullButton.addActionListener(this);
600	1088
	1089	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1090	+ screenfitButton.setToolTipText("Screen fit");
	1091	+ screenfitButton.addActionListener(this);
	1092	+
601	1093	oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	1094	restoreCameraButton.setToolTipText("Restore viewpoint");
603	1095	restoreCameraButton.addActionListener(this);
604	1096
605		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606		- undoButton.setToolTipText("Undo changes");
607		- undoButton.addActionListener(this);
	1097	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ saveVersionButton.setToolTipText("Duplicate current version");
	1099	+ saveVersionButton.addActionListener(this);
	1100	+
	1101	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ deleteVersionButton.setToolTipText("Delete current version");
	1103	+ deleteVersionButton.addActionListener(this);
	1104	+
	1105	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ previousVersionButton.setToolTipText("Previous version");
	1107	+ previousVersionButton.addActionListener(this);
	1108	+ previousVersionButton.setEnabled(false);
608	1109
609		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
610		- redoButton.setToolTipText("Redo changes");
611		- redoButton.addActionListener(this);
	1110	+ cGridBag updown = new cGridBag().setVertical(true);
	1111	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ restoreButton.setToolTipText("Undo (restore current version)");
	1113	+ restoreButton.addActionListener(this);
	1114	+ //restoreButton.setEnabled(false);
612	1115
613		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
614		- saveButton.setToolTipText("Save changes");
615		- saveButton.addActionListener(this);
	1116	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ replaceButton.setToolTipText("Save (replace current version)");
	1118	+ replaceButton.addActionListener(this);
	1119	+ //replaceButton.setEnabled(false);
616	1120
617		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
618		- liveCB.setToolTipText("Enable animation");
619		- liveCB.addItemListener(this);
620		-
621		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1121	+ copyOptionsPanel.add(updown);
	1122	+
	1123	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ nextVersionButton.setToolTipText("Next version");
	1125	+ nextVersionButton.addActionListener(this);
	1126	+ nextVersionButton.setEnabled(false);
	1127	+
	1128	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
622	1129	oneStepButton.setToolTipText("Animate one step forward");
623	1130	oneStepButton.addActionListener(this);
624	1131
625		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1132	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1133	+ liveCB.setToolTipText("Enable animation");
	1134	+ liveCB.addItemListener(this);
	1135	+
	1136	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
626	1137	fastCB.setToolTipText("Fast mode");
627	1138	fastCB.addItemListener(this);
628	1139
629	1140	//oe.toolboxPanel.Return();
630	1141
631		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632		- screenfitButton.setToolTipText("Screen fit");
633		- screenfitButton.addActionListener(this);
634		-
635	1142	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
636	1143	// trackCB.setToolTipText("Enable tracking");
637	1144	// trackCB.addItemListener(this);
..	..	@@ -644,31 +1151,17 @@
644	1151	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
645	1152	snapobjectButton.addActionListener(this);
646	1153	snapobjectButton.setToolTipText("Snap Object");
	1154	+
	1155	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1156	+ fourButton.addActionListener(this);
	1157	+ fourButton.setToolTipText("Show control panel only");
647	1158	}
648	1159
649	1160	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
650	1161
651		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
652		- twoButton.setToolTipText("Show center view only");
653		- twoButton.addActionListener(this);
654		- this.fullscreenLayout = twoButton;
655		-
656		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657		- fourButton.addActionListener(this);
658		- fourButton.setToolTipText("Show left panel only");
659		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
660		- sixButton.setToolTipText("2-column layout left");
661		- sixButton.addActionListener(this);
662		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
663		- threeButton.setToolTipText("2-column layout right");
664		- threeButton.addActionListener(this);
665		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
666		- sevenButton.setToolTipText("3-column layout");
667		- sevenButton.addActionListener(this);
668		- //
669	1162
670		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- rootButton.setToolTipText("Edit selection in new tab");
	1163	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1164	+ rootButton.setToolTipText("Open selection in new tab");
672	1165	rootButton.addActionListener(this);
673	1166
674	1167	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -677,28 +1170,30 @@
677	1170	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
678	1171	//clearButton.addActionListener(this);
679	1172
	1173	+ cGridBag row1 = new cGridBag();
	1174	+
680	1175	// INSERT
681		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682		- gridButton.setToolTipText("Create grid");
	1176	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ gridButton.setToolTipText("Create ground");
683	1178	gridButton.addActionListener(this);
684	1179
685		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686	1181	boxButton.setToolTipText("Create box");
687	1182	boxButton.addActionListener(this);
688	1183
689		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
690	1185	sphereButton.setToolTipText("Create sphere");
691	1186	sphereButton.addActionListener(this);
692	1187
693		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1188	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694	1189	coneButton.setToolTipText("Create cone");
695	1190	coneButton.addActionListener(this);
696	1191
697		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1192	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
698	1193	torusButton.setToolTipText("Create torus");
699	1194	torusButton.addActionListener(this);
700	1195
701		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1196	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
702	1197	superButton.setToolTipText("Create superellipsoid");
703	1198	superButton.addActionListener(this);
704	1199
..	..	@@ -709,60 +1204,74 @@
709	1204	kleinButton.addActionListener(this);
710	1205	}
711	1206
712		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
713	1208	particlesButton.setToolTipText("Create particle system");
714	1209	particlesButton.addActionListener(this);
715	1210
716		- oe.toolboxPanel.Return();
	1211	+ oe.toolboxPanel.add(row1);
717	1212
718		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1213	+ cGridBag row2 = new cGridBag();
	1214	+
	1215	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
719	1216	groupButton.setToolTipText("Create group");
720	1217	groupButton.addActionListener(this);
721	1218
722		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
723	1220	compositeButton.setToolTipText("Create composite");
724	1221	compositeButton.addActionListener(this);
725	1222
726		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
727		- switchButton.setToolTipText("Create switch");
	1223	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ switchButton.setToolTipText("Create item switcher");
728	1225	switchButton.addActionListener(this);
729	1226
730		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
731	1228	loopButton.setToolTipText("Create loop");
732	1229	loopButton.addActionListener(this);
733	1230
734		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1231	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
735	1232	textureButton.setToolTipText("Create texture");
736	1233	textureButton.addActionListener(this);
737	1234
738		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1235	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
739	1236	overlayButton.setToolTipText("Create overlay");
740	1237	overlayButton.addActionListener(this);
741	1238
742		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1239	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
743	1240	lightButton.setToolTipText("Create light");
744	1241	lightButton.addActionListener(this);
745	1242
	1243	+ oe.toolboxPanel.add(row2);
	1244	+
	1245	+ cGridBag textures = new cGridBag();
	1246	+
	1247	+ CreateTexturePanel(textures);
	1248	+
	1249	+ oe.toolboxPanel.add(textures);
	1250	+
	1251	+ textures.preferredHeight = 100;
	1252	+
	1253	+ CreateSkyboxPanel(oe.skyboxPanel);
	1254	+
746	1255	// EDIT panel
747		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
748		- editButton.setToolTipText("Edit selection");
	1256	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1257	+ editButton.setToolTipText("Pin selection controls");
749	1258	editButton.addActionListener(this);
750	1259
751		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
752		- uneditButton.setToolTipText("Unedit selection");
	1260	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1261	+ uneditButton.setToolTipText("Unpin and remove selection controls");
753	1262	uneditButton.addActionListener(this);
754	1263
755	1264	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
756		- allParamsButton.setToolTipText("Edit all params");
	1265	+ allParamsButton.setToolTipText("Show all controls");
757	1266	allParamsButton.addActionListener(this);
758	1267
759		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
760		- clearPanelButton.setToolTipText("Clear edit panel");
	1268	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1269	+ clearPanelButton.setToolTipText("Clear all controls");
761	1270	clearPanelButton.addActionListener(this);
762	1271
763		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
764		- unselectButton.setToolTipText("Unselect");
765		- unselectButton.addActionListener(this);
	1272	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1273	+ //unselectButton.setToolTipText("Unselect");
	1274	+ //unselectButton.addActionListener(this);
766	1275
767	1276	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
768	1277	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -770,6 +1279,7 @@
770	1279
771	1280	editCommandsPanel.preferredHeight = 1;
772	1281
	1282	+ SetPinStates(false);
773	1283	// oe.treePanel.add(commandsPanel);
774	1284	// oe.treePanel.Return();
775	1285
..	..	@@ -796,9 +1306,12 @@
796	1306
797	1307	oe.treePanel.add(copyOptionsPanel);
798	1308	oe.treePanel.Return();
	1309	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1310	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1311	+ sliderPane.preferredHeight = 1;
799	1312
800		-// mainPanel.setDividerLocation(0.5); //1.0);
801		-// mainPanel.setResizeWeight(0.5);
	1313	+// mainPanel.setDividerLocation(0.1); //1.0);
	1314	+ mainPanel.setResizeWeight(0.4);
802	1315
803	1316	//jList.addListSelectionListener(this);
804	1317	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -806,7 +1319,7 @@
806	1319	//jTree.setEditable(true);
807	1320	oe.jTree.setDragEnabled(true);
808	1321	//jTree.setPreferredSize(new Dimension(10,10));
809		- jSP.setPreferredSize(new Dimension(100,200));
	1322	+ //jSP.setPreferredSize(new Dimension(100,200));
810	1323
811	1324	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
812	1325
..	..	@@ -818,7 +1331,7 @@
818	1331	dgr.addDragGestureListener(this);
819	1332	}catch(Exception e) {}
820	1333	*/
821		- radio.layout = sevenButton;
	1334	+ radio.layout = threeButton; // sixButton;
822	1335	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
823	1336	}
824	1337
..	..	@@ -843,14 +1356,18 @@
843	1356	boxCB.addItemListener(this);
844	1357
845	1358	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
846		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1359	+ zoomBoxCB.setToolTipText("Display only for wheel");
847	1360	zoomBoxCB.addItemListener(this);
848	1361
849	1362	if (true) // Globals.ADVANCED)
850	1363	{
851		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
852		- supportCB.setToolTipText("Enable rigging");
853		- supportCB.addItemListener(this);
	1364	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1365	+// supportCB.setToolTipText("Enable rigging");
	1366	+// supportCB.addItemListener(this);
	1367	+
	1368	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1369	+ freezeCB.setToolTipText("Fast moving camera");
	1370	+ freezeCB.addItemListener(this);
854	1371
855	1372	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
856	1373	// localCB.addItemListener(this);
..	..	@@ -865,9 +1382,12 @@
865	1382	smoothCB.setToolTipText("Snapping delay");
866	1383	smoothCB.addItemListener(this);
867	1384
868		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
869		- slowCB.setToolTipText("Smooth interpolation");
870		- slowCB.addItemListener(this);
	1385	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1386	+// slowCB.setToolTipText("Smooth interpolation");
	1387	+// slowCB.addItemListener(this);
	1388	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1389	+ minshaderCB.setToolTipText("Minimal fast shader");
	1390	+ minshaderCB.addItemListener(this);
871	1391
872	1392	// constraints.gridy += 1;
873	1393	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -905,7 +1425,7 @@
905	1425	oeilCB.addItemListener(this);
906	1426
907	1427	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
908		- shadowCB.setToolTipText("Compute shadows when live");
	1428	+ shadowCB.setToolTipText("When live compute shadows");
909	1429	shadowCB.addItemListener(this);
910	1430
911	1431	panel.Return();
..	..	@@ -914,12 +1434,12 @@
914	1434	toggleTextureCB.addItemListener(this);
915	1435
916	1436	panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
917		- toggleSwitchCB.setToolTipText("Use switch");
	1437	+ toggleSwitchCB.setToolTipText("Choose a single item");
918	1438	toggleSwitchCB.addItemListener(this);
919	1439
920		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
921		- autosaveCB.setToolTipText("Auto-save on structure change");
922		- autosaveCB.addItemListener(this);
	1440	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1441	+ autokeepCB.setToolTipText("On structure change");
	1442	+ autokeepCB.addItemListener(this);
923	1443
924	1444	panel.Return();
925	1445	if (Globals.ADVANCED)
..	..	@@ -946,9 +1466,17 @@
946	1466
947	1467	void EditObject(Object3D obj)
948	1468	{
	1469	+ assert(obj instanceof Composite);
	1470	+
	1471	+// if (obj.versionlist == null)
	1472	+// {
	1473	+// obj.versionlist = new Object3D[100];
	1474	+// obj.versionindex = -1;
	1475	+// }
	1476	+
949	1477	cRadio radioButton = new cRadio(obj.name);
950	1478
951		- // Patch to avoid bug with transparency.
	1479	+ // June 2019. Patch to avoid bug with transparency.
952	1480	radioButton.hadMaterial = obj.material != null;
953	1481	if (!radioButton.hadMaterial)
954	1482	{
..	..	@@ -956,7 +1484,7 @@
956	1484	}
957	1485
958	1486	radioButton.SetObject(obj);
959		- radioButton.layout = sevenButton;
	1487	+ radioButton.layout = threeButton; // sixButton;
960	1488	radioButton.SetCamera(cameraView.renderCamera, false);
961	1489	radioButton.addActionListener(this);
962	1490	radioPanel.add(radioButton);
..	..	@@ -981,10 +1509,13 @@
981	1509	cCheckBox localCB;
982	1510	cCheckBox crowdCB;
983	1511	cCheckBox smoothCB;
	1512	+ cCheckBox minshaderCB;
	1513	+
984	1514	cToggleButton fastCB;
985	1515	cCheckBox slowCB;
986	1516	cCheckBox boxCB;
987	1517	cCheckBox zoomBoxCB;
	1518	+ cCheckBox freezeCB;
988	1519	//cToggleButton trackCB;
989	1520	cCheckBox trackCB;
990	1521	cCheckBox smoothfocusCB;
..	..	@@ -995,7 +1526,7 @@
995	1526
996	1527	cCheckBox oeilCB;
997	1528	cCheckBox shadowCB;
998		- cCheckBox autosaveCB;
	1529	+ cCheckBox autokeepCB;
999	1530	cCheckBox lookAtCB;
1000	1531
1001	1532	// static int COLOR = 1;
..	..	@@ -1051,6 +1582,12 @@
1051	1582	cameraView.ToggleInertia();
1052	1583	cameraView.repaint();
1053	1584	}
	1585	+ else if(e.getSource() == minshaderCB)
	1586	+ {
	1587	+ Globals.MINSHADER ^= true;
	1588	+ cameraView.programInitialized = false;
	1589	+ cameraView.repaint();
	1590	+ }
1054	1591	else if(e.getSource() == localCB)
1055	1592	{
1056	1593	cameraView.ToggleLocal();
..	..	@@ -1103,9 +1640,13 @@
1103	1640	{
1104	1641	Globals.COMPUTESHADOWWHENLIVE ^= true;
1105	1642	}
1106		- else if(e.getSource() == autosaveCB)
	1643	+ else if(e.getSource() == freezeCB)
1107	1644	{
1108		- Globals.SAVEONMAKE ^= true;
	1645	+ Globals.FREEZEONMOVE ^= true;
	1646	+ }
	1647	+ else if(e.getSource() == autokeepCB)
	1648	+ {
	1649	+ Globals.REPLACEONMAKE ^= true;
1109	1650	}
1110	1651	else if(e.getSource() == lookAtCB)
1111	1652	{
..	..	@@ -1187,8 +1728,6 @@
1187	1728	}
1188	1729	}
1189	1730
1190		- String string = (String) object;
1191		-
1192	1731	System.out.println("Transfer = " + object + "; drop : " + target);
1193	1732	// if( object instanceof java.io.File[])
1194	1733	// {
..	..	@@ -1196,6 +1735,8 @@
1196	1735	// objEditor.DropFile((java.io.File[]) object, true);
1197	1736	// return;
1198	1737	// }
	1738	+
	1739	+ String string = object.toString();
1199	1740
1200	1741	// File path for Mac and Windows
1201	1742	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1323,7 +1864,12 @@
1323	1864	TreePath path;
1324	1865
1325	1866	public TransferableTreePath(TreePath tp) {
1326		- path = tp;
	1867	+ Object[] objs = new Object[tp.getPathCount()];
	1868	+ for (int i=0; i<objs.length; i++)
	1869	+ {
	1870	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1871	+ }
	1872	+ path = new TreePath(objs);
1327	1873	}
1328	1874
1329	1875	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1445,6 +1991,9 @@
1445	1991	animationItem.addItemListener(this);
1446	1992	animationItem.setState(Globals.ANIMATION);
1447	1993
	1994	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1995	+ archiveItem.addActionListener(this);
	1996	+
1448	1997	menu.add("-");
1449	1998	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1450	1999	parseverticesItem.addActionListener(this);
..	..	@@ -1457,6 +2006,8 @@
1457	2006	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1458	2007	reduce34MorphItem.addActionListener(this);
1459	2008	menu.add("-");
	2009	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2010	+ memoryItem.addActionListener(this);
1460	2011	menu.add(computeAOItem = new MenuItem("Compute AO"));
1461	2012	computeAOItem.addActionListener(this);
1462	2013
..	..	@@ -1465,8 +2016,6 @@
1465	2016	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1466	2017	mirrorItem.addActionListener(this);
1467	2018	menu.add("-");
1468		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1469		- memoryItem.addActionListener(this);
1470	2019	menu.add(analyzeItem = new MenuItem("Analyze"));
1471	2020	analyzeItem.addActionListener(this);
1472	2021	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1614,6 +2163,30 @@
1614	2163
1615	2164	makeSomething(shadow);
1616	2165	}
	2166	+
	2167	+ private void ClearUnpinned()
	2168	+ {
	2169	+ //for (Object3D obj : listUI)
	2170	+ for (int i=listUI.size(); --i>=0;)
	2171	+ {
	2172	+ Object3D obj = listUI.elementAt(i);
	2173	+ if (!obj.pinned)
	2174	+ {
	2175	+ obj.CloseUI();
	2176	+ listUI.remove(i);
	2177	+ }
	2178	+ }
	2179	+ }
	2180	+
	2181	+ private void EditElement(Object3D elem, boolean newWindow)
	2182	+ {
	2183	+ // if (!(elem instanceof Composite))
	2184	+ // newWindow = false;
	2185	+ listUI.add(elem);
	2186	+ elem.openEditWindow(this, newWindow); //, false);
	2187	+ System.out.println("edit : " + elem);
	2188	+ elem.editWindow.refreshContents(true); // ? new
	2189	+ }
1617	2190
1618	2191	/**
1619	2192	* applyExample
..	..	@@ -2042,6 +2615,23 @@
2042	2615	{
2043	2616	makeSomething(new Light());
2044	2617	} else
	2618	+// if (source == skybox1Button \|\|
	2619	+// source == skybox2Button \|\|
	2620	+// source == skybox3Button \|\|
	2621	+// source == skybox4Button \|\|
	2622	+// source == skybox5Button \|\|
	2623	+// source == skybox6Button \|\|
	2624	+// source == skybox7Button \|\|
	2625	+// source == skybox11Button \|\|
	2626	+// source == skybox12Button \|\|
	2627	+// source == skybox13Button \|\|
	2628	+// source == skybox14Button \|\|
	2629	+// source == skybox15Button \|\|
	2630	+// source == skybox16Button \|\|
	2631	+// source == skybox17Button)
	2632	+// {
	2633	+// ChangeSkybox(source);
	2634	+// } else
2045	2635	if (source == csgItem)
2046	2636	{
2047	2637	group(new CSG());
..	..	@@ -2093,25 +2683,25 @@
2093	2683	Composite csg = new GroupLeaf();
2094	2684	csg.count = 5;
2095	2685	group(csg);
2096		- Composite child = new cGroup();
	2686	+ Composite child = new cGroup("Branch");
2097	2687	csg.addChild(child);
2098	2688	child.addChild(csg);
2099	2689	} else
2100	2690	if (source == doubleItem)
2101	2691	{
2102		- Composite csg = new GroupLeaf();
	2692	+ Composite csg = new GroupLeaf("Fork");
2103	2693	csg.count = 5;
2104	2694	group(csg);
2105		- Composite child = new cGroup();
	2695	+ Composite child = new cGroup("Branch A");
2106	2696	csg.addChild(child);
2107	2697	child.addChild(csg);
2108		- child = new cGroup();
	2698	+ child = new cGroup("Branch B");
2109	2699	csg.addChild(child);
2110	2700	child.addChild(csg);
2111	2701	} else
2112	2702	if (source == tripleItem)
2113	2703	{
2114		- Composite csg = new GroupLeaf();
	2704	+ Composite csg = new GroupLeaf("Trident");
2115	2705	csg.count = 4;
2116	2706	group(csg);
2117	2707	Composite child = new cGroup();
..	..	@@ -2127,7 +2717,7 @@
2127	2717	if (source == computeAOItem)
2128	2718	{
2129	2719	Globals.drawMode = CameraPane.OCCLUSION;
2130		- Globals.theRenderer.repaint();
	2720	+ cameraView.repaint();
2131	2721	} else
2132	2722	if (source == recompileItem)
2133	2723	{
..	..	@@ -2142,7 +2732,7 @@
2142	2732	if (source == invariantsItem)
2143	2733	{
2144	2734	System.out.println("Invariants:");
2145		- Grafreed.grafreeD.universe.invariants();
	2735	+ Grafreed.grafreed.universe.invariants();
2146	2736	} else
2147	2737	if (source == memoryItem)
2148	2738	{
..	..	@@ -2173,17 +2763,52 @@
2173	2763	{
2174	2764	ToggleFullScreen();
2175	2765	} else
2176		- if (source == undoButton)
	2766	+ if (source == collapseButton)
2177	2767	{
2178		- Undo();
	2768	+ this.expandedLayout = radio.layout;
	2769	+ CollapseToolbar();
2179	2770	} else
2180		- if (source == redoButton)
	2771	+ if (source == maximize3DButton)
2181	2772	{
2182		- Redo();
	2773	+ this.expandedLayout = radio.layout;
	2774	+ radio.layout = twoButton;
	2775	+ Show3DView();
	2776	+ CollapseToolbar();
2183	2777	} else
2184		- if (source == saveButton)
	2778	+ if (source == previousVersionButton)
2185	2779	{
2186		- Save();
	2780	+ // Go to previous version
	2781	+ //if (!Undo())
	2782	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2783	+ PreviousVersion();
	2784	+ } else
	2785	+ if (source == restoreButton)
	2786	+ {
	2787	+ // Restore current version
	2788	+ Restore();
	2789	+ //restoreButton.setEnabled(false);
	2790	+ } else
	2791	+ if (source == replaceButton)
	2792	+ {
	2793	+ // Overwrite current version
	2794	+ Replace();
	2795	+ //replaceButton.setEnabled(false);
	2796	+ } else
	2797	+ if (source == nextVersionButton)
	2798	+ {
	2799	+ // Go to next version
	2800	+ NextVersion();
	2801	+ } else
	2802	+ if (source == saveVersionButton)
	2803	+ {
	2804	+ // Save a new version
	2805	+ if (!Save(true))
	2806	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2807	+ } else
	2808	+ if (source == deleteVersionButton)
	2809	+ {
	2810	+ // Delete a new version
	2811	+ DeleteVersion();
2187	2812	} else
2188	2813	if (source == oneStepButton)
2189	2814	{
..	..	@@ -2192,17 +2817,14 @@
2192	2817	} else
2193	2818	if (source == screenfitButton)
2194	2819	{
2195		- //Reload(lastConverter, lastFilename, true);
2196	2820	ScreenFit();
2197	2821	} else
2198	2822	if (source == screenfitpointButton)
2199	2823	{
2200		- //Reload(lastConverter, lastFilename, true);
2201	2824	ScreenFitPoint();
2202	2825	} else
2203	2826	if (source == snapobjectButton)
2204	2827	{
2205		- //Reload(lastConverter, lastFilename, true);
2206	2828	SnapObject();
2207	2829	} else
2208	2830	// if (event.getSource() == recompileButton)
..	..	@@ -2241,11 +2863,11 @@
2241	2863	} else
2242	2864	if (source == undoItem)
2243	2865	{
2244		- Undo();
	2866	+ PreviousVersion();
2245	2867	} else
2246	2868	if (source == redoItem)
2247	2869	{
2248		- Redo();
	2870	+ NextVersion();
2249	2871	} else
2250	2872	if (source == duplicateItem)
2251	2873	{
..	..	@@ -2566,7 +3188,7 @@
2566	3188	{
2567	3189	StepAll();
2568	3190	} else
2569		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3191	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2570	3192	{
2571	3193	//int indices[] = jList.getSelectedIndices();
2572	3194	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2726,15 +3348,28 @@
2726	3348	} else
2727	3349	if (source == ungroupItem \|\| source == ungroupButton)
2728	3350	{
2729		- //ungroup();
	3351	+ boolean hasRoot = false;
	3352	+
2730	3353	for (int i=0; i<group.selection.size(); i++)
2731	3354	{
2732		- Ungroup(group.selection.get(i));
	3355	+ if (group.selection.get(i) == group)
	3356	+ {
	3357	+ hasRoot = true;
	3358	+ break;
	3359	+ }
2733	3360	}
2734	3361
2735		- ClearSelection(false);
2736		-
2737		- refreshContents();
	3362	+ if (!hasRoot)
	3363	+ {
	3364	+ for (int i=0; i<group.selection.size(); i++)
	3365	+ {
	3366	+ Ungroup(group.selection.get(i));
	3367	+ }
	3368	+
	3369	+ ClearSelection(false);
	3370	+
	3371	+ refreshContents();
	3372	+ }
2738	3373	} else
2739	3374	if (source == genUVItem)
2740	3375	{
..	..	@@ -3035,7 +3670,7 @@
3035	3670	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3036	3671	{
3037	3672	obj = (Object3D)e.nextElement();
3038		- obj.SetBumpTexture(null);
	3673	+ obj.ResetBumpTexture();
3039	3674	}
3040	3675
3041	3676	refreshContents();
..	..	@@ -3049,6 +3684,31 @@
3049	3684	obj.SetBumpTexture(obj.GetPigmentTexture());
3050	3685	}
3051	3686
	3687	+ refreshContents();
	3688	+ } else
	3689	+ if (source == embedTexturesItem)
	3690	+ {
	3691	+ Object3D obj;
	3692	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3693	+ {
	3694	+ obj = (Object3D)e.nextElement();
	3695	+ obj.EmbedTextures(true);
	3696	+ }
	3697	+
	3698	+ refreshContents();
	3699	+ } else
	3700	+ if (source == deEmbedTexturesItem)
	3701	+ {
	3702	+ Object3D obj;
	3703	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3704	+ {
	3705	+ obj = (Object3D)e.nextElement();
	3706	+ obj.EmbedTextures(false);
	3707	+ }
	3708	+
	3709	+ CameraPane.texturepigment.clear();
	3710	+ CameraPane.texturebump.clear();
	3711	+
3052	3712	refreshContents();
3053	3713	} else
3054	3714	if (source == flashSelectionButton)
..	..	@@ -3066,38 +3726,7 @@
3066	3726	if (CameraPane.FULLSCREEN)
3067	3727	fullscreenLayout = radio.layout;
3068	3728
3069		- // bug
3070		- //gridPanel.setDividerLocation(1.0);
3071		- //bigPanel.setDividerLocation(0.0);
3072		-// bigThree.remove(scenePanel);
3073		-// bigThree.remove(centralPanel);
3074		-// bigThree.remove(XYZPanel);
3075		-// aWindowConstraints.gridx = 0;
3076		-// aWindowConstraints.gridy = 0;
3077		-// aWindowConstraints.gridwidth = 1;
3078		-// // aConstraints.gridheight = 3;
3079		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3080		-// aWindowConstraints.weightx = 0;
3081		-// aWindowConstraints.weighty = 1;
3082		-// //bigThree.add(jtp, aWindowConstraints);
3083		-// aWindowConstraints.weightx = 1;
3084		-// aWindowConstraints.gridwidth = 3;
3085		-// // aConstraints.gridheight = 3;
3086		-// aWindowConstraints.gridx = 1;
3087		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3088		-// bigThree.add(centralPanel, aWindowConstraints);
3089		-// aWindowConstraints.weightx = 0;
3090		-// aWindowConstraints.gridx = 4;
3091		-// aWindowConstraints.gridwidth = 1;
3092		-// // aConstraints.gridheight = 3;
3093		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3094		-// //bigThree.add(XYZPanel, aWindowConstraints);
3095		-// scenePanel.setVisible(false);
3096		-// centralPanel.setVisible(true);
3097		-// XYZPanel.setVisible(false);
3098		- bigThree.ClearUI();
3099		- bigThree.add(centralPanel);
3100		- bigThree.FlushUI();
	3729	+ Show3DView();
3101	3730
3102	3731	cameraView.requestFocusInWindow();
3103	3732
..	..	@@ -3152,8 +3781,8 @@
3152	3781	// centralPanel.setVisible(true);
3153	3782	// XYZPanel.setVisible(true);
3154	3783	bigThree.ClearUI();
	3784	+ bigThree.add(scenePanel);
3155	3785	bigThree.add(centralPanel);
3156		- bigThree.add(XYZPanel);
3157	3786	bigThree.FlushUI();
3158	3787
3159	3788	cameraView.requestFocusInWindow();
..	..	@@ -3233,8 +3862,8 @@
3233	3862	// centralPanel.setVisible(true);
3234	3863	// XYZPanel.setVisible(false);
3235	3864	bigThree.ClearUI();
3236		- bigThree.add(scenePanel);
3237	3865	bigThree.add(centralPanel);
	3866	+ bigThree.add(scenePanel);
3238	3867	bigThree.FlushUI();
3239	3868
3240	3869	cameraView.requestFocusInWindow();
..	..	@@ -3283,6 +3912,7 @@
3283	3912	} else
3284	3913	if (source == rootButton)
3285	3914	{
	3915	+ Replace();
3286	3916	Object3D obj;
3287	3917	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3288	3918	{
..	..	@@ -3326,6 +3956,12 @@
3326	3956	} else
3327	3957	if (source == editItem \|\| source == editButton)
3328	3958	{
	3959	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3960	+ {
	3961	+ Object3D child = (Object3D)e.nextElement();
	3962	+ child.pinned = true;
	3963	+ }
	3964	+
3329	3965	EditSelection(false);
3330	3966	} else
3331	3967	if (source == uneditButton)
..	..	@@ -3334,9 +3970,10 @@
3334	3970	{
3335	3971	Object3D child = (Object3D)e.nextElement();
3336	3972	if(child.editWindow != null)
3337		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3973	+ child.pinned = false;
3338	3974	child.CloseUI();
3339	3975	listUI.remove(child);
	3976	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3340	3977
3341	3978	//child.editWindow = null; // ???????????
3342	3979	}
..	..	@@ -3351,16 +3988,18 @@
3351	3988	//copy.ClearUI();
3352	3989	for (Object3D obj : listUI)
3353	3990	{
	3991	+ obj.pinned = false;
3354	3992	obj.CloseUI();
3355	3993	}
3356	3994	listUI.clear();
	3995	+ SetPinStates(group.selection.size() > 0);
3357	3996	refreshContents(true);
3358	3997	} else
3359	3998	if (source == allParamsButton)
3360	3999	{
3361	4000	assert(copy == group);
3362	4001
3363		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4002	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3364	4003
3365	4004	for (Object3D obj : listUI)
3366	4005	{
..	..	@@ -3409,6 +4048,7 @@
3409	4048	}
3410	4049
3411	4050	copy = group;
	4051	+
3412	4052	//Globals.theRenderer.object = group;
3413	4053	if(!useclient)
3414	4054	{
..	..	@@ -3435,6 +4075,26 @@
3435	4075	currentLayout = sevenButton;
3436	4076	*/
3437	4077	radio.layout.doClick();
	4078	+
	4079	+ assert(copy instanceof Composite);
	4080	+
	4081	+ if (copy.versionlist == null)
	4082	+ {
	4083	+ copy.versionlist = new Object3D[100];
	4084	+ copy.versionindex = -1;
	4085	+
	4086	+ Save(true);
	4087	+ }
	4088	+
	4089	+ SetVersionStates();
	4090	+
	4091	+ ClearUnpinned();
	4092	+
	4093	+ //Grafreed.Assert(group != null);
	4094	+ //Grafreed.Assert(group.selection != null);
	4095	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4096	+ if (group.selection == null \|\| group.selection.size() == 1)
	4097	+ EditSelection(false);
3438	4098	keepparent = group.parent;
3439	4099	// PARENT = NULL or not???
3440	4100	//group.parent = null; // ROOT
..	..	@@ -3446,11 +4106,13 @@
3446	4106	} else if (event.getSource() == editCameraItem)
3447	4107	{
3448	4108	cameraView.ProtectCamera();
	4109	+ cameraView.requestFocusInWindow();
3449	4110	cameraView.repaint();
3450	4111	return;
3451	4112	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3452	4113	{
3453	4114	cameraView.RevertCamera();
	4115	+ cameraView.requestFocusInWindow();
3454	4116	cameraView.repaint();
3455	4117	return;
3456	4118	// } else if (event.getSource() == textureButton)
..	..	@@ -4027,7 +4689,7 @@
4027	4689
4028	4690	try
4029	4691	{
4030		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4692	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4031	4693	}
4032	4694	catch (Exception e)
4033	4695	{
..	..	@@ -4502,12 +5164,14 @@
4502	5164	// }
4503	5165	// }
4504	5166
4505		- static boolean allparams = true;
4506		-
4507		- static Vector<Object3D> listUI = new Vector<Object3D>();
4508		-
4509	5167	void EditSelection(boolean newWindow)
4510	5168	{
	5169	+ if (group.selection == null)
	5170	+ {
	5171	+ EditElement(group, newWindow); // ? new
	5172	+ return;
	5173	+ }
	5174	+
4511	5175	// aConstraints.gridy = 0;
4512	5176	for (int i=0; i<group.selection.size(); i++)
4513	5177	{
..	..	@@ -4518,12 +5182,7 @@
4518	5182	Object3D elem = (Object3D)group.selection.elementAt(i);
4519	5183	if(elem != group \|\| !newWindow)
4520	5184	{
4521		- // if (!(elem instanceof Composite))
4522		- // newWindow = false;
4523		- listUI.add(elem);
4524		- elem.openEditWindow(this, newWindow); //, false);
4525		- System.out.println("edit : " + elem);
4526		- elem.editWindow.refreshContents(true); // ? new
	5185	+ EditElement(elem, newWindow); // ? new
4527	5186	}
4528	5187	}
4529	5188	}
..	..	@@ -4586,9 +5245,7 @@
4586	5245
4587	5246	freezemodel = false;
4588	5247	}
4589		-
4590		- boolean flashIt = true;
4591		-
	5248	+
4592	5249	public void valueChanged(TreeSelectionEvent e)
4593	5250	//public boolean handleEvent(Event event)
4594	5251	{
..	..	@@ -4598,7 +5255,8 @@
4598	5255	//new Exception().printStackTrace();
4599	5256
4600	5257	freezemodel = true;
4601		-
	5258	+ ClearUnpinned();
	5259	+
4602	5260	/**/
4603	5261	//switch (event.id)
4604	5262	{
..	..	@@ -4631,7 +5289,7 @@
4631	5289	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4632	5290	// a camera
4633	5291	{
4634		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5292	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4635	5293	{
4636	5294	CameraPane.camerachangeframe = 0; // don't refuse it
4637	5295	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4640,6 +5298,13 @@
4640	5298	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4641	5299	}
4642	5300
	5301	+ if (tps != null && tps.length == 1)
	5302	+ {
	5303	+ EditSelection(false);
	5304	+ }
	5305	+
	5306	+ SetPinStates(tps != null && tps.length > 0);
	5307	+
4643	5308	refreshContents();
4644	5309	//return true;
4645	5310	}
..	..	@@ -4649,10 +5314,33 @@
4649	5314	freezemodel = false;
4650	5315	}
4651	5316
	5317	+ void SetPinStates(boolean enabled)
	5318	+ {
	5319	+ editButton.setEnabled(enabled);
	5320	+ uneditButton.setEnabled(enabled);
	5321	+ //unselectButton.setEnabled(enabled);
	5322	+ flashSelectionButton.setEnabled(enabled);
	5323	+
	5324	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5325	+
	5326	+ boolean allComposites = true;
	5327	+
	5328	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5329	+ {
	5330	+ if (!(e.nextElement() instanceof Composite))
	5331	+ {
	5332	+ allComposites = false;
	5333	+ break;
	5334	+ }
	5335	+ }
	5336	+
	5337	+ rootButton.setEnabled(allComposites);
	5338	+ }
	5339	+
4652	5340	void refreshContents(boolean cp)
4653	5341	{
4654		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4655		- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	5342	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5343	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4656	5344	{
4657	5345	objEditor.ClearInfo(); // .GetMaterial());
4658	5346
..	..	@@ -4661,7 +5349,7 @@
4661	5349	Object3D child = (Object3D) group.selection.get(i);
4662	5350
4663	5351	objEditor.AddInfo(child, this, true);
4664		- System.err.println("info : " + child.GetPath());
	5352	+// System.err.println("info : " + child.GetPath());
4665	5353	}
4666	5354
4667	5355	objEditor.SetText(); // jan 2014
..	..	@@ -4751,8 +5439,8 @@
4751	5439
4752	5440	if (cut)
4753	5441	{
4754		- if (Globals.SAVEONMAKE)
4755		- Save();
	5442	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5443	+// Save();
4756	5444	//int indices[] = jList.getSelectedIndices();
4757	5445	//for (int i = indices.length - 1; i >= 0; i--)
4758	5446	//jList.remove(indices[i]);
..	..	@@ -4855,6 +5543,10 @@
4855	5543
4856	5544	void paste(boolean expand)
4857	5545	{
	5546	+ if (Globals.REPLACEONMAKE)
	5547	+ Save();
	5548	+ boolean keep = Globals.REPLACEONMAKE;
	5549	+ Globals.REPLACEONMAKE = false;
4858	5550	// if (GrafreeD.clipboard == null)
4859	5551	// return;
4860	5552	boolean first = true;
..	..	@@ -4914,6 +5606,7 @@
4914	5606	Grafreed.clipboard.get(0).parent = keepparent;
4915	5607	}
4916	5608
	5609	+ Globals.REPLACEONMAKE = keep;
4917	5610	ResetModel();
4918	5611	refreshContents();
4919	5612	}
..	..	@@ -5049,6 +5742,10 @@
5049	5742
5050	5743	void group(Object3D csg, boolean grab)
5051	5744	{
	5745	+ if (Globals.REPLACEONMAKE)
	5746	+ Save();
	5747	+ boolean keep = Globals.REPLACEONMAKE;
	5748	+ Globals.REPLACEONMAKE = false;
5052	5749	if (//false) // why??
5053	5750	!group.selection.isEmpty())
5054	5751	{
..	..	@@ -5162,10 +5859,15 @@
5162	5859	//node.add(csg);
5163	5860	//makeSomething(node);
5164	5861	makeSomething(csg);
	5862	+ Globals.REPLACEONMAKE = keep;
5165	5863	}
5166	5864
5167	5865	void Ungroup(Object3D g)
5168	5866	{
	5867	+ if (Globals.REPLACEONMAKE)
	5868	+ Save();
	5869	+ boolean keep = Globals.REPLACEONMAKE;
	5870	+ Globals.REPLACEONMAKE = false;
5169	5871	if (g instanceof HiddenObject)
5170	5872	{
5171	5873	HiddenObject h = (HiddenObject) g;
..	..	@@ -5182,6 +5884,7 @@
5182	5884	objEditor.makeSomething(g.get(i), false);
5183	5885	}
5184	5886	}
	5887	+ Globals.REPLACEONMAKE = keep;
5185	5888	}
5186	5889
5187	5890	void ungroup()
..	..	@@ -5472,12 +6175,6 @@
5472	6175
5473	6176	cButton restoreCameraButton;
5474	6177
5475		- cButton minButton;
5476		- cButton maxButton;
5477		- cButton fullButton;
5478		- cButton undoButton;
5479		- cButton redoButton;
5480		- cButton saveButton;
5481	6178	cButton oneStepButton;
5482	6179
5483	6180	cButton groupButton;
..	..	@@ -5486,6 +6183,22 @@
5486	6183	cButton switchButton;
5487	6184	cButton loopButton;
5488	6185	cButton textureButton;
	6186	+
	6187	+ cButton skybox1Button;
	6188	+ cButton skybox2Button;
	6189	+ cButton skybox3Button;
	6190	+ cButton skybox4Button;
	6191	+ cButton skybox5Button;
	6192	+ cButton skybox6Button;
	6193	+ cButton skybox7Button;
	6194	+
	6195	+ cButton skybox11Button;
	6196	+ cButton skybox12Button;
	6197	+ cButton skybox13Button;
	6198	+ cButton skybox14Button;
	6199	+ cButton skybox15Button;
	6200	+ cButton skybox16Button;
	6201	+ cButton skybox17Button;
5489	6202
5490	6203	cButton gridButton;
5491	6204	cButton boxButton;
..	..	@@ -5550,7 +6263,7 @@
5550	6263	private MenuItem pasteLinkItem;
5551	6264	private MenuItem pasteCloneItem;
5552	6265	private MenuItem pasteExpandItem;
5553		- private MenuItem clearItem;
	6266	+ private MenuItem deleteItem;
5554	6267	private MenuItem clearAllItem;
5555	6268	private MenuItem genUVItem;
5556	6269	private MenuItem genNormalsMESHItem;
..	..	@@ -5634,6 +6347,8 @@
5634	6347	private MenuItem attachBumpItem;
5635	6348	private MenuItem detachBumpItem;
5636	6349	private MenuItem pigmentBumpItem;
	6350	+ private MenuItem embedTexturesItem;
	6351	+ private MenuItem deEmbedTexturesItem;
5637	6352
5638	6353	private MenuItem particleItem;
5639	6354	private MenuItem ragdollItem;