~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,75 @@
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 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	949	+ {
	950	+ currenttab = new cGridBag();
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	952	+ currenttab.setName(tabname);
	953	+ //added = false;
	954	+ resourcecontainer.add(currenttab);
	955	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	956	+ rowcount = 1;
	957	+ colcount = 0;
	958	+ texturecount = 0;
	959	+ }
	960	+
	961	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	962	+ {
	963	+ //if (!added)
	964	+ {
	965	+ //added = true;
	966	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	967	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	968	+ }
	969	+
	970	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	971	+
	972	+ if (++colcount >= columns)
	973	+ {
	974	+ colcount = 0;
	975	+ currenttab.Return();
	976	+
	977	+ if (rowcount++ >= rows)
	978	+ {
	979	+ rowcount = 0;
	980	+ }
	981	+ }
	982	+ }
	983	+ else
	984	+ {
	985	+// if (!path[path.length-1].equals("icons"))
	986	+// resourcecontainer.Return();
	987	+ }
	988	+ }
	989	+
	990	+ void CreateTexturePanel(cGridBag container)
	991	+ {
	992	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	993	+ container.add(resourcecontainer);
	994	+
	995	+ Grafreed.ParseResources("textures", this);
	996	+ }
	997	+
541	998	void SetupUI2(ObjEditor oe)
542	999	{
543	1000	// June 2019
..	..	@@ -555,11 +1012,6 @@
555	1012	//new Exception().printStackTrace();
556	1013
557	1014	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	1015	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
564	1016
565	1017	oe.buttonGroup = new ButtonGroup();
..	..	@@ -582,7 +1034,7 @@
582	1034	*/
583	1035	cGridBag copyOptionsPanel = new cGridBag();
584	1036
585		- copyOptionsPanel.preferredHeight = 1;
	1037	+ copyOptionsPanel.preferredHeight = 2;
586	1038
587	1039	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
588	1040
..	..	@@ -592,51 +1044,107 @@
592	1044
593	1045	if (Globals.ADVANCED)
594	1046	{
595		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596		- maxButton.setToolTipText("Maximize window");
597		- maxButton.addActionListener(this);
	1047	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+// maxButton.setToolTipText("Maximize window");
	1049	+// maxButton.addActionListener(this);
598	1050	}
	1051	+
	1052	+ cButton gcButton;
	1053	+
	1054	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+// gcButton.setToolTipText("Garbage collect");
	1056	+// gcButton.addActionListener(new ActionListener()
	1057	+// {
	1058	+// public void actionPerformed(ActionEvent e)
	1059	+// {
	1060	+// System.gc();
	1061	+// }
	1062	+// });
	1063	+
	1064	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+ collapseButton.setToolTipText("Collapse toolbar");
	1066	+ collapseButton.addActionListener(this);
	1067	+
	1068	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1070	+ maximize3DButton.addActionListener(this);
	1071	+
	1072	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ twoButton.setToolTipText("Show 3D view only");
	1074	+ twoButton.addActionListener(this);
	1075	+ this.fullscreenLayout = twoButton;
	1076	+
	1077	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1078	+ threeButton.setToolTipText("Show controls and 3D view");
	1079	+ threeButton.addActionListener(this);
	1080	+ if (Globals.ADVANCED)
	1081	+ {
	1082	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1083	+ sixButton.setToolTipText("Show 3D view and controls");
	1084	+ sixButton.addActionListener(this);
	1085	+ }
	1086	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+// sevenButton.setToolTipText("3-column layout");
	1088	+// sevenButton.addActionListener(this);
	1089	+ //
599	1090
600	1091	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
601	1092	fullButton.setToolTipText("Full-screen window");
602	1093	fullButton.addActionListener(this);
603	1094
	1095	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1096	+ screenfitButton.setToolTipText("Screen fit");
	1097	+ screenfitButton.addActionListener(this);
	1098	+
604	1099	oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605	1100	restoreCameraButton.setToolTipText("Restore viewpoint");
606	1101	restoreCameraButton.addActionListener(this);
607	1102
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);
	1103	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ saveVersionButton.setToolTipText("Duplicate current version");
	1105	+ saveVersionButton.addActionListener(this);
	1106	+
	1107	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ deleteVersionButton.setToolTipText("Delete current version");
	1109	+ deleteVersionButton.addActionListener(this);
	1110	+
	1111	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ previousVersionButton.setToolTipText("Previous version");
	1113	+ previousVersionButton.addActionListener(this);
	1114	+ previousVersionButton.setEnabled(false);
612	1115
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);
	1116	+ cGridBag updown = new cGridBag().setVertical(true);
	1117	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ restoreButton.setToolTipText("Undo (restore current version)");
	1119	+ restoreButton.addActionListener(this);
	1120	+ //restoreButton.setEnabled(false);
617	1121
618		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
619		- saveButton.setToolTipText("Save changes");
620		- saveButton.addActionListener(this);
	1122	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ replaceButton.setToolTipText("Save (replace current version)");
	1124	+ replaceButton.addActionListener(this);
	1125	+ //replaceButton.setEnabled(false);
621	1126
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);
	1127	+ copyOptionsPanel.add(updown);
	1128	+
	1129	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ nextVersionButton.setToolTipText("Next version");
	1131	+ nextVersionButton.addActionListener(this);
	1132	+ nextVersionButton.setEnabled(false);
	1133	+
	1134	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
627	1135	oneStepButton.setToolTipText("Animate one step forward");
628	1136	oneStepButton.addActionListener(this);
629	1137
630		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1138	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1139	+ liveCB.setToolTipText("Enable animation");
	1140	+ liveCB.addItemListener(this);
	1141	+
	1142	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
631	1143	fastCB.setToolTipText("Fast mode");
632	1144	fastCB.addItemListener(this);
633	1145
634	1146	//oe.toolboxPanel.Return();
635	1147
636		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637		- screenfitButton.setToolTipText("Screen fit");
638		- screenfitButton.addActionListener(this);
639		-
640	1148	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
641	1149	// trackCB.setToolTipText("Enable tracking");
642	1150	// trackCB.addItemListener(this);
..	..	@@ -649,31 +1157,17 @@
649	1157	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650	1158	snapobjectButton.addActionListener(this);
651	1159	snapobjectButton.setToolTipText("Snap Object");
	1160	+
	1161	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1162	+ fourButton.addActionListener(this);
	1163	+ fourButton.setToolTipText("Show control panel only");
652	1164	}
653	1165
654	1166	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
655	1167
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	1168
675		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
676		- rootButton.setToolTipText("Edit selection in new tab");
	1169	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1170	+ rootButton.setToolTipText("Open selection in new tab");
677	1171	rootButton.addActionListener(this);
678	1172
679	1173	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -682,30 +1176,32 @@
682	1176	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
683	1177	//clearButton.addActionListener(this);
684	1178
	1179	+ cGridBag row1 = new cGridBag();
	1180	+
685	1181	// INSERT
686		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
687		- gridButton.setToolTipText("Create grid");
	1182	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ gridButton.setToolTipText("Create ground");
688	1184	gridButton.addActionListener(this);
689	1185
690		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1186	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
691	1187	boxButton.setToolTipText("Create box");
692	1188	boxButton.addActionListener(this);
693	1189
694		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ superButton.setToolTipText("Create superellipsoid");
	1192	+ superButton.addActionListener(this);
	1193	+
	1194	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
695	1195	sphereButton.setToolTipText("Create sphere");
696	1196	sphereButton.addActionListener(this);
697	1197
698		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
699	1199	coneButton.setToolTipText("Create cone");
700	1200	coneButton.addActionListener(this);
701	1201
702		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
703	1203	torusButton.setToolTipText("Create torus");
704	1204	torusButton.addActionListener(this);
705		-
706		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
707		- superButton.setToolTipText("Create superellipsoid");
708		- superButton.addActionListener(this);
709	1205
710	1206	if (Globals.ADVANCED)
711	1207	{
..	..	@@ -714,51 +1210,53 @@
714	1210	kleinButton.addActionListener(this);
715	1211	}
716	1212
717		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1213	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
718	1214	particlesButton.setToolTipText("Create particle system");
719	1215	particlesButton.addActionListener(this);
720	1216
721		- oe.toolboxPanel.Return();
	1217	+ oe.toolboxPanel.add(row1);
722	1218
723		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ cGridBag row2 = new cGridBag();
	1220	+
	1221	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
724	1222	groupButton.setToolTipText("Create group");
725	1223	groupButton.addActionListener(this);
726	1224
727		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1225	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
728	1226	compositeButton.setToolTipText("Create composite");
729	1227	compositeButton.addActionListener(this);
730	1228
731		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
732	1230	switchButton.setToolTipText("Create item switcher");
733	1231	switchButton.addActionListener(this);
734	1232
735		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
736	1234	loopButton.setToolTipText("Create loop");
737	1235	loopButton.addActionListener(this);
738	1236
739		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
740	1238	textureButton.setToolTipText("Create texture");
741	1239	textureButton.addActionListener(this);
742	1240
743		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
744	1242	overlayButton.setToolTipText("Create overlay");
745	1243	overlayButton.addActionListener(this);
746	1244
747		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
748	1246	lightButton.setToolTipText("Create light");
749	1247	lightButton.addActionListener(this);
750	1248
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		- }
	1249	+ oe.toolboxPanel.add(row2);
	1250	+
	1251	+ cGridBag textures = new cGridBag();
	1252	+
	1253	+ CreateTexturePanel(textures);
	1254	+
	1255	+ oe.toolboxPanel.add(textures);
	1256	+
	1257	+ textures.preferredHeight = 100;
	1258	+
	1259	+ CreateSkyboxPanel(oe.skyboxPanel);
762	1260
763	1261	// EDIT panel
764	1262	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -766,20 +1264,20 @@
766	1264	editButton.addActionListener(this);
767	1265
768	1266	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
769		- uneditButton.setToolTipText("Remove selection controls");
	1267	+ uneditButton.setToolTipText("Unpin and remove selection controls");
770	1268	uneditButton.addActionListener(this);
771	1269
772	1270	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
773		- allParamsButton.setToolTipText("Show all controle");
	1271	+ allParamsButton.setToolTipText("Show all controls");
774	1272	allParamsButton.addActionListener(this);
775	1273
776		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
777		- clearPanelButton.setToolTipText("Clear edit panel");
	1274	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1275	+ clearPanelButton.setToolTipText("Clear all controls");
778	1276	clearPanelButton.addActionListener(this);
779	1277
780		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
781		- unselectButton.setToolTipText("Unselect");
782		- unselectButton.addActionListener(this);
	1278	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ //unselectButton.setToolTipText("Unselect");
	1280	+ //unselectButton.addActionListener(this);
783	1281
784	1282	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
785	1283	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -814,9 +1312,12 @@
814	1312
815	1313	oe.treePanel.add(copyOptionsPanel);
816	1314	oe.treePanel.Return();
	1315	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1316	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1317	+ sliderPane.preferredHeight = 1;
817	1318
818		-// mainPanel.setDividerLocation(0.5); //1.0);
819		-// mainPanel.setResizeWeight(0.5);
	1319	+// mainPanel.setDividerLocation(0.1); //1.0);
	1320	+ mainPanel.setResizeWeight(0.4);
820	1321
821	1322	//jList.addListSelectionListener(this);
822	1323	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -824,7 +1325,7 @@
824	1325	//jTree.setEditable(true);
825	1326	oe.jTree.setDragEnabled(true);
826	1327	//jTree.setPreferredSize(new Dimension(10,10));
827		- jSP.setPreferredSize(new Dimension(100,200));
	1328	+ //jSP.setPreferredSize(new Dimension(100,200));
828	1329
829	1330	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
830	1331
..	..	@@ -836,7 +1337,7 @@
836	1337	dgr.addDragGestureListener(this);
837	1338	}catch(Exception e) {}
838	1339	*/
839		- radio.layout = sevenButton;
	1340	+ radio.layout = threeButton; // sixButton;
840	1341	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
841	1342	}
842	1343
..	..	@@ -887,9 +1388,12 @@
887	1388	smoothCB.setToolTipText("Snapping delay");
888	1389	smoothCB.addItemListener(this);
889	1390
890		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
891		- slowCB.setToolTipText("Smooth interpolation");
892		- slowCB.addItemListener(this);
	1391	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1392	+// slowCB.setToolTipText("Smooth interpolation");
	1393	+// slowCB.addItemListener(this);
	1394	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1395	+ minshaderCB.setToolTipText("Minimal fast shader");
	1396	+ minshaderCB.addItemListener(this);
893	1397
894	1398	// constraints.gridy += 1;
895	1399	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -939,9 +1443,9 @@
939	1443	toggleSwitchCB.setToolTipText("Choose a single item");
940	1444	toggleSwitchCB.addItemListener(this);
941	1445
942		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
943		- autosaveCB.setToolTipText("On structure change");
944		- autosaveCB.addItemListener(this);
	1446	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1447	+ autokeepCB.setToolTipText("On structure change");
	1448	+ autokeepCB.addItemListener(this);
945	1449
946	1450	panel.Return();
947	1451	if (Globals.ADVANCED)
..	..	@@ -968,9 +1472,17 @@
968	1472
969	1473	void EditObject(Object3D obj)
970	1474	{
	1475	+ assert(obj instanceof Composite);
	1476	+
	1477	+// if (obj.versionlist == null)
	1478	+// {
	1479	+// obj.versionlist = new Object3D[100];
	1480	+// obj.versionindex = -1;
	1481	+// }
	1482	+
971	1483	cRadio radioButton = new cRadio(obj.name);
972	1484
973		- // Patch to avoid bug with transparency.
	1485	+ // June 2019. Patch to avoid bug with transparency.
974	1486	radioButton.hadMaterial = obj.material != null;
975	1487	if (!radioButton.hadMaterial)
976	1488	{
..	..	@@ -978,7 +1490,7 @@
978	1490	}
979	1491
980	1492	radioButton.SetObject(obj);
981		- radioButton.layout = sevenButton;
	1493	+ radioButton.layout = threeButton; // sixButton;
982	1494	radioButton.SetCamera(cameraView.renderCamera, false);
983	1495	radioButton.addActionListener(this);
984	1496	radioPanel.add(radioButton);
..	..	@@ -1003,6 +1515,8 @@
1003	1515	cCheckBox localCB;
1004	1516	cCheckBox crowdCB;
1005	1517	cCheckBox smoothCB;
	1518	+ cCheckBox minshaderCB;
	1519	+
1006	1520	cToggleButton fastCB;
1007	1521	cCheckBox slowCB;
1008	1522	cCheckBox boxCB;
..	..	@@ -1018,7 +1532,7 @@
1018	1532
1019	1533	cCheckBox oeilCB;
1020	1534	cCheckBox shadowCB;
1021		- cCheckBox autosaveCB;
	1535	+ cCheckBox autokeepCB;
1022	1536	cCheckBox lookAtCB;
1023	1537
1024	1538	// static int COLOR = 1;
..	..	@@ -1073,6 +1587,12 @@
1073	1587	{
1074	1588	cameraView.ToggleInertia();
1075	1589	cameraView.repaint();
	1590	+ }
	1591	+ else if(e.getSource() == minshaderCB)
	1592	+ {
	1593	+ Globals.MINSHADER ^= true;
	1594	+ cameraView.programInitialized = false;
	1595	+ cameraView.repaint();
1076	1596	}
1077	1597	else if(e.getSource() == localCB)
1078	1598	{
..	..	@@ -1130,9 +1650,9 @@
1130	1650	{
1131	1651	Globals.FREEZEONMOVE ^= true;
1132	1652	}
1133		- else if(e.getSource() == autosaveCB)
	1653	+ else if(e.getSource() == autokeepCB)
1134	1654	{
1135		- Globals.SAVEONMAKE ^= true;
	1655	+ Globals.REPLACEONMAKE ^= true;
1136	1656	}
1137	1657	else if(e.getSource() == lookAtCB)
1138	1658	{
..	..	@@ -1214,8 +1734,6 @@
1214	1734	}
1215	1735	}
1216	1736
1217		- String string = (String) object;
1218		-
1219	1737	System.out.println("Transfer = " + object + "; drop : " + target);
1220	1738	// if( object instanceof java.io.File[])
1221	1739	// {
..	..	@@ -1223,6 +1741,8 @@
1223	1741	// objEditor.DropFile((java.io.File[]) object, true);
1224	1742	// return;
1225	1743	// }
	1744	+
	1745	+ String string = object.toString();
1226	1746
1227	1747	// File path for Mac and Windows
1228	1748	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1350,7 +1870,12 @@
1350	1870	TreePath path;
1351	1871
1352	1872	public TransferableTreePath(TreePath tp) {
1353		- path = tp;
	1873	+ Object[] objs = new Object[tp.getPathCount()];
	1874	+ for (int i=0; i<objs.length; i++)
	1875	+ {
	1876	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1877	+ }
	1878	+ path = new TreePath(objs);
1354	1879	}
1355	1880
1356	1881	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1472,6 +1997,9 @@
1472	1997	animationItem.addItemListener(this);
1473	1998	animationItem.setState(Globals.ANIMATION);
1474	1999
	2000	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2001	+ archiveItem.addActionListener(this);
	2002	+
1475	2003	menu.add("-");
1476	2004	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1477	2005	parseverticesItem.addActionListener(this);
..	..	@@ -1484,6 +2012,8 @@
1484	2012	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1485	2013	reduce34MorphItem.addActionListener(this);
1486	2014	menu.add("-");
	2015	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2016	+ memoryItem.addActionListener(this);
1487	2017	menu.add(computeAOItem = new MenuItem("Compute AO"));
1488	2018	computeAOItem.addActionListener(this);
1489	2019
..	..	@@ -1492,8 +2022,6 @@
1492	2022	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1493	2023	mirrorItem.addActionListener(this);
1494	2024	menu.add("-");
1495		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1496		- memoryItem.addActionListener(this);
1497	2025	menu.add(analyzeItem = new MenuItem("Analyze"));
1498	2026	analyzeItem.addActionListener(this);
1499	2027	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1637,7 +2165,11 @@
1637	2165	shadow.material = new cMaterial(obj.material);
1638	2166	shadow.material.diffuse = 0.0001f;
1639	2167	shadow.material.specular = 0.0001f;
1640		- //shadow.projectedVertices[1].x = 300;
	2168	+ shadow.material.opacity = 0.75f;
	2169	+
	2170	+ AllocProjectedVertices(shadow);
	2171	+
	2172	+ shadow.projectedVertices[1].x = 300;
1641	2173
1642	2174	makeSomething(shadow);
1643	2175	}
..	..	@@ -1654,6 +2186,16 @@
1654	2186	listUI.remove(i);
1655	2187	}
1656	2188	}
	2189	+ }
	2190	+
	2191	+ private void EditElement(Object3D elem, boolean newWindow)
	2192	+ {
	2193	+ // if (!(elem instanceof Composite))
	2194	+ // newWindow = false;
	2195	+ listUI.add(elem);
	2196	+ elem.openEditWindow(this, newWindow); //, false);
	2197	+ System.out.println("edit : " + elem);
	2198	+ elem.editWindow.refreshContents(true); // ? new
1657	2199	}
1658	2200
1659	2201	/**
..	..	@@ -2083,6 +2625,23 @@
2083	2625	{
2084	2626	makeSomething(new Light());
2085	2627	} else
	2628	+// if (source == skybox1Button \|\|
	2629	+// source == skybox2Button \|\|
	2630	+// source == skybox3Button \|\|
	2631	+// source == skybox4Button \|\|
	2632	+// source == skybox5Button \|\|
	2633	+// source == skybox6Button \|\|
	2634	+// source == skybox7Button \|\|
	2635	+// source == skybox11Button \|\|
	2636	+// source == skybox12Button \|\|
	2637	+// source == skybox13Button \|\|
	2638	+// source == skybox14Button \|\|
	2639	+// source == skybox15Button \|\|
	2640	+// source == skybox16Button \|\|
	2641	+// source == skybox17Button)
	2642	+// {
	2643	+// ChangeSkybox(source);
	2644	+// } else
2086	2645	if (source == csgItem)
2087	2646	{
2088	2647	group(new CSG());
..	..	@@ -2131,27 +2690,35 @@
2131	2690	} else
2132	2691	if (source == loopItem \|\| source == loopButton)
2133	2692	{
	2693	+ if (!group.selection.isEmpty())
	2694	+ {
2134	2695	Composite csg = new GroupLeaf();
2135	2696	csg.count = 5;
2136		- group(csg);
2137	2697	Composite child = new cGroup("Branch");
2138	2698	csg.addChild(child);
2139	2699	child.addChild(csg);
	2700	+ group(csg);
	2701	+ }
2140	2702	} else
2141	2703	if (source == doubleItem)
2142	2704	{
	2705	+ if (!group.selection.isEmpty())
	2706	+ {
2143	2707	Composite csg = new GroupLeaf("Fork");
2144	2708	csg.count = 5;
2145		- group(csg);
2146	2709	Composite child = new cGroup("Branch A");
2147	2710	csg.addChild(child);
2148	2711	child.addChild(csg);
2149	2712	child = new cGroup("Branch B");
2150	2713	csg.addChild(child);
2151	2714	child.addChild(csg);
	2715	+ group(csg);
	2716	+ }
2152	2717	} else
2153	2718	if (source == tripleItem)
2154	2719	{
	2720	+ if (!group.selection.isEmpty())
	2721	+ {
2155	2722	Composite csg = new GroupLeaf("Trident");
2156	2723	csg.count = 4;
2157	2724	group(csg);
..	..	@@ -2164,11 +2731,12 @@
2164	2731	child = new cGroup();
2165	2732	csg.addChild(child);
2166	2733	child.addChild(csg);
	2734	+ }
2167	2735	} else
2168	2736	if (source == computeAOItem)
2169	2737	{
2170	2738	Globals.drawMode = CameraPane.OCCLUSION;
2171		- Globals.theRenderer.repaint();
	2739	+ cameraView.repaint();
2172	2740	} else
2173	2741	if (source == recompileItem)
2174	2742	{
..	..	@@ -2183,7 +2751,7 @@
2183	2751	if (source == invariantsItem)
2184	2752	{
2185	2753	System.out.println("Invariants:");
2186		- Grafreed.grafreeD.universe.invariants();
	2754	+ Grafreed.grafreed.universe.invariants();
2187	2755	} else
2188	2756	if (source == memoryItem)
2189	2757	{
..	..	@@ -2214,17 +2782,52 @@
2214	2782	{
2215	2783	ToggleFullScreen();
2216	2784	} else
2217		- if (source == undoButton)
	2785	+ if (source == collapseButton)
2218	2786	{
2219		- Undo();
	2787	+ this.expandedLayout = radio.layout;
	2788	+ CollapseToolbar();
2220	2789	} else
2221		- if (source == redoButton)
	2790	+ if (source == maximize3DButton)
2222	2791	{
2223		- Redo();
	2792	+ this.expandedLayout = radio.layout;
	2793	+ radio.layout = twoButton;
	2794	+ Show3DView();
	2795	+ CollapseToolbar();
2224	2796	} else
2225		- if (source == saveButton)
	2797	+ if (source == previousVersionButton)
2226	2798	{
2227		- Save();
	2799	+ // Go to previous version
	2800	+ //if (!Undo())
	2801	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2802	+ PreviousVersion();
	2803	+ } else
	2804	+ if (source == restoreButton)
	2805	+ {
	2806	+ // Restore current version
	2807	+ Restore();
	2808	+ //restoreButton.setEnabled(false);
	2809	+ } else
	2810	+ if (source == replaceButton)
	2811	+ {
	2812	+ // Overwrite current version
	2813	+ Replace();
	2814	+ //replaceButton.setEnabled(false);
	2815	+ } else
	2816	+ if (source == nextVersionButton)
	2817	+ {
	2818	+ // Go to next version
	2819	+ NextVersion();
	2820	+ } else
	2821	+ if (source == saveVersionButton)
	2822	+ {
	2823	+ // Save a new version
	2824	+ if (!Save(true))
	2825	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2826	+ } else
	2827	+ if (source == deleteVersionButton)
	2828	+ {
	2829	+ // Delete a new version
	2830	+ DeleteVersion();
2228	2831	} else
2229	2832	if (source == oneStepButton)
2230	2833	{
..	..	@@ -2233,17 +2836,14 @@
2233	2836	} else
2234	2837	if (source == screenfitButton)
2235	2838	{
2236		- //Reload(lastConverter, lastFilename, true);
2237	2839	ScreenFit();
2238	2840	} else
2239	2841	if (source == screenfitpointButton)
2240	2842	{
2241		- //Reload(lastConverter, lastFilename, true);
2242	2843	ScreenFitPoint();
2243	2844	} else
2244	2845	if (source == snapobjectButton)
2245	2846	{
2246		- //Reload(lastConverter, lastFilename, true);
2247	2847	SnapObject();
2248	2848	} else
2249	2849	// if (event.getSource() == recompileButton)
..	..	@@ -2282,11 +2882,11 @@
2282	2882	} else
2283	2883	if (source == undoItem)
2284	2884	{
2285		- Undo();
	2885	+ PreviousVersion();
2286	2886	} else
2287	2887	if (source == redoItem)
2288	2888	{
2289		- Redo();
	2889	+ NextVersion();
2290	2890	} else
2291	2891	if (source == duplicateItem)
2292	2892	{
..	..	@@ -2607,7 +3207,7 @@
2607	3207	{
2608	3208	StepAll();
2609	3209	} else
2610		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3210	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2611	3211	{
2612	3212	//int indices[] = jList.getSelectedIndices();
2613	3213	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2767,22 +3367,34 @@
2767	3367	} else
2768	3368	if (source == ungroupItem \|\| source == ungroupButton)
2769	3369	{
2770		- boolean hasRoot = false;
	3370	+ boolean canUngroup = true;
2771	3371
2772	3372	for (int i=0; i<group.selection.size(); i++)
2773	3373	{
2774		- if (group.selection.get(i) == group)
	3374	+ Object3D selectedItem = group.selection.get(i);
	3375	+
	3376	+ if (selectedItem.Size() == 0)
2775	3377	{
2776		- hasRoot = true;
	3378	+ // Cannot ungroup leaves
	3379	+ canUngroup = false;
	3380	+ break;
	3381	+ }
	3382	+
	3383	+ if (selectedItem == group)
	3384	+ {
	3385	+ // Cannot ungroup root
	3386	+ canUngroup = false;
2777	3387	break;
2778	3388	}
2779	3389	}
2780	3390
2781		- if (!hasRoot)
	3391	+ if (canUngroup)
2782	3392	{
2783	3393	for (int i=0; i<group.selection.size(); i++)
2784	3394	{
2785		- Ungroup(group.selection.get(i));
	3395	+ Object3D selectedItem = group.selection.get(i);
	3396	+
	3397	+ Ungroup(selectedItem);
2786	3398	}
2787	3399
2788	3400	ClearSelection(false);
..	..	@@ -3089,7 +3701,7 @@
3089	3701	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3090	3702	{
3091	3703	obj = (Object3D)e.nextElement();
3092		- obj.SetBumpTexture(null);
	3704	+ obj.ResetBumpTexture();
3093	3705	}
3094	3706
3095	3707	refreshContents();
..	..	@@ -3103,6 +3715,31 @@
3103	3715	obj.SetBumpTexture(obj.GetPigmentTexture());
3104	3716	}
3105	3717
	3718	+ refreshContents();
	3719	+ } else
	3720	+ if (source == embedTexturesItem)
	3721	+ {
	3722	+ Object3D obj;
	3723	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3724	+ {
	3725	+ obj = (Object3D)e.nextElement();
	3726	+ obj.EmbedTextures(true);
	3727	+ }
	3728	+
	3729	+ refreshContents();
	3730	+ } else
	3731	+ if (source == deEmbedTexturesItem)
	3732	+ {
	3733	+ Object3D obj;
	3734	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3735	+ {
	3736	+ obj = (Object3D)e.nextElement();
	3737	+ obj.EmbedTextures(false);
	3738	+ }
	3739	+
	3740	+ CameraPane.texturepigment.clear();
	3741	+ CameraPane.texturebump.clear();
	3742	+
3106	3743	refreshContents();
3107	3744	} else
3108	3745	if (source == flashSelectionButton)
..	..	@@ -3120,38 +3757,7 @@
3120	3757	if (CameraPane.FULLSCREEN)
3121	3758	fullscreenLayout = radio.layout;
3122	3759
3123		- // bug
3124		- //gridPanel.setDividerLocation(1.0);
3125		- //bigPanel.setDividerLocation(0.0);
3126		-// bigThree.remove(scenePanel);
3127		-// bigThree.remove(centralPanel);
3128		-// bigThree.remove(XYZPanel);
3129		-// aWindowConstraints.gridx = 0;
3130		-// aWindowConstraints.gridy = 0;
3131		-// aWindowConstraints.gridwidth = 1;
3132		-// // aConstraints.gridheight = 3;
3133		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3134		-// aWindowConstraints.weightx = 0;
3135		-// aWindowConstraints.weighty = 1;
3136		-// //bigThree.add(jtp, aWindowConstraints);
3137		-// aWindowConstraints.weightx = 1;
3138		-// aWindowConstraints.gridwidth = 3;
3139		-// // aConstraints.gridheight = 3;
3140		-// aWindowConstraints.gridx = 1;
3141		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3142		-// bigThree.add(centralPanel, aWindowConstraints);
3143		-// aWindowConstraints.weightx = 0;
3144		-// aWindowConstraints.gridx = 4;
3145		-// aWindowConstraints.gridwidth = 1;
3146		-// // aConstraints.gridheight = 3;
3147		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3148		-// //bigThree.add(XYZPanel, aWindowConstraints);
3149		-// scenePanel.setVisible(false);
3150		-// centralPanel.setVisible(true);
3151		-// XYZPanel.setVisible(false);
3152		- bigThree.ClearUI();
3153		- bigThree.add(centralPanel);
3154		- bigThree.FlushUI();
	3760	+ Show3DView();
3155	3761
3156	3762	cameraView.requestFocusInWindow();
3157	3763
..	..	@@ -3206,8 +3812,8 @@
3206	3812	// centralPanel.setVisible(true);
3207	3813	// XYZPanel.setVisible(true);
3208	3814	bigThree.ClearUI();
	3815	+ bigThree.add(scenePanel);
3209	3816	bigThree.add(centralPanel);
3210		- bigThree.add(XYZPanel);
3211	3817	bigThree.FlushUI();
3212	3818
3213	3819	cameraView.requestFocusInWindow();
..	..	@@ -3287,8 +3893,8 @@
3287	3893	// centralPanel.setVisible(true);
3288	3894	// XYZPanel.setVisible(false);
3289	3895	bigThree.ClearUI();
3290		- bigThree.add(scenePanel);
3291	3896	bigThree.add(centralPanel);
	3897	+ bigThree.add(scenePanel);
3292	3898	bigThree.FlushUI();
3293	3899
3294	3900	cameraView.requestFocusInWindow();
..	..	@@ -3337,6 +3943,7 @@
3337	3943	} else
3338	3944	if (source == rootButton)
3339	3945	{
	3946	+ Replace();
3340	3947	Object3D obj;
3341	3948	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3342	3949	{
..	..	@@ -3394,10 +4001,10 @@
3394	4001	{
3395	4002	Object3D child = (Object3D)e.nextElement();
3396	4003	if(child.editWindow != null)
3397		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3398	4004	child.pinned = false;
3399	4005	child.CloseUI();
3400	4006	listUI.remove(child);
	4007	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3401	4008
3402	4009	//child.editWindow = null; // ???????????
3403	4010	}
..	..	@@ -3416,6 +4023,7 @@
3416	4023	obj.CloseUI();
3417	4024	}
3418	4025	listUI.clear();
	4026	+ SetPinStates(group.selection.size() > 0);
3419	4027	refreshContents(true);
3420	4028	} else
3421	4029	if (source == allParamsButton)
..	..	@@ -3471,6 +4079,7 @@
3471	4079	}
3472	4080
3473	4081	copy = group;
	4082	+
3474	4083	//Globals.theRenderer.object = group;
3475	4084	if(!useclient)
3476	4085	{
..	..	@@ -3498,9 +4107,24 @@
3498	4107	*/
3499	4108	radio.layout.doClick();
3500	4109
	4110	+ assert(copy instanceof Composite);
	4111	+
	4112	+ if (copy.versionlist == null)
	4113	+ {
	4114	+ copy.versionlist = new Object3D[100];
	4115	+ copy.versionindex = -1;
	4116	+
	4117	+ Save(true);
	4118	+ }
	4119	+
	4120	+ SetVersionStates();
	4121	+
3501	4122	ClearUnpinned();
3502		- SetPinStates(group.selection.size() > 0);
3503		- if (group.selection.size() == 1)
	4123	+
	4124	+ //Grafreed.Assert(group != null);
	4125	+ //Grafreed.Assert(group.selection != null);
	4126	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4127	+ if (group.selection == null \|\| group.selection.size() == 1)
3504	4128	EditSelection(false);
3505	4129	keepparent = group.parent;
3506	4130	// PARENT = NULL or not???
..	..	@@ -3513,11 +4137,13 @@
3513	4137	} else if (event.getSource() == editCameraItem)
3514	4138	{
3515	4139	cameraView.ProtectCamera();
	4140	+ cameraView.requestFocusInWindow();
3516	4141	cameraView.repaint();
3517	4142	return;
3518	4143	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3519	4144	{
3520	4145	cameraView.RevertCamera();
	4146	+ cameraView.requestFocusInWindow();
3521	4147	cameraView.repaint();
3522	4148	return;
3523	4149	// } else if (event.getSource() == textureButton)
..	..	@@ -4094,7 +4720,7 @@
4094	4720
4095	4721	try
4096	4722	{
4097		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4723	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4098	4724	}
4099	4725	catch (Exception e)
4100	4726	{
..	..	@@ -4571,6 +5197,12 @@
4571	5197
4572	5198	void EditSelection(boolean newWindow)
4573	5199	{
	5200	+ if (group.selection == null)
	5201	+ {
	5202	+ EditElement(group, newWindow); // ? new
	5203	+ return;
	5204	+ }
	5205	+
4574	5206	// aConstraints.gridy = 0;
4575	5207	for (int i=0; i<group.selection.size(); i++)
4576	5208	{
..	..	@@ -4581,12 +5213,7 @@
4581	5213	Object3D elem = (Object3D)group.selection.elementAt(i);
4582	5214	if(elem != group \|\| !newWindow)
4583	5215	{
4584		- // if (!(elem instanceof Composite))
4585		- // newWindow = false;
4586		- listUI.add(elem);
4587		- elem.openEditWindow(this, newWindow); //, false);
4588		- System.out.println("edit : " + elem);
4589		- elem.editWindow.refreshContents(true); // ? new
	5216	+ EditElement(elem, newWindow); // ? new
4590	5217	}
4591	5218	}
4592	5219	}
..	..	@@ -4649,9 +5276,7 @@
4649	5276
4650	5277	freezemodel = false;
4651	5278	}
4652		-
4653		- boolean flashIt = true;
4654		-
	5279	+
4655	5280	public void valueChanged(TreeSelectionEvent e)
4656	5281	//public boolean handleEvent(Event event)
4657	5282	{
..	..	@@ -4724,14 +5349,30 @@
4724	5349	{
4725	5350	editButton.setEnabled(enabled);
4726	5351	uneditButton.setEnabled(enabled);
4727		- unselectButton.setEnabled(enabled);
	5352	+ //unselectButton.setEnabled(enabled);
4728	5353	flashSelectionButton.setEnabled(enabled);
	5354	+
	5355	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5356	+
	5357	+ boolean allComposites = true;
	5358	+
	5359	+ if (group.selection != null)
	5360	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5361	+ {
	5362	+ if (!(e.nextElement() instanceof Composite))
	5363	+ {
	5364	+ allComposites = false;
	5365	+ break;
	5366	+ }
	5367	+ }
	5368	+
	5369	+ rootButton.setEnabled(allComposites);
4729	5370	}
4730	5371
4731	5372	void refreshContents(boolean cp)
4732	5373	{
4733		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4734		- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	5374	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5375	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4735	5376	{
4736	5377	objEditor.ClearInfo(); // .GetMaterial());
4737	5378
..	..	@@ -4740,7 +5381,7 @@
4740	5381	Object3D child = (Object3D) group.selection.get(i);
4741	5382
4742	5383	objEditor.AddInfo(child, this, true);
4743		- System.err.println("info : " + child.GetPath());
	5384	+// System.err.println("info : " + child.GetPath());
4744	5385	}
4745	5386
4746	5387	objEditor.SetText(); // jan 2014
..	..	@@ -4830,8 +5471,8 @@
4830	5471
4831	5472	if (cut)
4832	5473	{
4833		- if (Globals.SAVEONMAKE)
4834		- Save();
	5474	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5475	+// Save();
4835	5476	//int indices[] = jList.getSelectedIndices();
4836	5477	//for (int i = indices.length - 1; i >= 0; i--)
4837	5478	//jList.remove(indices[i]);
..	..	@@ -4934,6 +5575,10 @@
4934	5575
4935	5576	void paste(boolean expand)
4936	5577	{
	5578	+ if (Globals.REPLACEONMAKE)
	5579	+ Save();
	5580	+ boolean keep = Globals.REPLACEONMAKE;
	5581	+ Globals.REPLACEONMAKE = false;
4937	5582	// if (GrafreeD.clipboard == null)
4938	5583	// return;
4939	5584	boolean first = true;
..	..	@@ -4993,6 +5638,7 @@
4993	5638	Grafreed.clipboard.get(0).parent = keepparent;
4994	5639	}
4995	5640
	5641	+ Globals.REPLACEONMAKE = keep;
4996	5642	ResetModel();
4997	5643	refreshContents();
4998	5644	}
..	..	@@ -5128,6 +5774,10 @@
5128	5774
5129	5775	void group(Object3D csg, boolean grab)
5130	5776	{
	5777	+ if (Globals.REPLACEONMAKE)
	5778	+ Save();
	5779	+ boolean keep = Globals.REPLACEONMAKE;
	5780	+ Globals.REPLACEONMAKE = false;
5131	5781	if (//false) // why??
5132	5782	!group.selection.isEmpty())
5133	5783	{
..	..	@@ -5241,10 +5891,15 @@
5241	5891	//node.add(csg);
5242	5892	//makeSomething(node);
5243	5893	makeSomething(csg);
	5894	+ Globals.REPLACEONMAKE = keep;
5244	5895	}
5245	5896
5246	5897	void Ungroup(Object3D g)
5247	5898	{
	5899	+ if (Globals.REPLACEONMAKE)
	5900	+ Save();
	5901	+ boolean keep = Globals.REPLACEONMAKE;
	5902	+ Globals.REPLACEONMAKE = false;
5248	5903	if (g instanceof HiddenObject)
5249	5904	{
5250	5905	HiddenObject h = (HiddenObject) g;
..	..	@@ -5261,6 +5916,7 @@
5261	5916	objEditor.makeSomething(g.get(i), false);
5262	5917	}
5263	5918	}
	5919	+ Globals.REPLACEONMAKE = keep;
5264	5920	}
5265	5921
5266	5922	void ungroup()
..	..	@@ -5551,7 +6207,6 @@
5551	6207
5552	6208	cButton restoreCameraButton;
5553	6209
5554		- cButton saveButton;
5555	6210	cButton oneStepButton;
5556	6211
5557	6212	cButton groupButton;
..	..	@@ -5560,6 +6215,22 @@
5560	6215	cButton switchButton;
5561	6216	cButton loopButton;
5562	6217	cButton textureButton;
	6218	+
	6219	+ cButton skybox1Button;
	6220	+ cButton skybox2Button;
	6221	+ cButton skybox3Button;
	6222	+ cButton skybox4Button;
	6223	+ cButton skybox5Button;
	6224	+ cButton skybox6Button;
	6225	+ cButton skybox7Button;
	6226	+
	6227	+ cButton skybox11Button;
	6228	+ cButton skybox12Button;
	6229	+ cButton skybox13Button;
	6230	+ cButton skybox14Button;
	6231	+ cButton skybox15Button;
	6232	+ cButton skybox16Button;
	6233	+ cButton skybox17Button;
5563	6234
5564	6235	cButton gridButton;
5565	6236	cButton boxButton;
..	..	@@ -5593,11 +6264,11 @@
5593	6264	private MenuItem lookAtItem;
5594	6265	private MenuItem lookFromItem;
5595	6266	private MenuItem switchViewItem;
5596		- private MenuItem cutItem;
	6267	+ private JMenuItem cutItem;
5597	6268	private MenuItem undoItem;
5598	6269	private MenuItem redoItem;
5599	6270	private JMenuItem duplicateItem;
5600		- private MenuItem cloneItem;
	6271	+ private JMenuItem cloneItem;
5601	6272	private MenuItem cloneSupportItem;
5602	6273	private MenuItem overwriteGeoItem;
5603	6274	private MenuItem overwriteMatItem;
..	..	@@ -5618,13 +6289,13 @@
5618	6289	private MenuItem cloneGeometriesItem;
5619	6290	private MenuItem shareGeometriesItem;
5620	6291	private MenuItem mergeGeometriesItem;
5621		- private MenuItem copyItem;
	6292	+ private JMenuItem copyItem;
5622	6293	private MenuItem pasteItem;
5623		- private MenuItem pasteIntoItem;
5624		- private MenuItem pasteLinkItem;
5625		- private MenuItem pasteCloneItem;
5626		- private MenuItem pasteExpandItem;
5627		- private MenuItem clearItem;
	6294	+ private JMenuItem pasteIntoItem;
	6295	+ private JMenuItem pasteLinkItem;
	6296	+ private JMenuItem pasteCloneItem;
	6297	+ private JMenuItem pasteExpandItem;
	6298	+ private JMenuItem deleteItem;
5628	6299	private MenuItem clearAllItem;
5629	6300	private MenuItem genUVItem;
5630	6301	private MenuItem genNormalsMESHItem;
..	..	@@ -5692,7 +6363,7 @@
5692	6363	private MenuItem switchTransfoItem;
5693	6364	private MenuItem morphItem;
5694	6365	private MenuItem linkerItem;
5695		- private MenuItem ungroupItem;
	6366	+ private JMenuItem ungroupItem;
5696	6367	private MenuItem editItem;
5697	6368	private MenuItem openWindowItem;
5698	6369	private MenuItem editLeafItem;
..	..	@@ -5708,6 +6379,8 @@
5708	6379	private MenuItem attachBumpItem;
5709	6380	private MenuItem detachBumpItem;
5710	6381	private MenuItem pigmentBumpItem;
	6382	+ private MenuItem embedTexturesItem;
	6383	+ private MenuItem deEmbedTexturesItem;
5711	6384
5712	6385	private MenuItem particleItem;
5713	6386	private MenuItem ragdollItem;