~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", !Globals.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, !Globals.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(JTabbedPane.LEFT);
	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,16 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ assert(false);
	419	+
	420	+// if (copy.versionlist == null)
	421	+// {
	422	+// copy.versionlist = new Object3D[100];
	423	+// copy.versionindex = -1;
	424	+//
	425	+// //Save(true);
	426	+// }
	427	+
63	428	if(ui)
64	429	SetupUI(objEditor);
65	430	}
..	..	@@ -80,14 +445,22 @@
80	445	SetupViews(objEditor);
81	446
82	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	448	+
	449	+// if (copy.versionlist == null)
	450	+// {
	451	+// copy.versionlist = new Object3D[100];
	452	+// copy.versionindex = -1;
	453	+//
	454	+// //Save(true);
	455	+// }
83	456	}
84	457
85	458	void CloneSelection(boolean supports)
86	459	{
87		- if (Globals.SAVEONMAKE)
	460	+ if (Globals.REPLACEONMAKE)
88	461	Save();
89		- boolean keep = Globals.SAVEONMAKE;
90		- Globals.SAVEONMAKE = false;
	462	+ boolean keep = Globals.REPLACEONMAKE;
	463	+ Globals.REPLACEONMAKE = false;
91	464	// Object3D keep = GrafreeD.clipboard;
92	465	//Object3D obj;
93	466	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -98,7 +471,7 @@
98	471
99	472	makeSomething(clone, i==group.selection.size()-1);
100	473	}
101		- Globals.SAVEONMAKE = keep;
	474	+ Globals.REPLACEONMAKE = keep;
102	475	}
103	476
104	477	void CloneClipboard(boolean supports)
..	..	@@ -169,33 +542,35 @@
169	542	// menu.add("-");
170	543	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
171	544	duplicateItem.addActionListener(this);
172		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
173	547	cloneItem.addActionListener(this);
174		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
175	549	{
176	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
177	551	cloneSupportItem.addActionListener(this);
178	552	}
	553	+ oe.jTree.popup.addSeparator();
179	554	menu.add("-");
180		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
181	556	cutItem.addActionListener(this);
182		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
183	558	copyItem.addActionListener(this);
184	559	pasteItem = menu.add(new MenuItem("Paste"));
185	560	pasteItem.addActionListener(this);
186	561
187		- menu.add("-");
188		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
189	565	pasteIntoItem.addActionListener(this);
190		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
191	567	pasteLinkItem.addActionListener(this);
192		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
193	569	pasteCloneItem.addActionListener(this);
194		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
195	571	// pasteExpandItem.addActionListener(this);
196		- menu.add("-");
197		- clearItem = menu.add(new MenuItem("Clear"));
198		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
199	574
200	575	if (Globals.ADVANCED)
201	576	{
..	..	@@ -281,11 +656,9 @@
281	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
282	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
283	658	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
284		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
285	659	oe.cameraMenu.add("-");
286	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
287	661	openWindowItem.addActionListener(this);
288		- editLeafItem.addActionListener(this);
289	662	lookAtItem.addActionListener(this);
290	663	//lookFromItem.addActinoListener(this);
291	664	//switchViewItem.addActionListener(this);
..	..	@@ -332,9 +705,8 @@
332	705	setMasterItem.addActionListener(this);
333	706	}
334	707
335		- oe.menuBar.add(menu = new Menu("Group"));
336		-// grabItem = menu.add(new MenuItem("Grab"));
337		-// grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
338	710	backItem = menu.add(new MenuItem("Back"));
339	711	backItem.addActionListener(this);
340	712	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -342,13 +714,21 @@
342	714	// compositeItem = menu.add(new MenuItem("Composite"));
343	715	// compositeItem.addActionListener(this);
344	716
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
345	720	if (Globals.ADVANCED)
346	721	{
347	722	hideItem = menu.add(new MenuItem("Hidden Group"));
348	723	hideItem.addActionListener(this);
349	724	}
350		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
351	726	ungroupItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
352	732
353	733	// menu.add("-");
354	734	//
..	..	@@ -421,7 +801,7 @@
421	801	genNormalsMESHItem.addActionListener(this);
422	802	if (Globals.ADVANCED)
423	803	{
424		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	804	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
425	805	genNormalsMINEItem.addActionListener(this);
426	806	}
427	807	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -455,6 +835,8 @@
455	835	}
456	836
457	837	oe.menuBar.add(menu = new Menu("Attributes"));
	838	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	839	+ clearVersionsItem.addActionListener(this);
458	840	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
459	841	clearMaterialsItem.addActionListener(this);
460	842	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -477,9 +859,9 @@
477	859	hideleavesItem.addActionListener(this);
478	860	showleavesItem = menu.add(new MenuItem("Show Leaves"));
479	861	showleavesItem.addActionListener(this);
480		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	862	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
481	863	markleavesItem.addActionListener(this);
482		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	864	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
483	865	unmarkleavesItem.addActionListener(this);
484	866	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
485	867	rewindleavesItem.addActionListener(this);
..	..	@@ -514,10 +896,15 @@
514	896	attachBumpItem.addActionListener(this);
515	897	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
516	898	pigmentBumpItem.addActionListener(this);
	899	+ //embedTexturesItem
517	900	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
518	901	detachPigmentItem.addActionListener(this);
519	902	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
520	903	detachBumpItem.addActionListener(this);
	904	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	905	+ embedTexturesItem.addActionListener(this);
	906	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	907	+ deEmbedTexturesItem.addActionListener(this);
521	908	menu.add("-");
522	909	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
523	910	sortbysizeItem.addActionListener(this);
..	..	@@ -528,6 +915,9 @@
528	915	shareGeometriesItem.addActionListener(this);
529	916	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
530	917	mergeGeometriesItem.addActionListener(this);
	918	+ menu.add("-");
	919	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	920	+ editLeafItem.addActionListener(this);
531	921	if (Globals.ADVANCED)
532	922	{
533	923	// Pretty much the same as duplicate and clone.
..	..	@@ -544,6 +934,80 @@
544	934	buildToolsMenu(menu);
545	935	}
546	936
	937	+ JTabbedPane resourcecontainer;
	938	+ cGridBag currenttab;
	939	+ //boolean added; // patch for jar
	940	+
	941	+ int totalcount = 0;
	942	+
	943	+ int tabcount = 0;
	944	+ int colcount = 0;
	945	+ int rowcount = 0;
	946	+ int texturecount = 0;
	947	+
	948	+ int columns = 5;
	949	+ int rows = 7;
	950	+
	951	+ public void ResourceCallBack(String[] path)
	952	+ {
	953	+// for (int i = 0; i < path.length; i++)
	954	+// System.out.print(path[i] + "/");
	955	+// System.out.println();
	956	+
	957	+ if (//rowcount == 0 \|\|
	958	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	959	+ {
	960	+ currenttab = new cGridBag();
	961	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	962	+ currenttab.setName(tabname);
	963	+ //added = false;
	964	+ resourcecontainer.add(currenttab);
	965	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	966	+ rowcount = 1;
	967	+ colcount = 0;
	968	+ texturecount = 0;
	969	+ }
	970	+
	971	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	972	+ {
	973	+ //if (!added)
	974	+ {
	975	+ //added = true;
	976	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	977	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	978	+ }
	979	+
	980	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	981	+ totalcount++;
	982	+
	983	+ if (++colcount >= columns)
	984	+ {
	985	+ colcount = 0;
	986	+ currenttab.Return();
	987	+
	988	+ if (rowcount++ >= rows)
	989	+ {
	990	+ rowcount = 0;
	991	+ }
	992	+ }
	993	+ }
	994	+ else
	995	+ {
	996	+// if (!path[path.length-1].equals("icons"))
	997	+// resourcecontainer.Return();
	998	+ }
	999	+ }
	1000	+
	1001	+ void CreateTexturePanel(cGridBag container)
	1002	+ {
	1003	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1004	+ container.add(resourcecontainer);
	1005	+
	1006	+ Grafreed.ParseResources("textures", this);
	1007	+
	1008	+ // 935. System.out.println("Total = " + totalcount);
	1009	+ }
	1010	+
547	1011	void SetupUI2(ObjEditor oe)
548	1012	{
549	1013	// June 2019
..	..	@@ -561,11 +1025,6 @@
561	1025	//new Exception().printStackTrace();
562	1026
563	1027	oe.radioPanel = new JPanel(new GridBagLayout());
564		- oe.aConstraints.weightx = 1;
565		- oe.aConstraints.weighty = 0;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridwidth = 100;
568		- oe.aConstraints.gridheight = 1;
569	1028	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
570	1029
571	1030	oe.buttonGroup = new ButtonGroup();
..	..	@@ -586,9 +1045,9 @@
586	1045	oe.radioPanel.add(dummyButton);
587	1046	oe.buttonGroup.add(dummyButton);
588	1047	*/
589		- cGridBag copyOptionsPanel = new cGridBag();
	1048	+ cGridBag versionManagerPanel = new cGridBag();
590	1049
591		- copyOptionsPanel.preferredHeight = 1;
	1050	+ versionManagerPanel.preferredHeight = 4;
592	1051
593	1052	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
594	1053
..	..	@@ -598,46 +1057,103 @@
598	1057
599	1058	if (Globals.ADVANCED)
600	1059	{
601		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602		- maxButton.setToolTipText("Maximize window");
603		- maxButton.addActionListener(this);
	1060	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+// maxButton.setToolTipText("Maximize window");
	1062	+// maxButton.addActionListener(this);
604	1063	}
605	1064
606		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+ cButton gcButton;
	1066	+
	1067	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+// gcButton.setToolTipText("Garbage collect");
	1069	+// gcButton.addActionListener(new ActionListener()
	1070	+// {
	1071	+// public void actionPerformed(ActionEvent e)
	1072	+// {
	1073	+// System.gc();
	1074	+// }
	1075	+// });
	1076	+
	1077	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1078	+ collapseButton.setToolTipText("Collapse toolbar");
	1079	+ collapseButton.addActionListener(this);
	1080	+
	1081	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1083	+ maximize3DButton.addActionListener(this);
	1084	+
	1085	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1086	+ twoButton.setToolTipText("Show 3D view only");
	1087	+ twoButton.addActionListener(this);
	1088	+ this.fullscreenLayout = twoButton;
	1089	+
	1090	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1091	+ threeButton.setToolTipText("Show controls and 3D view");
	1092	+ threeButton.addActionListener(this);
	1093	+ if (Globals.ADVANCED)
	1094	+ {
	1095	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1096	+ sixButton.setToolTipText("Show 3D view and controls");
	1097	+ sixButton.addActionListener(this);
	1098	+ }
	1099	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+// sevenButton.setToolTipText("3-column layout");
	1101	+// sevenButton.addActionListener(this);
	1102	+ //
	1103	+
	1104	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
607	1105	fullButton.setToolTipText("Full-screen window");
608	1106	fullButton.addActionListener(this);
609	1107
610		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
611	1109	screenfitButton.setToolTipText("Screen fit");
612	1110	screenfitButton.addActionListener(this);
613	1111
614		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
615	1113	restoreCameraButton.setToolTipText("Restore viewpoint");
616	1114	restoreCameraButton.addActionListener(this);
617	1115
618		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
619		- undoButton.setToolTipText("Undo changes");
620		- undoButton.addActionListener(this);
621		- undoButton.setEnabled(false);
	1116	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ saveVersionButton.setToolTipText("Duplicate current version");
	1118	+ saveVersionButton.addActionListener(this);
	1119	+
	1120	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1121	+ deleteVersionButton.setToolTipText("Delete current version");
	1122	+ deleteVersionButton.addActionListener(this);
	1123	+ deleteVersionButton.setEnabled(false);
	1124	+
	1125	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ previousVersionButton.setToolTipText("Previous version");
	1127	+ previousVersionButton.addActionListener(this);
	1128	+ previousVersionButton.setEnabled(false);
622	1129
623		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- redoButton.setToolTipText("Redo changes");
625		- redoButton.addActionListener(this);
626		- redoButton.setEnabled(false);
	1130	+ cGridBag updown = new cGridBag().setVertical(true);
	1131	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1132	+ restoreButton.setToolTipText("Undo (restore current version)");
	1133	+ restoreButton.addActionListener(this);
	1134	+ restoreButton.setEnabled(false);
627	1135
628		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- saveButton.setToolTipText("Save changes");
630		- saveButton.addActionListener(this);
	1136	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ replaceButton.setToolTipText("Save (replace current version)");
	1138	+ replaceButton.addActionListener(this);
	1139	+ replaceButton.setEnabled(false);
631	1140
632		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
633		- liveCB.setToolTipText("Enable animation");
634		- liveCB.addItemListener(this);
635		-
636		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1141	+ versionManagerPanel.add(updown);
	1142	+
	1143	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ nextVersionButton.setToolTipText("Next version");
	1145	+ nextVersionButton.addActionListener(this);
	1146	+ nextVersionButton.setEnabled(false);
	1147	+
	1148	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
637	1149	oneStepButton.setToolTipText("Animate one step forward");
638	1150	oneStepButton.addActionListener(this);
639	1151
640		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1152	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1153	+ liveCB.setToolTipText("Enable animation");
	1154	+ liveCB.addItemListener(this);
	1155	+
	1156	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
641	1157	fastCB.setToolTipText("Fast mode");
642	1158	fastCB.addItemListener(this);
643	1159
..	..	@@ -652,142 +1168,137 @@
652	1168
653	1169	if (Globals.ADVANCED)
654	1170	{
655		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1171	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
656	1172	snapobjectButton.addActionListener(this);
657	1173	snapobjectButton.setToolTipText("Snap Object");
	1174	+
	1175	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1176	+ fourButton.addActionListener(this);
	1177	+ fourButton.setToolTipText("Show control panel only");
658	1178	}
659	1179
660	1180	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
661	1181
662		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
663		- twoButton.setToolTipText("Show center view only");
664		- twoButton.addActionListener(this);
665		- this.fullscreenLayout = twoButton;
666		-
667		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668		- fourButton.addActionListener(this);
669		- fourButton.setToolTipText("Show left panel only");
670		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- sixButton.setToolTipText("2-column layout left");
672		- sixButton.addActionListener(this);
673		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674		- threeButton.setToolTipText("2-column layout right");
675		- threeButton.addActionListener(this);
676		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
677		- sevenButton.setToolTipText("3-column layout");
678		- sevenButton.addActionListener(this);
679		- //
680	1182
681		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682		- rootButton.setToolTipText("Edit selection in new tab");
	1183	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ rootButton.setToolTipText("Open selection in new tab");
683	1185	rootButton.addActionListener(this);
684	1186
685		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
686	1188	closeButton.setToolTipText("Close tab");
687	1189	closeButton.addActionListener(this);
688	1190	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
689	1191	//clearButton.addActionListener(this);
690	1192
	1193	+ cGridBag row1 = new cGridBag();
	1194	+
691	1195	// INSERT
692		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
693		- gridButton.setToolTipText("Create grid");
	1196	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ gridButton.setToolTipText("Create ground");
694	1198	gridButton.addActionListener(this);
695	1199
696		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1200	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
697	1201	boxButton.setToolTipText("Create box");
698	1202	boxButton.addActionListener(this);
699	1203
700		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
701		- sphereButton.setToolTipText("Create sphere");
702		- sphereButton.addActionListener(this);
703		-
704		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
705		- coneButton.setToolTipText("Create cone");
706		- coneButton.addActionListener(this);
707		-
708		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
709		- torusButton.setToolTipText("Create torus");
710		- torusButton.addActionListener(this);
711		-
712		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
713	1205	superButton.setToolTipText("Create superellipsoid");
714	1206	superButton.addActionListener(this);
715	1207
	1208	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1209	+ sphereButton.setToolTipText("Create sphere");
	1210	+ sphereButton.addActionListener(this);
	1211	+
	1212	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1213	+ coneButton.setToolTipText("Create cone");
	1214	+ coneButton.addActionListener(this);
	1215	+
	1216	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1217	+ torusButton.setToolTipText("Create torus");
	1218	+ torusButton.addActionListener(this);
	1219	+
716	1220	if (Globals.ADVANCED)
717	1221	{
718		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1222	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
719	1223	kleinButton.setToolTipText("Create Klein bottle");
720	1224	kleinButton.addActionListener(this);
721	1225	}
722	1226
723		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
724	1228	particlesButton.setToolTipText("Create particle system");
725	1229	particlesButton.addActionListener(this);
726	1230
727		- oe.toolboxPanel.Return();
	1231	+ oe.toolboxPanel.add(row1);
728	1232
729		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ cGridBag row2 = new cGridBag();
	1234	+
	1235	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
730	1236	groupButton.setToolTipText("Create group");
731	1237	groupButton.addActionListener(this);
732	1238
733		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1239	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
734	1240	compositeButton.setToolTipText("Create composite");
735	1241	compositeButton.addActionListener(this);
736	1242
737		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1243	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
738	1244	switchButton.setToolTipText("Create item switcher");
739	1245	switchButton.addActionListener(this);
740	1246
741		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1247	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
742	1248	loopButton.setToolTipText("Create loop");
743	1249	loopButton.addActionListener(this);
744	1250
745		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1251	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
746	1252	textureButton.setToolTipText("Create texture");
747	1253	textureButton.addActionListener(this);
748	1254
749		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1255	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
750	1256	overlayButton.setToolTipText("Create overlay");
751	1257	overlayButton.addActionListener(this);
752	1258
753		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1259	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
754	1260	lightButton.setToolTipText("Create light");
755	1261	lightButton.addActionListener(this);
756	1262
757		- for (int i=6; --i>=0;)
758		- {
759		- oe.toolboxPanel.Return();
760		- oe.toolboxPanel.add(new cGridBag());
761		- oe.toolboxPanel.add(new cGridBag());
762		- oe.toolboxPanel.add(new cGridBag());
763		- oe.toolboxPanel.add(new cGridBag());
764		- oe.toolboxPanel.add(new cGridBag());
765		- oe.toolboxPanel.add(new cGridBag());
766		- oe.toolboxPanel.add(new cGridBag());
767		- }
	1263	+ oe.toolboxPanel.add(row2);
	1264	+
	1265	+ cGridBag textures = new cGridBag();
	1266	+
	1267	+ CreateTexturePanel(textures);
	1268	+
	1269	+ int tabCount = resourcecontainer.getTabCount();
	1270	+
	1271	+ if (tabCount > 0)
	1272	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1273	+
	1274	+ oe.toolboxPanel.add(textures);
	1275	+
	1276	+ textures.preferredHeight = 100;
	1277	+
	1278	+ CreateSkyboxPanel(oe.skyboxPanel);
768	1279
769	1280	// EDIT panel
770		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1281	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
771	1282	editButton.setToolTipText("Pin selection controls");
772	1283	editButton.addActionListener(this);
773	1284
774		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
775		- uneditButton.setToolTipText("Remove selection controls");
	1285	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1286	+ uneditButton.setToolTipText("Unpin and remove selection controls");
776	1287	uneditButton.addActionListener(this);
777	1288
778	1289	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
779		- allParamsButton.setToolTipText("Show all controle");
	1290	+ allParamsButton.setToolTipText("Show all controls");
780	1291	allParamsButton.addActionListener(this);
781	1292
782		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
783		- clearPanelButton.setToolTipText("Clear edit panel");
	1293	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1294	+ clearPanelButton.setToolTipText("Clear all controls");
784	1295	clearPanelButton.addActionListener(this);
785	1296
786		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
787		- unselectButton.setToolTipText("Unselect");
788		- unselectButton.addActionListener(this);
	1297	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1298	+ //unselectButton.setToolTipText("Unselect");
	1299	+ //unselectButton.addActionListener(this);
789	1300
790		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1301	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
791	1302	flashSelectionButton.setToolTipText("Highlight selection");
792	1303	flashSelectionButton.addActionListener(this);
793	1304
..	..	@@ -810,6 +1321,8 @@
810	1321
811	1322	cGridBag jSPPanel = new cGridBag();
812	1323
	1324	+ jSPPanel.preferredHeight = 20;
	1325	+
813	1326	JScrollPane jSP;
814	1327	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
815	1328	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -818,11 +1331,14 @@
818	1331	oe.treePanel.add(jSPPanel);
819	1332	oe.treePanel.Return();
820	1333
821		- oe.treePanel.add(copyOptionsPanel);
	1334	+ oe.treePanel.add(versionManagerPanel);
822	1335	oe.treePanel.Return();
	1336	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1337	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1338	+ versionSliderPane.preferredHeight = 3;
823	1339
824		-// mainPanel.setDividerLocation(0.5); //1.0);
825		-// mainPanel.setResizeWeight(0.5);
	1340	+// mainPanel.setDividerLocation(0.1); //1.0);
	1341	+ mainPanel.setResizeWeight(0.4);
826	1342
827	1343	//jList.addListSelectionListener(this);
828	1344	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -830,7 +1346,7 @@
830	1346	//jTree.setEditable(true);
831	1347	oe.jTree.setDragEnabled(true);
832	1348	//jTree.setPreferredSize(new Dimension(10,10));
833		- jSP.setPreferredSize(new Dimension(100,200));
	1349	+ //jSP.setPreferredSize(new Dimension(100,200));
834	1350
835	1351	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
836	1352
..	..	@@ -842,7 +1358,7 @@
842	1358	dgr.addDragGestureListener(this);
843	1359	}catch(Exception e) {}
844	1360	*/
845		- radio.layout = sevenButton;
	1361	+ radio.layout = threeButton; // sixButton;
846	1362	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
847	1363	}
848	1364
..	..	@@ -893,9 +1409,12 @@
893	1409	smoothCB.setToolTipText("Snapping delay");
894	1410	smoothCB.addItemListener(this);
895	1411
896		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
897		- slowCB.setToolTipText("Smooth interpolation");
898		- slowCB.addItemListener(this);
	1412	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1413	+// slowCB.setToolTipText("Smooth interpolation");
	1414	+// slowCB.addItemListener(this);
	1415	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1416	+ minshaderCB.setToolTipText("Minimal fast shader");
	1417	+ minshaderCB.addItemListener(this);
899	1418
900	1419	// constraints.gridy += 1;
901	1420	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -945,9 +1464,9 @@
945	1464	toggleSwitchCB.setToolTipText("Choose a single item");
946	1465	toggleSwitchCB.addItemListener(this);
947	1466
948		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
949		- autosaveCB.setToolTipText("On structure change");
950		- autosaveCB.addItemListener(this);
	1467	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1468	+ autokeepCB.setToolTipText("On structure change");
	1469	+ autokeepCB.addItemListener(this);
951	1470
952	1471	panel.Return();
953	1472	if (Globals.ADVANCED)
..	..	@@ -974,6 +1493,14 @@
974	1493
975	1494	void EditObject(Object3D obj)
976	1495	{
	1496	+ assert(obj instanceof Composite);
	1497	+
	1498	+// if (obj.versionlist == null)
	1499	+// {
	1500	+// obj.versionlist = new Object3D[100];
	1501	+// obj.versionindex = -1;
	1502	+// }
	1503	+
977	1504	cRadio radioButton = new cRadio(obj.name);
978	1505
979	1506	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -984,7 +1511,7 @@
984	1511	}
985	1512
986	1513	radioButton.SetObject(obj);
987		- radioButton.layout = sevenButton;
	1514	+ radioButton.layout = threeButton; // sixButton;
988	1515	radioButton.SetCamera(cameraView.renderCamera, false);
989	1516	radioButton.addActionListener(this);
990	1517	radioPanel.add(radioButton);
..	..	@@ -998,6 +1525,7 @@
998	1525
999	1526	oe.SetupViews();
1000	1527
	1528	+ if (Globals.DEBUG)
1001	1529	System.out.println("SetupViews");
1002	1530	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1003	1531	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1009,6 +1537,8 @@
1009	1537	cCheckBox localCB;
1010	1538	cCheckBox crowdCB;
1011	1539	cCheckBox smoothCB;
	1540	+ cCheckBox minshaderCB;
	1541	+
1012	1542	cToggleButton fastCB;
1013	1543	cCheckBox slowCB;
1014	1544	cCheckBox boxCB;
..	..	@@ -1024,7 +1554,7 @@
1024	1554
1025	1555	cCheckBox oeilCB;
1026	1556	cCheckBox shadowCB;
1027		- cCheckBox autosaveCB;
	1557	+ cCheckBox autokeepCB;
1028	1558	cCheckBox lookAtCB;
1029	1559
1030	1560	// static int COLOR = 1;
..	..	@@ -1079,6 +1609,12 @@
1079	1609	{
1080	1610	cameraView.ToggleInertia();
1081	1611	cameraView.repaint();
	1612	+ }
	1613	+ else if(e.getSource() == minshaderCB)
	1614	+ {
	1615	+ Globals.MINSHADER ^= true;
	1616	+ cameraView.programInitialized = false;
	1617	+ cameraView.repaint();
1082	1618	}
1083	1619	else if(e.getSource() == localCB)
1084	1620	{
..	..	@@ -1136,9 +1672,9 @@
1136	1672	{
1137	1673	Globals.FREEZEONMOVE ^= true;
1138	1674	}
1139		- else if(e.getSource() == autosaveCB)
	1675	+ else if(e.getSource() == autokeepCB)
1140	1676	{
1141		- Globals.SAVEONMAKE ^= true;
	1677	+ Globals.REPLACEONMAKE ^= true;
1142	1678	}
1143	1679	else if(e.getSource() == lookAtCB)
1144	1680	{
..	..	@@ -1356,7 +1892,12 @@
1356	1892	TreePath path;
1357	1893
1358	1894	public TransferableTreePath(TreePath tp) {
1359		- path = tp;
	1895	+ Object[] objs = new Object[tp.getPathCount()];
	1896	+ for (int i=0; i<objs.length; i++)
	1897	+ {
	1898	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1899	+ }
	1900	+ path = new TreePath(objs);
1360	1901	}
1361	1902
1362	1903	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1588,24 +2129,24 @@
1588	2129	switch(axis)
1589	2130	{
1590	2131	case 0 :
1591		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1592		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1593		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1594		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2132	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2133	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2134	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2135	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1595	2136	norm = cVector.X;
1596	2137	break;
1597	2138	case 1 :
1598		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1599		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1600		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1601		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2139	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2140	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2141	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2142	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1602	2143	norm = cVector.Y;
1603	2144	break;
1604	2145	case 2 :
1605		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1606		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1607		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1608		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2146	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2147	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2148	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2149	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1609	2150	norm = cVector.Z;
1610	2151	break;
1611	2152	}
..	..	@@ -1646,7 +2187,11 @@
1646	2187	shadow.material = new cMaterial(obj.material);
1647	2188	shadow.material.diffuse = 0.0001f;
1648	2189	shadow.material.specular = 0.0001f;
1649		- //shadow.projectedVertices[1].x = 300;
	2190	+ shadow.material.opacity = 0.75f;
	2191	+
	2192	+ AllocProjectedVertices(shadow);
	2193	+
	2194	+ shadow.projectedVertices[1].x = 300;
1650	2195
1651	2196	makeSomething(shadow);
1652	2197	}
..	..	@@ -1663,6 +2208,16 @@
1663	2208	listUI.remove(i);
1664	2209	}
1665	2210	}
	2211	+ }
	2212	+
	2213	+ private void EditElement(Object3D elem, boolean newWindow)
	2214	+ {
	2215	+ // if (!(elem instanceof Composite))
	2216	+ // newWindow = false;
	2217	+ listUI.add(elem);
	2218	+ elem.openEditWindow(this, newWindow); //, false);
	2219	+ System.out.println("edit : " + elem);
	2220	+ elem.editWindow.refreshContents(true); // ? new
1666	2221	}
1667	2222
1668	2223	/**
..	..	@@ -2092,6 +2647,23 @@
2092	2647	{
2093	2648	makeSomething(new Light());
2094	2649	} else
	2650	+// if (source == skybox1Button \|\|
	2651	+// source == skybox2Button \|\|
	2652	+// source == skybox3Button \|\|
	2653	+// source == skybox4Button \|\|
	2654	+// source == skybox5Button \|\|
	2655	+// source == skybox6Button \|\|
	2656	+// source == skybox7Button \|\|
	2657	+// source == skybox11Button \|\|
	2658	+// source == skybox12Button \|\|
	2659	+// source == skybox13Button \|\|
	2660	+// source == skybox14Button \|\|
	2661	+// source == skybox15Button \|\|
	2662	+// source == skybox16Button \|\|
	2663	+// source == skybox17Button)
	2664	+// {
	2665	+// ChangeSkybox(source);
	2666	+// } else
2095	2667	if (source == csgItem)
2096	2668	{
2097	2669	group(new CSG());
..	..	@@ -2140,27 +2712,35 @@
2140	2712	} else
2141	2713	if (source == loopItem \|\| source == loopButton)
2142	2714	{
	2715	+ if (!group.selection.isEmpty())
	2716	+ {
2143	2717	Composite csg = new GroupLeaf();
2144	2718	csg.count = 5;
2145		- group(csg);
2146	2719	Composite child = new cGroup("Branch");
2147	2720	csg.addChild(child);
2148	2721	child.addChild(csg);
	2722	+ group(csg);
	2723	+ }
2149	2724	} else
2150	2725	if (source == doubleItem)
2151	2726	{
	2727	+ if (!group.selection.isEmpty())
	2728	+ {
2152	2729	Composite csg = new GroupLeaf("Fork");
2153	2730	csg.count = 5;
2154		- group(csg);
2155	2731	Composite child = new cGroup("Branch A");
2156	2732	csg.addChild(child);
2157	2733	child.addChild(csg);
2158	2734	child = new cGroup("Branch B");
2159	2735	csg.addChild(child);
2160	2736	child.addChild(csg);
	2737	+ group(csg);
	2738	+ }
2161	2739	} else
2162	2740	if (source == tripleItem)
2163	2741	{
	2742	+ if (!group.selection.isEmpty())
	2743	+ {
2164	2744	Composite csg = new GroupLeaf("Trident");
2165	2745	csg.count = 4;
2166	2746	group(csg);
..	..	@@ -2173,11 +2753,12 @@
2173	2753	child = new cGroup();
2174	2754	csg.addChild(child);
2175	2755	child.addChild(csg);
	2756	+ }
2176	2757	} else
2177	2758	if (source == computeAOItem)
2178	2759	{
2179	2760	Globals.drawMode = CameraPane.OCCLUSION;
2180		- Globals.theRenderer.repaint();
	2761	+ cameraView.repaint();
2181	2762	} else
2182	2763	if (source == recompileItem)
2183	2764	{
..	..	@@ -2192,7 +2773,7 @@
2192	2773	if (source == invariantsItem)
2193	2774	{
2194	2775	System.out.println("Invariants:");
2195		- Grafreed.grafreeD.universe.invariants();
	2776	+ Grafreed.grafreed.universe.invariants();
2196	2777	} else
2197	2778	if (source == memoryItem)
2198	2779	{
..	..	@@ -2223,19 +2804,52 @@
2223	2804	{
2224	2805	ToggleFullScreen();
2225	2806	} else
2226		- if (source == undoButton)
	2807	+ if (source == collapseButton)
2227	2808	{
2228		- if (!Undo())
2229		- java.awt.Toolkit.getDefaultToolkit().beep();
	2809	+ this.expandedLayout = radio.layout;
	2810	+ CollapseToolbar();
2230	2811	} else
2231		- if (source == redoButton)
	2812	+ if (source == maximize3DButton)
2232	2813	{
2233		- Redo();
	2814	+ this.expandedLayout = radio.layout;
	2815	+ radio.layout = twoButton;
	2816	+ Show3DView();
	2817	+ CollapseToolbar();
2234	2818	} else
2235		- if (source == saveButton)
	2819	+ if (source == previousVersionButton)
2236	2820	{
	2821	+ // Go to previous version
	2822	+ //if (!Undo())
	2823	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2824	+ PreviousVersion();
	2825	+ } else
	2826	+ if (source == restoreButton)
	2827	+ {
	2828	+ // Restore current version
	2829	+ Restore();
	2830	+ //restoreButton.setEnabled(false);
	2831	+ } else
	2832	+ if (source == replaceButton)
	2833	+ {
	2834	+ // Overwrite current version
	2835	+ Replace();
	2836	+ //replaceButton.setEnabled(false);
	2837	+ } else
	2838	+ if (source == nextVersionButton)
	2839	+ {
	2840	+ // Go to next version
	2841	+ NextVersion();
	2842	+ } else
	2843	+ if (source == saveVersionButton)
	2844	+ {
	2845	+ // Save a new version
2237	2846	if (!Save(true))
2238	2847	java.awt.Toolkit.getDefaultToolkit().beep();
	2848	+ } else
	2849	+ if (source == deleteVersionButton)
	2850	+ {
	2851	+ // Delete a new version
	2852	+ DeleteVersion();
2239	2853	} else
2240	2854	if (source == oneStepButton)
2241	2855	{
..	..	@@ -2290,11 +2904,11 @@
2290	2904	} else
2291	2905	if (source == undoItem)
2292	2906	{
2293		- Undo();
	2907	+ PreviousVersion();
2294	2908	} else
2295	2909	if (source == redoItem)
2296	2910	{
2297		- Redo();
	2911	+ NextVersion();
2298	2912	} else
2299	2913	if (source == duplicateItem)
2300	2914	{
..	..	@@ -2615,7 +3229,7 @@
2615	3229	{
2616	3230	StepAll();
2617	3231	} else
2618		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3232	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2619	3233	{
2620	3234	//int indices[] = jList.getSelectedIndices();
2621	3235	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2775,22 +3389,34 @@
2775	3389	} else
2776	3390	if (source == ungroupItem \|\| source == ungroupButton)
2777	3391	{
2778		- boolean hasRoot = false;
	3392	+ boolean canUngroup = true;
2779	3393
2780	3394	for (int i=0; i<group.selection.size(); i++)
2781	3395	{
2782		- if (group.selection.get(i) == group)
	3396	+ Object3D selectedItem = group.selection.get(i);
	3397	+
	3398	+ if (selectedItem.Size() == 0)
2783	3399	{
2784		- hasRoot = true;
	3400	+ // Cannot ungroup leaves
	3401	+ canUngroup = false;
	3402	+ break;
	3403	+ }
	3404	+
	3405	+ if (selectedItem == group)
	3406	+ {
	3407	+ // Cannot ungroup root
	3408	+ canUngroup = false;
2785	3409	break;
2786	3410	}
2787	3411	}
2788	3412
2789		- if (!hasRoot)
	3413	+ if (canUngroup)
2790	3414	{
2791	3415	for (int i=0; i<group.selection.size(); i++)
2792	3416	{
2793		- Ungroup(group.selection.get(i));
	3417	+ Object3D selectedItem = group.selection.get(i);
	3418	+
	3419	+ Ungroup(selectedItem);
2794	3420	}
2795	3421
2796	3422	ClearSelection(false);
..	..	@@ -2841,6 +3467,10 @@
2841	3467	if (source == clearMaterialsItem)
2842	3468	{
2843	3469	ClearMaterials();
	3470	+ } else
	3471	+ if (source == clearVersionsItem)
	3472	+ {
	3473	+ ClearVersions();
2844	3474	} else
2845	3475	if (source == liveleavesItem)
2846	3476	{
..	..	@@ -3097,7 +3727,7 @@
3097	3727	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3098	3728	{
3099	3729	obj = (Object3D)e.nextElement();
3100		- obj.SetBumpTexture(null);
	3730	+ obj.ResetBumpTexture();
3101	3731	}
3102	3732
3103	3733	refreshContents();
..	..	@@ -3111,6 +3741,31 @@
3111	3741	obj.SetBumpTexture(obj.GetPigmentTexture());
3112	3742	}
3113	3743
	3744	+ refreshContents();
	3745	+ } else
	3746	+ if (source == embedTexturesItem)
	3747	+ {
	3748	+ Object3D obj;
	3749	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3750	+ {
	3751	+ obj = (Object3D)e.nextElement();
	3752	+ obj.EmbedTextures(true);
	3753	+ }
	3754	+
	3755	+ refreshContents();
	3756	+ } else
	3757	+ if (source == deEmbedTexturesItem)
	3758	+ {
	3759	+ Object3D obj;
	3760	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3761	+ {
	3762	+ obj = (Object3D)e.nextElement();
	3763	+ obj.EmbedTextures(false);
	3764	+ }
	3765	+
	3766	+ CameraPane.texturepigment.clear();
	3767	+ CameraPane.texturebump.clear();
	3768	+
3114	3769	refreshContents();
3115	3770	} else
3116	3771	if (source == flashSelectionButton)
..	..	@@ -3128,38 +3783,7 @@
3128	3783	if (CameraPane.FULLSCREEN)
3129	3784	fullscreenLayout = radio.layout;
3130	3785
3131		- // bug
3132		- //gridPanel.setDividerLocation(1.0);
3133		- //bigPanel.setDividerLocation(0.0);
3134		-// bigThree.remove(scenePanel);
3135		-// bigThree.remove(centralPanel);
3136		-// bigThree.remove(XYZPanel);
3137		-// aWindowConstraints.gridx = 0;
3138		-// aWindowConstraints.gridy = 0;
3139		-// aWindowConstraints.gridwidth = 1;
3140		-// // aConstraints.gridheight = 3;
3141		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3142		-// aWindowConstraints.weightx = 0;
3143		-// aWindowConstraints.weighty = 1;
3144		-// //bigThree.add(jtp, aWindowConstraints);
3145		-// aWindowConstraints.weightx = 1;
3146		-// aWindowConstraints.gridwidth = 3;
3147		-// // aConstraints.gridheight = 3;
3148		-// aWindowConstraints.gridx = 1;
3149		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3150		-// bigThree.add(centralPanel, aWindowConstraints);
3151		-// aWindowConstraints.weightx = 0;
3152		-// aWindowConstraints.gridx = 4;
3153		-// aWindowConstraints.gridwidth = 1;
3154		-// // aConstraints.gridheight = 3;
3155		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3156		-// //bigThree.add(XYZPanel, aWindowConstraints);
3157		-// scenePanel.setVisible(false);
3158		-// centralPanel.setVisible(true);
3159		-// XYZPanel.setVisible(false);
3160		- bigThree.ClearUI();
3161		- bigThree.add(centralPanel);
3162		- bigThree.FlushUI();
	3786	+ Show3DView();
3163	3787
3164	3788	cameraView.requestFocusInWindow();
3165	3789
..	..	@@ -3214,8 +3838,8 @@
3214	3838	// centralPanel.setVisible(true);
3215	3839	// XYZPanel.setVisible(true);
3216	3840	bigThree.ClearUI();
	3841	+ bigThree.add(scenePanel);
3217	3842	bigThree.add(centralPanel);
3218		- bigThree.add(XYZPanel);
3219	3843	bigThree.FlushUI();
3220	3844
3221	3845	cameraView.requestFocusInWindow();
..	..	@@ -3295,8 +3919,8 @@
3295	3919	// centralPanel.setVisible(true);
3296	3920	// XYZPanel.setVisible(false);
3297	3921	bigThree.ClearUI();
3298		- bigThree.add(scenePanel);
3299	3922	bigThree.add(centralPanel);
	3923	+ bigThree.add(scenePanel);
3300	3924	bigThree.FlushUI();
3301	3925
3302	3926	cameraView.requestFocusInWindow();
..	..	@@ -3345,6 +3969,7 @@
3345	3969	} else
3346	3970	if (source == rootButton)
3347	3971	{
	3972	+ Replace();
3348	3973	Object3D obj;
3349	3974	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3350	3975	{
..	..	@@ -3359,6 +3984,8 @@
3359	3984	if (source == closeButton)
3360	3985	{
3361	3986	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3987	+ Replace();
	3988	+
3362	3989	cRadio ab;
3363	3990	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3364	3991	{
..	..	@@ -3402,10 +4029,10 @@
3402	4029	{
3403	4030	Object3D child = (Object3D)e.nextElement();
3404	4031	if(child.editWindow != null)
3405		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3406	4032	child.pinned = false;
3407	4033	child.CloseUI();
3408	4034	listUI.remove(child);
	4035	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3409	4036
3410	4037	//child.editWindow = null; // ???????????
3411	4038	}
..	..	@@ -3424,6 +4051,7 @@
3424	4051	obj.CloseUI();
3425	4052	}
3426	4053	listUI.clear();
	4054	+ SetPinStates(group.selection.size() > 0);
3427	4055	refreshContents(true);
3428	4056	} else
3429	4057	if (source == allParamsButton)
..	..	@@ -3456,6 +4084,8 @@
3456	4084	} else
3457	4085	if(source instanceof cRadio)
3458	4086	{
	4087	+ Replace();
	4088	+
3459	4089	group.parent = keepparent;
3460	4090	group.attributes = 0;
3461	4091	//group.editWindow = null;
..	..	@@ -3479,6 +4109,7 @@
3479	4109	}
3480	4110
3481	4111	copy = group;
	4112	+
3482	4113	//Globals.theRenderer.object = group;
3483	4114	if(!useclient)
3484	4115	{
..	..	@@ -3506,9 +4137,37 @@
3506	4137	*/
3507	4138	radio.layout.doClick();
3508	4139
	4140	+ assert(copy instanceof Composite);
	4141	+
	4142	+ if (copy.versionlist == null)
	4143	+ {
	4144	+ copy.versionindex = -1;
	4145	+
	4146	+ // Cannot work with loops
	4147	+ // To fix this issue, we first mark all nodes above the root,
	4148	+ // and check if any of these nodes are reachable below the root.
	4149	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4150	+
	4151	+ if (copy.versionlist == null && !copy.HasTags())
	4152	+ {
	4153	+ copy.versionlist = new Object3D[100];
	4154	+
	4155	+ //Save(true);
	4156	+ }
	4157	+ else
	4158	+ copy.versionindex = -2;
	4159	+
	4160	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4161	+ }
	4162	+
	4163	+ SetVersionStates();
	4164	+
3509	4165	ClearUnpinned();
3510		- SetPinStates(group.selection.size() > 0);
3511		- if (group.selection.size() == 1)
	4166	+
	4167	+ //Grafreed.Assert(group != null);
	4168	+ //Grafreed.Assert(group.selection != null);
	4169	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4170	+ if (group.selection == null \|\| group.selection.size() == 1)
3512	4171	EditSelection(false);
3513	4172	keepparent = group.parent;
3514	4173	// PARENT = NULL or not???
..	..	@@ -3521,11 +4180,13 @@
3521	4180	} else if (event.getSource() == editCameraItem)
3522	4181	{
3523	4182	cameraView.ProtectCamera();
	4183	+ cameraView.requestFocusInWindow();
3524	4184	cameraView.repaint();
3525	4185	return;
3526	4186	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3527	4187	{
3528	4188	cameraView.RevertCamera();
	4189	+ cameraView.requestFocusInWindow();
3529	4190	cameraView.repaint();
3530	4191	return;
3531	4192	// } else if (event.getSource() == textureButton)
..	..	@@ -3644,7 +4305,7 @@
3644	4305	TouchTransform(obj);
3645	4306	continue;
3646	4307	}
3647		- if ((mask&2) != 0) // Scale
	4308	+ if ((mask&2) != 0) // Scale/rotation
3648	4309	{
3649	4310	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3650	4311	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3652,10 +4313,6 @@
3652	4313	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3653	4314	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3654	4315	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3655		- }
3656		- if ((mask&4) != 0) // Rotation
3657		- {
3658		- // ?
3659	4316	}
3660	4317	if ((mask&1) != 0) // Translation
3661	4318	{
..	..	@@ -4102,7 +4759,7 @@
4102	4759
4103	4760	try
4104	4761	{
4105		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4762	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4106	4763	}
4107	4764	catch (Exception e)
4108	4765	{
..	..	@@ -4464,6 +5121,12 @@
4464	5121	refreshContents();
4465	5122	}
4466	5123
	5124	+ void ClearVersions()
	5125	+ {
	5126	+ group.selection.ClearVersions();
	5127	+ refreshContents();
	5128	+ }
	5129	+
4467	5130	void FlipV(boolean flip)
4468	5131	{
4469	5132	group.selection.FlipV(flip);
..	..	@@ -4579,6 +5242,12 @@
4579	5242
4580	5243	void EditSelection(boolean newWindow)
4581	5244	{
	5245	+ if (group.selection == null)
	5246	+ {
	5247	+ EditElement(group, newWindow); // ? new
	5248	+ return;
	5249	+ }
	5250	+
4582	5251	// aConstraints.gridy = 0;
4583	5252	for (int i=0; i<group.selection.size(); i++)
4584	5253	{
..	..	@@ -4589,12 +5258,7 @@
4589	5258	Object3D elem = (Object3D)group.selection.elementAt(i);
4590	5259	if(elem != group \|\| !newWindow)
4591	5260	{
4592		- // if (!(elem instanceof Composite))
4593		- // newWindow = false;
4594		- listUI.add(elem);
4595		- elem.openEditWindow(this, newWindow); //, false);
4596		- System.out.println("edit : " + elem);
4597		- elem.editWindow.refreshContents(true); // ? new
	5261	+ EditElement(elem, newWindow); // ? new
4598	5262	}
4599	5263	}
4600	5264	}
..	..	@@ -4657,9 +5321,7 @@
4657	5321
4658	5322	freezemodel = false;
4659	5323	}
4660		-
4661		- boolean flashIt = true;
4662		-
	5324	+
4663	5325	public void valueChanged(TreeSelectionEvent e)
4664	5326	//public boolean handleEvent(Event event)
4665	5327	{
..	..	@@ -4732,13 +5394,31 @@
4732	5394	{
4733	5395	editButton.setEnabled(enabled);
4734	5396	uneditButton.setEnabled(enabled);
4735		- unselectButton.setEnabled(enabled);
	5397	+ //unselectButton.setEnabled(enabled);
4736	5398	flashSelectionButton.setEnabled(enabled);
	5399	+
	5400	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5401	+
	5402	+ boolean allComposites = true;
	5403	+
	5404	+ if (group.selection != null)
	5405	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5406	+ {
	5407	+ Object next = e.nextElement();
	5408	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5409	+ {
	5410	+ allComposites = false;
	5411	+ break;
	5412	+ }
	5413	+ }
	5414	+
	5415	+ rootButton.setEnabled(allComposites);
4737	5416	}
4738	5417
4739	5418	void refreshContents(boolean cp)
4740	5419	{
4741		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	5420	+ if (Globals.ADVANCED)
	5421	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4742	5422	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4743	5423	{
4744	5424	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4748,7 +5428,7 @@
4748	5428	Object3D child = (Object3D) group.selection.get(i);
4749	5429
4750	5430	objEditor.AddInfo(child, this, true);
4751		- System.err.println("info : " + child.GetPath());
	5431	+// System.err.println("info : " + child.GetPath());
4752	5432	}
4753	5433
4754	5434	objEditor.SetText(); // jan 2014
..	..	@@ -4942,10 +5622,10 @@
4942	5622
4943	5623	void paste(boolean expand)
4944	5624	{
4945		- if (Globals.SAVEONMAKE)
	5625	+ if (Globals.REPLACEONMAKE)
4946	5626	Save();
4947		- boolean keep = Globals.SAVEONMAKE;
4948		- Globals.SAVEONMAKE = false;
	5627	+ boolean keep = Globals.REPLACEONMAKE;
	5628	+ Globals.REPLACEONMAKE = false;
4949	5629	// if (GrafreeD.clipboard == null)
4950	5630	// return;
4951	5631	boolean first = true;
..	..	@@ -5005,7 +5685,7 @@
5005	5685	Grafreed.clipboard.get(0).parent = keepparent;
5006	5686	}
5007	5687
5008		- Globals.SAVEONMAKE = keep;
	5688	+ Globals.REPLACEONMAKE = keep;
5009	5689	ResetModel();
5010	5690	refreshContents();
5011	5691	}
..	..	@@ -5141,10 +5821,10 @@
5141	5821
5142	5822	void group(Object3D csg, boolean grab)
5143	5823	{
5144		- if (Globals.SAVEONMAKE)
	5824	+ if (Globals.REPLACEONMAKE)
5145	5825	Save();
5146		- boolean keep = Globals.SAVEONMAKE;
5147		- Globals.SAVEONMAKE = false;
	5826	+ boolean keep = Globals.REPLACEONMAKE;
	5827	+ Globals.REPLACEONMAKE = false;
5148	5828	if (//false) // why??
5149	5829	!group.selection.isEmpty())
5150	5830	{
..	..	@@ -5258,15 +5938,15 @@
5258	5938	//node.add(csg);
5259	5939	//makeSomething(node);
5260	5940	makeSomething(csg);
5261		- Globals.SAVEONMAKE = keep;
	5941	+ Globals.REPLACEONMAKE = keep;
5262	5942	}
5263	5943
5264	5944	void Ungroup(Object3D g)
5265	5945	{
5266		- if (Globals.SAVEONMAKE)
	5946	+ if (Globals.REPLACEONMAKE)
5267	5947	Save();
5268		- boolean keep = Globals.SAVEONMAKE;
5269		- Globals.SAVEONMAKE = false;
	5948	+ boolean keep = Globals.REPLACEONMAKE;
	5949	+ Globals.REPLACEONMAKE = false;
5270	5950	if (g instanceof HiddenObject)
5271	5951	{
5272	5952	HiddenObject h = (HiddenObject) g;
..	..	@@ -5283,7 +5963,7 @@
5283	5963	objEditor.makeSomething(g.get(i), false);
5284	5964	}
5285	5965	}
5286		- Globals.SAVEONMAKE = keep;
	5966	+ Globals.REPLACEONMAKE = keep;
5287	5967	}
5288	5968
5289	5969	void ungroup()
..	..	@@ -5574,7 +6254,6 @@
5574	6254
5575	6255	cButton restoreCameraButton;
5576	6256
5577		- cButton saveButton;
5578	6257	cButton oneStepButton;
5579	6258
5580	6259	cButton groupButton;
..	..	@@ -5583,6 +6262,22 @@
5583	6262	cButton switchButton;
5584	6263	cButton loopButton;
5585	6264	cButton textureButton;
	6265	+
	6266	+ cButton skybox1Button;
	6267	+ cButton skybox2Button;
	6268	+ cButton skybox3Button;
	6269	+ cButton skybox4Button;
	6270	+ cButton skybox5Button;
	6271	+ cButton skybox6Button;
	6272	+ cButton skybox7Button;
	6273	+
	6274	+ cButton skybox11Button;
	6275	+ cButton skybox12Button;
	6276	+ cButton skybox13Button;
	6277	+ cButton skybox14Button;
	6278	+ cButton skybox15Button;
	6279	+ cButton skybox16Button;
	6280	+ cButton skybox17Button;
5586	6281
5587	6282	cButton gridButton;
5588	6283	cButton boxButton;
..	..	@@ -5616,11 +6311,11 @@
5616	6311	private MenuItem lookAtItem;
5617	6312	private MenuItem lookFromItem;
5618	6313	private MenuItem switchViewItem;
5619		- private MenuItem cutItem;
	6314	+ private JMenuItem cutItem;
5620	6315	private MenuItem undoItem;
5621	6316	private MenuItem redoItem;
5622	6317	private JMenuItem duplicateItem;
5623		- private MenuItem cloneItem;
	6318	+ private JMenuItem cloneItem;
5624	6319	private MenuItem cloneSupportItem;
5625	6320	private MenuItem overwriteGeoItem;
5626	6321	private MenuItem overwriteMatItem;
..	..	@@ -5641,13 +6336,13 @@
5641	6336	private MenuItem cloneGeometriesItem;
5642	6337	private MenuItem shareGeometriesItem;
5643	6338	private MenuItem mergeGeometriesItem;
5644		- private MenuItem copyItem;
	6339	+ private JMenuItem copyItem;
5645	6340	private MenuItem pasteItem;
5646		- private MenuItem pasteIntoItem;
5647		- private MenuItem pasteLinkItem;
5648		- private MenuItem pasteCloneItem;
5649		- private MenuItem pasteExpandItem;
5650		- private MenuItem clearItem;
	6341	+ private JMenuItem pasteIntoItem;
	6342	+ private JMenuItem pasteLinkItem;
	6343	+ private JMenuItem pasteCloneItem;
	6344	+ private JMenuItem pasteExpandItem;
	6345	+ private JMenuItem deleteItem;
5651	6346	private MenuItem clearAllItem;
5652	6347	private MenuItem genUVItem;
5653	6348	private MenuItem genNormalsMESHItem;
..	..	@@ -5673,6 +6368,7 @@
5673	6368	private MenuItem clipMeshItem;
5674	6369	private MenuItem smoothMeshItem;
5675	6370	private MenuItem clearMaterialsItem;
	6371	+ private MenuItem clearVersionsItem;
5676	6372
5677	6373	private MenuItem liveleavesItem;
5678	6374	private MenuItem unliveleavesItem;
..	..	@@ -5702,7 +6398,7 @@
5702	6398	private MenuItem transformGeometryItem;
5703	6399	private MenuItem transformChildrenItem;
5704	6400	private MenuItem hideItem;
5705		- private MenuItem grabItem;
	6401	+ private JMenuItem grabItem;
5706	6402	private MenuItem backItem;
5707	6403	private MenuItem frontItem;
5708	6404	private MenuItem cameraItem;
..	..	@@ -5715,7 +6411,7 @@
5715	6411	private MenuItem switchTransfoItem;
5716	6412	private MenuItem morphItem;
5717	6413	private MenuItem linkerItem;
5718		- private MenuItem ungroupItem;
	6414	+ private JMenuItem ungroupItem;
5719	6415	private MenuItem editItem;
5720	6416	private MenuItem openWindowItem;
5721	6417	private MenuItem editLeafItem;
..	..	@@ -5731,6 +6427,8 @@
5731	6427	private MenuItem attachBumpItem;
5732	6428	private MenuItem detachBumpItem;
5733	6429	private MenuItem pigmentBumpItem;
	6430	+ private MenuItem embedTexturesItem;
	6431	+ private MenuItem deEmbedTexturesItem;
5734	6432
5735	6433	private MenuItem particleItem;
5736	6434	private MenuItem ragdollItem;