~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,351 @@
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);
	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", "rgb", 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	+ //cameraView.envyoff = false;
	334	+ group.skyboxname = skybox;
	335	+ group.skyboxext = "jpg";
	336	+ cameraView.repaint();
	337	+ }
	338	+
	339	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	340	+ {
	341	+ JTabbedPane skyboxpane = new JTabbedPane();
	342	+
	343	+ AddSkyboxTab0(skyboxpane);
	344	+ AddSkyboxTab1(skyboxpane);
	345	+ AddSkyboxTab2(skyboxpane);
	346	+ AddSkyboxTab3(skyboxpane);
	347	+
	348	+ skyboxPanel.add(skyboxpane);
	349	+ }
	350	+
	351	+ public void ChangeTexture(String texture)
	352	+ {
	353	+ for (int i=0; i<group.selection.size(); i++)
	354	+ {
	355	+ Object3D obj = group.selection.get(i);
	356	+ obj.SetPigmentTexture("@" + texture);
	357	+ }
	358	+
	359	+ refreshContents();
	360	+ }
	361	+
	362	+ public void Show3DView()
	363	+ {
	364	+ // bug
	365	+ //gridPanel.setDividerLocation(1.0);
	366	+ //bigPanel.setDividerLocation(0.0);
	367	+ bigThree.ClearUI();
	368	+ bigThree.add(centralPanel);
	369	+ bigThree.FlushUI();
	370	+ }
	371	+
26	372	//ObjEditor objEditor;
27	373	public void closeUI2()
28	374	{
..	..	@@ -60,6 +406,14 @@
60	406	this.copy = this.group = group;
61	407	//selectees = this.group.selectees;
62	408
	409	+ if (copy.versionlist == null)
	410	+ {
	411	+ copy.versionlist = new Object3D[100];
	412	+ copy.versionindex = -1;
	413	+
	414	+ Save(true);
	415	+ }
	416	+
63	417	if(ui)
64	418	SetupUI(objEditor);
65	419	}
..	..	@@ -80,10 +434,22 @@
80	434	SetupViews(objEditor);
81	435
82	436	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	437	+
	438	+ if (copy.versionlist == null)
	439	+ {
	440	+ copy.versionlist = new Object3D[100];
	441	+ copy.versionindex = -1;
	442	+
	443	+ Save(true);
	444	+ }
83	445	}
84	446
85	447	void CloneSelection(boolean supports)
86	448	{
	449	+ if (Globals.REPLACEONMAKE)
	450	+ Save();
	451	+ boolean keep = Globals.REPLACEONMAKE;
	452	+ Globals.REPLACEONMAKE = false;
87	453	// Object3D keep = GrafreeD.clipboard;
88	454	//Object3D obj;
89	455	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +460,7 @@
94	460
95	461	makeSomething(clone, i==group.selection.size()-1);
96	462	}
	463	+ Globals.REPLACEONMAKE = keep;
97	464	}
98	465
99	466	void CloneClipboard(boolean supports)
..	..	@@ -189,8 +556,8 @@
189	556	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190	557	// pasteExpandItem.addActionListener(this);
191	558	menu.add("-");
192		- clearItem = menu.add(new MenuItem("Clear"));
193		- clearItem.addActionListener(this);
	559	+ deleteItem = menu.add(new MenuItem("Delete"));
	560	+ deleteItem.addActionListener(this);
194	561
195	562	if (Globals.ADVANCED)
196	563	{
..	..	@@ -220,7 +587,7 @@
220	587	// toggleSwitchItem.addItemListener(this);
221	588	// toggleSwitchItem.setState(CameraPane.SWITCH);
222	589
223		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	590	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	591	toggleHandleItem.addItemListener(this);
225	592	toggleHandleItem.setState(CameraPane.HANDLES);
226	593
..	..	@@ -276,11 +643,9 @@
276	643	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
277	644	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
278	645	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
280	646	oe.cameraMenu.add("-");
281	647	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
282	648	openWindowItem.addActionListener(this);
283		- editLeafItem.addActionListener(this);
284	649	lookAtItem.addActionListener(this);
285	650	//lookFromItem.addActinoListener(this);
286	651	//switchViewItem.addActionListener(this);
..	..	@@ -380,13 +745,14 @@
380	745	shadowYItem.addActionListener(this);
381	746	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382	747	shadowZItem.addActionListener(this);
	748	+ attributeItem = menu.add(new MenuItem("Attribute"));
	749	+ attributeItem.addActionListener(this);
	750	+
383	751	if (Globals.ADVANCED)
384	752	{
385	753	menu.add("-");
386	754	linkerItem = menu.add(new MenuItem("Linker"));
387	755	linkerItem.addActionListener(this);
388		- attributeItem = menu.add(new MenuItem("Attribute"));
389		- attributeItem.addActionListener(this);
390	756	templateItem = menu.add(new MenuItem("Template"));
391	757	templateItem.addActionListener(this);
392	758	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -415,7 +781,7 @@
415	781	genNormalsMESHItem.addActionListener(this);
416	782	if (Globals.ADVANCED)
417	783	{
418		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	784	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419	785	genNormalsMINEItem.addActionListener(this);
420	786	}
421	787	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -508,10 +874,15 @@
508	874	attachBumpItem.addActionListener(this);
509	875	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
510	876	pigmentBumpItem.addActionListener(this);
	877	+ //embedTexturesItem
511	878	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
512	879	detachPigmentItem.addActionListener(this);
513	880	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
514	881	detachBumpItem.addActionListener(this);
	882	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	883	+ embedTexturesItem.addActionListener(this);
	884	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	885	+ deEmbedTexturesItem.addActionListener(this);
515	886	menu.add("-");
516	887	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
517	888	sortbysizeItem.addActionListener(this);
..	..	@@ -522,6 +893,9 @@
522	893	shareGeometriesItem.addActionListener(this);
523	894	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
524	895	mergeGeometriesItem.addActionListener(this);
	896	+ menu.add("-");
	897	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	898	+ editLeafItem.addActionListener(this);
525	899	if (Globals.ADVANCED)
526	900	{
527	901	// Pretty much the same as duplicate and clone.
..	..	@@ -538,6 +912,74 @@
538	912	buildToolsMenu(menu);
539	913	}
540	914
	915	+ JTabbedPane resourcecontainer;
	916	+ cGridBag currenttab;
	917	+ boolean added; // patch for jar
	918	+
	919	+ int tabcount = 0;
	920	+ int colcount = 0;
	921	+ int rowcount = 0;
	922	+ int texturecount = 0;
	923	+
	924	+ int columns = 5;
	925	+ int rows = 7;
	926	+
	927	+ public void ResourceCallBack(String[] path)
	928	+ {
	929	+// for (int i = 0; i < path.length; i++)
	930	+// System.out.print(path[i] + "/");
	931	+// System.out.println();
	932	+
	933	+ if (//rowcount == 0 \|\|
	934	+ path.length == 1)
	935	+ {
	936	+ currenttab = new cGridBag();
	937	+ added = false;
	938	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	939	+ currenttab.setName(tabname);
	940	+ rowcount = 1;
	941	+ colcount = 0;
	942	+ texturecount = 0;
	943	+ }
	944	+
	945	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	946	+ {
	947	+ if (!added)
	948	+ {
	949	+ added = true;
	950	+ resourcecontainer.add(currenttab);
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	952	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	953	+ }
	954	+
	955	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	956	+
	957	+ if (++colcount >= columns)
	958	+ {
	959	+ colcount = 0;
	960	+ currenttab.Return();
	961	+
	962	+ if (rowcount++ >= rows)
	963	+ {
	964	+ rowcount = 0;
	965	+ }
	966	+ }
	967	+ }
	968	+ else
	969	+ {
	970	+// if (!path[path.length-1].equals("icons"))
	971	+// resourcecontainer.Return();
	972	+ }
	973	+ }
	974	+
	975	+ void CreateTexturePanel(cGridBag container)
	976	+ {
	977	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	978	+ container.add(resourcecontainer);
	979	+
	980	+ Grafreed.ParseResources("textures", this);
	981	+ }
	982	+
541	983	void SetupUI2(ObjEditor oe)
542	984	{
543	985	// June 2019
..	..	@@ -555,11 +997,6 @@
555	997	//new Exception().printStackTrace();
556	998
557	999	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	1000	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
564	1001
565	1002	oe.buttonGroup = new ButtonGroup();
..	..	@@ -590,50 +1027,109 @@
590	1027	//minButton.setToolTipText("Minimize window");
591	1028	//minButton.addActionListener(this);
592	1029
593		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- maxButton.setToolTipText("Maximize window");
595		- maxButton.addActionListener(this);
	1030	+ if (Globals.ADVANCED)
	1031	+ {
	1032	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1033	+// maxButton.setToolTipText("Maximize window");
	1034	+// maxButton.addActionListener(this);
	1035	+ }
	1036	+
	1037	+// cButton gcButton;
	1038	+//
	1039	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1040	+// gcButton.setToolTipText("Garbage collect");
	1041	+// gcButton.addActionListener(new ActionListener()
	1042	+// {
	1043	+// public void actionPerformed(ActionEvent e)
	1044	+// {
	1045	+// System.gc();
	1046	+// }
	1047	+// });
	1048	+
	1049	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ collapseButton.setToolTipText("Collapse toolbar");
	1051	+ collapseButton.addActionListener(this);
	1052	+
	1053	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1055	+ maximize3DButton.addActionListener(this);
	1056	+
	1057	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ twoButton.setToolTipText("Show 3D view only");
	1059	+ twoButton.addActionListener(this);
	1060	+ this.fullscreenLayout = twoButton;
	1061	+
	1062	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ threeButton.setToolTipText("Show controls and 3D view");
	1064	+ threeButton.addActionListener(this);
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ sixButton.setToolTipText("Show 3D view and controls");
	1069	+ sixButton.addActionListener(this);
	1070	+ }
	1071	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+// sevenButton.setToolTipText("3-column layout");
	1073	+// sevenButton.addActionListener(this);
	1074	+ //
596	1075
597	1076	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598	1077	fullButton.setToolTipText("Full-screen window");
599	1078	fullButton.addActionListener(this);
600	1079
	1080	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+ screenfitButton.setToolTipText("Screen fit");
	1082	+ screenfitButton.addActionListener(this);
	1083	+
601	1084	oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	1085	restoreCameraButton.setToolTipText("Restore viewpoint");
603	1086	restoreCameraButton.addActionListener(this);
604	1087
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);
	1088	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ saveVersionButton.setToolTipText("Duplicate current version");
	1090	+ saveVersionButton.addActionListener(this);
	1091	+
	1092	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ deleteVersionButton.setToolTipText("Delete current version");
	1094	+ deleteVersionButton.addActionListener(this);
	1095	+
	1096	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ previousVersionButton.setToolTipText("Previous version");
	1098	+ previousVersionButton.addActionListener(this);
	1099	+ previousVersionButton.setEnabled(false);
609	1100
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);
	1101	+ cGridBag updown = new cGridBag().setVertical(true);
	1102	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ restoreButton.setToolTipText("Undo (restore current version)");
	1104	+ restoreButton.addActionListener(this);
	1105	+ //restoreButton.setEnabled(false);
614	1106
615		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616		- saveButton.setToolTipText("Save changes");
617		- saveButton.addActionListener(this);
	1107	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ replaceButton.setToolTipText("Save (replace current version)");
	1109	+ replaceButton.addActionListener(this);
	1110	+ //replaceButton.setEnabled(false);
618	1111
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);
	1112	+ copyOptionsPanel.add(updown);
	1113	+
	1114	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ nextVersionButton.setToolTipText("Next version");
	1116	+ nextVersionButton.addActionListener(this);
	1117	+ nextVersionButton.setEnabled(false);
	1118	+
	1119	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624	1120	oneStepButton.setToolTipText("Animate one step forward");
625	1121	oneStepButton.addActionListener(this);
626	1122
627		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1123	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1124	+ liveCB.setToolTipText("Enable animation");
	1125	+ liveCB.addItemListener(this);
	1126	+
	1127	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
628	1128	fastCB.setToolTipText("Fast mode");
629	1129	fastCB.addItemListener(this);
630	1130
631	1131	//oe.toolboxPanel.Return();
632	1132
633		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- screenfitButton.setToolTipText("Screen fit");
635		- screenfitButton.addActionListener(this);
636		-
637	1133	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
638	1134	// trackCB.setToolTipText("Enable tracking");
639	1135	// trackCB.addItemListener(this);
..	..	@@ -646,31 +1142,17 @@
646	1142	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647	1143	snapobjectButton.addActionListener(this);
648	1144	snapobjectButton.setToolTipText("Snap Object");
	1145	+
	1146	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1147	+ fourButton.addActionListener(this);
	1148	+ fourButton.setToolTipText("Show control panel only");
649	1149	}
650	1150
651	1151	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
652	1152
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	1153
672		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
673		- rootButton.setToolTipText("Edit selection in new tab");
	1154	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1155	+ rootButton.setToolTipText("Open selection in new tab");
674	1156	rootButton.addActionListener(this);
675	1157
676	1158	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -679,28 +1161,30 @@
679	1161	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
680	1162	//clearButton.addActionListener(this);
681	1163
	1164	+ cGridBag row1 = new cGridBag();
	1165	+
682	1166	// INSERT
683		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684		- gridButton.setToolTipText("Create grid");
	1167	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ gridButton.setToolTipText("Create ground");
685	1169	gridButton.addActionListener(this);
686	1170
687		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1171	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688	1172	boxButton.setToolTipText("Create box");
689	1173	boxButton.addActionListener(this);
690	1174
691		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1175	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
692	1176	sphereButton.setToolTipText("Create sphere");
693	1177	sphereButton.addActionListener(this);
694	1178
695		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1179	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696	1180	coneButton.setToolTipText("Create cone");
697	1181	coneButton.addActionListener(this);
698	1182
699		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700	1184	torusButton.setToolTipText("Create torus");
701	1185	torusButton.addActionListener(this);
702	1186
703		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
704	1188	superButton.setToolTipText("Create superellipsoid");
705	1189	superButton.addActionListener(this);
706	1190
..	..	@@ -711,72 +1195,74 @@
711	1195	kleinButton.addActionListener(this);
712	1196	}
713	1197
714		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
715	1199	particlesButton.setToolTipText("Create particle system");
716	1200	particlesButton.addActionListener(this);
717	1201
718		- oe.toolboxPanel.Return();
	1202	+ oe.toolboxPanel.add(row1);
719	1203
720		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ cGridBag row2 = new cGridBag();
	1205	+
	1206	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
721	1207	groupButton.setToolTipText("Create group");
722	1208	groupButton.addActionListener(this);
723	1209
724		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
725	1211	compositeButton.setToolTipText("Create composite");
726	1212	compositeButton.addActionListener(this);
727	1213
728		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
729		- switchButton.setToolTipText("Create switch");
	1214	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ switchButton.setToolTipText("Create item switcher");
730	1216	switchButton.addActionListener(this);
731	1217
732		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1218	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
733	1219	loopButton.setToolTipText("Create loop");
734	1220	loopButton.addActionListener(this);
735	1221
736		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1222	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
737	1223	textureButton.setToolTipText("Create texture");
738	1224	textureButton.addActionListener(this);
739	1225
740		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
741	1227	overlayButton.setToolTipText("Create overlay");
742	1228	overlayButton.addActionListener(this);
743	1229
744		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1230	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
745	1231	lightButton.setToolTipText("Create light");
746	1232	lightButton.addActionListener(this);
747	1233
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		- }
	1234	+ oe.toolboxPanel.add(row2);
	1235	+
	1236	+ cGridBag textures = new cGridBag();
	1237	+
	1238	+ CreateTexturePanel(textures);
	1239	+
	1240	+ oe.toolboxPanel.add(textures);
	1241	+
	1242	+ textures.preferredHeight = 100;
	1243	+
	1244	+ CreateSkyboxPanel(oe.skyboxPanel);
759	1245
760	1246	// EDIT panel
761		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
762		- editButton.setToolTipText("Edit selection");
	1247	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1248	+ editButton.setToolTipText("Pin selection controls");
763	1249	editButton.addActionListener(this);
764	1250
765		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
766		- uneditButton.setToolTipText("Unedit selection");
	1251	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1252	+ uneditButton.setToolTipText("Unpin and remove selection controls");
767	1253	uneditButton.addActionListener(this);
768	1254
769	1255	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
770		- allParamsButton.setToolTipText("Edit all params");
	1256	+ allParamsButton.setToolTipText("Show all controls");
771	1257	allParamsButton.addActionListener(this);
772	1258
773		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
774		- clearPanelButton.setToolTipText("Clear edit panel");
	1259	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1260	+ clearPanelButton.setToolTipText("Clear all controls");
775	1261	clearPanelButton.addActionListener(this);
776	1262
777		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
778		- unselectButton.setToolTipText("Unselect");
779		- unselectButton.addActionListener(this);
	1263	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1264	+ //unselectButton.setToolTipText("Unselect");
	1265	+ //unselectButton.addActionListener(this);
780	1266
781	1267	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
782	1268	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -784,6 +1270,7 @@
784	1270
785	1271	editCommandsPanel.preferredHeight = 1;
786	1272
	1273	+ SetPinStates(false);
787	1274	// oe.treePanel.add(commandsPanel);
788	1275	// oe.treePanel.Return();
789	1276
..	..	@@ -810,9 +1297,12 @@
810	1297
811	1298	oe.treePanel.add(copyOptionsPanel);
812	1299	oe.treePanel.Return();
	1300	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1301	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1302	+ sliderPane.preferredHeight = 1;
813	1303
814		-// mainPanel.setDividerLocation(0.5); //1.0);
815		-// mainPanel.setResizeWeight(0.5);
	1304	+// mainPanel.setDividerLocation(0.1); //1.0);
	1305	+ mainPanel.setResizeWeight(0.4);
816	1306
817	1307	//jList.addListSelectionListener(this);
818	1308	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -820,7 +1310,7 @@
820	1310	//jTree.setEditable(true);
821	1311	oe.jTree.setDragEnabled(true);
822	1312	//jTree.setPreferredSize(new Dimension(10,10));
823		- jSP.setPreferredSize(new Dimension(100,200));
	1313	+ //jSP.setPreferredSize(new Dimension(100,200));
824	1314
825	1315	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
826	1316
..	..	@@ -832,7 +1322,7 @@
832	1322	dgr.addDragGestureListener(this);
833	1323	}catch(Exception e) {}
834	1324	*/
835		- radio.layout = sevenButton;
	1325	+ radio.layout = threeButton; // sixButton;
836	1326	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
837	1327	}
838	1328
..	..	@@ -857,14 +1347,18 @@
857	1347	boxCB.addItemListener(this);
858	1348
859	1349	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
860		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1350	+ zoomBoxCB.setToolTipText("Display only for wheel");
861	1351	zoomBoxCB.addItemListener(this);
862	1352
863	1353	if (true) // Globals.ADVANCED)
864	1354	{
865		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
866		- supportCB.setToolTipText("Enable rigging");
867		- supportCB.addItemListener(this);
	1355	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1356	+// supportCB.setToolTipText("Enable rigging");
	1357	+// supportCB.addItemListener(this);
	1358	+
	1359	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1360	+ freezeCB.setToolTipText("Fast moving camera");
	1361	+ freezeCB.addItemListener(this);
868	1362
869	1363	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
870	1364	// localCB.addItemListener(this);
..	..	@@ -879,9 +1373,12 @@
879	1373	smoothCB.setToolTipText("Snapping delay");
880	1374	smoothCB.addItemListener(this);
881	1375
882		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
883		- slowCB.setToolTipText("Smooth interpolation");
884		- slowCB.addItemListener(this);
	1376	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1377	+// slowCB.setToolTipText("Smooth interpolation");
	1378	+// slowCB.addItemListener(this);
	1379	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1380	+ minshaderCB.setToolTipText("Minimal fast shader");
	1381	+ minshaderCB.addItemListener(this);
885	1382
886	1383	// constraints.gridy += 1;
887	1384	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -919,7 +1416,7 @@
919	1416	oeilCB.addItemListener(this);
920	1417
921	1418	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
922		- shadowCB.setToolTipText("Compute shadows when live");
	1419	+ shadowCB.setToolTipText("When live compute shadows");
923	1420	shadowCB.addItemListener(this);
924	1421
925	1422	panel.Return();
..	..	@@ -928,12 +1425,12 @@
928	1425	toggleTextureCB.addItemListener(this);
929	1426
930	1427	panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
931		- toggleSwitchCB.setToolTipText("Use switch");
	1428	+ toggleSwitchCB.setToolTipText("Choose a single item");
932	1429	toggleSwitchCB.addItemListener(this);
933	1430
934		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
935		- autosaveCB.setToolTipText("Auto-save on structure change");
936		- autosaveCB.addItemListener(this);
	1431	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1432	+ autokeepCB.setToolTipText("On structure change");
	1433	+ autokeepCB.addItemListener(this);
937	1434
938	1435	panel.Return();
939	1436	if (Globals.ADVANCED)
..	..	@@ -960,9 +1457,17 @@
960	1457
961	1458	void EditObject(Object3D obj)
962	1459	{
	1460	+ assert(obj instanceof Composite);
	1461	+
	1462	+ if (obj.versionlist == null)
	1463	+ {
	1464	+ obj.versionlist = new Object3D[100];
	1465	+ obj.versionindex = -1;
	1466	+ }
	1467	+
963	1468	cRadio radioButton = new cRadio(obj.name);
964	1469
965		- // Patch to avoid bug with transparency.
	1470	+ // June 2019. Patch to avoid bug with transparency.
966	1471	radioButton.hadMaterial = obj.material != null;
967	1472	if (!radioButton.hadMaterial)
968	1473	{
..	..	@@ -970,7 +1475,7 @@
970	1475	}
971	1476
972	1477	radioButton.SetObject(obj);
973		- radioButton.layout = sevenButton;
	1478	+ radioButton.layout = threeButton; // sixButton;
974	1479	radioButton.SetCamera(cameraView.renderCamera, false);
975	1480	radioButton.addActionListener(this);
976	1481	radioPanel.add(radioButton);
..	..	@@ -995,10 +1500,13 @@
995	1500	cCheckBox localCB;
996	1501	cCheckBox crowdCB;
997	1502	cCheckBox smoothCB;
	1503	+ cCheckBox minshaderCB;
	1504	+
998	1505	cToggleButton fastCB;
999	1506	cCheckBox slowCB;
1000	1507	cCheckBox boxCB;
1001	1508	cCheckBox zoomBoxCB;
	1509	+ cCheckBox freezeCB;
1002	1510	//cToggleButton trackCB;
1003	1511	cCheckBox trackCB;
1004	1512	cCheckBox smoothfocusCB;
..	..	@@ -1009,7 +1517,7 @@
1009	1517
1010	1518	cCheckBox oeilCB;
1011	1519	cCheckBox shadowCB;
1012		- cCheckBox autosaveCB;
	1520	+ cCheckBox autokeepCB;
1013	1521	cCheckBox lookAtCB;
1014	1522
1015	1523	// static int COLOR = 1;
..	..	@@ -1065,6 +1573,12 @@
1065	1573	cameraView.ToggleInertia();
1066	1574	cameraView.repaint();
1067	1575	}
	1576	+ else if(e.getSource() == minshaderCB)
	1577	+ {
	1578	+ Globals.MINSHADER ^= true;
	1579	+ cameraView.programInitialized = false;
	1580	+ cameraView.repaint();
	1581	+ }
1068	1582	else if(e.getSource() == localCB)
1069	1583	{
1070	1584	cameraView.ToggleLocal();
..	..	@@ -1117,9 +1631,13 @@
1117	1631	{
1118	1632	Globals.COMPUTESHADOWWHENLIVE ^= true;
1119	1633	}
1120		- else if(e.getSource() == autosaveCB)
	1634	+ else if(e.getSource() == freezeCB)
1121	1635	{
1122		- Globals.SAVEONMAKE ^= true;
	1636	+ Globals.FREEZEONMOVE ^= true;
	1637	+ }
	1638	+ else if(e.getSource() == autokeepCB)
	1639	+ {
	1640	+ Globals.REPLACEONMAKE ^= true;
1123	1641	}
1124	1642	else if(e.getSource() == lookAtCB)
1125	1643	{
..	..	@@ -1201,8 +1719,6 @@
1201	1719	}
1202	1720	}
1203	1721
1204		- String string = (String) object;
1205		-
1206	1722	System.out.println("Transfer = " + object + "; drop : " + target);
1207	1723	// if( object instanceof java.io.File[])
1208	1724	// {
..	..	@@ -1210,6 +1726,8 @@
1210	1726	// objEditor.DropFile((java.io.File[]) object, true);
1211	1727	// return;
1212	1728	// }
	1729	+
	1730	+ String string = object.toString();
1213	1731
1214	1732	// File path for Mac and Windows
1215	1733	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1337,7 +1855,12 @@
1337	1855	TreePath path;
1338	1856
1339	1857	public TransferableTreePath(TreePath tp) {
1340		- path = tp;
	1858	+ Object[] objs = new Object[tp.getPathCount()];
	1859	+ for (int i=0; i<objs.length; i++)
	1860	+ {
	1861	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1862	+ }
	1863	+ path = new TreePath(objs);
1341	1864	}
1342	1865
1343	1866	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1459,6 +1982,9 @@
1459	1982	animationItem.addItemListener(this);
1460	1983	animationItem.setState(Globals.ANIMATION);
1461	1984
	1985	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1986	+ archiveItem.addActionListener(this);
	1987	+
1462	1988	menu.add("-");
1463	1989	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1464	1990	parseverticesItem.addActionListener(this);
..	..	@@ -1471,6 +1997,8 @@
1471	1997	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1472	1998	reduce34MorphItem.addActionListener(this);
1473	1999	menu.add("-");
	2000	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2001	+ memoryItem.addActionListener(this);
1474	2002	menu.add(computeAOItem = new MenuItem("Compute AO"));
1475	2003	computeAOItem.addActionListener(this);
1476	2004
..	..	@@ -1479,8 +2007,6 @@
1479	2007	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1480	2008	mirrorItem.addActionListener(this);
1481	2009	menu.add("-");
1482		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1483		- memoryItem.addActionListener(this);
1484	2010	menu.add(analyzeItem = new MenuItem("Analyze"));
1485	2011	analyzeItem.addActionListener(this);
1486	2012	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1628,6 +2154,30 @@
1628	2154
1629	2155	makeSomething(shadow);
1630	2156	}
	2157	+
	2158	+ private void ClearUnpinned()
	2159	+ {
	2160	+ //for (Object3D obj : listUI)
	2161	+ for (int i=listUI.size(); --i>=0;)
	2162	+ {
	2163	+ Object3D obj = listUI.elementAt(i);
	2164	+ if (!obj.pinned)
	2165	+ {
	2166	+ obj.CloseUI();
	2167	+ listUI.remove(i);
	2168	+ }
	2169	+ }
	2170	+ }
	2171	+
	2172	+ private void EditElement(Object3D elem, boolean newWindow)
	2173	+ {
	2174	+ // if (!(elem instanceof Composite))
	2175	+ // newWindow = false;
	2176	+ listUI.add(elem);
	2177	+ elem.openEditWindow(this, newWindow); //, false);
	2178	+ System.out.println("edit : " + elem);
	2179	+ elem.editWindow.refreshContents(true); // ? new
	2180	+ }
1631	2181
1632	2182	/**
1633	2183	* applyExample
..	..	@@ -2056,6 +2606,23 @@
2056	2606	{
2057	2607	makeSomething(new Light());
2058	2608	} else
	2609	+// if (source == skybox1Button \|\|
	2610	+// source == skybox2Button \|\|
	2611	+// source == skybox3Button \|\|
	2612	+// source == skybox4Button \|\|
	2613	+// source == skybox5Button \|\|
	2614	+// source == skybox6Button \|\|
	2615	+// source == skybox7Button \|\|
	2616	+// source == skybox11Button \|\|
	2617	+// source == skybox12Button \|\|
	2618	+// source == skybox13Button \|\|
	2619	+// source == skybox14Button \|\|
	2620	+// source == skybox15Button \|\|
	2621	+// source == skybox16Button \|\|
	2622	+// source == skybox17Button)
	2623	+// {
	2624	+// ChangeSkybox(source);
	2625	+// } else
2059	2626	if (source == csgItem)
2060	2627	{
2061	2628	group(new CSG());
..	..	@@ -2107,25 +2674,25 @@
2107	2674	Composite csg = new GroupLeaf();
2108	2675	csg.count = 5;
2109	2676	group(csg);
2110		- Composite child = new cGroup();
	2677	+ Composite child = new cGroup("Branch");
2111	2678	csg.addChild(child);
2112	2679	child.addChild(csg);
2113	2680	} else
2114	2681	if (source == doubleItem)
2115	2682	{
2116		- Composite csg = new GroupLeaf();
	2683	+ Composite csg = new GroupLeaf("Fork");
2117	2684	csg.count = 5;
2118	2685	group(csg);
2119		- Composite child = new cGroup();
	2686	+ Composite child = new cGroup("Branch A");
2120	2687	csg.addChild(child);
2121	2688	child.addChild(csg);
2122		- child = new cGroup();
	2689	+ child = new cGroup("Branch B");
2123	2690	csg.addChild(child);
2124	2691	child.addChild(csg);
2125	2692	} else
2126	2693	if (source == tripleItem)
2127	2694	{
2128		- Composite csg = new GroupLeaf();
	2695	+ Composite csg = new GroupLeaf("Trident");
2129	2696	csg.count = 4;
2130	2697	group(csg);
2131	2698	Composite child = new cGroup();
..	..	@@ -2141,7 +2708,7 @@
2141	2708	if (source == computeAOItem)
2142	2709	{
2143	2710	Globals.drawMode = CameraPane.OCCLUSION;
2144		- Globals.theRenderer.repaint();
	2711	+ cameraView.repaint();
2145	2712	} else
2146	2713	if (source == recompileItem)
2147	2714	{
..	..	@@ -2156,7 +2723,7 @@
2156	2723	if (source == invariantsItem)
2157	2724	{
2158	2725	System.out.println("Invariants:");
2159		- Grafreed.grafreeD.universe.invariants();
	2726	+ Grafreed.grafreed.universe.invariants();
2160	2727	} else
2161	2728	if (source == memoryItem)
2162	2729	{
..	..	@@ -2187,17 +2754,52 @@
2187	2754	{
2188	2755	ToggleFullScreen();
2189	2756	} else
2190		- if (source == undoButton)
	2757	+ if (source == collapseButton)
2191	2758	{
2192		- Undo();
	2759	+ this.expandedLayout = radio.layout;
	2760	+ CollapseToolbar();
2193	2761	} else
2194		- if (source == redoButton)
	2762	+ if (source == maximize3DButton)
2195	2763	{
2196		- Redo();
	2764	+ this.expandedLayout = radio.layout;
	2765	+ radio.layout = twoButton;
	2766	+ Show3DView();
	2767	+ CollapseToolbar();
2197	2768	} else
2198		- if (source == saveButton)
	2769	+ if (source == previousVersionButton)
2199	2770	{
2200		- Save();
	2771	+ // Go to previous version
	2772	+ //if (!Undo())
	2773	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2774	+ PreviousVersion();
	2775	+ } else
	2776	+ if (source == restoreButton)
	2777	+ {
	2778	+ // Restore current version
	2779	+ Restore();
	2780	+ //restoreButton.setEnabled(false);
	2781	+ } else
	2782	+ if (source == replaceButton)
	2783	+ {
	2784	+ // Overwrite current version
	2785	+ Replace();
	2786	+ //replaceButton.setEnabled(false);
	2787	+ } else
	2788	+ if (source == nextVersionButton)
	2789	+ {
	2790	+ // Go to next version
	2791	+ NextVersion();
	2792	+ } else
	2793	+ if (source == saveVersionButton)
	2794	+ {
	2795	+ // Save a new version
	2796	+ if (!Save(true))
	2797	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2798	+ } else
	2799	+ if (source == deleteVersionButton)
	2800	+ {
	2801	+ // Delete a new version
	2802	+ DeleteVersion();
2201	2803	} else
2202	2804	if (source == oneStepButton)
2203	2805	{
..	..	@@ -2206,17 +2808,14 @@
2206	2808	} else
2207	2809	if (source == screenfitButton)
2208	2810	{
2209		- //Reload(lastConverter, lastFilename, true);
2210	2811	ScreenFit();
2211	2812	} else
2212	2813	if (source == screenfitpointButton)
2213	2814	{
2214		- //Reload(lastConverter, lastFilename, true);
2215	2815	ScreenFitPoint();
2216	2816	} else
2217	2817	if (source == snapobjectButton)
2218	2818	{
2219		- //Reload(lastConverter, lastFilename, true);
2220	2819	SnapObject();
2221	2820	} else
2222	2821	// if (event.getSource() == recompileButton)
..	..	@@ -2255,11 +2854,11 @@
2255	2854	} else
2256	2855	if (source == undoItem)
2257	2856	{
2258		- Undo();
	2857	+ PreviousVersion();
2259	2858	} else
2260	2859	if (source == redoItem)
2261	2860	{
2262		- Redo();
	2861	+ NextVersion();
2263	2862	} else
2264	2863	if (source == duplicateItem)
2265	2864	{
..	..	@@ -2580,7 +3179,7 @@
2580	3179	{
2581	3180	StepAll();
2582	3181	} else
2583		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3182	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2584	3183	{
2585	3184	//int indices[] = jList.getSelectedIndices();
2586	3185	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2740,15 +3339,28 @@
2740	3339	} else
2741	3340	if (source == ungroupItem \|\| source == ungroupButton)
2742	3341	{
2743		- //ungroup();
	3342	+ boolean hasRoot = false;
	3343	+
2744	3344	for (int i=0; i<group.selection.size(); i++)
2745	3345	{
2746		- Ungroup(group.selection.get(i));
	3346	+ if (group.selection.get(i) == group)
	3347	+ {
	3348	+ hasRoot = true;
	3349	+ break;
	3350	+ }
2747	3351	}
2748	3352
2749		- ClearSelection(false);
2750		-
2751		- refreshContents();
	3353	+ if (!hasRoot)
	3354	+ {
	3355	+ for (int i=0; i<group.selection.size(); i++)
	3356	+ {
	3357	+ Ungroup(group.selection.get(i));
	3358	+ }
	3359	+
	3360	+ ClearSelection(false);
	3361	+
	3362	+ refreshContents();
	3363	+ }
2752	3364	} else
2753	3365	if (source == genUVItem)
2754	3366	{
..	..	@@ -3049,7 +3661,7 @@
3049	3661	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3050	3662	{
3051	3663	obj = (Object3D)e.nextElement();
3052		- obj.SetBumpTexture(null);
	3664	+ obj.ResetBumpTexture();
3053	3665	}
3054	3666
3055	3667	refreshContents();
..	..	@@ -3063,6 +3675,31 @@
3063	3675	obj.SetBumpTexture(obj.GetPigmentTexture());
3064	3676	}
3065	3677
	3678	+ refreshContents();
	3679	+ } else
	3680	+ if (source == embedTexturesItem)
	3681	+ {
	3682	+ Object3D obj;
	3683	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3684	+ {
	3685	+ obj = (Object3D)e.nextElement();
	3686	+ obj.EmbedTextures(true);
	3687	+ }
	3688	+
	3689	+ refreshContents();
	3690	+ } else
	3691	+ if (source == deEmbedTexturesItem)
	3692	+ {
	3693	+ Object3D obj;
	3694	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3695	+ {
	3696	+ obj = (Object3D)e.nextElement();
	3697	+ obj.EmbedTextures(false);
	3698	+ }
	3699	+
	3700	+ CameraPane.texturepigment.clear();
	3701	+ CameraPane.texturebump.clear();
	3702	+
3066	3703	refreshContents();
3067	3704	} else
3068	3705	if (source == flashSelectionButton)
..	..	@@ -3080,38 +3717,7 @@
3080	3717	if (CameraPane.FULLSCREEN)
3081	3718	fullscreenLayout = radio.layout;
3082	3719
3083		- // bug
3084		- //gridPanel.setDividerLocation(1.0);
3085		- //bigPanel.setDividerLocation(0.0);
3086		-// bigThree.remove(scenePanel);
3087		-// bigThree.remove(centralPanel);
3088		-// bigThree.remove(XYZPanel);
3089		-// aWindowConstraints.gridx = 0;
3090		-// aWindowConstraints.gridy = 0;
3091		-// aWindowConstraints.gridwidth = 1;
3092		-// // aConstraints.gridheight = 3;
3093		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3094		-// aWindowConstraints.weightx = 0;
3095		-// aWindowConstraints.weighty = 1;
3096		-// //bigThree.add(jtp, aWindowConstraints);
3097		-// aWindowConstraints.weightx = 1;
3098		-// aWindowConstraints.gridwidth = 3;
3099		-// // aConstraints.gridheight = 3;
3100		-// aWindowConstraints.gridx = 1;
3101		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3102		-// bigThree.add(centralPanel, aWindowConstraints);
3103		-// aWindowConstraints.weightx = 0;
3104		-// aWindowConstraints.gridx = 4;
3105		-// aWindowConstraints.gridwidth = 1;
3106		-// // aConstraints.gridheight = 3;
3107		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3108		-// //bigThree.add(XYZPanel, aWindowConstraints);
3109		-// scenePanel.setVisible(false);
3110		-// centralPanel.setVisible(true);
3111		-// XYZPanel.setVisible(false);
3112		- bigThree.ClearUI();
3113		- bigThree.add(centralPanel);
3114		- bigThree.FlushUI();
	3720	+ Show3DView();
3115	3721
3116	3722	cameraView.requestFocusInWindow();
3117	3723
..	..	@@ -3166,8 +3772,8 @@
3166	3772	// centralPanel.setVisible(true);
3167	3773	// XYZPanel.setVisible(true);
3168	3774	bigThree.ClearUI();
	3775	+ bigThree.add(scenePanel);
3169	3776	bigThree.add(centralPanel);
3170		- bigThree.add(XYZPanel);
3171	3777	bigThree.FlushUI();
3172	3778
3173	3779	cameraView.requestFocusInWindow();
..	..	@@ -3247,8 +3853,8 @@
3247	3853	// centralPanel.setVisible(true);
3248	3854	// XYZPanel.setVisible(false);
3249	3855	bigThree.ClearUI();
3250		- bigThree.add(scenePanel);
3251	3856	bigThree.add(centralPanel);
	3857	+ bigThree.add(scenePanel);
3252	3858	bigThree.FlushUI();
3253	3859
3254	3860	cameraView.requestFocusInWindow();
..	..	@@ -3297,6 +3903,7 @@
3297	3903	} else
3298	3904	if (source == rootButton)
3299	3905	{
	3906	+ Replace();
3300	3907	Object3D obj;
3301	3908	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3302	3909	{
..	..	@@ -3354,10 +3961,10 @@
3354	3961	{
3355	3962	Object3D child = (Object3D)e.nextElement();
3356	3963	if(child.editWindow != null)
3357		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3358	3964	child.pinned = false;
3359	3965	child.CloseUI();
3360	3966	listUI.remove(child);
	3967	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3361	3968
3362	3969	//child.editWindow = null; // ???????????
3363	3970	}
..	..	@@ -3372,10 +3979,11 @@
3372	3979	//copy.ClearUI();
3373	3980	for (Object3D obj : listUI)
3374	3981	{
3375		- obj.pinned = true;
	3982	+ obj.pinned = false;
3376	3983	obj.CloseUI();
3377	3984	}
3378	3985	listUI.clear();
	3986	+ SetPinStates(group.selection.size() > 0);
3379	3987	refreshContents(true);
3380	3988	} else
3381	3989	if (source == allParamsButton)
..	..	@@ -3431,6 +4039,7 @@
3431	4039	}
3432	4040
3433	4041	copy = group;
	4042	+
3434	4043	//Globals.theRenderer.object = group;
3435	4044	if(!useclient)
3436	4045	{
..	..	@@ -3457,6 +4066,16 @@
3457	4066	currentLayout = sevenButton;
3458	4067	*/
3459	4068	radio.layout.doClick();
	4069	+
	4070	+ SetUndoStates();
	4071	+
	4072	+ ClearUnpinned();
	4073	+
	4074	+ //Grafreed.Assert(group != null);
	4075	+ //Grafreed.Assert(group.selection != null);
	4076	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4077	+ if (group.selection == null \|\| group.selection.size() == 1)
	4078	+ EditSelection(false);
3460	4079	keepparent = group.parent;
3461	4080	// PARENT = NULL or not???
3462	4081	//group.parent = null; // ROOT
..	..	@@ -3468,11 +4087,13 @@
3468	4087	} else if (event.getSource() == editCameraItem)
3469	4088	{
3470	4089	cameraView.ProtectCamera();
	4090	+ cameraView.requestFocusInWindow();
3471	4091	cameraView.repaint();
3472	4092	return;
3473	4093	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3474	4094	{
3475	4095	cameraView.RevertCamera();
	4096	+ cameraView.requestFocusInWindow();
3476	4097	cameraView.repaint();
3477	4098	return;
3478	4099	// } else if (event.getSource() == textureButton)
..	..	@@ -4049,7 +4670,7 @@
4049	4670
4050	4671	try
4051	4672	{
4052		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4673	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4053	4674	}
4054	4675	catch (Exception e)
4055	4676	{
..	..	@@ -4526,6 +5147,12 @@
4526	5147
4527	5148	void EditSelection(boolean newWindow)
4528	5149	{
	5150	+ if (group.selection == null)
	5151	+ {
	5152	+ EditElement(group, newWindow); // ? new
	5153	+ return;
	5154	+ }
	5155	+
4529	5156	// aConstraints.gridy = 0;
4530	5157	for (int i=0; i<group.selection.size(); i++)
4531	5158	{
..	..	@@ -4536,12 +5163,7 @@
4536	5163	Object3D elem = (Object3D)group.selection.elementAt(i);
4537	5164	if(elem != group \|\| !newWindow)
4538	5165	{
4539		- // if (!(elem instanceof Composite))
4540		- // newWindow = false;
4541		- listUI.add(elem);
4542		- elem.openEditWindow(this, newWindow); //, false);
4543		- System.out.println("edit : " + elem);
4544		- elem.editWindow.refreshContents(true); // ? new
	5166	+ EditElement(elem, newWindow); // ? new
4545	5167	}
4546	5168	}
4547	5169	}
..	..	@@ -4604,9 +5226,7 @@
4604	5226
4605	5227	freezemodel = false;
4606	5228	}
4607		-
4608		- boolean flashIt = true;
4609		-
	5229	+
4610	5230	public void valueChanged(TreeSelectionEvent e)
4611	5231	//public boolean handleEvent(Event event)
4612	5232	{
..	..	@@ -4616,17 +5236,7 @@
4616	5236	//new Exception().printStackTrace();
4617	5237
4618	5238	freezemodel = true;
4619		-
4620		- //for (Object3D obj : listUI)
4621		- for (int i=listUI.size(); --i>=0;)
4622		- {
4623		- Object3D obj = listUI.elementAt(i);
4624		- if (!obj.pinned)
4625		- {
4626		- obj.CloseUI();
4627		- listUI.remove(i);
4628		- }
4629		- }
	5239	+ ClearUnpinned();
4630	5240
4631	5241	/**/
4632	5242	//switch (event.id)
..	..	@@ -4689,12 +5299,29 @@
4689	5299	{
4690	5300	editButton.setEnabled(enabled);
4691	5301	uneditButton.setEnabled(enabled);
	5302	+ //unselectButton.setEnabled(enabled);
	5303	+ flashSelectionButton.setEnabled(enabled);
	5304	+
	5305	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5306	+
	5307	+ boolean allComposites = true;
	5308	+
	5309	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5310	+ {
	5311	+ if (!(e.nextElement() instanceof Composite))
	5312	+ {
	5313	+ allComposites = false;
	5314	+ break;
	5315	+ }
	5316	+ }
	5317	+
	5318	+ rootButton.setEnabled(allComposites);
4692	5319	}
4693	5320
4694	5321	void refreshContents(boolean cp)
4695	5322	{
4696		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4697		- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	5323	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5324	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4698	5325	{
4699	5326	objEditor.ClearInfo(); // .GetMaterial());
4700	5327
..	..	@@ -4703,7 +5330,7 @@
4703	5330	Object3D child = (Object3D) group.selection.get(i);
4704	5331
4705	5332	objEditor.AddInfo(child, this, true);
4706		- System.err.println("info : " + child.GetPath());
	5333	+// System.err.println("info : " + child.GetPath());
4707	5334	}
4708	5335
4709	5336	objEditor.SetText(); // jan 2014
..	..	@@ -4793,8 +5420,8 @@
4793	5420
4794	5421	if (cut)
4795	5422	{
4796		- if (Globals.SAVEONMAKE)
4797		- Save();
	5423	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5424	+// Save();
4798	5425	//int indices[] = jList.getSelectedIndices();
4799	5426	//for (int i = indices.length - 1; i >= 0; i--)
4800	5427	//jList.remove(indices[i]);
..	..	@@ -4897,6 +5524,10 @@
4897	5524
4898	5525	void paste(boolean expand)
4899	5526	{
	5527	+ if (Globals.REPLACEONMAKE)
	5528	+ Save();
	5529	+ boolean keep = Globals.REPLACEONMAKE;
	5530	+ Globals.REPLACEONMAKE = false;
4900	5531	// if (GrafreeD.clipboard == null)
4901	5532	// return;
4902	5533	boolean first = true;
..	..	@@ -4956,6 +5587,7 @@
4956	5587	Grafreed.clipboard.get(0).parent = keepparent;
4957	5588	}
4958	5589
	5590	+ Globals.REPLACEONMAKE = keep;
4959	5591	ResetModel();
4960	5592	refreshContents();
4961	5593	}
..	..	@@ -5091,6 +5723,10 @@
5091	5723
5092	5724	void group(Object3D csg, boolean grab)
5093	5725	{
	5726	+ if (Globals.REPLACEONMAKE)
	5727	+ Save();
	5728	+ boolean keep = Globals.REPLACEONMAKE;
	5729	+ Globals.REPLACEONMAKE = false;
5094	5730	if (//false) // why??
5095	5731	!group.selection.isEmpty())
5096	5732	{
..	..	@@ -5204,10 +5840,15 @@
5204	5840	//node.add(csg);
5205	5841	//makeSomething(node);
5206	5842	makeSomething(csg);
	5843	+ Globals.REPLACEONMAKE = keep;
5207	5844	}
5208	5845
5209	5846	void Ungroup(Object3D g)
5210	5847	{
	5848	+ if (Globals.REPLACEONMAKE)
	5849	+ Save();
	5850	+ boolean keep = Globals.REPLACEONMAKE;
	5851	+ Globals.REPLACEONMAKE = false;
5211	5852	if (g instanceof HiddenObject)
5212	5853	{
5213	5854	HiddenObject h = (HiddenObject) g;
..	..	@@ -5224,6 +5865,7 @@
5224	5865	objEditor.makeSomething(g.get(i), false);
5225	5866	}
5226	5867	}
	5868	+ Globals.REPLACEONMAKE = keep;
5227	5869	}
5228	5870
5229	5871	void ungroup()
..	..	@@ -5514,10 +6156,6 @@
5514	6156
5515	6157	cButton restoreCameraButton;
5516	6158
5517		- cButton minButton;
5518		- cButton maxButton;
5519		- cButton fullButton;
5520		- cButton saveButton;
5521	6159	cButton oneStepButton;
5522	6160
5523	6161	cButton groupButton;
..	..	@@ -5526,6 +6164,22 @@
5526	6164	cButton switchButton;
5527	6165	cButton loopButton;
5528	6166	cButton textureButton;
	6167	+
	6168	+ cButton skybox1Button;
	6169	+ cButton skybox2Button;
	6170	+ cButton skybox3Button;
	6171	+ cButton skybox4Button;
	6172	+ cButton skybox5Button;
	6173	+ cButton skybox6Button;
	6174	+ cButton skybox7Button;
	6175	+
	6176	+ cButton skybox11Button;
	6177	+ cButton skybox12Button;
	6178	+ cButton skybox13Button;
	6179	+ cButton skybox14Button;
	6180	+ cButton skybox15Button;
	6181	+ cButton skybox16Button;
	6182	+ cButton skybox17Button;
5529	6183
5530	6184	cButton gridButton;
5531	6185	cButton boxButton;
..	..	@@ -5590,7 +6244,7 @@
5590	6244	private MenuItem pasteLinkItem;
5591	6245	private MenuItem pasteCloneItem;
5592	6246	private MenuItem pasteExpandItem;
5593		- private MenuItem clearItem;
	6247	+ private MenuItem deleteItem;
5594	6248	private MenuItem clearAllItem;
5595	6249	private MenuItem genUVItem;
5596	6250	private MenuItem genNormalsMESHItem;
..	..	@@ -5674,6 +6328,8 @@
5674	6328	private MenuItem attachBumpItem;
5675	6329	private MenuItem detachBumpItem;
5676	6330	private MenuItem pigmentBumpItem;
	6331	+ private MenuItem embedTexturesItem;
	6332	+ private MenuItem deEmbedTexturesItem;
5677	6333
5678	6334	private MenuItem particleItem;
5679	6335	private MenuItem ragdollItem;