~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)
..	..	@@ -164,33 +540,35 @@
164	540	// menu.add("-");
165	541	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
166	542	duplicateItem.addActionListener(this);
167		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
168	545	cloneItem.addActionListener(this);
169		- if (Globals.ADVANCED)
	546	+ //if (Globals.ADVANCED)
170	547	{
171	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
172	549	cloneSupportItem.addActionListener(this);
173	550	}
	551	+ oe.jTree.popup.addSeparator();
174	552	menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
176	554	cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
178	556	copyItem.addActionListener(this);
179	557	pasteItem = menu.add(new MenuItem("Paste"));
180	558	pasteItem.addActionListener(this);
181	559
182		- menu.add("-");
183		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	560	+ oe.jTree.popup.addSeparator();
	561	+ //menu.add("-");
	562	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
184	563	pasteIntoItem.addActionListener(this);
185		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
186	565	pasteLinkItem.addActionListener(this);
187		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
188	567	pasteCloneItem.addActionListener(this);
189		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
190	569	// pasteExpandItem.addActionListener(this);
191		- menu.add("-");
192		- clearItem = menu.add(new MenuItem("Clear"));
193		- clearItem.addActionListener(this);
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
194	572
195	573	if (Globals.ADVANCED)
196	574	{
..	..	@@ -276,11 +654,9 @@
276	654	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
277	655	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
278	656	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
280	657	oe.cameraMenu.add("-");
281	658	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
282	659	openWindowItem.addActionListener(this);
283		- editLeafItem.addActionListener(this);
284	660	lookAtItem.addActionListener(this);
285	661	//lookFromItem.addActinoListener(this);
286	662	//switchViewItem.addActionListener(this);
..	..	@@ -327,9 +703,8 @@
327	703	setMasterItem.addActionListener(this);
328	704	}
329	705
330		- oe.menuBar.add(menu = new Menu("Group"));
331		-// grabItem = menu.add(new MenuItem("Grab"));
332		-// grabItem.addActionListener(this);
	706	+ oe.menuBar.add(menu = new Menu("Order"));
	707	+
333	708	backItem = menu.add(new MenuItem("Back"));
334	709	backItem.addActionListener(this);
335	710	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -337,13 +712,21 @@
337	712	// compositeItem = menu.add(new MenuItem("Composite"));
338	713	// compositeItem.addActionListener(this);
339	714
	715	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	716	+ grabItem.addActionListener(this);
	717	+
340	718	if (Globals.ADVANCED)
341	719	{
342	720	hideItem = menu.add(new MenuItem("Hidden Group"));
343	721	hideItem.addActionListener(this);
344	722	}
345		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	723	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
346	724	ungroupItem.addActionListener(this);
	725	+
	726	+ oe.jTree.popup.addSeparator();
	727	+
	728	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	729	+ deleteItem.addActionListener(this);
347	730
348	731	// menu.add("-");
349	732	//
..	..	@@ -380,14 +763,14 @@
380	763	shadowYItem.addActionListener(this);
381	764	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382	765	shadowZItem.addActionListener(this);
	766	+ attributeItem = menu.add(new MenuItem("Attribute"));
	767	+ attributeItem.addActionListener(this);
383	768
384	769	if (Globals.ADVANCED)
385	770	{
386	771	menu.add("-");
387	772	linkerItem = menu.add(new MenuItem("Linker"));
388	773	linkerItem.addActionListener(this);
389		- attributeItem = menu.add(new MenuItem("Attribute"));
390		- attributeItem.addActionListener(this);
391	774	templateItem = menu.add(new MenuItem("Template"));
392	775	templateItem.addActionListener(this);
393	776	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -416,7 +799,7 @@
416	799	genNormalsMESHItem.addActionListener(this);
417	800	if (Globals.ADVANCED)
418	801	{
419		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	802	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
420	803	genNormalsMINEItem.addActionListener(this);
421	804	}
422	805	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -509,10 +892,15 @@
509	892	attachBumpItem.addActionListener(this);
510	893	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
511	894	pigmentBumpItem.addActionListener(this);
	895	+ //embedTexturesItem
512	896	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
513	897	detachPigmentItem.addActionListener(this);
514	898	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
515	899	detachBumpItem.addActionListener(this);
	900	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	901	+ embedTexturesItem.addActionListener(this);
	902	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	903	+ deEmbedTexturesItem.addActionListener(this);
516	904	menu.add("-");
517	905	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
518	906	sortbysizeItem.addActionListener(this);
..	..	@@ -523,6 +911,9 @@
523	911	shareGeometriesItem.addActionListener(this);
524	912	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
525	913	mergeGeometriesItem.addActionListener(this);
	914	+ menu.add("-");
	915	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	916	+ editLeafItem.addActionListener(this);
526	917	if (Globals.ADVANCED)
527	918	{
528	919	// Pretty much the same as duplicate and clone.
..	..	@@ -539,6 +930,75 @@
539	930	buildToolsMenu(menu);
540	931	}
541	932
	933	+ JTabbedPane resourcecontainer;
	934	+ cGridBag currenttab;
	935	+ //boolean added; // patch for jar
	936	+
	937	+ int tabcount = 0;
	938	+ int colcount = 0;
	939	+ int rowcount = 0;
	940	+ int texturecount = 0;
	941	+
	942	+ int columns = 5;
	943	+ int rows = 7;
	944	+
	945	+ public void ResourceCallBack(String[] path)
	946	+ {
	947	+// for (int i = 0; i < path.length; i++)
	948	+// System.out.print(path[i] + "/");
	949	+// System.out.println();
	950	+
	951	+ if (//rowcount == 0 \|\|
	952	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	953	+ {
	954	+ currenttab = new cGridBag();
	955	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	956	+ currenttab.setName(tabname);
	957	+ //added = false;
	958	+ resourcecontainer.add(currenttab);
	959	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	960	+ rowcount = 1;
	961	+ colcount = 0;
	962	+ texturecount = 0;
	963	+ }
	964	+
	965	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	966	+ {
	967	+ //if (!added)
	968	+ {
	969	+ //added = true;
	970	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	971	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	972	+ }
	973	+
	974	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	975	+
	976	+ if (++colcount >= columns)
	977	+ {
	978	+ colcount = 0;
	979	+ currenttab.Return();
	980	+
	981	+ if (rowcount++ >= rows)
	982	+ {
	983	+ rowcount = 0;
	984	+ }
	985	+ }
	986	+ }
	987	+ else
	988	+ {
	989	+// if (!path[path.length-1].equals("icons"))
	990	+// resourcecontainer.Return();
	991	+ }
	992	+ }
	993	+
	994	+ void CreateTexturePanel(cGridBag container)
	995	+ {
	996	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	997	+ container.add(resourcecontainer);
	998	+
	999	+ Grafreed.ParseResources("textures", this);
	1000	+ }
	1001	+
542	1002	void SetupUI2(ObjEditor oe)
543	1003	{
544	1004	// June 2019
..	..	@@ -556,11 +1016,6 @@
556	1016	//new Exception().printStackTrace();
557	1017
558	1018	oe.radioPanel = new JPanel(new GridBagLayout());
559		- oe.aConstraints.weightx = 1;
560		- oe.aConstraints.weighty = 0;
561		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
562		- oe.aConstraints.gridwidth = 100;
563		- oe.aConstraints.gridheight = 1;
564	1019	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
565	1020
566	1021	oe.buttonGroup = new ButtonGroup();
..	..	@@ -583,7 +1038,7 @@
583	1038	*/
584	1039	cGridBag copyOptionsPanel = new cGridBag();
585	1040
586		- copyOptionsPanel.preferredHeight = 1;
	1041	+ copyOptionsPanel.preferredHeight = 2;
587	1042
588	1043	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
589	1044
..	..	@@ -593,10 +1048,49 @@
593	1048
594	1049	if (Globals.ADVANCED)
595	1050	{
596		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- maxButton.setToolTipText("Maximize window");
598		- maxButton.addActionListener(this);
	1051	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1052	+// maxButton.setToolTipText("Maximize window");
	1053	+// maxButton.addActionListener(this);
599	1054	}
	1055	+
	1056	+ cButton gcButton;
	1057	+
	1058	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+// gcButton.setToolTipText("Garbage collect");
	1060	+// gcButton.addActionListener(new ActionListener()
	1061	+// {
	1062	+// public void actionPerformed(ActionEvent e)
	1063	+// {
	1064	+// System.gc();
	1065	+// }
	1066	+// });
	1067	+
	1068	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+ collapseButton.setToolTipText("Collapse toolbar");
	1070	+ collapseButton.addActionListener(this);
	1071	+
	1072	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1074	+ maximize3DButton.addActionListener(this);
	1075	+
	1076	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ twoButton.setToolTipText("Show 3D view only");
	1078	+ twoButton.addActionListener(this);
	1079	+ this.fullscreenLayout = twoButton;
	1080	+
	1081	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ threeButton.setToolTipText("Show controls and 3D view");
	1083	+ threeButton.addActionListener(this);
	1084	+ if (Globals.ADVANCED)
	1085	+ {
	1086	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ sixButton.setToolTipText("Show 3D view and controls");
	1088	+ sixButton.addActionListener(this);
	1089	+ }
	1090	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1091	+// sevenButton.setToolTipText("3-column layout");
	1092	+// sevenButton.addActionListener(this);
	1093	+ //
600	1094
601	1095	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	1096	fullButton.setToolTipText("Full-screen window");
..	..	@@ -610,29 +1104,46 @@
610	1104	restoreCameraButton.setToolTipText("Restore viewpoint");
611	1105	restoreCameraButton.addActionListener(this);
612	1106
613		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
614		- undoButton.setToolTipText("Undo changes");
615		- undoButton.addActionListener(this);
616		- undoButton.setEnabled(false);
	1107	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ saveVersionButton.setToolTipText("Duplicate current version");
	1109	+ saveVersionButton.addActionListener(this);
	1110	+
	1111	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ deleteVersionButton.setToolTipText("Delete current version");
	1113	+ deleteVersionButton.addActionListener(this);
	1114	+
	1115	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1116	+ previousVersionButton.setToolTipText("Previous version");
	1117	+ previousVersionButton.addActionListener(this);
	1118	+ previousVersionButton.setEnabled(false);
617	1119
618		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
619		- redoButton.setToolTipText("Redo changes");
620		- redoButton.addActionListener(this);
621		- redoButton.setEnabled(false);
	1120	+ cGridBag updown = new cGridBag().setVertical(true);
	1121	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1122	+ restoreButton.setToolTipText("Undo (restore current version)");
	1123	+ restoreButton.addActionListener(this);
	1124	+ //restoreButton.setEnabled(false);
622	1125
623		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- saveButton.setToolTipText("Save changes");
625		- saveButton.addActionListener(this);
	1126	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1127	+ replaceButton.setToolTipText("Save (replace current version)");
	1128	+ replaceButton.addActionListener(this);
	1129	+ //replaceButton.setEnabled(false);
626	1130
627		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
628		- liveCB.setToolTipText("Enable animation");
629		- liveCB.addItemListener(this);
630		-
631		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1131	+ copyOptionsPanel.add(updown);
	1132	+
	1133	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ nextVersionButton.setToolTipText("Next version");
	1135	+ nextVersionButton.addActionListener(this);
	1136	+ nextVersionButton.setEnabled(false);
	1137	+
	1138	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632	1139	oneStepButton.setToolTipText("Animate one step forward");
633	1140	oneStepButton.addActionListener(this);
634	1141
635		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1142	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1143	+ liveCB.setToolTipText("Enable animation");
	1144	+ liveCB.addItemListener(this);
	1145	+
	1146	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
636	1147	fastCB.setToolTipText("Fast mode");
637	1148	fastCB.addItemListener(this);
638	1149
..	..	@@ -650,31 +1161,17 @@
650	1161	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
651	1162	snapobjectButton.addActionListener(this);
652	1163	snapobjectButton.setToolTipText("Snap Object");
	1164	+
	1165	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1166	+ fourButton.addActionListener(this);
	1167	+ fourButton.setToolTipText("Show control panel only");
653	1168	}
654	1169
655	1170	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
656	1171
657		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- twoButton.setToolTipText("Show center view only");
659		- twoButton.addActionListener(this);
660		- this.fullscreenLayout = twoButton;
661		-
662		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
663		- fourButton.addActionListener(this);
664		- fourButton.setToolTipText("Show left panel only");
665		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
666		- sixButton.setToolTipText("2-column layout left");
667		- sixButton.addActionListener(this);
668		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
669		- threeButton.setToolTipText("2-column layout right");
670		- threeButton.addActionListener(this);
671		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
672		- sevenButton.setToolTipText("3-column layout");
673		- sevenButton.addActionListener(this);
674		- //
675	1172
676		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
677		- rootButton.setToolTipText("Edit selection in new tab");
	1173	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1174	+ rootButton.setToolTipText("Open selection in new tab");
678	1175	rootButton.addActionListener(this);
679	1176
680	1177	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -683,30 +1180,32 @@
683	1180	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
684	1181	//clearButton.addActionListener(this);
685	1182
	1183	+ cGridBag row1 = new cGridBag();
	1184	+
686	1185	// INSERT
687		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688		- gridButton.setToolTipText("Create grid");
	1186	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ gridButton.setToolTipText("Create ground");
689	1188	gridButton.addActionListener(this);
690	1189
691		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
692	1191	boxButton.setToolTipText("Create box");
693	1192	boxButton.addActionListener(this);
694	1193
695		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ superButton.setToolTipText("Create superellipsoid");
	1196	+ superButton.addActionListener(this);
	1197	+
	1198	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696	1199	sphereButton.setToolTipText("Create sphere");
697	1200	sphereButton.addActionListener(this);
698	1201
699		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700	1203	coneButton.setToolTipText("Create cone");
701	1204	coneButton.addActionListener(this);
702	1205
703		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
704	1207	torusButton.setToolTipText("Create torus");
705	1208	torusButton.addActionListener(this);
706		-
707		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
708		- superButton.setToolTipText("Create superellipsoid");
709		- superButton.addActionListener(this);
710	1209
711	1210	if (Globals.ADVANCED)
712	1211	{
..	..	@@ -715,51 +1214,53 @@
715	1214	kleinButton.addActionListener(this);
716	1215	}
717	1216
718		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1217	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
719	1218	particlesButton.setToolTipText("Create particle system");
720	1219	particlesButton.addActionListener(this);
721	1220
722		- oe.toolboxPanel.Return();
	1221	+ oe.toolboxPanel.add(row1);
723	1222
724		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ cGridBag row2 = new cGridBag();
	1224	+
	1225	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
725	1226	groupButton.setToolTipText("Create group");
726	1227	groupButton.addActionListener(this);
727	1228
728		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
729	1230	compositeButton.setToolTipText("Create composite");
730	1231	compositeButton.addActionListener(this);
731	1232
732		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
733	1234	switchButton.setToolTipText("Create item switcher");
734	1235	switchButton.addActionListener(this);
735	1236
736		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
737	1238	loopButton.setToolTipText("Create loop");
738	1239	loopButton.addActionListener(this);
739	1240
740		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
741	1242	textureButton.setToolTipText("Create texture");
742	1243	textureButton.addActionListener(this);
743	1244
744		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
745	1246	overlayButton.setToolTipText("Create overlay");
746	1247	overlayButton.addActionListener(this);
747	1248
748		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
749	1250	lightButton.setToolTipText("Create light");
750	1251	lightButton.addActionListener(this);
751	1252
752		- for (int i=6; --i>=0;)
753		- {
754		- oe.toolboxPanel.Return();
755		- oe.toolboxPanel.add(new cGridBag());
756		- oe.toolboxPanel.add(new cGridBag());
757		- oe.toolboxPanel.add(new cGridBag());
758		- oe.toolboxPanel.add(new cGridBag());
759		- oe.toolboxPanel.add(new cGridBag());
760		- oe.toolboxPanel.add(new cGridBag());
761		- oe.toolboxPanel.add(new cGridBag());
762		- }
	1253	+ oe.toolboxPanel.add(row2);
	1254	+
	1255	+ cGridBag textures = new cGridBag();
	1256	+
	1257	+ CreateTexturePanel(textures);
	1258	+
	1259	+ oe.toolboxPanel.add(textures);
	1260	+
	1261	+ textures.preferredHeight = 100;
	1262	+
	1263	+ CreateSkyboxPanel(oe.skyboxPanel);
763	1264
764	1265	// EDIT panel
765	1266	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -767,20 +1268,20 @@
767	1268	editButton.addActionListener(this);
768	1269
769	1270	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
770		- uneditButton.setToolTipText("Remove selection controls");
	1271	+ uneditButton.setToolTipText("Unpin and remove selection controls");
771	1272	uneditButton.addActionListener(this);
772	1273
773	1274	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
774		- allParamsButton.setToolTipText("Show all controle");
	1275	+ allParamsButton.setToolTipText("Show all controls");
775	1276	allParamsButton.addActionListener(this);
776	1277
777		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
778		- clearPanelButton.setToolTipText("Clear edit panel");
	1278	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ clearPanelButton.setToolTipText("Clear all controls");
779	1280	clearPanelButton.addActionListener(this);
780	1281
781		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
782		- unselectButton.setToolTipText("Unselect");
783		- unselectButton.addActionListener(this);
	1282	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ //unselectButton.setToolTipText("Unselect");
	1284	+ //unselectButton.addActionListener(this);
784	1285
785	1286	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
786	1287	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -815,9 +1316,12 @@
815	1316
816	1317	oe.treePanel.add(copyOptionsPanel);
817	1318	oe.treePanel.Return();
	1319	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1320	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1321	+ sliderPane.preferredHeight = 1;
818	1322
819		-// mainPanel.setDividerLocation(0.5); //1.0);
820		-// mainPanel.setResizeWeight(0.5);
	1323	+// mainPanel.setDividerLocation(0.1); //1.0);
	1324	+ mainPanel.setResizeWeight(0.4);
821	1325
822	1326	//jList.addListSelectionListener(this);
823	1327	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -825,7 +1329,7 @@
825	1329	//jTree.setEditable(true);
826	1330	oe.jTree.setDragEnabled(true);
827	1331	//jTree.setPreferredSize(new Dimension(10,10));
828		- jSP.setPreferredSize(new Dimension(100,200));
	1332	+ //jSP.setPreferredSize(new Dimension(100,200));
829	1333
830	1334	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
831	1335
..	..	@@ -837,7 +1341,7 @@
837	1341	dgr.addDragGestureListener(this);
838	1342	}catch(Exception e) {}
839	1343	*/
840		- radio.layout = sevenButton;
	1344	+ radio.layout = threeButton; // sixButton;
841	1345	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
842	1346	}
843	1347
..	..	@@ -888,9 +1392,12 @@
888	1392	smoothCB.setToolTipText("Snapping delay");
889	1393	smoothCB.addItemListener(this);
890	1394
891		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
892		- slowCB.setToolTipText("Smooth interpolation");
893		- slowCB.addItemListener(this);
	1395	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1396	+// slowCB.setToolTipText("Smooth interpolation");
	1397	+// slowCB.addItemListener(this);
	1398	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1399	+ minshaderCB.setToolTipText("Minimal fast shader");
	1400	+ minshaderCB.addItemListener(this);
894	1401
895	1402	// constraints.gridy += 1;
896	1403	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -940,9 +1447,9 @@
940	1447	toggleSwitchCB.setToolTipText("Choose a single item");
941	1448	toggleSwitchCB.addItemListener(this);
942	1449
943		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
944		- autosaveCB.setToolTipText("On structure change");
945		- autosaveCB.addItemListener(this);
	1450	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1451	+ autokeepCB.setToolTipText("On structure change");
	1452	+ autokeepCB.addItemListener(this);
946	1453
947	1454	panel.Return();
948	1455	if (Globals.ADVANCED)
..	..	@@ -969,9 +1476,17 @@
969	1476
970	1477	void EditObject(Object3D obj)
971	1478	{
	1479	+ assert(obj instanceof Composite);
	1480	+
	1481	+// if (obj.versionlist == null)
	1482	+// {
	1483	+// obj.versionlist = new Object3D[100];
	1484	+// obj.versionindex = -1;
	1485	+// }
	1486	+
972	1487	cRadio radioButton = new cRadio(obj.name);
973	1488
974		- // Patch to avoid bug with transparency.
	1489	+ // June 2019. Patch to avoid bug with transparency.
975	1490	radioButton.hadMaterial = obj.material != null;
976	1491	if (!radioButton.hadMaterial)
977	1492	{
..	..	@@ -979,7 +1494,7 @@
979	1494	}
980	1495
981	1496	radioButton.SetObject(obj);
982		- radioButton.layout = sevenButton;
	1497	+ radioButton.layout = threeButton; // sixButton;
983	1498	radioButton.SetCamera(cameraView.renderCamera, false);
984	1499	radioButton.addActionListener(this);
985	1500	radioPanel.add(radioButton);
..	..	@@ -993,6 +1508,7 @@
993	1508
994	1509	oe.SetupViews();
995	1510
	1511	+ if (Globals.DEBUG)
996	1512	System.out.println("SetupViews");
997	1513	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
998	1514	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1004,6 +1520,8 @@
1004	1520	cCheckBox localCB;
1005	1521	cCheckBox crowdCB;
1006	1522	cCheckBox smoothCB;
	1523	+ cCheckBox minshaderCB;
	1524	+
1007	1525	cToggleButton fastCB;
1008	1526	cCheckBox slowCB;
1009	1527	cCheckBox boxCB;
..	..	@@ -1019,7 +1537,7 @@
1019	1537
1020	1538	cCheckBox oeilCB;
1021	1539	cCheckBox shadowCB;
1022		- cCheckBox autosaveCB;
	1540	+ cCheckBox autokeepCB;
1023	1541	cCheckBox lookAtCB;
1024	1542
1025	1543	// static int COLOR = 1;
..	..	@@ -1074,6 +1592,12 @@
1074	1592	{
1075	1593	cameraView.ToggleInertia();
1076	1594	cameraView.repaint();
	1595	+ }
	1596	+ else if(e.getSource() == minshaderCB)
	1597	+ {
	1598	+ Globals.MINSHADER ^= true;
	1599	+ cameraView.programInitialized = false;
	1600	+ cameraView.repaint();
1077	1601	}
1078	1602	else if(e.getSource() == localCB)
1079	1603	{
..	..	@@ -1131,9 +1655,9 @@
1131	1655	{
1132	1656	Globals.FREEZEONMOVE ^= true;
1133	1657	}
1134		- else if(e.getSource() == autosaveCB)
	1658	+ else if(e.getSource() == autokeepCB)
1135	1659	{
1136		- Globals.SAVEONMAKE ^= true;
	1660	+ Globals.REPLACEONMAKE ^= true;
1137	1661	}
1138	1662	else if(e.getSource() == lookAtCB)
1139	1663	{
..	..	@@ -1223,7 +1747,7 @@
1223	1747	// return;
1224	1748	// }
1225	1749
1226		- String string = (String) object;
	1750	+ String string = object.toString();
1227	1751
1228	1752	// File path for Mac and Windows
1229	1753	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1351,7 +1875,12 @@
1351	1875	TreePath path;
1352	1876
1353	1877	public TransferableTreePath(TreePath tp) {
1354		- path = tp;
	1878	+ Object[] objs = new Object[tp.getPathCount()];
	1879	+ for (int i=0; i<objs.length; i++)
	1880	+ {
	1881	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1882	+ }
	1883	+ path = new TreePath(objs);
1355	1884	}
1356	1885
1357	1886	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1488,6 +2017,8 @@
1488	2017	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1489	2018	reduce34MorphItem.addActionListener(this);
1490	2019	menu.add("-");
	2020	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2021	+ memoryItem.addActionListener(this);
1491	2022	menu.add(computeAOItem = new MenuItem("Compute AO"));
1492	2023	computeAOItem.addActionListener(this);
1493	2024
..	..	@@ -1496,8 +2027,6 @@
1496	2027	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1497	2028	mirrorItem.addActionListener(this);
1498	2029	menu.add("-");
1499		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1500		- memoryItem.addActionListener(this);
1501	2030	menu.add(analyzeItem = new MenuItem("Analyze"));
1502	2031	analyzeItem.addActionListener(this);
1503	2032	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1641,7 +2170,11 @@
1641	2170	shadow.material = new cMaterial(obj.material);
1642	2171	shadow.material.diffuse = 0.0001f;
1643	2172	shadow.material.specular = 0.0001f;
1644		- //shadow.projectedVertices[1].x = 300;
	2173	+ shadow.material.opacity = 0.75f;
	2174	+
	2175	+ AllocProjectedVertices(shadow);
	2176	+
	2177	+ shadow.projectedVertices[1].x = 300;
1645	2178
1646	2179	makeSomething(shadow);
1647	2180	}
..	..	@@ -1658,6 +2191,16 @@
1658	2191	listUI.remove(i);
1659	2192	}
1660	2193	}
	2194	+ }
	2195	+
	2196	+ private void EditElement(Object3D elem, boolean newWindow)
	2197	+ {
	2198	+ // if (!(elem instanceof Composite))
	2199	+ // newWindow = false;
	2200	+ listUI.add(elem);
	2201	+ elem.openEditWindow(this, newWindow); //, false);
	2202	+ System.out.println("edit : " + elem);
	2203	+ elem.editWindow.refreshContents(true); // ? new
1661	2204	}
1662	2205
1663	2206	/**
..	..	@@ -2087,6 +2630,23 @@
2087	2630	{
2088	2631	makeSomething(new Light());
2089	2632	} else
	2633	+// if (source == skybox1Button \|\|
	2634	+// source == skybox2Button \|\|
	2635	+// source == skybox3Button \|\|
	2636	+// source == skybox4Button \|\|
	2637	+// source == skybox5Button \|\|
	2638	+// source == skybox6Button \|\|
	2639	+// source == skybox7Button \|\|
	2640	+// source == skybox11Button \|\|
	2641	+// source == skybox12Button \|\|
	2642	+// source == skybox13Button \|\|
	2643	+// source == skybox14Button \|\|
	2644	+// source == skybox15Button \|\|
	2645	+// source == skybox16Button \|\|
	2646	+// source == skybox17Button)
	2647	+// {
	2648	+// ChangeSkybox(source);
	2649	+// } else
2090	2650	if (source == csgItem)
2091	2651	{
2092	2652	group(new CSG());
..	..	@@ -2135,27 +2695,35 @@
2135	2695	} else
2136	2696	if (source == loopItem \|\| source == loopButton)
2137	2697	{
	2698	+ if (!group.selection.isEmpty())
	2699	+ {
2138	2700	Composite csg = new GroupLeaf();
2139	2701	csg.count = 5;
2140		- group(csg);
2141	2702	Composite child = new cGroup("Branch");
2142	2703	csg.addChild(child);
2143	2704	child.addChild(csg);
	2705	+ group(csg);
	2706	+ }
2144	2707	} else
2145	2708	if (source == doubleItem)
2146	2709	{
	2710	+ if (!group.selection.isEmpty())
	2711	+ {
2147	2712	Composite csg = new GroupLeaf("Fork");
2148	2713	csg.count = 5;
2149		- group(csg);
2150	2714	Composite child = new cGroup("Branch A");
2151	2715	csg.addChild(child);
2152	2716	child.addChild(csg);
2153	2717	child = new cGroup("Branch B");
2154	2718	csg.addChild(child);
2155	2719	child.addChild(csg);
	2720	+ group(csg);
	2721	+ }
2156	2722	} else
2157	2723	if (source == tripleItem)
2158	2724	{
	2725	+ if (!group.selection.isEmpty())
	2726	+ {
2159	2727	Composite csg = new GroupLeaf("Trident");
2160	2728	csg.count = 4;
2161	2729	group(csg);
..	..	@@ -2168,11 +2736,12 @@
2168	2736	child = new cGroup();
2169	2737	csg.addChild(child);
2170	2738	child.addChild(csg);
	2739	+ }
2171	2740	} else
2172	2741	if (source == computeAOItem)
2173	2742	{
2174	2743	Globals.drawMode = CameraPane.OCCLUSION;
2175		- Globals.theRenderer.repaint();
	2744	+ cameraView.repaint();
2176	2745	} else
2177	2746	if (source == recompileItem)
2178	2747	{
..	..	@@ -2187,7 +2756,7 @@
2187	2756	if (source == invariantsItem)
2188	2757	{
2189	2758	System.out.println("Invariants:");
2190		- Grafreed.grafreeD.universe.invariants();
	2759	+ Grafreed.grafreed.universe.invariants();
2191	2760	} else
2192	2761	if (source == memoryItem)
2193	2762	{
..	..	@@ -2218,19 +2787,52 @@
2218	2787	{
2219	2788	ToggleFullScreen();
2220	2789	} else
2221		- if (source == undoButton)
	2790	+ if (source == collapseButton)
2222	2791	{
2223		- if (!Undo())
2224		- java.awt.Toolkit.getDefaultToolkit().beep();
	2792	+ this.expandedLayout = radio.layout;
	2793	+ CollapseToolbar();
2225	2794	} else
2226		- if (source == redoButton)
	2795	+ if (source == maximize3DButton)
2227	2796	{
2228		- Redo();
	2797	+ this.expandedLayout = radio.layout;
	2798	+ radio.layout = twoButton;
	2799	+ Show3DView();
	2800	+ CollapseToolbar();
2229	2801	} else
2230		- if (source == saveButton)
	2802	+ if (source == previousVersionButton)
2231	2803	{
	2804	+ // Go to previous version
	2805	+ //if (!Undo())
	2806	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2807	+ PreviousVersion();
	2808	+ } else
	2809	+ if (source == restoreButton)
	2810	+ {
	2811	+ // Restore current version
	2812	+ Restore();
	2813	+ //restoreButton.setEnabled(false);
	2814	+ } else
	2815	+ if (source == replaceButton)
	2816	+ {
	2817	+ // Overwrite current version
	2818	+ Replace();
	2819	+ //replaceButton.setEnabled(false);
	2820	+ } else
	2821	+ if (source == nextVersionButton)
	2822	+ {
	2823	+ // Go to next version
	2824	+ NextVersion();
	2825	+ } else
	2826	+ if (source == saveVersionButton)
	2827	+ {
	2828	+ // Save a new version
2232	2829	if (!Save(true))
2233	2830	java.awt.Toolkit.getDefaultToolkit().beep();
	2831	+ } else
	2832	+ if (source == deleteVersionButton)
	2833	+ {
	2834	+ // Delete a new version
	2835	+ DeleteVersion();
2234	2836	} else
2235	2837	if (source == oneStepButton)
2236	2838	{
..	..	@@ -2285,11 +2887,11 @@
2285	2887	} else
2286	2888	if (source == undoItem)
2287	2889	{
2288		- Undo();
	2890	+ PreviousVersion();
2289	2891	} else
2290	2892	if (source == redoItem)
2291	2893	{
2292		- Redo();
	2894	+ NextVersion();
2293	2895	} else
2294	2896	if (source == duplicateItem)
2295	2897	{
..	..	@@ -2610,7 +3212,7 @@
2610	3212	{
2611	3213	StepAll();
2612	3214	} else
2613		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3215	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2614	3216	{
2615	3217	//int indices[] = jList.getSelectedIndices();
2616	3218	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2770,22 +3372,34 @@
2770	3372	} else
2771	3373	if (source == ungroupItem \|\| source == ungroupButton)
2772	3374	{
2773		- boolean hasRoot = false;
	3375	+ boolean canUngroup = true;
2774	3376
2775	3377	for (int i=0; i<group.selection.size(); i++)
2776	3378	{
2777		- if (group.selection.get(i) == group)
	3379	+ Object3D selectedItem = group.selection.get(i);
	3380	+
	3381	+ if (selectedItem.Size() == 0)
2778	3382	{
2779		- hasRoot = true;
	3383	+ // Cannot ungroup leaves
	3384	+ canUngroup = false;
	3385	+ break;
	3386	+ }
	3387	+
	3388	+ if (selectedItem == group)
	3389	+ {
	3390	+ // Cannot ungroup root
	3391	+ canUngroup = false;
2780	3392	break;
2781	3393	}
2782	3394	}
2783	3395
2784		- if (!hasRoot)
	3396	+ if (canUngroup)
2785	3397	{
2786	3398	for (int i=0; i<group.selection.size(); i++)
2787	3399	{
2788		- Ungroup(group.selection.get(i));
	3400	+ Object3D selectedItem = group.selection.get(i);
	3401	+
	3402	+ Ungroup(selectedItem);
2789	3403	}
2790	3404
2791	3405	ClearSelection(false);
..	..	@@ -3092,7 +3706,7 @@
3092	3706	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3093	3707	{
3094	3708	obj = (Object3D)e.nextElement();
3095		- obj.SetBumpTexture(null);
	3709	+ obj.ResetBumpTexture();
3096	3710	}
3097	3711
3098	3712	refreshContents();
..	..	@@ -3106,6 +3720,31 @@
3106	3720	obj.SetBumpTexture(obj.GetPigmentTexture());
3107	3721	}
3108	3722
	3723	+ refreshContents();
	3724	+ } else
	3725	+ if (source == embedTexturesItem)
	3726	+ {
	3727	+ Object3D obj;
	3728	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3729	+ {
	3730	+ obj = (Object3D)e.nextElement();
	3731	+ obj.EmbedTextures(true);
	3732	+ }
	3733	+
	3734	+ refreshContents();
	3735	+ } else
	3736	+ if (source == deEmbedTexturesItem)
	3737	+ {
	3738	+ Object3D obj;
	3739	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3740	+ {
	3741	+ obj = (Object3D)e.nextElement();
	3742	+ obj.EmbedTextures(false);
	3743	+ }
	3744	+
	3745	+ CameraPane.texturepigment.clear();
	3746	+ CameraPane.texturebump.clear();
	3747	+
3109	3748	refreshContents();
3110	3749	} else
3111	3750	if (source == flashSelectionButton)
..	..	@@ -3123,38 +3762,7 @@
3123	3762	if (CameraPane.FULLSCREEN)
3124	3763	fullscreenLayout = radio.layout;
3125	3764
3126		- // bug
3127		- //gridPanel.setDividerLocation(1.0);
3128		- //bigPanel.setDividerLocation(0.0);
3129		-// bigThree.remove(scenePanel);
3130		-// bigThree.remove(centralPanel);
3131		-// bigThree.remove(XYZPanel);
3132		-// aWindowConstraints.gridx = 0;
3133		-// aWindowConstraints.gridy = 0;
3134		-// aWindowConstraints.gridwidth = 1;
3135		-// // aConstraints.gridheight = 3;
3136		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3137		-// aWindowConstraints.weightx = 0;
3138		-// aWindowConstraints.weighty = 1;
3139		-// //bigThree.add(jtp, aWindowConstraints);
3140		-// aWindowConstraints.weightx = 1;
3141		-// aWindowConstraints.gridwidth = 3;
3142		-// // aConstraints.gridheight = 3;
3143		-// aWindowConstraints.gridx = 1;
3144		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3145		-// bigThree.add(centralPanel, aWindowConstraints);
3146		-// aWindowConstraints.weightx = 0;
3147		-// aWindowConstraints.gridx = 4;
3148		-// aWindowConstraints.gridwidth = 1;
3149		-// // aConstraints.gridheight = 3;
3150		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3151		-// //bigThree.add(XYZPanel, aWindowConstraints);
3152		-// scenePanel.setVisible(false);
3153		-// centralPanel.setVisible(true);
3154		-// XYZPanel.setVisible(false);
3155		- bigThree.ClearUI();
3156		- bigThree.add(centralPanel);
3157		- bigThree.FlushUI();
	3765	+ Show3DView();
3158	3766
3159	3767	cameraView.requestFocusInWindow();
3160	3768
..	..	@@ -3209,8 +3817,8 @@
3209	3817	// centralPanel.setVisible(true);
3210	3818	// XYZPanel.setVisible(true);
3211	3819	bigThree.ClearUI();
	3820	+ bigThree.add(scenePanel);
3212	3821	bigThree.add(centralPanel);
3213		- bigThree.add(XYZPanel);
3214	3822	bigThree.FlushUI();
3215	3823
3216	3824	cameraView.requestFocusInWindow();
..	..	@@ -3290,8 +3898,8 @@
3290	3898	// centralPanel.setVisible(true);
3291	3899	// XYZPanel.setVisible(false);
3292	3900	bigThree.ClearUI();
3293		- bigThree.add(scenePanel);
3294	3901	bigThree.add(centralPanel);
	3902	+ bigThree.add(scenePanel);
3295	3903	bigThree.FlushUI();
3296	3904
3297	3905	cameraView.requestFocusInWindow();
..	..	@@ -3340,6 +3948,7 @@
3340	3948	} else
3341	3949	if (source == rootButton)
3342	3950	{
	3951	+ Replace();
3343	3952	Object3D obj;
3344	3953	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3345	3954	{
..	..	@@ -3397,10 +4006,10 @@
3397	4006	{
3398	4007	Object3D child = (Object3D)e.nextElement();
3399	4008	if(child.editWindow != null)
3400		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3401	4009	child.pinned = false;
3402	4010	child.CloseUI();
3403	4011	listUI.remove(child);
	4012	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3404	4013
3405	4014	//child.editWindow = null; // ???????????
3406	4015	}
..	..	@@ -3419,6 +4028,7 @@
3419	4028	obj.CloseUI();
3420	4029	}
3421	4030	listUI.clear();
	4031	+ SetPinStates(group.selection.size() > 0);
3422	4032	refreshContents(true);
3423	4033	} else
3424	4034	if (source == allParamsButton)
..	..	@@ -3474,6 +4084,7 @@
3474	4084	}
3475	4085
3476	4086	copy = group;
	4087	+
3477	4088	//Globals.theRenderer.object = group;
3478	4089	if(!useclient)
3479	4090	{
..	..	@@ -3501,9 +4112,27 @@
3501	4112	*/
3502	4113	radio.layout.doClick();
3503	4114
	4115	+ assert(copy instanceof Composite);
	4116	+
	4117	+ if (copy.versionlist == null)
	4118	+ {
	4119	+ copy.versionlist = new Object3D[100];
	4120	+ copy.versionindex = -1;
	4121	+
	4122	+ // Cannot work with loops
	4123	+ // To fix this issue, first mark all nodes above the root,
	4124	+ // and check if any of these nodes are reachable below the root.
	4125	+ //Save(true);
	4126	+ }
	4127	+
	4128	+ SetVersionStates();
	4129	+
3504	4130	ClearUnpinned();
3505		- SetPinStates(group.selection.size() > 0);
3506		- if (group.selection.size() == 1)
	4131	+
	4132	+ //Grafreed.Assert(group != null);
	4133	+ //Grafreed.Assert(group.selection != null);
	4134	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4135	+ if (group.selection == null \|\| group.selection.size() == 1)
3507	4136	EditSelection(false);
3508	4137	keepparent = group.parent;
3509	4138	// PARENT = NULL or not???
..	..	@@ -3516,11 +4145,13 @@
3516	4145	} else if (event.getSource() == editCameraItem)
3517	4146	{
3518	4147	cameraView.ProtectCamera();
	4148	+ cameraView.requestFocusInWindow();
3519	4149	cameraView.repaint();
3520	4150	return;
3521	4151	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3522	4152	{
3523	4153	cameraView.RevertCamera();
	4154	+ cameraView.requestFocusInWindow();
3524	4155	cameraView.repaint();
3525	4156	return;
3526	4157	// } else if (event.getSource() == textureButton)
..	..	@@ -4097,7 +4728,7 @@
4097	4728
4098	4729	try
4099	4730	{
4100		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4731	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4101	4732	}
4102	4733	catch (Exception e)
4103	4734	{
..	..	@@ -4574,6 +5205,12 @@
4574	5205
4575	5206	void EditSelection(boolean newWindow)
4576	5207	{
	5208	+ if (group.selection == null)
	5209	+ {
	5210	+ EditElement(group, newWindow); // ? new
	5211	+ return;
	5212	+ }
	5213	+
4577	5214	// aConstraints.gridy = 0;
4578	5215	for (int i=0; i<group.selection.size(); i++)
4579	5216	{
..	..	@@ -4584,12 +5221,7 @@
4584	5221	Object3D elem = (Object3D)group.selection.elementAt(i);
4585	5222	if(elem != group \|\| !newWindow)
4586	5223	{
4587		- // if (!(elem instanceof Composite))
4588		- // newWindow = false;
4589		- listUI.add(elem);
4590		- elem.openEditWindow(this, newWindow); //, false);
4591		- System.out.println("edit : " + elem);
4592		- elem.editWindow.refreshContents(true); // ? new
	5224	+ EditElement(elem, newWindow); // ? new
4593	5225	}
4594	5226	}
4595	5227	}
..	..	@@ -4652,9 +5284,7 @@
4652	5284
4653	5285	freezemodel = false;
4654	5286	}
4655		-
4656		- boolean flashIt = true;
4657		-
	5287	+
4658	5288	public void valueChanged(TreeSelectionEvent e)
4659	5289	//public boolean handleEvent(Event event)
4660	5290	{
..	..	@@ -4727,13 +5357,30 @@
4727	5357	{
4728	5358	editButton.setEnabled(enabled);
4729	5359	uneditButton.setEnabled(enabled);
4730		- unselectButton.setEnabled(enabled);
	5360	+ //unselectButton.setEnabled(enabled);
4731	5361	flashSelectionButton.setEnabled(enabled);
	5362	+
	5363	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5364	+
	5365	+ boolean allComposites = true;
	5366	+
	5367	+ if (group.selection != null)
	5368	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5369	+ {
	5370	+ Object next = e.nextElement();
	5371	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5372	+ {
	5373	+ allComposites = false;
	5374	+ break;
	5375	+ }
	5376	+ }
	5377	+
	5378	+ rootButton.setEnabled(allComposites);
4732	5379	}
4733	5380
4734	5381	void refreshContents(boolean cp)
4735	5382	{
4736		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	5383	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4737	5384	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4738	5385	{
4739	5386	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4743,7 +5390,7 @@
4743	5390	Object3D child = (Object3D) group.selection.get(i);
4744	5391
4745	5392	objEditor.AddInfo(child, this, true);
4746		- System.err.println("info : " + child.GetPath());
	5393	+// System.err.println("info : " + child.GetPath());
4747	5394	}
4748	5395
4749	5396	objEditor.SetText(); // jan 2014
..	..	@@ -4833,8 +5480,8 @@
4833	5480
4834	5481	if (cut)
4835	5482	{
4836		- if (Globals.SAVEONMAKE)
4837		- Save();
	5483	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5484	+// Save();
4838	5485	//int indices[] = jList.getSelectedIndices();
4839	5486	//for (int i = indices.length - 1; i >= 0; i--)
4840	5487	//jList.remove(indices[i]);
..	..	@@ -4937,6 +5584,10 @@
4937	5584
4938	5585	void paste(boolean expand)
4939	5586	{
	5587	+ if (Globals.REPLACEONMAKE)
	5588	+ Save();
	5589	+ boolean keep = Globals.REPLACEONMAKE;
	5590	+ Globals.REPLACEONMAKE = false;
4940	5591	// if (GrafreeD.clipboard == null)
4941	5592	// return;
4942	5593	boolean first = true;
..	..	@@ -4996,6 +5647,7 @@
4996	5647	Grafreed.clipboard.get(0).parent = keepparent;
4997	5648	}
4998	5649
	5650	+ Globals.REPLACEONMAKE = keep;
4999	5651	ResetModel();
5000	5652	refreshContents();
5001	5653	}
..	..	@@ -5131,6 +5783,10 @@
5131	5783
5132	5784	void group(Object3D csg, boolean grab)
5133	5785	{
	5786	+ if (Globals.REPLACEONMAKE)
	5787	+ Save();
	5788	+ boolean keep = Globals.REPLACEONMAKE;
	5789	+ Globals.REPLACEONMAKE = false;
5134	5790	if (//false) // why??
5135	5791	!group.selection.isEmpty())
5136	5792	{
..	..	@@ -5244,10 +5900,15 @@
5244	5900	//node.add(csg);
5245	5901	//makeSomething(node);
5246	5902	makeSomething(csg);
	5903	+ Globals.REPLACEONMAKE = keep;
5247	5904	}
5248	5905
5249	5906	void Ungroup(Object3D g)
5250	5907	{
	5908	+ if (Globals.REPLACEONMAKE)
	5909	+ Save();
	5910	+ boolean keep = Globals.REPLACEONMAKE;
	5911	+ Globals.REPLACEONMAKE = false;
5251	5912	if (g instanceof HiddenObject)
5252	5913	{
5253	5914	HiddenObject h = (HiddenObject) g;
..	..	@@ -5264,6 +5925,7 @@
5264	5925	objEditor.makeSomething(g.get(i), false);
5265	5926	}
5266	5927	}
	5928	+ Globals.REPLACEONMAKE = keep;
5267	5929	}
5268	5930
5269	5931	void ungroup()
..	..	@@ -5554,7 +6216,6 @@
5554	6216
5555	6217	cButton restoreCameraButton;
5556	6218
5557		- cButton saveButton;
5558	6219	cButton oneStepButton;
5559	6220
5560	6221	cButton groupButton;
..	..	@@ -5563,6 +6224,22 @@
5563	6224	cButton switchButton;
5564	6225	cButton loopButton;
5565	6226	cButton textureButton;
	6227	+
	6228	+ cButton skybox1Button;
	6229	+ cButton skybox2Button;
	6230	+ cButton skybox3Button;
	6231	+ cButton skybox4Button;
	6232	+ cButton skybox5Button;
	6233	+ cButton skybox6Button;
	6234	+ cButton skybox7Button;
	6235	+
	6236	+ cButton skybox11Button;
	6237	+ cButton skybox12Button;
	6238	+ cButton skybox13Button;
	6239	+ cButton skybox14Button;
	6240	+ cButton skybox15Button;
	6241	+ cButton skybox16Button;
	6242	+ cButton skybox17Button;
5566	6243
5567	6244	cButton gridButton;
5568	6245	cButton boxButton;
..	..	@@ -5596,11 +6273,11 @@
5596	6273	private MenuItem lookAtItem;
5597	6274	private MenuItem lookFromItem;
5598	6275	private MenuItem switchViewItem;
5599		- private MenuItem cutItem;
	6276	+ private JMenuItem cutItem;
5600	6277	private MenuItem undoItem;
5601	6278	private MenuItem redoItem;
5602	6279	private JMenuItem duplicateItem;
5603		- private MenuItem cloneItem;
	6280	+ private JMenuItem cloneItem;
5604	6281	private MenuItem cloneSupportItem;
5605	6282	private MenuItem overwriteGeoItem;
5606	6283	private MenuItem overwriteMatItem;
..	..	@@ -5621,13 +6298,13 @@
5621	6298	private MenuItem cloneGeometriesItem;
5622	6299	private MenuItem shareGeometriesItem;
5623	6300	private MenuItem mergeGeometriesItem;
5624		- private MenuItem copyItem;
	6301	+ private JMenuItem copyItem;
5625	6302	private MenuItem pasteItem;
5626		- private MenuItem pasteIntoItem;
5627		- private MenuItem pasteLinkItem;
5628		- private MenuItem pasteCloneItem;
5629		- private MenuItem pasteExpandItem;
5630		- private MenuItem clearItem;
	6303	+ private JMenuItem pasteIntoItem;
	6304	+ private JMenuItem pasteLinkItem;
	6305	+ private JMenuItem pasteCloneItem;
	6306	+ private JMenuItem pasteExpandItem;
	6307	+ private JMenuItem deleteItem;
5631	6308	private MenuItem clearAllItem;
5632	6309	private MenuItem genUVItem;
5633	6310	private MenuItem genNormalsMESHItem;
..	..	@@ -5682,7 +6359,7 @@
5682	6359	private MenuItem transformGeometryItem;
5683	6360	private MenuItem transformChildrenItem;
5684	6361	private MenuItem hideItem;
5685		- private MenuItem grabItem;
	6362	+ private JMenuItem grabItem;
5686	6363	private MenuItem backItem;
5687	6364	private MenuItem frontItem;
5688	6365	private MenuItem cameraItem;
..	..	@@ -5695,7 +6372,7 @@
5695	6372	private MenuItem switchTransfoItem;
5696	6373	private MenuItem morphItem;
5697	6374	private MenuItem linkerItem;
5698		- private MenuItem ungroupItem;
	6375	+ private JMenuItem ungroupItem;
5699	6376	private MenuItem editItem;
5700	6377	private MenuItem openWindowItem;
5701	6378	private MenuItem editLeafItem;
..	..	@@ -5711,6 +6388,8 @@
5711	6388	private MenuItem attachBumpItem;
5712	6389	private MenuItem detachBumpItem;
5713	6390	private MenuItem pigmentBumpItem;
	6391	+ private MenuItem embedTexturesItem;
	6392	+ private MenuItem deEmbedTexturesItem;
5714	6393
5715	6394	private MenuItem particleItem;
5716	6395	private MenuItem ragdollItem;