~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,38 @@
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();
	572	+
	573	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	574	+ deleteItem.addActionListener(this);
194	575
195	576	if (Globals.ADVANCED)
196	577	{
..	..	@@ -276,11 +657,9 @@
276	657	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
277	658	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
278	659	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
280	660	oe.cameraMenu.add("-");
281	661	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
282	662	openWindowItem.addActionListener(this);
283		- editLeafItem.addActionListener(this);
284	663	lookAtItem.addActionListener(this);
285	664	//lookFromItem.addActinoListener(this);
286	665	//switchViewItem.addActionListener(this);
..	..	@@ -342,7 +721,7 @@
342	721	hideItem = menu.add(new MenuItem("Hidden Group"));
343	722	hideItem.addActionListener(this);
344	723	}
345		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
346	725	ungroupItem.addActionListener(this);
347	726
348	727	// menu.add("-");
..	..	@@ -380,13 +759,14 @@
380	759	shadowYItem.addActionListener(this);
381	760	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382	761	shadowZItem.addActionListener(this);
	762	+ attributeItem = menu.add(new MenuItem("Attribute"));
	763	+ attributeItem.addActionListener(this);
	764	+
383	765	if (Globals.ADVANCED)
384	766	{
385	767	menu.add("-");
386	768	linkerItem = menu.add(new MenuItem("Linker"));
387	769	linkerItem.addActionListener(this);
388		- attributeItem = menu.add(new MenuItem("Attribute"));
389		- attributeItem.addActionListener(this);
390	770	templateItem = menu.add(new MenuItem("Template"));
391	771	templateItem.addActionListener(this);
392	772	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -415,7 +795,7 @@
415	795	genNormalsMESHItem.addActionListener(this);
416	796	if (Globals.ADVANCED)
417	797	{
418		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	798	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419	799	genNormalsMINEItem.addActionListener(this);
420	800	}
421	801	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -508,10 +888,15 @@
508	888	attachBumpItem.addActionListener(this);
509	889	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
510	890	pigmentBumpItem.addActionListener(this);
	891	+ //embedTexturesItem
511	892	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
512	893	detachPigmentItem.addActionListener(this);
513	894	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
514	895	detachBumpItem.addActionListener(this);
	896	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	897	+ embedTexturesItem.addActionListener(this);
	898	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	899	+ deEmbedTexturesItem.addActionListener(this);
515	900	menu.add("-");
516	901	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
517	902	sortbysizeItem.addActionListener(this);
..	..	@@ -522,6 +907,9 @@
522	907	shareGeometriesItem.addActionListener(this);
523	908	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
524	909	mergeGeometriesItem.addActionListener(this);
	910	+ menu.add("-");
	911	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	912	+ editLeafItem.addActionListener(this);
525	913	if (Globals.ADVANCED)
526	914	{
527	915	// Pretty much the same as duplicate and clone.
..	..	@@ -538,6 +926,74 @@
538	926	buildToolsMenu(menu);
539	927	}
540	928
	929	+ JTabbedPane resourcecontainer;
	930	+ cGridBag currenttab;
	931	+ boolean added; // patch for jar
	932	+
	933	+ int tabcount = 0;
	934	+ int colcount = 0;
	935	+ int rowcount = 0;
	936	+ int texturecount = 0;
	937	+
	938	+ int columns = 5;
	939	+ int rows = 7;
	940	+
	941	+ public void ResourceCallBack(String[] path)
	942	+ {
	943	+ for (int i = 0; i < path.length; i++)
	944	+ System.out.print(path[i] + "/");
	945	+ System.out.println();
	946	+
	947	+ if (//rowcount == 0 \|\|
	948	+ path.length == 1)
	949	+ {
	950	+ currenttab = new cGridBag();
	951	+ added = false;
	952	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	953	+ currenttab.setName(tabname);
	954	+ rowcount = 1;
	955	+ colcount = 0;
	956	+ texturecount = 0;
	957	+ }
	958	+
	959	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	960	+ {
	961	+ if (!added)
	962	+ {
	963	+ added = true;
	964	+ resourcecontainer.add(currenttab);
	965	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	966	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	967	+ }
	968	+
	969	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	970	+
	971	+ if (++colcount >= columns)
	972	+ {
	973	+ colcount = 0;
	974	+ currenttab.Return();
	975	+
	976	+ if (rowcount++ >= rows)
	977	+ {
	978	+ rowcount = 0;
	979	+ }
	980	+ }
	981	+ }
	982	+ else
	983	+ {
	984	+// if (!path[path.length-1].equals("icons"))
	985	+// resourcecontainer.Return();
	986	+ }
	987	+ }
	988	+
	989	+ void CreateTexturePanel(cGridBag container)
	990	+ {
	991	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	992	+ container.add(resourcecontainer);
	993	+
	994	+ Grafreed.ParseResources("textures", this);
	995	+ }
	996	+
541	997	void SetupUI2(ObjEditor oe)
542	998	{
543	999	// June 2019
..	..	@@ -555,11 +1011,6 @@
555	1011	//new Exception().printStackTrace();
556	1012
557	1013	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	1014	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
564	1015
565	1016	oe.buttonGroup = new ButtonGroup();
..	..	@@ -582,7 +1033,7 @@
582	1033	*/
583	1034	cGridBag copyOptionsPanel = new cGridBag();
584	1035
585		- copyOptionsPanel.preferredHeight = 1;
	1036	+ copyOptionsPanel.preferredHeight = 2;
586	1037
587	1038	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
588	1039
..	..	@@ -592,51 +1043,107 @@
592	1043
593	1044	if (Globals.ADVANCED)
594	1045	{
595		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596		- maxButton.setToolTipText("Maximize window");
597		- maxButton.addActionListener(this);
	1046	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1047	+// maxButton.setToolTipText("Maximize window");
	1048	+// maxButton.addActionListener(this);
598	1049	}
	1050	+
	1051	+ cButton gcButton;
	1052	+
	1053	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// gcButton.setToolTipText("Garbage collect");
	1055	+// gcButton.addActionListener(new ActionListener()
	1056	+// {
	1057	+// public void actionPerformed(ActionEvent e)
	1058	+// {
	1059	+// System.gc();
	1060	+// }
	1061	+// });
	1062	+
	1063	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ collapseButton.setToolTipText("Collapse toolbar");
	1065	+ collapseButton.addActionListener(this);
	1066	+
	1067	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1069	+ maximize3DButton.addActionListener(this);
	1070	+
	1071	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ twoButton.setToolTipText("Show 3D view only");
	1073	+ twoButton.addActionListener(this);
	1074	+ this.fullscreenLayout = twoButton;
	1075	+
	1076	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ threeButton.setToolTipText("Show controls and 3D view");
	1078	+ threeButton.addActionListener(this);
	1079	+ if (Globals.ADVANCED)
	1080	+ {
	1081	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ sixButton.setToolTipText("Show 3D view and controls");
	1083	+ sixButton.addActionListener(this);
	1084	+ }
	1085	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1086	+// sevenButton.setToolTipText("3-column layout");
	1087	+// sevenButton.addActionListener(this);
	1088	+ //
599	1089
600	1090	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
601	1091	fullButton.setToolTipText("Full-screen window");
602	1092	fullButton.addActionListener(this);
603	1093
	1094	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1095	+ screenfitButton.setToolTipText("Screen fit");
	1096	+ screenfitButton.addActionListener(this);
	1097	+
604	1098	oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605	1099	restoreCameraButton.setToolTipText("Restore viewpoint");
606	1100	restoreCameraButton.addActionListener(this);
607	1101
608		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609		- undoButton.setToolTipText("Undo changes");
610		- undoButton.addActionListener(this);
611		- undoButton.setEnabled(false);
	1102	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ saveVersionButton.setToolTipText("Duplicate current version");
	1104	+ saveVersionButton.addActionListener(this);
	1105	+
	1106	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+ deleteVersionButton.setToolTipText("Delete current version");
	1108	+ deleteVersionButton.addActionListener(this);
	1109	+
	1110	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1111	+ previousVersionButton.setToolTipText("Previous version");
	1112	+ previousVersionButton.addActionListener(this);
	1113	+ previousVersionButton.setEnabled(false);
612	1114
613		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
614		- redoButton.setToolTipText("Redo changes");
615		- redoButton.addActionListener(this);
616		- redoButton.setEnabled(false);
	1115	+ cGridBag updown = new cGridBag().setVertical(true);
	1116	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ restoreButton.setToolTipText("Undo (restore current version)");
	1118	+ restoreButton.addActionListener(this);
	1119	+ //restoreButton.setEnabled(false);
617	1120
618		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
619		- saveButton.setToolTipText("Save changes");
620		- saveButton.addActionListener(this);
	1121	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1122	+ replaceButton.setToolTipText("Save (replace current version)");
	1123	+ replaceButton.addActionListener(this);
	1124	+ //replaceButton.setEnabled(false);
621	1125
622		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
623		- liveCB.setToolTipText("Enable animation");
624		- liveCB.addItemListener(this);
625		-
626		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ copyOptionsPanel.add(updown);
	1127	+
	1128	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ nextVersionButton.setToolTipText("Next version");
	1130	+ nextVersionButton.addActionListener(this);
	1131	+ nextVersionButton.setEnabled(false);
	1132	+
	1133	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
627	1134	oneStepButton.setToolTipText("Animate one step forward");
628	1135	oneStepButton.addActionListener(this);
629	1136
630		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1137	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1138	+ liveCB.setToolTipText("Enable animation");
	1139	+ liveCB.addItemListener(this);
	1140	+
	1141	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
631	1142	fastCB.setToolTipText("Fast mode");
632	1143	fastCB.addItemListener(this);
633	1144
634	1145	//oe.toolboxPanel.Return();
635	1146
636		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637		- screenfitButton.setToolTipText("Screen fit");
638		- screenfitButton.addActionListener(this);
639		-
640	1147	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
641	1148	// trackCB.setToolTipText("Enable tracking");
642	1149	// trackCB.addItemListener(this);
..	..	@@ -649,31 +1156,17 @@
649	1156	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650	1157	snapobjectButton.addActionListener(this);
651	1158	snapobjectButton.setToolTipText("Snap Object");
	1159	+
	1160	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1161	+ fourButton.addActionListener(this);
	1162	+ fourButton.setToolTipText("Show control panel only");
652	1163	}
653	1164
654	1165	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
655	1166
656		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657		- twoButton.setToolTipText("Show center view only");
658		- twoButton.addActionListener(this);
659		- this.fullscreenLayout = twoButton;
660		-
661		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662		- fourButton.addActionListener(this);
663		- fourButton.setToolTipText("Show left panel only");
664		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
665		- sixButton.setToolTipText("2-column layout left");
666		- sixButton.addActionListener(this);
667		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668		- threeButton.setToolTipText("2-column layout right");
669		- threeButton.addActionListener(this);
670		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- sevenButton.setToolTipText("3-column layout");
672		- sevenButton.addActionListener(this);
673		- //
674	1167
675		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
676		- rootButton.setToolTipText("Edit selection in new tab");
	1168	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ rootButton.setToolTipText("Open selection in new tab");
677	1170	rootButton.addActionListener(this);
678	1171
679	1172	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -682,28 +1175,30 @@
682	1175	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
683	1176	//clearButton.addActionListener(this);
684	1177
	1178	+ cGridBag row1 = new cGridBag();
	1179	+
685	1180	// INSERT
686		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
687		- gridButton.setToolTipText("Create grid");
	1181	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ gridButton.setToolTipText("Create ground");
688	1183	gridButton.addActionListener(this);
689	1184
690		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
691	1186	boxButton.setToolTipText("Create box");
692	1187	boxButton.addActionListener(this);
693	1188
694		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1189	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
695	1190	sphereButton.setToolTipText("Create sphere");
696	1191	sphereButton.addActionListener(this);
697	1192
698		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1193	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
699	1194	coneButton.setToolTipText("Create cone");
700	1195	coneButton.addActionListener(this);
701	1196
702		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
703	1198	torusButton.setToolTipText("Create torus");
704	1199	torusButton.addActionListener(this);
705	1200
706		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1201	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
707	1202	superButton.setToolTipText("Create superellipsoid");
708	1203	superButton.addActionListener(this);
709	1204
..	..	@@ -714,51 +1209,53 @@
714	1209	kleinButton.addActionListener(this);
715	1210	}
716	1211
717		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1212	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
718	1213	particlesButton.setToolTipText("Create particle system");
719	1214	particlesButton.addActionListener(this);
720	1215
721		- oe.toolboxPanel.Return();
	1216	+ oe.toolboxPanel.add(row1);
722	1217
723		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1218	+ cGridBag row2 = new cGridBag();
	1219	+
	1220	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
724	1221	groupButton.setToolTipText("Create group");
725	1222	groupButton.addActionListener(this);
726	1223
727		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
728	1225	compositeButton.setToolTipText("Create composite");
729	1226	compositeButton.addActionListener(this);
730	1227
731		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
732	1229	switchButton.setToolTipText("Create item switcher");
733	1230	switchButton.addActionListener(this);
734	1231
735		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
736	1233	loopButton.setToolTipText("Create loop");
737	1234	loopButton.addActionListener(this);
738	1235
739		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
740	1237	textureButton.setToolTipText("Create texture");
741	1238	textureButton.addActionListener(this);
742	1239
743		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
744	1241	overlayButton.setToolTipText("Create overlay");
745	1242	overlayButton.addActionListener(this);
746	1243
747		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1244	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
748	1245	lightButton.setToolTipText("Create light");
749	1246	lightButton.addActionListener(this);
750	1247
751		- for (int i=6; --i>=0;)
752		- {
753		- oe.toolboxPanel.Return();
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		- oe.toolboxPanel.add(new cGridBag());
759		- oe.toolboxPanel.add(new cGridBag());
760		- oe.toolboxPanel.add(new cGridBag());
761		- }
	1248	+ oe.toolboxPanel.add(row2);
	1249	+
	1250	+ cGridBag textures = new cGridBag();
	1251	+
	1252	+ CreateTexturePanel(textures);
	1253	+
	1254	+ oe.toolboxPanel.add(textures);
	1255	+
	1256	+ textures.preferredHeight = 100;
	1257	+
	1258	+ CreateSkyboxPanel(oe.skyboxPanel);
762	1259
763	1260	// EDIT panel
764	1261	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -766,20 +1263,20 @@
766	1263	editButton.addActionListener(this);
767	1264
768	1265	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
769		- uneditButton.setToolTipText("Remove selection controls");
	1266	+ uneditButton.setToolTipText("Unpin and remove selection controls");
770	1267	uneditButton.addActionListener(this);
771	1268
772	1269	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
773		- allParamsButton.setToolTipText("Show all controle");
	1270	+ allParamsButton.setToolTipText("Show all controls");
774	1271	allParamsButton.addActionListener(this);
775	1272
776		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
777		- clearPanelButton.setToolTipText("Clear edit panel");
	1273	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1274	+ clearPanelButton.setToolTipText("Clear all controls");
778	1275	clearPanelButton.addActionListener(this);
779	1276
780		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
781		- unselectButton.setToolTipText("Unselect");
782		- unselectButton.addActionListener(this);
	1277	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1278	+ //unselectButton.setToolTipText("Unselect");
	1279	+ //unselectButton.addActionListener(this);
783	1280
784	1281	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
785	1282	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -814,9 +1311,12 @@
814	1311
815	1312	oe.treePanel.add(copyOptionsPanel);
816	1313	oe.treePanel.Return();
	1314	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1315	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1316	+ sliderPane.preferredHeight = 1;
817	1317
818		-// mainPanel.setDividerLocation(0.5); //1.0);
819		-// mainPanel.setResizeWeight(0.5);
	1318	+// mainPanel.setDividerLocation(0.1); //1.0);
	1319	+ mainPanel.setResizeWeight(0.4);
820	1320
821	1321	//jList.addListSelectionListener(this);
822	1322	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -824,7 +1324,7 @@
824	1324	//jTree.setEditable(true);
825	1325	oe.jTree.setDragEnabled(true);
826	1326	//jTree.setPreferredSize(new Dimension(10,10));
827		- jSP.setPreferredSize(new Dimension(100,200));
	1327	+ //jSP.setPreferredSize(new Dimension(100,200));
828	1328
829	1329	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
830	1330
..	..	@@ -836,7 +1336,7 @@
836	1336	dgr.addDragGestureListener(this);
837	1337	}catch(Exception e) {}
838	1338	*/
839		- radio.layout = sevenButton;
	1339	+ radio.layout = threeButton; // sixButton;
840	1340	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
841	1341	}
842	1342
..	..	@@ -887,9 +1387,12 @@
887	1387	smoothCB.setToolTipText("Snapping delay");
888	1388	smoothCB.addItemListener(this);
889	1389
890		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
891		- slowCB.setToolTipText("Smooth interpolation");
892		- slowCB.addItemListener(this);
	1390	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1391	+// slowCB.setToolTipText("Smooth interpolation");
	1392	+// slowCB.addItemListener(this);
	1393	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1394	+ minshaderCB.setToolTipText("Minimal fast shader");
	1395	+ minshaderCB.addItemListener(this);
893	1396
894	1397	// constraints.gridy += 1;
895	1398	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -939,9 +1442,9 @@
939	1442	toggleSwitchCB.setToolTipText("Choose a single item");
940	1443	toggleSwitchCB.addItemListener(this);
941	1444
942		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
943		- autosaveCB.setToolTipText("On structure change");
944		- autosaveCB.addItemListener(this);
	1445	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1446	+ autokeepCB.setToolTipText("On structure change");
	1447	+ autokeepCB.addItemListener(this);
945	1448
946	1449	panel.Return();
947	1450	if (Globals.ADVANCED)
..	..	@@ -968,9 +1471,17 @@
968	1471
969	1472	void EditObject(Object3D obj)
970	1473	{
	1474	+ assert(obj instanceof Composite);
	1475	+
	1476	+// if (obj.versionlist == null)
	1477	+// {
	1478	+// obj.versionlist = new Object3D[100];
	1479	+// obj.versionindex = -1;
	1480	+// }
	1481	+
971	1482	cRadio radioButton = new cRadio(obj.name);
972	1483
973		- // Patch to avoid bug with transparency.
	1484	+ // June 2019. Patch to avoid bug with transparency.
974	1485	radioButton.hadMaterial = obj.material != null;
975	1486	if (!radioButton.hadMaterial)
976	1487	{
..	..	@@ -978,7 +1489,7 @@
978	1489	}
979	1490
980	1491	radioButton.SetObject(obj);
981		- radioButton.layout = sevenButton;
	1492	+ radioButton.layout = threeButton; // sixButton;
982	1493	radioButton.SetCamera(cameraView.renderCamera, false);
983	1494	radioButton.addActionListener(this);
984	1495	radioPanel.add(radioButton);
..	..	@@ -1003,6 +1514,8 @@
1003	1514	cCheckBox localCB;
1004	1515	cCheckBox crowdCB;
1005	1516	cCheckBox smoothCB;
	1517	+ cCheckBox minshaderCB;
	1518	+
1006	1519	cToggleButton fastCB;
1007	1520	cCheckBox slowCB;
1008	1521	cCheckBox boxCB;
..	..	@@ -1018,7 +1531,7 @@
1018	1531
1019	1532	cCheckBox oeilCB;
1020	1533	cCheckBox shadowCB;
1021		- cCheckBox autosaveCB;
	1534	+ cCheckBox autokeepCB;
1022	1535	cCheckBox lookAtCB;
1023	1536
1024	1537	// static int COLOR = 1;
..	..	@@ -1073,6 +1586,12 @@
1073	1586	{
1074	1587	cameraView.ToggleInertia();
1075	1588	cameraView.repaint();
	1589	+ }
	1590	+ else if(e.getSource() == minshaderCB)
	1591	+ {
	1592	+ Globals.MINSHADER ^= true;
	1593	+ cameraView.programInitialized = false;
	1594	+ cameraView.repaint();
1076	1595	}
1077	1596	else if(e.getSource() == localCB)
1078	1597	{
..	..	@@ -1130,9 +1649,9 @@
1130	1649	{
1131	1650	Globals.FREEZEONMOVE ^= true;
1132	1651	}
1133		- else if(e.getSource() == autosaveCB)
	1652	+ else if(e.getSource() == autokeepCB)
1134	1653	{
1135		- Globals.SAVEONMAKE ^= true;
	1654	+ Globals.REPLACEONMAKE ^= true;
1136	1655	}
1137	1656	else if(e.getSource() == lookAtCB)
1138	1657	{
..	..	@@ -1214,8 +1733,6 @@
1214	1733	}
1215	1734	}
1216	1735
1217		- String string = (String) object;
1218		-
1219	1736	System.out.println("Transfer = " + object + "; drop : " + target);
1220	1737	// if( object instanceof java.io.File[])
1221	1738	// {
..	..	@@ -1223,6 +1740,8 @@
1223	1740	// objEditor.DropFile((java.io.File[]) object, true);
1224	1741	// return;
1225	1742	// }
	1743	+
	1744	+ String string = object.toString();
1226	1745
1227	1746	// File path for Mac and Windows
1228	1747	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1350,7 +1869,12 @@
1350	1869	TreePath path;
1351	1870
1352	1871	public TransferableTreePath(TreePath tp) {
1353		- path = tp;
	1872	+ Object[] objs = new Object[tp.getPathCount()];
	1873	+ for (int i=0; i<objs.length; i++)
	1874	+ {
	1875	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1876	+ }
	1877	+ path = new TreePath(objs);
1354	1878	}
1355	1879
1356	1880	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1487,6 +2011,8 @@
1487	2011	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1488	2012	reduce34MorphItem.addActionListener(this);
1489	2013	menu.add("-");
	2014	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2015	+ memoryItem.addActionListener(this);
1490	2016	menu.add(computeAOItem = new MenuItem("Compute AO"));
1491	2017	computeAOItem.addActionListener(this);
1492	2018
..	..	@@ -1495,8 +2021,6 @@
1495	2021	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1496	2022	mirrorItem.addActionListener(this);
1497	2023	menu.add("-");
1498		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1499		- memoryItem.addActionListener(this);
1500	2024	menu.add(analyzeItem = new MenuItem("Analyze"));
1501	2025	analyzeItem.addActionListener(this);
1502	2026	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1657,6 +2181,16 @@
1657	2181	listUI.remove(i);
1658	2182	}
1659	2183	}
	2184	+ }
	2185	+
	2186	+ private void EditElement(Object3D elem, boolean newWindow)
	2187	+ {
	2188	+ // if (!(elem instanceof Composite))
	2189	+ // newWindow = false;
	2190	+ listUI.add(elem);
	2191	+ elem.openEditWindow(this, newWindow); //, false);
	2192	+ System.out.println("edit : " + elem);
	2193	+ elem.editWindow.refreshContents(true); // ? new
1660	2194	}
1661	2195
1662	2196	/**
..	..	@@ -2086,6 +2620,23 @@
2086	2620	{
2087	2621	makeSomething(new Light());
2088	2622	} else
	2623	+// if (source == skybox1Button \|\|
	2624	+// source == skybox2Button \|\|
	2625	+// source == skybox3Button \|\|
	2626	+// source == skybox4Button \|\|
	2627	+// source == skybox5Button \|\|
	2628	+// source == skybox6Button \|\|
	2629	+// source == skybox7Button \|\|
	2630	+// source == skybox11Button \|\|
	2631	+// source == skybox12Button \|\|
	2632	+// source == skybox13Button \|\|
	2633	+// source == skybox14Button \|\|
	2634	+// source == skybox15Button \|\|
	2635	+// source == skybox16Button \|\|
	2636	+// source == skybox17Button)
	2637	+// {
	2638	+// ChangeSkybox(source);
	2639	+// } else
2089	2640	if (source == csgItem)
2090	2641	{
2091	2642	group(new CSG());
..	..	@@ -2134,27 +2685,35 @@
2134	2685	} else
2135	2686	if (source == loopItem \|\| source == loopButton)
2136	2687	{
	2688	+ if (!group.selection.isEmpty())
	2689	+ {
2137	2690	Composite csg = new GroupLeaf();
2138	2691	csg.count = 5;
2139		- group(csg);
2140	2692	Composite child = new cGroup("Branch");
2141	2693	csg.addChild(child);
2142	2694	child.addChild(csg);
	2695	+ group(csg);
	2696	+ }
2143	2697	} else
2144	2698	if (source == doubleItem)
2145	2699	{
	2700	+ if (!group.selection.isEmpty())
	2701	+ {
2146	2702	Composite csg = new GroupLeaf("Fork");
2147	2703	csg.count = 5;
2148		- group(csg);
2149	2704	Composite child = new cGroup("Branch A");
2150	2705	csg.addChild(child);
2151	2706	child.addChild(csg);
2152	2707	child = new cGroup("Branch B");
2153	2708	csg.addChild(child);
2154	2709	child.addChild(csg);
	2710	+ group(csg);
	2711	+ }
2155	2712	} else
2156	2713	if (source == tripleItem)
2157	2714	{
	2715	+ if (!group.selection.isEmpty())
	2716	+ {
2158	2717	Composite csg = new GroupLeaf("Trident");
2159	2718	csg.count = 4;
2160	2719	group(csg);
..	..	@@ -2167,11 +2726,12 @@
2167	2726	child = new cGroup();
2168	2727	csg.addChild(child);
2169	2728	child.addChild(csg);
	2729	+ }
2170	2730	} else
2171	2731	if (source == computeAOItem)
2172	2732	{
2173	2733	Globals.drawMode = CameraPane.OCCLUSION;
2174		- Globals.theRenderer.repaint();
	2734	+ cameraView.repaint();
2175	2735	} else
2176	2736	if (source == recompileItem)
2177	2737	{
..	..	@@ -2186,7 +2746,7 @@
2186	2746	if (source == invariantsItem)
2187	2747	{
2188	2748	System.out.println("Invariants:");
2189		- Grafreed.grafreeD.universe.invariants();
	2749	+ Grafreed.grafreed.universe.invariants();
2190	2750	} else
2191	2751	if (source == memoryItem)
2192	2752	{
..	..	@@ -2217,17 +2777,52 @@
2217	2777	{
2218	2778	ToggleFullScreen();
2219	2779	} else
2220		- if (source == undoButton)
	2780	+ if (source == collapseButton)
2221	2781	{
2222		- Undo();
	2782	+ this.expandedLayout = radio.layout;
	2783	+ CollapseToolbar();
2223	2784	} else
2224		- if (source == redoButton)
	2785	+ if (source == maximize3DButton)
2225	2786	{
2226		- Redo();
	2787	+ this.expandedLayout = radio.layout;
	2788	+ radio.layout = twoButton;
	2789	+ Show3DView();
	2790	+ CollapseToolbar();
2227	2791	} else
2228		- if (source == saveButton)
	2792	+ if (source == previousVersionButton)
2229	2793	{
2230		- Save();
	2794	+ // Go to previous version
	2795	+ //if (!Undo())
	2796	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2797	+ PreviousVersion();
	2798	+ } else
	2799	+ if (source == restoreButton)
	2800	+ {
	2801	+ // Restore current version
	2802	+ Restore();
	2803	+ //restoreButton.setEnabled(false);
	2804	+ } else
	2805	+ if (source == replaceButton)
	2806	+ {
	2807	+ // Overwrite current version
	2808	+ Replace();
	2809	+ //replaceButton.setEnabled(false);
	2810	+ } else
	2811	+ if (source == nextVersionButton)
	2812	+ {
	2813	+ // Go to next version
	2814	+ NextVersion();
	2815	+ } else
	2816	+ if (source == saveVersionButton)
	2817	+ {
	2818	+ // Save a new version
	2819	+ if (!Save(true))
	2820	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2821	+ } else
	2822	+ if (source == deleteVersionButton)
	2823	+ {
	2824	+ // Delete a new version
	2825	+ DeleteVersion();
2231	2826	} else
2232	2827	if (source == oneStepButton)
2233	2828	{
..	..	@@ -2236,17 +2831,14 @@
2236	2831	} else
2237	2832	if (source == screenfitButton)
2238	2833	{
2239		- //Reload(lastConverter, lastFilename, true);
2240	2834	ScreenFit();
2241	2835	} else
2242	2836	if (source == screenfitpointButton)
2243	2837	{
2244		- //Reload(lastConverter, lastFilename, true);
2245	2838	ScreenFitPoint();
2246	2839	} else
2247	2840	if (source == snapobjectButton)
2248	2841	{
2249		- //Reload(lastConverter, lastFilename, true);
2250	2842	SnapObject();
2251	2843	} else
2252	2844	// if (event.getSource() == recompileButton)
..	..	@@ -2285,11 +2877,11 @@
2285	2877	} else
2286	2878	if (source == undoItem)
2287	2879	{
2288		- Undo();
	2880	+ PreviousVersion();
2289	2881	} else
2290	2882	if (source == redoItem)
2291	2883	{
2292		- Redo();
	2884	+ NextVersion();
2293	2885	} else
2294	2886	if (source == duplicateItem)
2295	2887	{
..	..	@@ -2610,7 +3202,7 @@
2610	3202	{
2611	3203	StepAll();
2612	3204	} else
2613		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3205	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2614	3206	{
2615	3207	//int indices[] = jList.getSelectedIndices();
2616	3208	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2770,22 +3362,34 @@
2770	3362	} else
2771	3363	if (source == ungroupItem \|\| source == ungroupButton)
2772	3364	{
2773		- boolean hasRoot = false;
	3365	+ boolean canUngroup = true;
2774	3366
2775	3367	for (int i=0; i<group.selection.size(); i++)
2776	3368	{
2777		- if (group.selection.get(i) == group)
	3369	+ Object3D selectedItem = group.selection.get(i);
	3370	+
	3371	+ if (selectedItem.Size() == 0)
2778	3372	{
2779		- hasRoot = true;
	3373	+ // Cannot ungroup leaves
	3374	+ canUngroup = false;
	3375	+ break;
	3376	+ }
	3377	+
	3378	+ if (selectedItem == group)
	3379	+ {
	3380	+ // Cannot ungroup root
	3381	+ canUngroup = false;
2780	3382	break;
2781	3383	}
2782	3384	}
2783	3385
2784		- if (!hasRoot)
	3386	+ if (canUngroup)
2785	3387	{
2786	3388	for (int i=0; i<group.selection.size(); i++)
2787	3389	{
2788		- Ungroup(group.selection.get(i));
	3390	+ Object3D selectedItem = group.selection.get(i);
	3391	+
	3392	+ Ungroup(selectedItem);
2789	3393	}
2790	3394
2791	3395	ClearSelection(false);
..	..	@@ -3092,7 +3696,7 @@
3092	3696	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3093	3697	{
3094	3698	obj = (Object3D)e.nextElement();
3095		- obj.SetBumpTexture(null);
	3699	+ obj.ResetBumpTexture();
3096	3700	}
3097	3701
3098	3702	refreshContents();
..	..	@@ -3106,6 +3710,31 @@
3106	3710	obj.SetBumpTexture(obj.GetPigmentTexture());
3107	3711	}
3108	3712
	3713	+ refreshContents();
	3714	+ } else
	3715	+ if (source == embedTexturesItem)
	3716	+ {
	3717	+ Object3D obj;
	3718	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3719	+ {
	3720	+ obj = (Object3D)e.nextElement();
	3721	+ obj.EmbedTextures(true);
	3722	+ }
	3723	+
	3724	+ refreshContents();
	3725	+ } else
	3726	+ if (source == deEmbedTexturesItem)
	3727	+ {
	3728	+ Object3D obj;
	3729	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3730	+ {
	3731	+ obj = (Object3D)e.nextElement();
	3732	+ obj.EmbedTextures(false);
	3733	+ }
	3734	+
	3735	+ CameraPane.texturepigment.clear();
	3736	+ CameraPane.texturebump.clear();
	3737	+
3109	3738	refreshContents();
3110	3739	} else
3111	3740	if (source == flashSelectionButton)
..	..	@@ -3123,38 +3752,7 @@
3123	3752	if (CameraPane.FULLSCREEN)
3124	3753	fullscreenLayout = radio.layout;
3125	3754
3126		- // bug
3127		- //gridPanel.setDividerLocation(1.0);
3128		- //bigPanel.setDividerLocation(0.0);
3129		-// bigThree.remove(scenePanel);
3130		-// bigThree.remove(centralPanel);
3131		-// bigThree.remove(XYZPanel);
3132		-// aWindowConstraints.gridx = 0;
3133		-// aWindowConstraints.gridy = 0;
3134		-// aWindowConstraints.gridwidth = 1;
3135		-// // aConstraints.gridheight = 3;
3136		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3137		-// aWindowConstraints.weightx = 0;
3138		-// aWindowConstraints.weighty = 1;
3139		-// //bigThree.add(jtp, aWindowConstraints);
3140		-// aWindowConstraints.weightx = 1;
3141		-// aWindowConstraints.gridwidth = 3;
3142		-// // aConstraints.gridheight = 3;
3143		-// aWindowConstraints.gridx = 1;
3144		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3145		-// bigThree.add(centralPanel, aWindowConstraints);
3146		-// aWindowConstraints.weightx = 0;
3147		-// aWindowConstraints.gridx = 4;
3148		-// aWindowConstraints.gridwidth = 1;
3149		-// // aConstraints.gridheight = 3;
3150		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3151		-// //bigThree.add(XYZPanel, aWindowConstraints);
3152		-// scenePanel.setVisible(false);
3153		-// centralPanel.setVisible(true);
3154		-// XYZPanel.setVisible(false);
3155		- bigThree.ClearUI();
3156		- bigThree.add(centralPanel);
3157		- bigThree.FlushUI();
	3755	+ Show3DView();
3158	3756
3159	3757	cameraView.requestFocusInWindow();
3160	3758
..	..	@@ -3209,8 +3807,8 @@
3209	3807	// centralPanel.setVisible(true);
3210	3808	// XYZPanel.setVisible(true);
3211	3809	bigThree.ClearUI();
	3810	+ bigThree.add(scenePanel);
3212	3811	bigThree.add(centralPanel);
3213		- bigThree.add(XYZPanel);
3214	3812	bigThree.FlushUI();
3215	3813
3216	3814	cameraView.requestFocusInWindow();
..	..	@@ -3290,8 +3888,8 @@
3290	3888	// centralPanel.setVisible(true);
3291	3889	// XYZPanel.setVisible(false);
3292	3890	bigThree.ClearUI();
3293		- bigThree.add(scenePanel);
3294	3891	bigThree.add(centralPanel);
	3892	+ bigThree.add(scenePanel);
3295	3893	bigThree.FlushUI();
3296	3894
3297	3895	cameraView.requestFocusInWindow();
..	..	@@ -3340,6 +3938,7 @@
3340	3938	} else
3341	3939	if (source == rootButton)
3342	3940	{
	3941	+ Replace();
3343	3942	Object3D obj;
3344	3943	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3345	3944	{
..	..	@@ -3397,10 +3996,10 @@
3397	3996	{
3398	3997	Object3D child = (Object3D)e.nextElement();
3399	3998	if(child.editWindow != null)
3400		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3401	3999	child.pinned = false;
3402	4000	child.CloseUI();
3403	4001	listUI.remove(child);
	4002	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3404	4003
3405	4004	//child.editWindow = null; // ???????????
3406	4005	}
..	..	@@ -3419,6 +4018,7 @@
3419	4018	obj.CloseUI();
3420	4019	}
3421	4020	listUI.clear();
	4021	+ SetPinStates(group.selection.size() > 0);
3422	4022	refreshContents(true);
3423	4023	} else
3424	4024	if (source == allParamsButton)
..	..	@@ -3474,6 +4074,7 @@
3474	4074	}
3475	4075
3476	4076	copy = group;
	4077	+
3477	4078	//Globals.theRenderer.object = group;
3478	4079	if(!useclient)
3479	4080	{
..	..	@@ -3501,9 +4102,24 @@
3501	4102	*/
3502	4103	radio.layout.doClick();
3503	4104
	4105	+ assert(copy instanceof Composite);
	4106	+
	4107	+ if (copy.versionlist == null)
	4108	+ {
	4109	+ copy.versionlist = new Object3D[100];
	4110	+ copy.versionindex = -1;
	4111	+
	4112	+ Save(true);
	4113	+ }
	4114	+
	4115	+ SetVersionStates();
	4116	+
3504	4117	ClearUnpinned();
3505		- SetPinStates(group.selection.size() > 0);
3506		- if (group.selection.size() == 1)
	4118	+
	4119	+ //Grafreed.Assert(group != null);
	4120	+ //Grafreed.Assert(group.selection != null);
	4121	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4122	+ if (group.selection == null \|\| group.selection.size() == 1)
3507	4123	EditSelection(false);
3508	4124	keepparent = group.parent;
3509	4125	// PARENT = NULL or not???
..	..	@@ -3516,11 +4132,13 @@
3516	4132	} else if (event.getSource() == editCameraItem)
3517	4133	{
3518	4134	cameraView.ProtectCamera();
	4135	+ cameraView.requestFocusInWindow();
3519	4136	cameraView.repaint();
3520	4137	return;
3521	4138	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3522	4139	{
3523	4140	cameraView.RevertCamera();
	4141	+ cameraView.requestFocusInWindow();
3524	4142	cameraView.repaint();
3525	4143	return;
3526	4144	// } else if (event.getSource() == textureButton)
..	..	@@ -4097,7 +4715,7 @@
4097	4715
4098	4716	try
4099	4717	{
4100		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4718	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4101	4719	}
4102	4720	catch (Exception e)
4103	4721	{
..	..	@@ -4574,6 +5192,12 @@
4574	5192
4575	5193	void EditSelection(boolean newWindow)
4576	5194	{
	5195	+ if (group.selection == null)
	5196	+ {
	5197	+ EditElement(group, newWindow); // ? new
	5198	+ return;
	5199	+ }
	5200	+
4577	5201	// aConstraints.gridy = 0;
4578	5202	for (int i=0; i<group.selection.size(); i++)
4579	5203	{
..	..	@@ -4584,12 +5208,7 @@
4584	5208	Object3D elem = (Object3D)group.selection.elementAt(i);
4585	5209	if(elem != group \|\| !newWindow)
4586	5210	{
4587		- // if (!(elem instanceof Composite))
4588		- // newWindow = false;
4589		- listUI.add(elem);
4590		- elem.openEditWindow(this, newWindow); //, false);
4591		- System.out.println("edit : " + elem);
4592		- elem.editWindow.refreshContents(true); // ? new
	5211	+ EditElement(elem, newWindow); // ? new
4593	5212	}
4594	5213	}
4595	5214	}
..	..	@@ -4652,9 +5271,7 @@
4652	5271
4653	5272	freezemodel = false;
4654	5273	}
4655		-
4656		- boolean flashIt = true;
4657		-
	5274	+
4658	5275	public void valueChanged(TreeSelectionEvent e)
4659	5276	//public boolean handleEvent(Event event)
4660	5277	{
..	..	@@ -4727,13 +5344,29 @@
4727	5344	{
4728	5345	editButton.setEnabled(enabled);
4729	5346	uneditButton.setEnabled(enabled);
4730		- unselectButton.setEnabled(enabled);
	5347	+ //unselectButton.setEnabled(enabled);
4731	5348	flashSelectionButton.setEnabled(enabled);
	5349	+
	5350	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5351	+
	5352	+ boolean allComposites = true;
	5353	+
	5354	+ if (group.selection != null)
	5355	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5356	+ {
	5357	+ if (!(e.nextElement() instanceof Composite))
	5358	+ {
	5359	+ allComposites = false;
	5360	+ break;
	5361	+ }
	5362	+ }
	5363	+
	5364	+ rootButton.setEnabled(allComposites);
4732	5365	}
4733	5366
4734	5367	void refreshContents(boolean cp)
4735	5368	{
4736		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	5369	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4737	5370	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4738	5371	{
4739	5372	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4743,7 +5376,7 @@
4743	5376	Object3D child = (Object3D) group.selection.get(i);
4744	5377
4745	5378	objEditor.AddInfo(child, this, true);
4746		- System.err.println("info : " + child.GetPath());
	5379	+// System.err.println("info : " + child.GetPath());
4747	5380	}
4748	5381
4749	5382	objEditor.SetText(); // jan 2014
..	..	@@ -4833,8 +5466,8 @@
4833	5466
4834	5467	if (cut)
4835	5468	{
4836		- if (Globals.SAVEONMAKE)
4837		- Save();
	5469	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5470	+// Save();
4838	5471	//int indices[] = jList.getSelectedIndices();
4839	5472	//for (int i = indices.length - 1; i >= 0; i--)
4840	5473	//jList.remove(indices[i]);
..	..	@@ -4937,6 +5570,10 @@
4937	5570
4938	5571	void paste(boolean expand)
4939	5572	{
	5573	+ if (Globals.REPLACEONMAKE)
	5574	+ Save();
	5575	+ boolean keep = Globals.REPLACEONMAKE;
	5576	+ Globals.REPLACEONMAKE = false;
4940	5577	// if (GrafreeD.clipboard == null)
4941	5578	// return;
4942	5579	boolean first = true;
..	..	@@ -4996,6 +5633,7 @@
4996	5633	Grafreed.clipboard.get(0).parent = keepparent;
4997	5634	}
4998	5635
	5636	+ Globals.REPLACEONMAKE = keep;
4999	5637	ResetModel();
5000	5638	refreshContents();
5001	5639	}
..	..	@@ -5131,6 +5769,10 @@
5131	5769
5132	5770	void group(Object3D csg, boolean grab)
5133	5771	{
	5772	+ if (Globals.REPLACEONMAKE)
	5773	+ Save();
	5774	+ boolean keep = Globals.REPLACEONMAKE;
	5775	+ Globals.REPLACEONMAKE = false;
5134	5776	if (//false) // why??
5135	5777	!group.selection.isEmpty())
5136	5778	{
..	..	@@ -5244,10 +5886,15 @@
5244	5886	//node.add(csg);
5245	5887	//makeSomething(node);
5246	5888	makeSomething(csg);
	5889	+ Globals.REPLACEONMAKE = keep;
5247	5890	}
5248	5891
5249	5892	void Ungroup(Object3D g)
5250	5893	{
	5894	+ if (Globals.REPLACEONMAKE)
	5895	+ Save();
	5896	+ boolean keep = Globals.REPLACEONMAKE;
	5897	+ Globals.REPLACEONMAKE = false;
5251	5898	if (g instanceof HiddenObject)
5252	5899	{
5253	5900	HiddenObject h = (HiddenObject) g;
..	..	@@ -5264,6 +5911,7 @@
5264	5911	objEditor.makeSomething(g.get(i), false);
5265	5912	}
5266	5913	}
	5914	+ Globals.REPLACEONMAKE = keep;
5267	5915	}
5268	5916
5269	5917	void ungroup()
..	..	@@ -5554,7 +6202,6 @@
5554	6202
5555	6203	cButton restoreCameraButton;
5556	6204
5557		- cButton saveButton;
5558	6205	cButton oneStepButton;
5559	6206
5560	6207	cButton groupButton;
..	..	@@ -5563,6 +6210,22 @@
5563	6210	cButton switchButton;
5564	6211	cButton loopButton;
5565	6212	cButton textureButton;
	6213	+
	6214	+ cButton skybox1Button;
	6215	+ cButton skybox2Button;
	6216	+ cButton skybox3Button;
	6217	+ cButton skybox4Button;
	6218	+ cButton skybox5Button;
	6219	+ cButton skybox6Button;
	6220	+ cButton skybox7Button;
	6221	+
	6222	+ cButton skybox11Button;
	6223	+ cButton skybox12Button;
	6224	+ cButton skybox13Button;
	6225	+ cButton skybox14Button;
	6226	+ cButton skybox15Button;
	6227	+ cButton skybox16Button;
	6228	+ cButton skybox17Button;
5566	6229
5567	6230	cButton gridButton;
5568	6231	cButton boxButton;
..	..	@@ -5596,11 +6259,11 @@
5596	6259	private MenuItem lookAtItem;
5597	6260	private MenuItem lookFromItem;
5598	6261	private MenuItem switchViewItem;
5599		- private MenuItem cutItem;
	6262	+ private JMenuItem cutItem;
5600	6263	private MenuItem undoItem;
5601	6264	private MenuItem redoItem;
5602	6265	private JMenuItem duplicateItem;
5603		- private MenuItem cloneItem;
	6266	+ private JMenuItem cloneItem;
5604	6267	private MenuItem cloneSupportItem;
5605	6268	private MenuItem overwriteGeoItem;
5606	6269	private MenuItem overwriteMatItem;
..	..	@@ -5621,13 +6284,13 @@
5621	6284	private MenuItem cloneGeometriesItem;
5622	6285	private MenuItem shareGeometriesItem;
5623	6286	private MenuItem mergeGeometriesItem;
5624		- private MenuItem copyItem;
	6287	+ private JMenuItem copyItem;
5625	6288	private MenuItem pasteItem;
5626		- private MenuItem pasteIntoItem;
5627		- private MenuItem pasteLinkItem;
5628		- private MenuItem pasteCloneItem;
5629		- private MenuItem pasteExpandItem;
5630		- private MenuItem clearItem;
	6289	+ private JMenuItem pasteIntoItem;
	6290	+ private JMenuItem pasteLinkItem;
	6291	+ private JMenuItem pasteCloneItem;
	6292	+ private JMenuItem pasteExpandItem;
	6293	+ private JMenuItem deleteItem;
5631	6294	private MenuItem clearAllItem;
5632	6295	private MenuItem genUVItem;
5633	6296	private MenuItem genNormalsMESHItem;
..	..	@@ -5695,7 +6358,7 @@
5695	6358	private MenuItem switchTransfoItem;
5696	6359	private MenuItem morphItem;
5697	6360	private MenuItem linkerItem;
5698		- private MenuItem ungroupItem;
	6361	+ private JMenuItem ungroupItem;
5699	6362	private MenuItem editItem;
5700	6363	private MenuItem openWindowItem;
5701	6364	private MenuItem editLeafItem;
..	..	@@ -5711,6 +6374,8 @@
5711	6374	private MenuItem attachBumpItem;
5712	6375	private MenuItem detachBumpItem;
5713	6376	private MenuItem pigmentBumpItem;
	6377	+ private MenuItem embedTexturesItem;
	6378	+ private MenuItem deEmbedTexturesItem;
5714	6379
5715	6380	private MenuItem particleItem;
5716	6381	private MenuItem ragdollItem;