~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	{
..	..	@@ -220,7 +598,7 @@
220	598	// toggleSwitchItem.addItemListener(this);
221	599	// toggleSwitchItem.setState(CameraPane.SWITCH);
222	600
223		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	601	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	602	toggleHandleItem.addItemListener(this);
225	603	toggleHandleItem.setState(CameraPane.HANDLES);
226	604
..	..	@@ -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,13 +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);
	768	+
383	769	if (Globals.ADVANCED)
384	770	{
385	771	menu.add("-");
386	772	linkerItem = menu.add(new MenuItem("Linker"));
387	773	linkerItem.addActionListener(this);
388		- attributeItem = menu.add(new MenuItem("Attribute"));
389		- attributeItem.addActionListener(this);
390	774	templateItem = menu.add(new MenuItem("Template"));
391	775	templateItem.addActionListener(this);
392	776	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -415,7 +799,7 @@
415	799	genNormalsMESHItem.addActionListener(this);
416	800	if (Globals.ADVANCED)
417	801	{
418		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	802	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419	803	genNormalsMINEItem.addActionListener(this);
420	804	}
421	805	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -508,10 +892,15 @@
508	892	attachBumpItem.addActionListener(this);
509	893	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
510	894	pigmentBumpItem.addActionListener(this);
	895	+ //embedTexturesItem
511	896	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
512	897	detachPigmentItem.addActionListener(this);
513	898	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
514	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);
515	904	menu.add("-");
516	905	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
517	906	sortbysizeItem.addActionListener(this);
..	..	@@ -522,6 +911,9 @@
522	911	shareGeometriesItem.addActionListener(this);
523	912	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
524	913	mergeGeometriesItem.addActionListener(this);
	914	+ menu.add("-");
	915	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	916	+ editLeafItem.addActionListener(this);
525	917	if (Globals.ADVANCED)
526	918	{
527	919	// Pretty much the same as duplicate and clone.
..	..	@@ -538,6 +930,75 @@
538	930	buildToolsMenu(menu);
539	931	}
540	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	+
541	1002	void SetupUI2(ObjEditor oe)
542	1003	{
543	1004	// June 2019
..	..	@@ -555,11 +1016,6 @@
555	1016	//new Exception().printStackTrace();
556	1017
557	1018	oe.radioPanel = new JPanel(new GridBagLayout());
558		- oe.aConstraints.weightx = 1;
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
561		- oe.aConstraints.gridwidth = 100;
562		- oe.aConstraints.gridheight = 1;
563	1019	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
564	1020
565	1021	oe.buttonGroup = new ButtonGroup();
..	..	@@ -590,50 +1046,109 @@
590	1046	//minButton.setToolTipText("Minimize window");
591	1047	//minButton.addActionListener(this);
592	1048
593		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- maxButton.setToolTipText("Maximize window");
595		- maxButton.addActionListener(this);
	1049	+ if (Globals.ADVANCED)
	1050	+ {
	1051	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1052	+// maxButton.setToolTipText("Maximize window");
	1053	+// maxButton.addActionListener(this);
	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	+ //
596	1094
597	1095	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598	1096	fullButton.setToolTipText("Full-screen window");
599	1097	fullButton.addActionListener(this);
600	1098
	1099	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ screenfitButton.setToolTipText("Screen fit");
	1101	+ screenfitButton.addActionListener(this);
	1102	+
601	1103	oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	1104	restoreCameraButton.setToolTipText("Restore viewpoint");
603	1105	restoreCameraButton.addActionListener(this);
604	1106
605		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606		- undoButton.setToolTipText("Undo changes");
607		- undoButton.addActionListener(this);
608		- undoButton.setEnabled(false);
	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);
609	1119
610		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611		- redoButton.setToolTipText("Redo changes");
612		- redoButton.addActionListener(this);
613		- redoButton.setEnabled(false);
	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);
614	1125
615		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616		- saveButton.setToolTipText("Save changes");
617		- 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);
618	1130
619		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
620		- liveCB.setToolTipText("Enable animation");
621		- liveCB.addItemListener(this);
622		-
623		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	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);
624	1139	oneStepButton.setToolTipText("Animate one step forward");
625	1140	oneStepButton.addActionListener(this);
626	1141
627		- 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);
628	1147	fastCB.setToolTipText("Fast mode");
629	1148	fastCB.addItemListener(this);
630	1149
631	1150	//oe.toolboxPanel.Return();
632	1151
633		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- screenfitButton.setToolTipText("Screen fit");
635		- screenfitButton.addActionListener(this);
636		-
637	1152	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
638	1153	// trackCB.setToolTipText("Enable tracking");
639	1154	// trackCB.addItemListener(this);
..	..	@@ -646,31 +1161,17 @@
646	1161	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647	1162	snapobjectButton.addActionListener(this);
648	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");
649	1168	}
650	1169
651	1170	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
652	1171
653		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654		- twoButton.setToolTipText("Show center view only");
655		- twoButton.addActionListener(this);
656		- this.fullscreenLayout = twoButton;
657		-
658		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
659		- fourButton.addActionListener(this);
660		- fourButton.setToolTipText("Show left panel only");
661		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662		- sixButton.setToolTipText("2-column layout left");
663		- sixButton.addActionListener(this);
664		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
665		- threeButton.setToolTipText("2-column layout right");
666		- threeButton.addActionListener(this);
667		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668		- sevenButton.setToolTipText("3-column layout");
669		- sevenButton.addActionListener(this);
670		- //
671	1172
672		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
673		- 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");
674	1175	rootButton.addActionListener(this);
675	1176
676	1177	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -679,30 +1180,32 @@
679	1180	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
680	1181	//clearButton.addActionListener(this);
681	1182
	1183	+ cGridBag row1 = new cGridBag();
	1184	+
682	1185	// INSERT
683		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684		- gridButton.setToolTipText("Create grid");
	1186	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ gridButton.setToolTipText("Create ground");
685	1188	gridButton.addActionListener(this);
686	1189
687		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688	1191	boxButton.setToolTipText("Create box");
689	1192	boxButton.addActionListener(this);
690	1193
691		- 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);
692	1199	sphereButton.setToolTipText("Create sphere");
693	1200	sphereButton.addActionListener(this);
694	1201
695		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696	1203	coneButton.setToolTipText("Create cone");
697	1204	coneButton.addActionListener(this);
698	1205
699		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700	1207	torusButton.setToolTipText("Create torus");
701	1208	torusButton.addActionListener(this);
702		-
703		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
704		- superButton.setToolTipText("Create superellipsoid");
705		- superButton.addActionListener(this);
706	1209
707	1210	if (Globals.ADVANCED)
708	1211	{
..	..	@@ -711,72 +1214,74 @@
711	1214	kleinButton.addActionListener(this);
712	1215	}
713	1216
714		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1217	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
715	1218	particlesButton.setToolTipText("Create particle system");
716	1219	particlesButton.addActionListener(this);
717	1220
718		- oe.toolboxPanel.Return();
	1221	+ oe.toolboxPanel.add(row1);
719	1222
720		- 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);
721	1226	groupButton.setToolTipText("Create group");
722	1227	groupButton.addActionListener(this);
723	1228
724		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
725	1230	compositeButton.setToolTipText("Create composite");
726	1231	compositeButton.addActionListener(this);
727	1232
728		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
729		- switchButton.setToolTipText("Create switch");
	1233	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ switchButton.setToolTipText("Create item switcher");
730	1235	switchButton.addActionListener(this);
731	1236
732		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
733	1238	loopButton.setToolTipText("Create loop");
734	1239	loopButton.addActionListener(this);
735	1240
736		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
737	1242	textureButton.setToolTipText("Create texture");
738	1243	textureButton.addActionListener(this);
739	1244
740		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
741	1246	overlayButton.setToolTipText("Create overlay");
742	1247	overlayButton.addActionListener(this);
743	1248
744		- 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);
745	1250	lightButton.setToolTipText("Create light");
746	1251	lightButton.addActionListener(this);
747	1252
748		- for (int i=6; --i>=0;)
749		- {
750		- oe.toolboxPanel.Return();
751		- oe.toolboxPanel.add(new cGridBag());
752		- oe.toolboxPanel.add(new cGridBag());
753		- oe.toolboxPanel.add(new cGridBag());
754		- oe.toolboxPanel.add(new cGridBag());
755		- oe.toolboxPanel.add(new cGridBag());
756		- oe.toolboxPanel.add(new cGridBag());
757		- oe.toolboxPanel.add(new cGridBag());
758		- }
	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);
759	1264
760	1265	// EDIT panel
761		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
762		- editButton.setToolTipText("Edit selection");
	1266	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ editButton.setToolTipText("Pin selection controls");
763	1268	editButton.addActionListener(this);
764	1269
765		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
766		- uneditButton.setToolTipText("Unedit selection");
	1270	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1271	+ uneditButton.setToolTipText("Unpin and remove selection controls");
767	1272	uneditButton.addActionListener(this);
768	1273
769	1274	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
770		- allParamsButton.setToolTipText("Edit all params");
	1275	+ allParamsButton.setToolTipText("Show all controls");
771	1276	allParamsButton.addActionListener(this);
772	1277
773		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
774		- clearPanelButton.setToolTipText("Clear edit panel");
	1278	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ clearPanelButton.setToolTipText("Clear all controls");
775	1280	clearPanelButton.addActionListener(this);
776	1281
777		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
778		- unselectButton.setToolTipText("Unselect");
779		- unselectButton.addActionListener(this);
	1282	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ //unselectButton.setToolTipText("Unselect");
	1284	+ //unselectButton.addActionListener(this);
780	1285
781	1286	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
782	1287	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -784,6 +1289,7 @@
784	1289
785	1290	editCommandsPanel.preferredHeight = 1;
786	1291
	1292	+ SetPinStates(false);
787	1293	// oe.treePanel.add(commandsPanel);
788	1294	// oe.treePanel.Return();
789	1295
..	..	@@ -810,9 +1316,12 @@
810	1316
811	1317	oe.treePanel.add(copyOptionsPanel);
812	1318	oe.treePanel.Return();
	1319	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1320	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1321	+ sliderPane.preferredHeight = 1;
813	1322
814		-// mainPanel.setDividerLocation(0.5); //1.0);
815		-// mainPanel.setResizeWeight(0.5);
	1323	+// mainPanel.setDividerLocation(0.1); //1.0);
	1324	+ mainPanel.setResizeWeight(0.4);
816	1325
817	1326	//jList.addListSelectionListener(this);
818	1327	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -820,7 +1329,7 @@
820	1329	//jTree.setEditable(true);
821	1330	oe.jTree.setDragEnabled(true);
822	1331	//jTree.setPreferredSize(new Dimension(10,10));
823		- jSP.setPreferredSize(new Dimension(100,200));
	1332	+ //jSP.setPreferredSize(new Dimension(100,200));
824	1333
825	1334	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
826	1335
..	..	@@ -832,7 +1341,7 @@
832	1341	dgr.addDragGestureListener(this);
833	1342	}catch(Exception e) {}
834	1343	*/
835		- radio.layout = sevenButton;
	1344	+ radio.layout = threeButton; // sixButton;
836	1345	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
837	1346	}
838	1347
..	..	@@ -857,14 +1366,18 @@
857	1366	boxCB.addItemListener(this);
858	1367
859	1368	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
860		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1369	+ zoomBoxCB.setToolTipText("Display only for wheel");
861	1370	zoomBoxCB.addItemListener(this);
862	1371
863	1372	if (true) // Globals.ADVANCED)
864	1373	{
865		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
866		- supportCB.setToolTipText("Enable rigging");
867		- supportCB.addItemListener(this);
	1374	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1375	+// supportCB.setToolTipText("Enable rigging");
	1376	+// supportCB.addItemListener(this);
	1377	+
	1378	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1379	+ freezeCB.setToolTipText("Fast moving camera");
	1380	+ freezeCB.addItemListener(this);
868	1381
869	1382	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
870	1383	// localCB.addItemListener(this);
..	..	@@ -879,9 +1392,12 @@
879	1392	smoothCB.setToolTipText("Snapping delay");
880	1393	smoothCB.addItemListener(this);
881	1394
882		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
883		- slowCB.setToolTipText("Smooth interpolation");
884		- 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);
885	1401
886	1402	// constraints.gridy += 1;
887	1403	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -919,7 +1435,7 @@
919	1435	oeilCB.addItemListener(this);
920	1436
921	1437	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
922		- shadowCB.setToolTipText("Compute shadows when live");
	1438	+ shadowCB.setToolTipText("When live compute shadows");
923	1439	shadowCB.addItemListener(this);
924	1440
925	1441	panel.Return();
..	..	@@ -928,12 +1444,12 @@
928	1444	toggleTextureCB.addItemListener(this);
929	1445
930	1446	panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
931		- toggleSwitchCB.setToolTipText("Use switch");
	1447	+ toggleSwitchCB.setToolTipText("Choose a single item");
932	1448	toggleSwitchCB.addItemListener(this);
933	1449
934		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
935		- autosaveCB.setToolTipText("Auto-save on structure change");
936		- autosaveCB.addItemListener(this);
	1450	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1451	+ autokeepCB.setToolTipText("On structure change");
	1452	+ autokeepCB.addItemListener(this);
937	1453
938	1454	panel.Return();
939	1455	if (Globals.ADVANCED)
..	..	@@ -960,9 +1476,17 @@
960	1476
961	1477	void EditObject(Object3D obj)
962	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	+
963	1487	cRadio radioButton = new cRadio(obj.name);
964	1488
965		- // Patch to avoid bug with transparency.
	1489	+ // June 2019. Patch to avoid bug with transparency.
966	1490	radioButton.hadMaterial = obj.material != null;
967	1491	if (!radioButton.hadMaterial)
968	1492	{
..	..	@@ -970,7 +1494,7 @@
970	1494	}
971	1495
972	1496	radioButton.SetObject(obj);
973		- radioButton.layout = sevenButton;
	1497	+ radioButton.layout = threeButton; // sixButton;
974	1498	radioButton.SetCamera(cameraView.renderCamera, false);
975	1499	radioButton.addActionListener(this);
976	1500	radioPanel.add(radioButton);
..	..	@@ -984,6 +1508,7 @@
984	1508
985	1509	oe.SetupViews();
986	1510
	1511	+ if (Globals.DEBUG)
987	1512	System.out.println("SetupViews");
988	1513	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
989	1514	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -995,10 +1520,13 @@
995	1520	cCheckBox localCB;
996	1521	cCheckBox crowdCB;
997	1522	cCheckBox smoothCB;
	1523	+ cCheckBox minshaderCB;
	1524	+
998	1525	cToggleButton fastCB;
999	1526	cCheckBox slowCB;
1000	1527	cCheckBox boxCB;
1001	1528	cCheckBox zoomBoxCB;
	1529	+ cCheckBox freezeCB;
1002	1530	//cToggleButton trackCB;
1003	1531	cCheckBox trackCB;
1004	1532	cCheckBox smoothfocusCB;
..	..	@@ -1009,7 +1537,7 @@
1009	1537
1010	1538	cCheckBox oeilCB;
1011	1539	cCheckBox shadowCB;
1012		- cCheckBox autosaveCB;
	1540	+ cCheckBox autokeepCB;
1013	1541	cCheckBox lookAtCB;
1014	1542
1015	1543	// static int COLOR = 1;
..	..	@@ -1065,6 +1593,12 @@
1065	1593	cameraView.ToggleInertia();
1066	1594	cameraView.repaint();
1067	1595	}
	1596	+ else if(e.getSource() == minshaderCB)
	1597	+ {
	1598	+ Globals.MINSHADER ^= true;
	1599	+ cameraView.programInitialized = false;
	1600	+ cameraView.repaint();
	1601	+ }
1068	1602	else if(e.getSource() == localCB)
1069	1603	{
1070	1604	cameraView.ToggleLocal();
..	..	@@ -1117,9 +1651,13 @@
1117	1651	{
1118	1652	Globals.COMPUTESHADOWWHENLIVE ^= true;
1119	1653	}
1120		- else if(e.getSource() == autosaveCB)
	1654	+ else if(e.getSource() == freezeCB)
1121	1655	{
1122		- Globals.SAVEONMAKE ^= true;
	1656	+ Globals.FREEZEONMOVE ^= true;
	1657	+ }
	1658	+ else if(e.getSource() == autokeepCB)
	1659	+ {
	1660	+ Globals.REPLACEONMAKE ^= true;
1123	1661	}
1124	1662	else if(e.getSource() == lookAtCB)
1125	1663	{
..	..	@@ -1201,8 +1739,6 @@
1201	1739	}
1202	1740	}
1203	1741
1204		- String string = (String) object;
1205		-
1206	1742	System.out.println("Transfer = " + object + "; drop : " + target);
1207	1743	// if( object instanceof java.io.File[])
1208	1744	// {
..	..	@@ -1210,6 +1746,8 @@
1210	1746	// objEditor.DropFile((java.io.File[]) object, true);
1211	1747	// return;
1212	1748	// }
	1749	+
	1750	+ String string = object.toString();
1213	1751
1214	1752	// File path for Mac and Windows
1215	1753	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1337,7 +1875,12 @@
1337	1875	TreePath path;
1338	1876
1339	1877	public TransferableTreePath(TreePath tp) {
1340		- 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);
1341	1884	}
1342	1885
1343	1886	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1459,6 +2002,9 @@
1459	2002	animationItem.addItemListener(this);
1460	2003	animationItem.setState(Globals.ANIMATION);
1461	2004
	2005	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2006	+ archiveItem.addActionListener(this);
	2007	+
1462	2008	menu.add("-");
1463	2009	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1464	2010	parseverticesItem.addActionListener(this);
..	..	@@ -1471,6 +2017,8 @@
1471	2017	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1472	2018	reduce34MorphItem.addActionListener(this);
1473	2019	menu.add("-");
	2020	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2021	+ memoryItem.addActionListener(this);
1474	2022	menu.add(computeAOItem = new MenuItem("Compute AO"));
1475	2023	computeAOItem.addActionListener(this);
1476	2024
..	..	@@ -1479,8 +2027,6 @@
1479	2027	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1480	2028	mirrorItem.addActionListener(this);
1481	2029	menu.add("-");
1482		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1483		- memoryItem.addActionListener(this);
1484	2030	menu.add(analyzeItem = new MenuItem("Analyze"));
1485	2031	analyzeItem.addActionListener(this);
1486	2032	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1624,10 +2170,38 @@
1624	2170	shadow.material = new cMaterial(obj.material);
1625	2171	shadow.material.diffuse = 0.0001f;
1626	2172	shadow.material.specular = 0.0001f;
1627		- //shadow.projectedVertices[1].x = 300;
	2173	+ shadow.material.opacity = 0.75f;
	2174	+
	2175	+ AllocProjectedVertices(shadow);
	2176	+
	2177	+ shadow.projectedVertices[1].x = 300;
1628	2178
1629	2179	makeSomething(shadow);
1630	2180	}
	2181	+
	2182	+ private void ClearUnpinned()
	2183	+ {
	2184	+ //for (Object3D obj : listUI)
	2185	+ for (int i=listUI.size(); --i>=0;)
	2186	+ {
	2187	+ Object3D obj = listUI.elementAt(i);
	2188	+ if (!obj.pinned)
	2189	+ {
	2190	+ obj.CloseUI();
	2191	+ listUI.remove(i);
	2192	+ }
	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
	2204	+ }
1631	2205
1632	2206	/**
1633	2207	* applyExample
..	..	@@ -2056,6 +2630,23 @@
2056	2630	{
2057	2631	makeSomething(new Light());
2058	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
2059	2650	if (source == csgItem)
2060	2651	{
2061	2652	group(new CSG());
..	..	@@ -2104,28 +2695,36 @@
2104	2695	} else
2105	2696	if (source == loopItem \|\| source == loopButton)
2106	2697	{
	2698	+ if (!group.selection.isEmpty())
	2699	+ {
2107	2700	Composite csg = new GroupLeaf();
2108	2701	csg.count = 5;
2109		- group(csg);
2110		- Composite child = new cGroup();
	2702	+ Composite child = new cGroup("Branch");
2111	2703	csg.addChild(child);
2112	2704	child.addChild(csg);
	2705	+ group(csg);
	2706	+ }
2113	2707	} else
2114	2708	if (source == doubleItem)
2115	2709	{
2116		- Composite csg = new GroupLeaf();
	2710	+ if (!group.selection.isEmpty())
	2711	+ {
	2712	+ Composite csg = new GroupLeaf("Fork");
2117	2713	csg.count = 5;
	2714	+ Composite child = new cGroup("Branch A");
	2715	+ csg.addChild(child);
	2716	+ child.addChild(csg);
	2717	+ child = new cGroup("Branch B");
	2718	+ csg.addChild(child);
	2719	+ child.addChild(csg);
2118	2720	group(csg);
2119		- Composite child = new cGroup();
2120		- csg.addChild(child);
2121		- child.addChild(csg);
2122		- child = new cGroup();
2123		- csg.addChild(child);
2124		- child.addChild(csg);
	2721	+ }
2125	2722	} else
2126	2723	if (source == tripleItem)
2127	2724	{
2128		- Composite csg = new GroupLeaf();
	2725	+ if (!group.selection.isEmpty())
	2726	+ {
	2727	+ Composite csg = new GroupLeaf("Trident");
2129	2728	csg.count = 4;
2130	2729	group(csg);
2131	2730	Composite child = new cGroup();
..	..	@@ -2137,11 +2736,12 @@
2137	2736	child = new cGroup();
2138	2737	csg.addChild(child);
2139	2738	child.addChild(csg);
	2739	+ }
2140	2740	} else
2141	2741	if (source == computeAOItem)
2142	2742	{
2143	2743	Globals.drawMode = CameraPane.OCCLUSION;
2144		- Globals.theRenderer.repaint();
	2744	+ cameraView.repaint();
2145	2745	} else
2146	2746	if (source == recompileItem)
2147	2747	{
..	..	@@ -2156,7 +2756,7 @@
2156	2756	if (source == invariantsItem)
2157	2757	{
2158	2758	System.out.println("Invariants:");
2159		- Grafreed.grafreeD.universe.invariants();
	2759	+ Grafreed.grafreed.universe.invariants();
2160	2760	} else
2161	2761	if (source == memoryItem)
2162	2762	{
..	..	@@ -2187,17 +2787,52 @@
2187	2787	{
2188	2788	ToggleFullScreen();
2189	2789	} else
2190		- if (source == undoButton)
	2790	+ if (source == collapseButton)
2191	2791	{
2192		- Undo();
	2792	+ this.expandedLayout = radio.layout;
	2793	+ CollapseToolbar();
2193	2794	} else
2194		- if (source == redoButton)
	2795	+ if (source == maximize3DButton)
2195	2796	{
2196		- Redo();
	2797	+ this.expandedLayout = radio.layout;
	2798	+ radio.layout = twoButton;
	2799	+ Show3DView();
	2800	+ CollapseToolbar();
2197	2801	} else
2198		- if (source == saveButton)
	2802	+ if (source == previousVersionButton)
2199	2803	{
2200		- Save();
	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
	2829	+ if (!Save(true))
	2830	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2831	+ } else
	2832	+ if (source == deleteVersionButton)
	2833	+ {
	2834	+ // Delete a new version
	2835	+ DeleteVersion();
2201	2836	} else
2202	2837	if (source == oneStepButton)
2203	2838	{
..	..	@@ -2206,17 +2841,14 @@
2206	2841	} else
2207	2842	if (source == screenfitButton)
2208	2843	{
2209		- //Reload(lastConverter, lastFilename, true);
2210	2844	ScreenFit();
2211	2845	} else
2212	2846	if (source == screenfitpointButton)
2213	2847	{
2214		- //Reload(lastConverter, lastFilename, true);
2215	2848	ScreenFitPoint();
2216	2849	} else
2217	2850	if (source == snapobjectButton)
2218	2851	{
2219		- //Reload(lastConverter, lastFilename, true);
2220	2852	SnapObject();
2221	2853	} else
2222	2854	// if (event.getSource() == recompileButton)
..	..	@@ -2255,11 +2887,11 @@
2255	2887	} else
2256	2888	if (source == undoItem)
2257	2889	{
2258		- Undo();
	2890	+ PreviousVersion();
2259	2891	} else
2260	2892	if (source == redoItem)
2261	2893	{
2262		- Redo();
	2894	+ NextVersion();
2263	2895	} else
2264	2896	if (source == duplicateItem)
2265	2897	{
..	..	@@ -2580,7 +3212,7 @@
2580	3212	{
2581	3213	StepAll();
2582	3214	} else
2583		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3215	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2584	3216	{
2585	3217	//int indices[] = jList.getSelectedIndices();
2586	3218	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2740,15 +3372,40 @@
2740	3372	} else
2741	3373	if (source == ungroupItem \|\| source == ungroupButton)
2742	3374	{
2743		- //ungroup();
	3375	+ boolean canUngroup = true;
	3376	+
2744	3377	for (int i=0; i<group.selection.size(); i++)
2745	3378	{
2746		- Ungroup(group.selection.get(i));
	3379	+ Object3D selectedItem = group.selection.get(i);
	3380	+
	3381	+ if (selectedItem.Size() == 0)
	3382	+ {
	3383	+ // Cannot ungroup leaves
	3384	+ canUngroup = false;
	3385	+ break;
	3386	+ }
	3387	+
	3388	+ if (selectedItem == group)
	3389	+ {
	3390	+ // Cannot ungroup root
	3391	+ canUngroup = false;
	3392	+ break;
	3393	+ }
2747	3394	}
2748	3395
2749		- ClearSelection(false);
2750		-
2751		- refreshContents();
	3396	+ if (canUngroup)
	3397	+ {
	3398	+ for (int i=0; i<group.selection.size(); i++)
	3399	+ {
	3400	+ Object3D selectedItem = group.selection.get(i);
	3401	+
	3402	+ Ungroup(selectedItem);
	3403	+ }
	3404	+
	3405	+ ClearSelection(false);
	3406	+
	3407	+ refreshContents();
	3408	+ }
2752	3409	} else
2753	3410	if (source == genUVItem)
2754	3411	{
..	..	@@ -3049,7 +3706,7 @@
3049	3706	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3050	3707	{
3051	3708	obj = (Object3D)e.nextElement();
3052		- obj.SetBumpTexture(null);
	3709	+ obj.ResetBumpTexture();
3053	3710	}
3054	3711
3055	3712	refreshContents();
..	..	@@ -3063,6 +3720,31 @@
3063	3720	obj.SetBumpTexture(obj.GetPigmentTexture());
3064	3721	}
3065	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	+
3066	3748	refreshContents();
3067	3749	} else
3068	3750	if (source == flashSelectionButton)
..	..	@@ -3080,38 +3762,7 @@
3080	3762	if (CameraPane.FULLSCREEN)
3081	3763	fullscreenLayout = radio.layout;
3082	3764
3083		- // bug
3084		- //gridPanel.setDividerLocation(1.0);
3085		- //bigPanel.setDividerLocation(0.0);
3086		-// bigThree.remove(scenePanel);
3087		-// bigThree.remove(centralPanel);
3088		-// bigThree.remove(XYZPanel);
3089		-// aWindowConstraints.gridx = 0;
3090		-// aWindowConstraints.gridy = 0;
3091		-// aWindowConstraints.gridwidth = 1;
3092		-// // aConstraints.gridheight = 3;
3093		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3094		-// aWindowConstraints.weightx = 0;
3095		-// aWindowConstraints.weighty = 1;
3096		-// //bigThree.add(jtp, aWindowConstraints);
3097		-// aWindowConstraints.weightx = 1;
3098		-// aWindowConstraints.gridwidth = 3;
3099		-// // aConstraints.gridheight = 3;
3100		-// aWindowConstraints.gridx = 1;
3101		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3102		-// bigThree.add(centralPanel, aWindowConstraints);
3103		-// aWindowConstraints.weightx = 0;
3104		-// aWindowConstraints.gridx = 4;
3105		-// aWindowConstraints.gridwidth = 1;
3106		-// // aConstraints.gridheight = 3;
3107		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3108		-// //bigThree.add(XYZPanel, aWindowConstraints);
3109		-// scenePanel.setVisible(false);
3110		-// centralPanel.setVisible(true);
3111		-// XYZPanel.setVisible(false);
3112		- bigThree.ClearUI();
3113		- bigThree.add(centralPanel);
3114		- bigThree.FlushUI();
	3765	+ Show3DView();
3115	3766
3116	3767	cameraView.requestFocusInWindow();
3117	3768
..	..	@@ -3166,8 +3817,8 @@
3166	3817	// centralPanel.setVisible(true);
3167	3818	// XYZPanel.setVisible(true);
3168	3819	bigThree.ClearUI();
	3820	+ bigThree.add(scenePanel);
3169	3821	bigThree.add(centralPanel);
3170		- bigThree.add(XYZPanel);
3171	3822	bigThree.FlushUI();
3172	3823
3173	3824	cameraView.requestFocusInWindow();
..	..	@@ -3247,8 +3898,8 @@
3247	3898	// centralPanel.setVisible(true);
3248	3899	// XYZPanel.setVisible(false);
3249	3900	bigThree.ClearUI();
3250		- bigThree.add(scenePanel);
3251	3901	bigThree.add(centralPanel);
	3902	+ bigThree.add(scenePanel);
3252	3903	bigThree.FlushUI();
3253	3904
3254	3905	cameraView.requestFocusInWindow();
..	..	@@ -3297,6 +3948,7 @@
3297	3948	} else
3298	3949	if (source == rootButton)
3299	3950	{
	3951	+ Replace();
3300	3952	Object3D obj;
3301	3953	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3302	3954	{
..	..	@@ -3354,10 +4006,10 @@
3354	4006	{
3355	4007	Object3D child = (Object3D)e.nextElement();
3356	4008	if(child.editWindow != null)
3357		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3358	4009	child.pinned = false;
3359	4010	child.CloseUI();
3360	4011	listUI.remove(child);
	4012	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3361	4013
3362	4014	//child.editWindow = null; // ???????????
3363	4015	}
..	..	@@ -3372,10 +4024,11 @@
3372	4024	//copy.ClearUI();
3373	4025	for (Object3D obj : listUI)
3374	4026	{
3375		- obj.pinned = true;
	4027	+ obj.pinned = false;
3376	4028	obj.CloseUI();
3377	4029	}
3378	4030	listUI.clear();
	4031	+ SetPinStates(group.selection.size() > 0);
3379	4032	refreshContents(true);
3380	4033	} else
3381	4034	if (source == allParamsButton)
..	..	@@ -3431,6 +4084,7 @@
3431	4084	}
3432	4085
3433	4086	copy = group;
	4087	+
3434	4088	//Globals.theRenderer.object = group;
3435	4089	if(!useclient)
3436	4090	{
..	..	@@ -3457,6 +4111,29 @@
3457	4111	currentLayout = sevenButton;
3458	4112	*/
3459	4113	radio.layout.doClick();
	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	+
	4130	+ ClearUnpinned();
	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)
	4136	+ EditSelection(false);
3460	4137	keepparent = group.parent;
3461	4138	// PARENT = NULL or not???
3462	4139	//group.parent = null; // ROOT
..	..	@@ -3468,11 +4145,13 @@
3468	4145	} else if (event.getSource() == editCameraItem)
3469	4146	{
3470	4147	cameraView.ProtectCamera();
	4148	+ cameraView.requestFocusInWindow();
3471	4149	cameraView.repaint();
3472	4150	return;
3473	4151	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3474	4152	{
3475	4153	cameraView.RevertCamera();
	4154	+ cameraView.requestFocusInWindow();
3476	4155	cameraView.repaint();
3477	4156	return;
3478	4157	// } else if (event.getSource() == textureButton)
..	..	@@ -4049,7 +4728,7 @@
4049	4728
4050	4729	try
4051	4730	{
4052		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4731	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4053	4732	}
4054	4733	catch (Exception e)
4055	4734	{
..	..	@@ -4526,6 +5205,12 @@
4526	5205
4527	5206	void EditSelection(boolean newWindow)
4528	5207	{
	5208	+ if (group.selection == null)
	5209	+ {
	5210	+ EditElement(group, newWindow); // ? new
	5211	+ return;
	5212	+ }
	5213	+
4529	5214	// aConstraints.gridy = 0;
4530	5215	for (int i=0; i<group.selection.size(); i++)
4531	5216	{
..	..	@@ -4536,12 +5221,7 @@
4536	5221	Object3D elem = (Object3D)group.selection.elementAt(i);
4537	5222	if(elem != group \|\| !newWindow)
4538	5223	{
4539		- // if (!(elem instanceof Composite))
4540		- // newWindow = false;
4541		- listUI.add(elem);
4542		- elem.openEditWindow(this, newWindow); //, false);
4543		- System.out.println("edit : " + elem);
4544		- elem.editWindow.refreshContents(true); // ? new
	5224	+ EditElement(elem, newWindow); // ? new
4545	5225	}
4546	5226	}
4547	5227	}
..	..	@@ -4604,9 +5284,7 @@
4604	5284
4605	5285	freezemodel = false;
4606	5286	}
4607		-
4608		- boolean flashIt = true;
4609		-
	5287	+
4610	5288	public void valueChanged(TreeSelectionEvent e)
4611	5289	//public boolean handleEvent(Event event)
4612	5290	{
..	..	@@ -4616,17 +5294,7 @@
4616	5294	//new Exception().printStackTrace();
4617	5295
4618	5296	freezemodel = true;
4619		-
4620		- //for (Object3D obj : listUI)
4621		- for (int i=listUI.size(); --i>=0;)
4622		- {
4623		- Object3D obj = listUI.elementAt(i);
4624		- if (!obj.pinned)
4625		- {
4626		- obj.CloseUI();
4627		- listUI.remove(i);
4628		- }
4629		- }
	5297	+ ClearUnpinned();
4630	5298
4631	5299	/**/
4632	5300	//switch (event.id)
..	..	@@ -4689,12 +5357,31 @@
4689	5357	{
4690	5358	editButton.setEnabled(enabled);
4691	5359	uneditButton.setEnabled(enabled);
	5360	+ //unselectButton.setEnabled(enabled);
	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);
4692	5379	}
4693	5380
4694	5381	void refreshContents(boolean cp)
4695	5382	{
4696		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4697		- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	5383	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5384	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4698	5385	{
4699	5386	objEditor.ClearInfo(); // .GetMaterial());
4700	5387
..	..	@@ -4703,7 +5390,7 @@
4703	5390	Object3D child = (Object3D) group.selection.get(i);
4704	5391
4705	5392	objEditor.AddInfo(child, this, true);
4706		- System.err.println("info : " + child.GetPath());
	5393	+// System.err.println("info : " + child.GetPath());
4707	5394	}
4708	5395
4709	5396	objEditor.SetText(); // jan 2014
..	..	@@ -4793,8 +5480,8 @@
4793	5480
4794	5481	if (cut)
4795	5482	{
4796		- if (Globals.SAVEONMAKE)
4797		- Save();
	5483	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5484	+// Save();
4798	5485	//int indices[] = jList.getSelectedIndices();
4799	5486	//for (int i = indices.length - 1; i >= 0; i--)
4800	5487	//jList.remove(indices[i]);
..	..	@@ -4897,6 +5584,10 @@
4897	5584
4898	5585	void paste(boolean expand)
4899	5586	{
	5587	+ if (Globals.REPLACEONMAKE)
	5588	+ Save();
	5589	+ boolean keep = Globals.REPLACEONMAKE;
	5590	+ Globals.REPLACEONMAKE = false;
4900	5591	// if (GrafreeD.clipboard == null)
4901	5592	// return;
4902	5593	boolean first = true;
..	..	@@ -4956,6 +5647,7 @@
4956	5647	Grafreed.clipboard.get(0).parent = keepparent;
4957	5648	}
4958	5649
	5650	+ Globals.REPLACEONMAKE = keep;
4959	5651	ResetModel();
4960	5652	refreshContents();
4961	5653	}
..	..	@@ -5091,6 +5783,10 @@
5091	5783
5092	5784	void group(Object3D csg, boolean grab)
5093	5785	{
	5786	+ if (Globals.REPLACEONMAKE)
	5787	+ Save();
	5788	+ boolean keep = Globals.REPLACEONMAKE;
	5789	+ Globals.REPLACEONMAKE = false;
5094	5790	if (//false) // why??
5095	5791	!group.selection.isEmpty())
5096	5792	{
..	..	@@ -5204,10 +5900,15 @@
5204	5900	//node.add(csg);
5205	5901	//makeSomething(node);
5206	5902	makeSomething(csg);
	5903	+ Globals.REPLACEONMAKE = keep;
5207	5904	}
5208	5905
5209	5906	void Ungroup(Object3D g)
5210	5907	{
	5908	+ if (Globals.REPLACEONMAKE)
	5909	+ Save();
	5910	+ boolean keep = Globals.REPLACEONMAKE;
	5911	+ Globals.REPLACEONMAKE = false;
5211	5912	if (g instanceof HiddenObject)
5212	5913	{
5213	5914	HiddenObject h = (HiddenObject) g;
..	..	@@ -5224,6 +5925,7 @@
5224	5925	objEditor.makeSomething(g.get(i), false);
5225	5926	}
5226	5927	}
	5928	+ Globals.REPLACEONMAKE = keep;
5227	5929	}
5228	5930
5229	5931	void ungroup()
..	..	@@ -5514,10 +6216,6 @@
5514	6216
5515	6217	cButton restoreCameraButton;
5516	6218
5517		- cButton minButton;
5518		- cButton maxButton;
5519		- cButton fullButton;
5520		- cButton saveButton;
5521	6219	cButton oneStepButton;
5522	6220
5523	6221	cButton groupButton;
..	..	@@ -5526,6 +6224,22 @@
5526	6224	cButton switchButton;
5527	6225	cButton loopButton;
5528	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;
5529	6243
5530	6244	cButton gridButton;
5531	6245	cButton boxButton;
..	..	@@ -5559,11 +6273,11 @@
5559	6273	private MenuItem lookAtItem;
5560	6274	private MenuItem lookFromItem;
5561	6275	private MenuItem switchViewItem;
5562		- private MenuItem cutItem;
	6276	+ private JMenuItem cutItem;
5563	6277	private MenuItem undoItem;
5564	6278	private MenuItem redoItem;
5565	6279	private JMenuItem duplicateItem;
5566		- private MenuItem cloneItem;
	6280	+ private JMenuItem cloneItem;
5567	6281	private MenuItem cloneSupportItem;
5568	6282	private MenuItem overwriteGeoItem;
5569	6283	private MenuItem overwriteMatItem;
..	..	@@ -5584,13 +6298,13 @@
5584	6298	private MenuItem cloneGeometriesItem;
5585	6299	private MenuItem shareGeometriesItem;
5586	6300	private MenuItem mergeGeometriesItem;
5587		- private MenuItem copyItem;
	6301	+ private JMenuItem copyItem;
5588	6302	private MenuItem pasteItem;
5589		- private MenuItem pasteIntoItem;
5590		- private MenuItem pasteLinkItem;
5591		- private MenuItem pasteCloneItem;
5592		- private MenuItem pasteExpandItem;
5593		- private MenuItem clearItem;
	6303	+ private JMenuItem pasteIntoItem;
	6304	+ private JMenuItem pasteLinkItem;
	6305	+ private JMenuItem pasteCloneItem;
	6306	+ private JMenuItem pasteExpandItem;
	6307	+ private JMenuItem deleteItem;
5594	6308	private MenuItem clearAllItem;
5595	6309	private MenuItem genUVItem;
5596	6310	private MenuItem genNormalsMESHItem;
..	..	@@ -5645,7 +6359,7 @@
5645	6359	private MenuItem transformGeometryItem;
5646	6360	private MenuItem transformChildrenItem;
5647	6361	private MenuItem hideItem;
5648		- private MenuItem grabItem;
	6362	+ private JMenuItem grabItem;
5649	6363	private MenuItem backItem;
5650	6364	private MenuItem frontItem;
5651	6365	private MenuItem cameraItem;
..	..	@@ -5658,7 +6372,7 @@
5658	6372	private MenuItem switchTransfoItem;
5659	6373	private MenuItem morphItem;
5660	6374	private MenuItem linkerItem;
5661		- private MenuItem ungroupItem;
	6375	+ private JMenuItem ungroupItem;
5662	6376	private MenuItem editItem;
5663	6377	private MenuItem openWindowItem;
5664	6378	private MenuItem editLeafItem;
..	..	@@ -5674,6 +6388,8 @@
5674	6388	private MenuItem attachBumpItem;
5675	6389	private MenuItem detachBumpItem;
5676	6390	private MenuItem pigmentBumpItem;
	6391	+ private MenuItem embedTexturesItem;
	6392	+ private MenuItem deEmbedTexturesItem;
5677	6393
5678	6394	private MenuItem particleItem;
5679	6395	private MenuItem ragdollItem;