~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,50 +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);
608		- undoButton.setEnabled(false);
	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);
609	1109
610		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611		- redoButton.setToolTipText("Redo changes");
612		- redoButton.addActionListener(this);
613		- redoButton.setEnabled(false);
	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);
614	1115
615		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616		- saveButton.setToolTipText("Save changes");
617		- 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);
618	1120
619		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
620		- liveCB.setToolTipText("Enable animation");
621		- liveCB.addItemListener(this);
622		-
623		- 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);
624	1129	oneStepButton.setToolTipText("Animate one step forward");
625	1130	oneStepButton.addActionListener(this);
626	1131
627		- 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);
628	1137	fastCB.setToolTipText("Fast mode");
629	1138	fastCB.addItemListener(this);
630	1139
631	1140	//oe.toolboxPanel.Return();
632	1141
633		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- screenfitButton.setToolTipText("Screen fit");
635		- screenfitButton.addActionListener(this);
636		-
637	1142	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
638	1143	// trackCB.setToolTipText("Enable tracking");
639	1144	// trackCB.addItemListener(this);
..	..	@@ -646,31 +1151,17 @@
646	1151	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647	1152	snapobjectButton.addActionListener(this);
648	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");
649	1158	}
650	1159
651	1160	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
652	1161
653		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654		- twoButton.setToolTipText("Show center view only");
655		- twoButton.addActionListener(this);
656		- this.fullscreenLayout = twoButton;
657		-
658		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
659		- fourButton.addActionListener(this);
660		- fourButton.setToolTipText("Show left panel only");
661		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662		- sixButton.setToolTipText("2-column layout left");
663		- sixButton.addActionListener(this);
664		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
665		- threeButton.setToolTipText("2-column layout right");
666		- threeButton.addActionListener(this);
667		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668		- sevenButton.setToolTipText("3-column layout");
669		- sevenButton.addActionListener(this);
670		- //
671	1162
672		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
673		- 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");
674	1165	rootButton.addActionListener(this);
675	1166
676	1167	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -679,28 +1170,30 @@
679	1170	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
680	1171	//clearButton.addActionListener(this);
681	1172
	1173	+ cGridBag row1 = new cGridBag();
	1174	+
682	1175	// INSERT
683		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684		- gridButton.setToolTipText("Create grid");
	1176	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ gridButton.setToolTipText("Create ground");
685	1178	gridButton.addActionListener(this);
686	1179
687		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688	1181	boxButton.setToolTipText("Create box");
689	1182	boxButton.addActionListener(this);
690	1183
691		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
692	1185	sphereButton.setToolTipText("Create sphere");
693	1186	sphereButton.addActionListener(this);
694	1187
695		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1188	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696	1189	coneButton.setToolTipText("Create cone");
697	1190	coneButton.addActionListener(this);
698	1191
699		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1192	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700	1193	torusButton.setToolTipText("Create torus");
701	1194	torusButton.addActionListener(this);
702	1195
703		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1196	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
704	1197	superButton.setToolTipText("Create superellipsoid");
705	1198	superButton.addActionListener(this);
706	1199
..	..	@@ -711,51 +1204,53 @@
711	1204	kleinButton.addActionListener(this);
712	1205	}
713	1206
714		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
715	1208	particlesButton.setToolTipText("Create particle system");
716	1209	particlesButton.addActionListener(this);
717	1210
718		- oe.toolboxPanel.Return();
	1211	+ oe.toolboxPanel.add(row1);
719	1212
720		- 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);
721	1216	groupButton.setToolTipText("Create group");
722	1217	groupButton.addActionListener(this);
723	1218
724		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
725	1220	compositeButton.setToolTipText("Create composite");
726	1221	compositeButton.addActionListener(this);
727	1222
728		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
729		- switchButton.setToolTipText("Create switch");
	1223	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ switchButton.setToolTipText("Create item switcher");
730	1225	switchButton.addActionListener(this);
731	1226
732		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
733	1228	loopButton.setToolTipText("Create loop");
734	1229	loopButton.addActionListener(this);
735	1230
736		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1231	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
737	1232	textureButton.setToolTipText("Create texture");
738	1233	textureButton.addActionListener(this);
739	1234
740		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1235	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
741	1236	overlayButton.setToolTipText("Create overlay");
742	1237	overlayButton.addActionListener(this);
743	1238
744		- 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);
745	1240	lightButton.setToolTipText("Create light");
746	1241	lightButton.addActionListener(this);
747	1242
748		- for (int i=6; --i>=0;)
749		- {
750		- oe.toolboxPanel.Return();
751		- oe.toolboxPanel.add(new cGridBag());
752		- oe.toolboxPanel.add(new cGridBag());
753		- oe.toolboxPanel.add(new cGridBag());
754		- oe.toolboxPanel.add(new cGridBag());
755		- oe.toolboxPanel.add(new cGridBag());
756		- oe.toolboxPanel.add(new cGridBag());
757		- oe.toolboxPanel.add(new cGridBag());
758		- }
	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);
759	1254
760	1255	// EDIT panel
761	1256	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -763,20 +1258,20 @@
763	1258	editButton.addActionListener(this);
764	1259
765	1260	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
766		- uneditButton.setToolTipText("Remove selection controls");
	1261	+ uneditButton.setToolTipText("Unpin and remove selection controls");
767	1262	uneditButton.addActionListener(this);
768	1263
769	1264	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
770		- allParamsButton.setToolTipText("Show all controle");
	1265	+ allParamsButton.setToolTipText("Show all controls");
771	1266	allParamsButton.addActionListener(this);
772	1267
773		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
774		- clearPanelButton.setToolTipText("Clear edit panel");
	1268	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1269	+ clearPanelButton.setToolTipText("Clear all controls");
775	1270	clearPanelButton.addActionListener(this);
776	1271
777		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
778		- unselectButton.setToolTipText("Unselect");
779		- unselectButton.addActionListener(this);
	1272	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1273	+ //unselectButton.setToolTipText("Unselect");
	1274	+ //unselectButton.addActionListener(this);
780	1275
781	1276	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
782	1277	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -811,9 +1306,12 @@
811	1306
812	1307	oe.treePanel.add(copyOptionsPanel);
813	1308	oe.treePanel.Return();
	1309	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1310	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1311	+ sliderPane.preferredHeight = 1;
814	1312
815		-// mainPanel.setDividerLocation(0.5); //1.0);
816		-// mainPanel.setResizeWeight(0.5);
	1313	+// mainPanel.setDividerLocation(0.1); //1.0);
	1314	+ mainPanel.setResizeWeight(0.4);
817	1315
818	1316	//jList.addListSelectionListener(this);
819	1317	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -821,7 +1319,7 @@
821	1319	//jTree.setEditable(true);
822	1320	oe.jTree.setDragEnabled(true);
823	1321	//jTree.setPreferredSize(new Dimension(10,10));
824		- jSP.setPreferredSize(new Dimension(100,200));
	1322	+ //jSP.setPreferredSize(new Dimension(100,200));
825	1323
826	1324	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
827	1325
..	..	@@ -833,7 +1331,7 @@
833	1331	dgr.addDragGestureListener(this);
834	1332	}catch(Exception e) {}
835	1333	*/
836		- radio.layout = sevenButton;
	1334	+ radio.layout = threeButton; // sixButton;
837	1335	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
838	1336	}
839	1337
..	..	@@ -863,9 +1361,13 @@
863	1361
864	1362	if (true) // Globals.ADVANCED)
865	1363	{
866		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
867		- supportCB.setToolTipText("Enable rigging");
868		- 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);
869	1371
870	1372	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
871	1373	// localCB.addItemListener(this);
..	..	@@ -880,9 +1382,12 @@
880	1382	smoothCB.setToolTipText("Snapping delay");
881	1383	smoothCB.addItemListener(this);
882	1384
883		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
884		- slowCB.setToolTipText("Smooth interpolation");
885		- 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);
886	1391
887	1392	// constraints.gridy += 1;
888	1393	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -929,12 +1434,12 @@
929	1434	toggleTextureCB.addItemListener(this);
930	1435
931	1436	panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
932		- toggleSwitchCB.setToolTipText("Use switch");
	1437	+ toggleSwitchCB.setToolTipText("Choose a single item");
933	1438	toggleSwitchCB.addItemListener(this);
934	1439
935		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
936		- autosaveCB.setToolTipText("On structure change");
937		- autosaveCB.addItemListener(this);
	1440	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1441	+ autokeepCB.setToolTipText("On structure change");
	1442	+ autokeepCB.addItemListener(this);
938	1443
939	1444	panel.Return();
940	1445	if (Globals.ADVANCED)
..	..	@@ -961,9 +1466,17 @@
961	1466
962	1467	void EditObject(Object3D obj)
963	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	+
964	1477	cRadio radioButton = new cRadio(obj.name);
965	1478
966		- // Patch to avoid bug with transparency.
	1479	+ // June 2019. Patch to avoid bug with transparency.
967	1480	radioButton.hadMaterial = obj.material != null;
968	1481	if (!radioButton.hadMaterial)
969	1482	{
..	..	@@ -971,7 +1484,7 @@
971	1484	}
972	1485
973	1486	radioButton.SetObject(obj);
974		- radioButton.layout = sevenButton;
	1487	+ radioButton.layout = threeButton; // sixButton;
975	1488	radioButton.SetCamera(cameraView.renderCamera, false);
976	1489	radioButton.addActionListener(this);
977	1490	radioPanel.add(radioButton);
..	..	@@ -996,10 +1509,13 @@
996	1509	cCheckBox localCB;
997	1510	cCheckBox crowdCB;
998	1511	cCheckBox smoothCB;
	1512	+ cCheckBox minshaderCB;
	1513	+
999	1514	cToggleButton fastCB;
1000	1515	cCheckBox slowCB;
1001	1516	cCheckBox boxCB;
1002	1517	cCheckBox zoomBoxCB;
	1518	+ cCheckBox freezeCB;
1003	1519	//cToggleButton trackCB;
1004	1520	cCheckBox trackCB;
1005	1521	cCheckBox smoothfocusCB;
..	..	@@ -1010,7 +1526,7 @@
1010	1526
1011	1527	cCheckBox oeilCB;
1012	1528	cCheckBox shadowCB;
1013		- cCheckBox autosaveCB;
	1529	+ cCheckBox autokeepCB;
1014	1530	cCheckBox lookAtCB;
1015	1531
1016	1532	// static int COLOR = 1;
..	..	@@ -1066,6 +1582,12 @@
1066	1582	cameraView.ToggleInertia();
1067	1583	cameraView.repaint();
1068	1584	}
	1585	+ else if(e.getSource() == minshaderCB)
	1586	+ {
	1587	+ Globals.MINSHADER ^= true;
	1588	+ cameraView.programInitialized = false;
	1589	+ cameraView.repaint();
	1590	+ }
1069	1591	else if(e.getSource() == localCB)
1070	1592	{
1071	1593	cameraView.ToggleLocal();
..	..	@@ -1118,9 +1640,13 @@
1118	1640	{
1119	1641	Globals.COMPUTESHADOWWHENLIVE ^= true;
1120	1642	}
1121		- else if(e.getSource() == autosaveCB)
	1643	+ else if(e.getSource() == freezeCB)
1122	1644	{
1123		- Globals.SAVEONMAKE ^= true;
	1645	+ Globals.FREEZEONMOVE ^= true;
	1646	+ }
	1647	+ else if(e.getSource() == autokeepCB)
	1648	+ {
	1649	+ Globals.REPLACEONMAKE ^= true;
1124	1650	}
1125	1651	else if(e.getSource() == lookAtCB)
1126	1652	{
..	..	@@ -1202,8 +1728,6 @@
1202	1728	}
1203	1729	}
1204	1730
1205		- String string = (String) object;
1206		-
1207	1731	System.out.println("Transfer = " + object + "; drop : " + target);
1208	1732	// if( object instanceof java.io.File[])
1209	1733	// {
..	..	@@ -1211,6 +1735,8 @@
1211	1735	// objEditor.DropFile((java.io.File[]) object, true);
1212	1736	// return;
1213	1737	// }
	1738	+
	1739	+ String string = object.toString();
1214	1740
1215	1741	// File path for Mac and Windows
1216	1742	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1338,7 +1864,12 @@
1338	1864	TreePath path;
1339	1865
1340	1866	public TransferableTreePath(TreePath tp) {
1341		- 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);
1342	1873	}
1343	1874
1344	1875	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1460,6 +1991,9 @@
1460	1991	animationItem.addItemListener(this);
1461	1992	animationItem.setState(Globals.ANIMATION);
1462	1993
	1994	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1995	+ archiveItem.addActionListener(this);
	1996	+
1463	1997	menu.add("-");
1464	1998	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1465	1999	parseverticesItem.addActionListener(this);
..	..	@@ -1472,6 +2006,8 @@
1472	2006	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1473	2007	reduce34MorphItem.addActionListener(this);
1474	2008	menu.add("-");
	2009	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2010	+ memoryItem.addActionListener(this);
1475	2011	menu.add(computeAOItem = new MenuItem("Compute AO"));
1476	2012	computeAOItem.addActionListener(this);
1477	2013
..	..	@@ -1480,8 +2016,6 @@
1480	2016	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1481	2017	mirrorItem.addActionListener(this);
1482	2018	menu.add("-");
1483		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1484		- memoryItem.addActionListener(this);
1485	2019	menu.add(analyzeItem = new MenuItem("Analyze"));
1486	2020	analyzeItem.addActionListener(this);
1487	2021	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1642,6 +2176,16 @@
1642	2176	listUI.remove(i);
1643	2177	}
1644	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
1645	2189	}
1646	2190
1647	2191	/**
..	..	@@ -2071,6 +2615,23 @@
2071	2615	{
2072	2616	makeSomething(new Light());
2073	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
2074	2635	if (source == csgItem)
2075	2636	{
2076	2637	group(new CSG());
..	..	@@ -2122,25 +2683,25 @@
2122	2683	Composite csg = new GroupLeaf();
2123	2684	csg.count = 5;
2124	2685	group(csg);
2125		- Composite child = new cGroup();
	2686	+ Composite child = new cGroup("Branch");
2126	2687	csg.addChild(child);
2127	2688	child.addChild(csg);
2128	2689	} else
2129	2690	if (source == doubleItem)
2130	2691	{
2131		- Composite csg = new GroupLeaf();
	2692	+ Composite csg = new GroupLeaf("Fork");
2132	2693	csg.count = 5;
2133	2694	group(csg);
2134		- Composite child = new cGroup();
	2695	+ Composite child = new cGroup("Branch A");
2135	2696	csg.addChild(child);
2136	2697	child.addChild(csg);
2137		- child = new cGroup();
	2698	+ child = new cGroup("Branch B");
2138	2699	csg.addChild(child);
2139	2700	child.addChild(csg);
2140	2701	} else
2141	2702	if (source == tripleItem)
2142	2703	{
2143		- Composite csg = new GroupLeaf();
	2704	+ Composite csg = new GroupLeaf("Trident");
2144	2705	csg.count = 4;
2145	2706	group(csg);
2146	2707	Composite child = new cGroup();
..	..	@@ -2156,7 +2717,7 @@
2156	2717	if (source == computeAOItem)
2157	2718	{
2158	2719	Globals.drawMode = CameraPane.OCCLUSION;
2159		- Globals.theRenderer.repaint();
	2720	+ cameraView.repaint();
2160	2721	} else
2161	2722	if (source == recompileItem)
2162	2723	{
..	..	@@ -2171,7 +2732,7 @@
2171	2732	if (source == invariantsItem)
2172	2733	{
2173	2734	System.out.println("Invariants:");
2174		- Grafreed.grafreeD.universe.invariants();
	2735	+ Grafreed.grafreed.universe.invariants();
2175	2736	} else
2176	2737	if (source == memoryItem)
2177	2738	{
..	..	@@ -2202,17 +2763,52 @@
2202	2763	{
2203	2764	ToggleFullScreen();
2204	2765	} else
2205		- if (source == undoButton)
	2766	+ if (source == collapseButton)
2206	2767	{
2207		- Undo();
	2768	+ this.expandedLayout = radio.layout;
	2769	+ CollapseToolbar();
2208	2770	} else
2209		- if (source == redoButton)
	2771	+ if (source == maximize3DButton)
2210	2772	{
2211		- Redo();
	2773	+ this.expandedLayout = radio.layout;
	2774	+ radio.layout = twoButton;
	2775	+ Show3DView();
	2776	+ CollapseToolbar();
2212	2777	} else
2213		- if (source == saveButton)
	2778	+ if (source == previousVersionButton)
2214	2779	{
2215		- 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();
2216	2812	} else
2217	2813	if (source == oneStepButton)
2218	2814	{
..	..	@@ -2221,17 +2817,14 @@
2221	2817	} else
2222	2818	if (source == screenfitButton)
2223	2819	{
2224		- //Reload(lastConverter, lastFilename, true);
2225	2820	ScreenFit();
2226	2821	} else
2227	2822	if (source == screenfitpointButton)
2228	2823	{
2229		- //Reload(lastConverter, lastFilename, true);
2230	2824	ScreenFitPoint();
2231	2825	} else
2232	2826	if (source == snapobjectButton)
2233	2827	{
2234		- //Reload(lastConverter, lastFilename, true);
2235	2828	SnapObject();
2236	2829	} else
2237	2830	// if (event.getSource() == recompileButton)
..	..	@@ -2270,11 +2863,11 @@
2270	2863	} else
2271	2864	if (source == undoItem)
2272	2865	{
2273		- Undo();
	2866	+ PreviousVersion();
2274	2867	} else
2275	2868	if (source == redoItem)
2276	2869	{
2277		- Redo();
	2870	+ NextVersion();
2278	2871	} else
2279	2872	if (source == duplicateItem)
2280	2873	{
..	..	@@ -2595,7 +3188,7 @@
2595	3188	{
2596	3189	StepAll();
2597	3190	} else
2598		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3191	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2599	3192	{
2600	3193	//int indices[] = jList.getSelectedIndices();
2601	3194	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2755,15 +3348,28 @@
2755	3348	} else
2756	3349	if (source == ungroupItem \|\| source == ungroupButton)
2757	3350	{
2758		- //ungroup();
	3351	+ boolean hasRoot = false;
	3352	+
2759	3353	for (int i=0; i<group.selection.size(); i++)
2760	3354	{
2761		- Ungroup(group.selection.get(i));
	3355	+ if (group.selection.get(i) == group)
	3356	+ {
	3357	+ hasRoot = true;
	3358	+ break;
	3359	+ }
2762	3360	}
2763	3361
2764		- ClearSelection(false);
2765		-
2766		- 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	+ }
2767	3373	} else
2768	3374	if (source == genUVItem)
2769	3375	{
..	..	@@ -3064,7 +3670,7 @@
3064	3670	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3065	3671	{
3066	3672	obj = (Object3D)e.nextElement();
3067		- obj.SetBumpTexture(null);
	3673	+ obj.ResetBumpTexture();
3068	3674	}
3069	3675
3070	3676	refreshContents();
..	..	@@ -3078,6 +3684,31 @@
3078	3684	obj.SetBumpTexture(obj.GetPigmentTexture());
3079	3685	}
3080	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	+
3081	3712	refreshContents();
3082	3713	} else
3083	3714	if (source == flashSelectionButton)
..	..	@@ -3095,38 +3726,7 @@
3095	3726	if (CameraPane.FULLSCREEN)
3096	3727	fullscreenLayout = radio.layout;
3097	3728
3098		- // bug
3099		- //gridPanel.setDividerLocation(1.0);
3100		- //bigPanel.setDividerLocation(0.0);
3101		-// bigThree.remove(scenePanel);
3102		-// bigThree.remove(centralPanel);
3103		-// bigThree.remove(XYZPanel);
3104		-// aWindowConstraints.gridx = 0;
3105		-// aWindowConstraints.gridy = 0;
3106		-// aWindowConstraints.gridwidth = 1;
3107		-// // aConstraints.gridheight = 3;
3108		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3109		-// aWindowConstraints.weightx = 0;
3110		-// aWindowConstraints.weighty = 1;
3111		-// //bigThree.add(jtp, aWindowConstraints);
3112		-// aWindowConstraints.weightx = 1;
3113		-// aWindowConstraints.gridwidth = 3;
3114		-// // aConstraints.gridheight = 3;
3115		-// aWindowConstraints.gridx = 1;
3116		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3117		-// bigThree.add(centralPanel, aWindowConstraints);
3118		-// aWindowConstraints.weightx = 0;
3119		-// aWindowConstraints.gridx = 4;
3120		-// aWindowConstraints.gridwidth = 1;
3121		-// // aConstraints.gridheight = 3;
3122		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3123		-// //bigThree.add(XYZPanel, aWindowConstraints);
3124		-// scenePanel.setVisible(false);
3125		-// centralPanel.setVisible(true);
3126		-// XYZPanel.setVisible(false);
3127		- bigThree.ClearUI();
3128		- bigThree.add(centralPanel);
3129		- bigThree.FlushUI();
	3729	+ Show3DView();
3130	3730
3131	3731	cameraView.requestFocusInWindow();
3132	3732
..	..	@@ -3181,8 +3781,8 @@
3181	3781	// centralPanel.setVisible(true);
3182	3782	// XYZPanel.setVisible(true);
3183	3783	bigThree.ClearUI();
	3784	+ bigThree.add(scenePanel);
3184	3785	bigThree.add(centralPanel);
3185		- bigThree.add(XYZPanel);
3186	3786	bigThree.FlushUI();
3187	3787
3188	3788	cameraView.requestFocusInWindow();
..	..	@@ -3262,8 +3862,8 @@
3262	3862	// centralPanel.setVisible(true);
3263	3863	// XYZPanel.setVisible(false);
3264	3864	bigThree.ClearUI();
3265		- bigThree.add(scenePanel);
3266	3865	bigThree.add(centralPanel);
	3866	+ bigThree.add(scenePanel);
3267	3867	bigThree.FlushUI();
3268	3868
3269	3869	cameraView.requestFocusInWindow();
..	..	@@ -3312,6 +3912,7 @@
3312	3912	} else
3313	3913	if (source == rootButton)
3314	3914	{
	3915	+ Replace();
3315	3916	Object3D obj;
3316	3917	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3317	3918	{
..	..	@@ -3369,10 +3970,10 @@
3369	3970	{
3370	3971	Object3D child = (Object3D)e.nextElement();
3371	3972	if(child.editWindow != null)
3372		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3373	3973	child.pinned = false;
3374	3974	child.CloseUI();
3375	3975	listUI.remove(child);
	3976	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3376	3977
3377	3978	//child.editWindow = null; // ???????????
3378	3979	}
..	..	@@ -3391,6 +3992,7 @@
3391	3992	obj.CloseUI();
3392	3993	}
3393	3994	listUI.clear();
	3995	+ SetPinStates(group.selection.size() > 0);
3394	3996	refreshContents(true);
3395	3997	} else
3396	3998	if (source == allParamsButton)
..	..	@@ -3446,6 +4048,7 @@
3446	4048	}
3447	4049
3448	4050	copy = group;
	4051	+
3449	4052	//Globals.theRenderer.object = group;
3450	4053	if(!useclient)
3451	4054	{
..	..	@@ -3473,9 +4076,24 @@
3473	4076	*/
3474	4077	radio.layout.doClick();
3475	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	+
3476	4091	ClearUnpinned();
3477		- SetPinStates(group.selection.size() > 0);
3478		- if (group.selection.size() == 1)
	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)
3479	4097	EditSelection(false);
3480	4098	keepparent = group.parent;
3481	4099	// PARENT = NULL or not???
..	..	@@ -3488,11 +4106,13 @@
3488	4106	} else if (event.getSource() == editCameraItem)
3489	4107	{
3490	4108	cameraView.ProtectCamera();
	4109	+ cameraView.requestFocusInWindow();
3491	4110	cameraView.repaint();
3492	4111	return;
3493	4112	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3494	4113	{
3495	4114	cameraView.RevertCamera();
	4115	+ cameraView.requestFocusInWindow();
3496	4116	cameraView.repaint();
3497	4117	return;
3498	4118	// } else if (event.getSource() == textureButton)
..	..	@@ -4069,7 +4689,7 @@
4069	4689
4070	4690	try
4071	4691	{
4072		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4692	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4073	4693	}
4074	4694	catch (Exception e)
4075	4695	{
..	..	@@ -4546,6 +5166,12 @@
4546	5166
4547	5167	void EditSelection(boolean newWindow)
4548	5168	{
	5169	+ if (group.selection == null)
	5170	+ {
	5171	+ EditElement(group, newWindow); // ? new
	5172	+ return;
	5173	+ }
	5174	+
4549	5175	// aConstraints.gridy = 0;
4550	5176	for (int i=0; i<group.selection.size(); i++)
4551	5177	{
..	..	@@ -4556,12 +5182,7 @@
4556	5182	Object3D elem = (Object3D)group.selection.elementAt(i);
4557	5183	if(elem != group \|\| !newWindow)
4558	5184	{
4559		- // if (!(elem instanceof Composite))
4560		- // newWindow = false;
4561		- listUI.add(elem);
4562		- elem.openEditWindow(this, newWindow); //, false);
4563		- System.out.println("edit : " + elem);
4564		- elem.editWindow.refreshContents(true); // ? new
	5185	+ EditElement(elem, newWindow); // ? new
4565	5186	}
4566	5187	}
4567	5188	}
..	..	@@ -4624,9 +5245,7 @@
4624	5245
4625	5246	freezemodel = false;
4626	5247	}
4627		-
4628		- boolean flashIt = true;
4629		-
	5248	+
4630	5249	public void valueChanged(TreeSelectionEvent e)
4631	5250	//public boolean handleEvent(Event event)
4632	5251	{
..	..	@@ -4699,14 +5318,30 @@
4699	5318	{
4700	5319	editButton.setEnabled(enabled);
4701	5320	uneditButton.setEnabled(enabled);
4702		- unselectButton.setEnabled(enabled);
	5321	+ //unselectButton.setEnabled(enabled);
4703	5322	flashSelectionButton.setEnabled(enabled);
	5323	+
	5324	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5325	+
	5326	+ boolean allComposites = true;
	5327	+
	5328	+ if (group.selection != null)
	5329	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5330	+ {
	5331	+ if (!(e.nextElement() instanceof Composite))
	5332	+ {
	5333	+ allComposites = false;
	5334	+ break;
	5335	+ }
	5336	+ }
	5337	+
	5338	+ rootButton.setEnabled(allComposites);
4704	5339	}
4705	5340
4706	5341	void refreshContents(boolean cp)
4707	5342	{
4708		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4709		- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	5343	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5344	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4710	5345	{
4711	5346	objEditor.ClearInfo(); // .GetMaterial());
4712	5347
..	..	@@ -4715,7 +5350,7 @@
4715	5350	Object3D child = (Object3D) group.selection.get(i);
4716	5351
4717	5352	objEditor.AddInfo(child, this, true);
4718		- System.err.println("info : " + child.GetPath());
	5353	+// System.err.println("info : " + child.GetPath());
4719	5354	}
4720	5355
4721	5356	objEditor.SetText(); // jan 2014
..	..	@@ -4805,8 +5440,8 @@
4805	5440
4806	5441	if (cut)
4807	5442	{
4808		- if (Globals.SAVEONMAKE)
4809		- Save();
	5443	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5444	+// Save();
4810	5445	//int indices[] = jList.getSelectedIndices();
4811	5446	//for (int i = indices.length - 1; i >= 0; i--)
4812	5447	//jList.remove(indices[i]);
..	..	@@ -4909,6 +5544,10 @@
4909	5544
4910	5545	void paste(boolean expand)
4911	5546	{
	5547	+ if (Globals.REPLACEONMAKE)
	5548	+ Save();
	5549	+ boolean keep = Globals.REPLACEONMAKE;
	5550	+ Globals.REPLACEONMAKE = false;
4912	5551	// if (GrafreeD.clipboard == null)
4913	5552	// return;
4914	5553	boolean first = true;
..	..	@@ -4968,6 +5607,7 @@
4968	5607	Grafreed.clipboard.get(0).parent = keepparent;
4969	5608	}
4970	5609
	5610	+ Globals.REPLACEONMAKE = keep;
4971	5611	ResetModel();
4972	5612	refreshContents();
4973	5613	}
..	..	@@ -5103,6 +5743,10 @@
5103	5743
5104	5744	void group(Object3D csg, boolean grab)
5105	5745	{
	5746	+ if (Globals.REPLACEONMAKE)
	5747	+ Save();
	5748	+ boolean keep = Globals.REPLACEONMAKE;
	5749	+ Globals.REPLACEONMAKE = false;
5106	5750	if (//false) // why??
5107	5751	!group.selection.isEmpty())
5108	5752	{
..	..	@@ -5216,10 +5860,15 @@
5216	5860	//node.add(csg);
5217	5861	//makeSomething(node);
5218	5862	makeSomething(csg);
	5863	+ Globals.REPLACEONMAKE = keep;
5219	5864	}
5220	5865
5221	5866	void Ungroup(Object3D g)
5222	5867	{
	5868	+ if (Globals.REPLACEONMAKE)
	5869	+ Save();
	5870	+ boolean keep = Globals.REPLACEONMAKE;
	5871	+ Globals.REPLACEONMAKE = false;
5223	5872	if (g instanceof HiddenObject)
5224	5873	{
5225	5874	HiddenObject h = (HiddenObject) g;
..	..	@@ -5236,6 +5885,7 @@
5236	5885	objEditor.makeSomething(g.get(i), false);
5237	5886	}
5238	5887	}
	5888	+ Globals.REPLACEONMAKE = keep;
5239	5889	}
5240	5890
5241	5891	void ungroup()
..	..	@@ -5526,10 +6176,6 @@
5526	6176
5527	6177	cButton restoreCameraButton;
5528	6178
5529		- cButton minButton;
5530		- cButton maxButton;
5531		- cButton fullButton;
5532		- cButton saveButton;
5533	6179	cButton oneStepButton;
5534	6180
5535	6181	cButton groupButton;
..	..	@@ -5538,6 +6184,22 @@
5538	6184	cButton switchButton;
5539	6185	cButton loopButton;
5540	6186	cButton textureButton;
	6187	+
	6188	+ cButton skybox1Button;
	6189	+ cButton skybox2Button;
	6190	+ cButton skybox3Button;
	6191	+ cButton skybox4Button;
	6192	+ cButton skybox5Button;
	6193	+ cButton skybox6Button;
	6194	+ cButton skybox7Button;
	6195	+
	6196	+ cButton skybox11Button;
	6197	+ cButton skybox12Button;
	6198	+ cButton skybox13Button;
	6199	+ cButton skybox14Button;
	6200	+ cButton skybox15Button;
	6201	+ cButton skybox16Button;
	6202	+ cButton skybox17Button;
5541	6203
5542	6204	cButton gridButton;
5543	6205	cButton boxButton;
..	..	@@ -5602,7 +6264,7 @@
5602	6264	private MenuItem pasteLinkItem;
5603	6265	private MenuItem pasteCloneItem;
5604	6266	private MenuItem pasteExpandItem;
5605		- private MenuItem clearItem;
	6267	+ private MenuItem deleteItem;
5606	6268	private MenuItem clearAllItem;
5607	6269	private MenuItem genUVItem;
5608	6270	private MenuItem genNormalsMESHItem;
..	..	@@ -5686,6 +6348,8 @@
5686	6348	private MenuItem attachBumpItem;
5687	6349	private MenuItem detachBumpItem;
5688	6350	private MenuItem pigmentBumpItem;
	6351	+ private MenuItem embedTexturesItem;
	6352	+ private MenuItem deEmbedTexturesItem;
5689	6353
5690	6354	private MenuItem particleItem;
5691	6355	private MenuItem ragdollItem;