~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
..	..	@@ -590,50 +1042,109 @@
590	1042	//minButton.setToolTipText("Minimize window");
591	1043	//minButton.addActionListener(this);
592	1044
593		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- maxButton.setToolTipText("Maximize window");
595		- maxButton.addActionListener(this);
	1045	+ if (Globals.ADVANCED)
	1046	+ {
	1047	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+// maxButton.setToolTipText("Maximize window");
	1049	+// maxButton.addActionListener(this);
	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	+ //
596	1090
597	1091	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598	1092	fullButton.setToolTipText("Full-screen window");
599	1093	fullButton.addActionListener(this);
600	1094
	1095	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1096	+ screenfitButton.setToolTipText("Screen fit");
	1097	+ screenfitButton.addActionListener(this);
	1098	+
601	1099	oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	1100	restoreCameraButton.setToolTipText("Restore viewpoint");
603	1101	restoreCameraButton.addActionListener(this);
604	1102
605		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606		- undoButton.setToolTipText("Undo changes");
607		- undoButton.addActionListener(this);
608		- undoButton.setEnabled(false);
	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);
609	1115
610		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611		- redoButton.setToolTipText("Redo changes");
612		- redoButton.addActionListener(this);
613		- redoButton.setEnabled(false);
	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);
614	1121
615		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616		- saveButton.setToolTipText("Save changes");
617		- 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);
618	1126
619		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
620		- liveCB.setToolTipText("Enable animation");
621		- liveCB.addItemListener(this);
622		-
623		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	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);
624	1135	oneStepButton.setToolTipText("Animate one step forward");
625	1136	oneStepButton.addActionListener(this);
626	1137
627		- 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);
628	1143	fastCB.setToolTipText("Fast mode");
629	1144	fastCB.addItemListener(this);
630	1145
631	1146	//oe.toolboxPanel.Return();
632	1147
633		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- screenfitButton.setToolTipText("Screen fit");
635		- screenfitButton.addActionListener(this);
636		-
637	1148	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
638	1149	// trackCB.setToolTipText("Enable tracking");
639	1150	// trackCB.addItemListener(this);
..	..	@@ -646,31 +1157,17 @@
646	1157	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647	1158	snapobjectButton.addActionListener(this);
648	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");
649	1164	}
650	1165
651	1166	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
652	1167
653		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654		- twoButton.setToolTipText("Show center view only");
655		- twoButton.addActionListener(this);
656		- this.fullscreenLayout = twoButton;
657		-
658		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
659		- fourButton.addActionListener(this);
660		- fourButton.setToolTipText("Show left panel only");
661		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662		- sixButton.setToolTipText("2-column layout left");
663		- sixButton.addActionListener(this);
664		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
665		- threeButton.setToolTipText("2-column layout right");
666		- threeButton.addActionListener(this);
667		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668		- sevenButton.setToolTipText("3-column layout");
669		- sevenButton.addActionListener(this);
670		- //
671	1168
672		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
673		- 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");
674	1171	rootButton.addActionListener(this);
675	1172
676	1173	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -679,28 +1176,30 @@
679	1176	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
680	1177	//clearButton.addActionListener(this);
681	1178
	1179	+ cGridBag row1 = new cGridBag();
	1180	+
682	1181	// INSERT
683		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684		- gridButton.setToolTipText("Create grid");
	1182	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ gridButton.setToolTipText("Create ground");
685	1184	gridButton.addActionListener(this);
686	1185
687		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1186	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688	1187	boxButton.setToolTipText("Create box");
689	1188	boxButton.addActionListener(this);
690	1189
691		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
692	1191	sphereButton.setToolTipText("Create sphere");
693	1192	sphereButton.addActionListener(this);
694	1193
695		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696	1195	coneButton.setToolTipText("Create cone");
697	1196	coneButton.addActionListener(this);
698	1197
699		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700	1199	torusButton.setToolTipText("Create torus");
701	1200	torusButton.addActionListener(this);
702	1201
703		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
704	1203	superButton.setToolTipText("Create superellipsoid");
705	1204	superButton.addActionListener(this);
706	1205
..	..	@@ -711,51 +1210,53 @@
711	1210	kleinButton.addActionListener(this);
712	1211	}
713	1212
714		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1213	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
715	1214	particlesButton.setToolTipText("Create particle system");
716	1215	particlesButton.addActionListener(this);
717	1216
718		- oe.toolboxPanel.Return();
	1217	+ oe.toolboxPanel.add(row1);
719	1218
720		- 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);
721	1222	groupButton.setToolTipText("Create group");
722	1223	groupButton.addActionListener(this);
723	1224
724		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1225	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
725	1226	compositeButton.setToolTipText("Create composite");
726	1227	compositeButton.addActionListener(this);
727	1228
728		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
729	1230	switchButton.setToolTipText("Create item switcher");
730	1231	switchButton.addActionListener(this);
731	1232
732		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
733	1234	loopButton.setToolTipText("Create loop");
734	1235	loopButton.addActionListener(this);
735	1236
736		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
737	1238	textureButton.setToolTipText("Create texture");
738	1239	textureButton.addActionListener(this);
739	1240
740		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
741	1242	overlayButton.setToolTipText("Create overlay");
742	1243	overlayButton.addActionListener(this);
743	1244
744		- 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);
745	1246	lightButton.setToolTipText("Create light");
746	1247	lightButton.addActionListener(this);
747	1248
748		- for (int i=6; --i>=0;)
749		- {
750		- oe.toolboxPanel.Return();
751		- oe.toolboxPanel.add(new cGridBag());
752		- oe.toolboxPanel.add(new cGridBag());
753		- oe.toolboxPanel.add(new cGridBag());
754		- oe.toolboxPanel.add(new cGridBag());
755		- oe.toolboxPanel.add(new cGridBag());
756		- oe.toolboxPanel.add(new cGridBag());
757		- oe.toolboxPanel.add(new cGridBag());
758		- }
	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);
759	1260
760	1261	// EDIT panel
761	1262	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -763,20 +1264,20 @@
763	1264	editButton.addActionListener(this);
764	1265
765	1266	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
766		- uneditButton.setToolTipText("Remove selection controls");
	1267	+ uneditButton.setToolTipText("Unpin and remove selection controls");
767	1268	uneditButton.addActionListener(this);
768	1269
769	1270	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
770		- allParamsButton.setToolTipText("Show all controle");
	1271	+ allParamsButton.setToolTipText("Show all controls");
771	1272	allParamsButton.addActionListener(this);
772	1273
773		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
774		- clearPanelButton.setToolTipText("Clear edit panel");
	1274	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1275	+ clearPanelButton.setToolTipText("Clear all controls");
775	1276	clearPanelButton.addActionListener(this);
776	1277
777		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
778		- unselectButton.setToolTipText("Unselect");
779		- unselectButton.addActionListener(this);
	1278	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ //unselectButton.setToolTipText("Unselect");
	1280	+ //unselectButton.addActionListener(this);
780	1281
781	1282	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
782	1283	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -811,9 +1312,12 @@
811	1312
812	1313	oe.treePanel.add(copyOptionsPanel);
813	1314	oe.treePanel.Return();
	1315	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1316	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1317	+ sliderPane.preferredHeight = 1;
814	1318
815		-// mainPanel.setDividerLocation(0.5); //1.0);
816		-// mainPanel.setResizeWeight(0.5);
	1319	+// mainPanel.setDividerLocation(0.1); //1.0);
	1320	+ mainPanel.setResizeWeight(0.4);
817	1321
818	1322	//jList.addListSelectionListener(this);
819	1323	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -821,7 +1325,7 @@
821	1325	//jTree.setEditable(true);
822	1326	oe.jTree.setDragEnabled(true);
823	1327	//jTree.setPreferredSize(new Dimension(10,10));
824		- jSP.setPreferredSize(new Dimension(100,200));
	1328	+ //jSP.setPreferredSize(new Dimension(100,200));
825	1329
826	1330	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
827	1331
..	..	@@ -833,7 +1337,7 @@
833	1337	dgr.addDragGestureListener(this);
834	1338	}catch(Exception e) {}
835	1339	*/
836		- radio.layout = sevenButton;
	1340	+ radio.layout = threeButton; // sixButton;
837	1341	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
838	1342	}
839	1343
..	..	@@ -884,9 +1388,12 @@
884	1388	smoothCB.setToolTipText("Snapping delay");
885	1389	smoothCB.addItemListener(this);
886	1390
887		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
888		- slowCB.setToolTipText("Smooth interpolation");
889		- 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);
890	1397
891	1398	// constraints.gridy += 1;
892	1399	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -936,9 +1443,9 @@
936	1443	toggleSwitchCB.setToolTipText("Choose a single item");
937	1444	toggleSwitchCB.addItemListener(this);
938	1445
939		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
940		- autosaveCB.setToolTipText("On structure change");
941		- autosaveCB.addItemListener(this);
	1446	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1447	+ autokeepCB.setToolTipText("On structure change");
	1448	+ autokeepCB.addItemListener(this);
942	1449
943	1450	panel.Return();
944	1451	if (Globals.ADVANCED)
..	..	@@ -965,9 +1472,17 @@
965	1472
966	1473	void EditObject(Object3D obj)
967	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	+
968	1483	cRadio radioButton = new cRadio(obj.name);
969	1484
970		- // Patch to avoid bug with transparency.
	1485	+ // June 2019. Patch to avoid bug with transparency.
971	1486	radioButton.hadMaterial = obj.material != null;
972	1487	if (!radioButton.hadMaterial)
973	1488	{
..	..	@@ -975,7 +1490,7 @@
975	1490	}
976	1491
977	1492	radioButton.SetObject(obj);
978		- radioButton.layout = sevenButton;
	1493	+ radioButton.layout = threeButton; // sixButton;
979	1494	radioButton.SetCamera(cameraView.renderCamera, false);
980	1495	radioButton.addActionListener(this);
981	1496	radioPanel.add(radioButton);
..	..	@@ -1000,6 +1515,8 @@
1000	1515	cCheckBox localCB;
1001	1516	cCheckBox crowdCB;
1002	1517	cCheckBox smoothCB;
	1518	+ cCheckBox minshaderCB;
	1519	+
1003	1520	cToggleButton fastCB;
1004	1521	cCheckBox slowCB;
1005	1522	cCheckBox boxCB;
..	..	@@ -1015,7 +1532,7 @@
1015	1532
1016	1533	cCheckBox oeilCB;
1017	1534	cCheckBox shadowCB;
1018		- cCheckBox autosaveCB;
	1535	+ cCheckBox autokeepCB;
1019	1536	cCheckBox lookAtCB;
1020	1537
1021	1538	// static int COLOR = 1;
..	..	@@ -1070,6 +1587,12 @@
1070	1587	{
1071	1588	cameraView.ToggleInertia();
1072	1589	cameraView.repaint();
	1590	+ }
	1591	+ else if(e.getSource() == minshaderCB)
	1592	+ {
	1593	+ Globals.MINSHADER ^= true;
	1594	+ cameraView.programInitialized = false;
	1595	+ cameraView.repaint();
1073	1596	}
1074	1597	else if(e.getSource() == localCB)
1075	1598	{
..	..	@@ -1127,9 +1650,9 @@
1127	1650	{
1128	1651	Globals.FREEZEONMOVE ^= true;
1129	1652	}
1130		- else if(e.getSource() == autosaveCB)
	1653	+ else if(e.getSource() == autokeepCB)
1131	1654	{
1132		- Globals.SAVEONMAKE ^= true;
	1655	+ Globals.REPLACEONMAKE ^= true;
1133	1656	}
1134	1657	else if(e.getSource() == lookAtCB)
1135	1658	{
..	..	@@ -1211,8 +1734,6 @@
1211	1734	}
1212	1735	}
1213	1736
1214		- String string = (String) object;
1215		-
1216	1737	System.out.println("Transfer = " + object + "; drop : " + target);
1217	1738	// if( object instanceof java.io.File[])
1218	1739	// {
..	..	@@ -1220,6 +1741,8 @@
1220	1741	// objEditor.DropFile((java.io.File[]) object, true);
1221	1742	// return;
1222	1743	// }
	1744	+
	1745	+ String string = object.toString();
1223	1746
1224	1747	// File path for Mac and Windows
1225	1748	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1347,7 +1870,12 @@
1347	1870	TreePath path;
1348	1871
1349	1872	public TransferableTreePath(TreePath tp) {
1350		- 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);
1351	1879	}
1352	1880
1353	1881	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1469,6 +1997,9 @@
1469	1997	animationItem.addItemListener(this);
1470	1998	animationItem.setState(Globals.ANIMATION);
1471	1999
	2000	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2001	+ archiveItem.addActionListener(this);
	2002	+
1472	2003	menu.add("-");
1473	2004	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1474	2005	parseverticesItem.addActionListener(this);
..	..	@@ -1481,6 +2012,8 @@
1481	2012	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1482	2013	reduce34MorphItem.addActionListener(this);
1483	2014	menu.add("-");
	2015	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2016	+ memoryItem.addActionListener(this);
1484	2017	menu.add(computeAOItem = new MenuItem("Compute AO"));
1485	2018	computeAOItem.addActionListener(this);
1486	2019
..	..	@@ -1489,8 +2022,6 @@
1489	2022	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1490	2023	mirrorItem.addActionListener(this);
1491	2024	menu.add("-");
1492		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1493		- memoryItem.addActionListener(this);
1494	2025	menu.add(analyzeItem = new MenuItem("Analyze"));
1495	2026	analyzeItem.addActionListener(this);
1496	2027	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1651,6 +2182,16 @@
1651	2182	listUI.remove(i);
1652	2183	}
1653	2184	}
	2185	+ }
	2186	+
	2187	+ private void EditElement(Object3D elem, boolean newWindow)
	2188	+ {
	2189	+ // if (!(elem instanceof Composite))
	2190	+ // newWindow = false;
	2191	+ listUI.add(elem);
	2192	+ elem.openEditWindow(this, newWindow); //, false);
	2193	+ System.out.println("edit : " + elem);
	2194	+ elem.editWindow.refreshContents(true); // ? new
1654	2195	}
1655	2196
1656	2197	/**
..	..	@@ -2080,6 +2621,23 @@
2080	2621	{
2081	2622	makeSomething(new Light());
2082	2623	} else
	2624	+// if (source == skybox1Button \|\|
	2625	+// source == skybox2Button \|\|
	2626	+// source == skybox3Button \|\|
	2627	+// source == skybox4Button \|\|
	2628	+// source == skybox5Button \|\|
	2629	+// source == skybox6Button \|\|
	2630	+// source == skybox7Button \|\|
	2631	+// source == skybox11Button \|\|
	2632	+// source == skybox12Button \|\|
	2633	+// source == skybox13Button \|\|
	2634	+// source == skybox14Button \|\|
	2635	+// source == skybox15Button \|\|
	2636	+// source == skybox16Button \|\|
	2637	+// source == skybox17Button)
	2638	+// {
	2639	+// ChangeSkybox(source);
	2640	+// } else
2083	2641	if (source == csgItem)
2084	2642	{
2085	2643	group(new CSG());
..	..	@@ -2128,27 +2686,35 @@
2128	2686	} else
2129	2687	if (source == loopItem \|\| source == loopButton)
2130	2688	{
	2689	+ if (!group.selection.isEmpty())
	2690	+ {
2131	2691	Composite csg = new GroupLeaf();
2132	2692	csg.count = 5;
2133		- group(csg);
2134	2693	Composite child = new cGroup("Branch");
2135	2694	csg.addChild(child);
2136	2695	child.addChild(csg);
	2696	+ group(csg);
	2697	+ }
2137	2698	} else
2138	2699	if (source == doubleItem)
2139	2700	{
	2701	+ if (!group.selection.isEmpty())
	2702	+ {
2140	2703	Composite csg = new GroupLeaf("Fork");
2141	2704	csg.count = 5;
2142		- group(csg);
2143	2705	Composite child = new cGroup("Branch A");
2144	2706	csg.addChild(child);
2145	2707	child.addChild(csg);
2146	2708	child = new cGroup("Branch B");
2147	2709	csg.addChild(child);
2148	2710	child.addChild(csg);
	2711	+ group(csg);
	2712	+ }
2149	2713	} else
2150	2714	if (source == tripleItem)
2151	2715	{
	2716	+ if (!group.selection.isEmpty())
	2717	+ {
2152	2718	Composite csg = new GroupLeaf("Trident");
2153	2719	csg.count = 4;
2154	2720	group(csg);
..	..	@@ -2161,11 +2727,12 @@
2161	2727	child = new cGroup();
2162	2728	csg.addChild(child);
2163	2729	child.addChild(csg);
	2730	+ }
2164	2731	} else
2165	2732	if (source == computeAOItem)
2166	2733	{
2167	2734	Globals.drawMode = CameraPane.OCCLUSION;
2168		- Globals.theRenderer.repaint();
	2735	+ cameraView.repaint();
2169	2736	} else
2170	2737	if (source == recompileItem)
2171	2738	{
..	..	@@ -2180,7 +2747,7 @@
2180	2747	if (source == invariantsItem)
2181	2748	{
2182	2749	System.out.println("Invariants:");
2183		- Grafreed.grafreeD.universe.invariants();
	2750	+ Grafreed.grafreed.universe.invariants();
2184	2751	} else
2185	2752	if (source == memoryItem)
2186	2753	{
..	..	@@ -2211,17 +2778,52 @@
2211	2778	{
2212	2779	ToggleFullScreen();
2213	2780	} else
2214		- if (source == undoButton)
	2781	+ if (source == collapseButton)
2215	2782	{
2216		- Undo();
	2783	+ this.expandedLayout = radio.layout;
	2784	+ CollapseToolbar();
2217	2785	} else
2218		- if (source == redoButton)
	2786	+ if (source == maximize3DButton)
2219	2787	{
2220		- Redo();
	2788	+ this.expandedLayout = radio.layout;
	2789	+ radio.layout = twoButton;
	2790	+ Show3DView();
	2791	+ CollapseToolbar();
2221	2792	} else
2222		- if (source == saveButton)
	2793	+ if (source == previousVersionButton)
2223	2794	{
2224		- Save();
	2795	+ // Go to previous version
	2796	+ //if (!Undo())
	2797	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2798	+ PreviousVersion();
	2799	+ } else
	2800	+ if (source == restoreButton)
	2801	+ {
	2802	+ // Restore current version
	2803	+ Restore();
	2804	+ //restoreButton.setEnabled(false);
	2805	+ } else
	2806	+ if (source == replaceButton)
	2807	+ {
	2808	+ // Overwrite current version
	2809	+ Replace();
	2810	+ //replaceButton.setEnabled(false);
	2811	+ } else
	2812	+ if (source == nextVersionButton)
	2813	+ {
	2814	+ // Go to next version
	2815	+ NextVersion();
	2816	+ } else
	2817	+ if (source == saveVersionButton)
	2818	+ {
	2819	+ // Save a new version
	2820	+ if (!Save(true))
	2821	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2822	+ } else
	2823	+ if (source == deleteVersionButton)
	2824	+ {
	2825	+ // Delete a new version
	2826	+ DeleteVersion();
2225	2827	} else
2226	2828	if (source == oneStepButton)
2227	2829	{
..	..	@@ -2230,17 +2832,14 @@
2230	2832	} else
2231	2833	if (source == screenfitButton)
2232	2834	{
2233		- //Reload(lastConverter, lastFilename, true);
2234	2835	ScreenFit();
2235	2836	} else
2236	2837	if (source == screenfitpointButton)
2237	2838	{
2238		- //Reload(lastConverter, lastFilename, true);
2239	2839	ScreenFitPoint();
2240	2840	} else
2241	2841	if (source == snapobjectButton)
2242	2842	{
2243		- //Reload(lastConverter, lastFilename, true);
2244	2843	SnapObject();
2245	2844	} else
2246	2845	// if (event.getSource() == recompileButton)
..	..	@@ -2279,11 +2878,11 @@
2279	2878	} else
2280	2879	if (source == undoItem)
2281	2880	{
2282		- Undo();
	2881	+ PreviousVersion();
2283	2882	} else
2284	2883	if (source == redoItem)
2285	2884	{
2286		- Redo();
	2885	+ NextVersion();
2287	2886	} else
2288	2887	if (source == duplicateItem)
2289	2888	{
..	..	@@ -2604,7 +3203,7 @@
2604	3203	{
2605	3204	StepAll();
2606	3205	} else
2607		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3206	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2608	3207	{
2609	3208	//int indices[] = jList.getSelectedIndices();
2610	3209	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2764,22 +3363,34 @@
2764	3363	} else
2765	3364	if (source == ungroupItem \|\| source == ungroupButton)
2766	3365	{
2767		- boolean hasRoot = false;
	3366	+ boolean canUngroup = true;
2768	3367
2769	3368	for (int i=0; i<group.selection.size(); i++)
2770	3369	{
2771		- if (group.selection.get(i) == group)
	3370	+ Object3D selectedItem = group.selection.get(i);
	3371	+
	3372	+ if (selectedItem.Size() == 0)
2772	3373	{
2773		- hasRoot = true;
	3374	+ // Cannot ungroup leaves
	3375	+ canUngroup = false;
	3376	+ break;
	3377	+ }
	3378	+
	3379	+ if (selectedItem == group)
	3380	+ {
	3381	+ // Cannot ungroup root
	3382	+ canUngroup = false;
2774	3383	break;
2775	3384	}
2776	3385	}
2777	3386
2778		- if (!hasRoot)
	3387	+ if (canUngroup)
2779	3388	{
2780	3389	for (int i=0; i<group.selection.size(); i++)
2781	3390	{
2782		- Ungroup(group.selection.get(i));
	3391	+ Object3D selectedItem = group.selection.get(i);
	3392	+
	3393	+ Ungroup(selectedItem);
2783	3394	}
2784	3395
2785	3396	ClearSelection(false);
..	..	@@ -3086,7 +3697,7 @@
3086	3697	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3087	3698	{
3088	3699	obj = (Object3D)e.nextElement();
3089		- obj.SetBumpTexture(null);
	3700	+ obj.ResetBumpTexture();
3090	3701	}
3091	3702
3092	3703	refreshContents();
..	..	@@ -3100,6 +3711,31 @@
3100	3711	obj.SetBumpTexture(obj.GetPigmentTexture());
3101	3712	}
3102	3713
	3714	+ refreshContents();
	3715	+ } else
	3716	+ if (source == embedTexturesItem)
	3717	+ {
	3718	+ Object3D obj;
	3719	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3720	+ {
	3721	+ obj = (Object3D)e.nextElement();
	3722	+ obj.EmbedTextures(true);
	3723	+ }
	3724	+
	3725	+ refreshContents();
	3726	+ } else
	3727	+ if (source == deEmbedTexturesItem)
	3728	+ {
	3729	+ Object3D obj;
	3730	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3731	+ {
	3732	+ obj = (Object3D)e.nextElement();
	3733	+ obj.EmbedTextures(false);
	3734	+ }
	3735	+
	3736	+ CameraPane.texturepigment.clear();
	3737	+ CameraPane.texturebump.clear();
	3738	+
3103	3739	refreshContents();
3104	3740	} else
3105	3741	if (source == flashSelectionButton)
..	..	@@ -3117,38 +3753,7 @@
3117	3753	if (CameraPane.FULLSCREEN)
3118	3754	fullscreenLayout = radio.layout;
3119	3755
3120		- // bug
3121		- //gridPanel.setDividerLocation(1.0);
3122		- //bigPanel.setDividerLocation(0.0);
3123		-// bigThree.remove(scenePanel);
3124		-// bigThree.remove(centralPanel);
3125		-// bigThree.remove(XYZPanel);
3126		-// aWindowConstraints.gridx = 0;
3127		-// aWindowConstraints.gridy = 0;
3128		-// aWindowConstraints.gridwidth = 1;
3129		-// // aConstraints.gridheight = 3;
3130		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3131		-// aWindowConstraints.weightx = 0;
3132		-// aWindowConstraints.weighty = 1;
3133		-// //bigThree.add(jtp, aWindowConstraints);
3134		-// aWindowConstraints.weightx = 1;
3135		-// aWindowConstraints.gridwidth = 3;
3136		-// // aConstraints.gridheight = 3;
3137		-// aWindowConstraints.gridx = 1;
3138		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3139		-// bigThree.add(centralPanel, aWindowConstraints);
3140		-// aWindowConstraints.weightx = 0;
3141		-// aWindowConstraints.gridx = 4;
3142		-// aWindowConstraints.gridwidth = 1;
3143		-// // aConstraints.gridheight = 3;
3144		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3145		-// //bigThree.add(XYZPanel, aWindowConstraints);
3146		-// scenePanel.setVisible(false);
3147		-// centralPanel.setVisible(true);
3148		-// XYZPanel.setVisible(false);
3149		- bigThree.ClearUI();
3150		- bigThree.add(centralPanel);
3151		- bigThree.FlushUI();
	3756	+ Show3DView();
3152	3757
3153	3758	cameraView.requestFocusInWindow();
3154	3759
..	..	@@ -3203,8 +3808,8 @@
3203	3808	// centralPanel.setVisible(true);
3204	3809	// XYZPanel.setVisible(true);
3205	3810	bigThree.ClearUI();
	3811	+ bigThree.add(scenePanel);
3206	3812	bigThree.add(centralPanel);
3207		- bigThree.add(XYZPanel);
3208	3813	bigThree.FlushUI();
3209	3814
3210	3815	cameraView.requestFocusInWindow();
..	..	@@ -3284,8 +3889,8 @@
3284	3889	// centralPanel.setVisible(true);
3285	3890	// XYZPanel.setVisible(false);
3286	3891	bigThree.ClearUI();
3287		- bigThree.add(scenePanel);
3288	3892	bigThree.add(centralPanel);
	3893	+ bigThree.add(scenePanel);
3289	3894	bigThree.FlushUI();
3290	3895
3291	3896	cameraView.requestFocusInWindow();
..	..	@@ -3334,6 +3939,7 @@
3334	3939	} else
3335	3940	if (source == rootButton)
3336	3941	{
	3942	+ Replace();
3337	3943	Object3D obj;
3338	3944	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3339	3945	{
..	..	@@ -3391,10 +3997,10 @@
3391	3997	{
3392	3998	Object3D child = (Object3D)e.nextElement();
3393	3999	if(child.editWindow != null)
3394		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3395	4000	child.pinned = false;
3396	4001	child.CloseUI();
3397	4002	listUI.remove(child);
	4003	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3398	4004
3399	4005	//child.editWindow = null; // ???????????
3400	4006	}
..	..	@@ -3413,6 +4019,7 @@
3413	4019	obj.CloseUI();
3414	4020	}
3415	4021	listUI.clear();
	4022	+ SetPinStates(group.selection.size() > 0);
3416	4023	refreshContents(true);
3417	4024	} else
3418	4025	if (source == allParamsButton)
..	..	@@ -3468,6 +4075,7 @@
3468	4075	}
3469	4076
3470	4077	copy = group;
	4078	+
3471	4079	//Globals.theRenderer.object = group;
3472	4080	if(!useclient)
3473	4081	{
..	..	@@ -3495,9 +4103,24 @@
3495	4103	*/
3496	4104	radio.layout.doClick();
3497	4105
	4106	+ assert(copy instanceof Composite);
	4107	+
	4108	+ if (copy.versionlist == null)
	4109	+ {
	4110	+ copy.versionlist = new Object3D[100];
	4111	+ copy.versionindex = -1;
	4112	+
	4113	+ Save(true);
	4114	+ }
	4115	+
	4116	+ SetVersionStates();
	4117	+
3498	4118	ClearUnpinned();
3499		- SetPinStates(group.selection.size() > 0);
3500		- if (group.selection.size() == 1)
	4119	+
	4120	+ //Grafreed.Assert(group != null);
	4121	+ //Grafreed.Assert(group.selection != null);
	4122	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4123	+ if (group.selection == null \|\| group.selection.size() == 1)
3501	4124	EditSelection(false);
3502	4125	keepparent = group.parent;
3503	4126	// PARENT = NULL or not???
..	..	@@ -3510,11 +4133,13 @@
3510	4133	} else if (event.getSource() == editCameraItem)
3511	4134	{
3512	4135	cameraView.ProtectCamera();
	4136	+ cameraView.requestFocusInWindow();
3513	4137	cameraView.repaint();
3514	4138	return;
3515	4139	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3516	4140	{
3517	4141	cameraView.RevertCamera();
	4142	+ cameraView.requestFocusInWindow();
3518	4143	cameraView.repaint();
3519	4144	return;
3520	4145	// } else if (event.getSource() == textureButton)
..	..	@@ -4091,7 +4716,7 @@
4091	4716
4092	4717	try
4093	4718	{
4094		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4719	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4095	4720	}
4096	4721	catch (Exception e)
4097	4722	{
..	..	@@ -4568,6 +5193,12 @@
4568	5193
4569	5194	void EditSelection(boolean newWindow)
4570	5195	{
	5196	+ if (group.selection == null)
	5197	+ {
	5198	+ EditElement(group, newWindow); // ? new
	5199	+ return;
	5200	+ }
	5201	+
4571	5202	// aConstraints.gridy = 0;
4572	5203	for (int i=0; i<group.selection.size(); i++)
4573	5204	{
..	..	@@ -4578,12 +5209,7 @@
4578	5209	Object3D elem = (Object3D)group.selection.elementAt(i);
4579	5210	if(elem != group \|\| !newWindow)
4580	5211	{
4581		- // if (!(elem instanceof Composite))
4582		- // newWindow = false;
4583		- listUI.add(elem);
4584		- elem.openEditWindow(this, newWindow); //, false);
4585		- System.out.println("edit : " + elem);
4586		- elem.editWindow.refreshContents(true); // ? new
	5212	+ EditElement(elem, newWindow); // ? new
4587	5213	}
4588	5214	}
4589	5215	}
..	..	@@ -4646,9 +5272,7 @@
4646	5272
4647	5273	freezemodel = false;
4648	5274	}
4649		-
4650		- boolean flashIt = true;
4651		-
	5275	+
4652	5276	public void valueChanged(TreeSelectionEvent e)
4653	5277	//public boolean handleEvent(Event event)
4654	5278	{
..	..	@@ -4721,14 +5345,30 @@
4721	5345	{
4722	5346	editButton.setEnabled(enabled);
4723	5347	uneditButton.setEnabled(enabled);
4724		- unselectButton.setEnabled(enabled);
	5348	+ //unselectButton.setEnabled(enabled);
4725	5349	flashSelectionButton.setEnabled(enabled);
	5350	+
	5351	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5352	+
	5353	+ boolean allComposites = true;
	5354	+
	5355	+ if (group.selection != null)
	5356	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5357	+ {
	5358	+ if (!(e.nextElement() instanceof Composite))
	5359	+ {
	5360	+ allComposites = false;
	5361	+ break;
	5362	+ }
	5363	+ }
	5364	+
	5365	+ rootButton.setEnabled(allComposites);
4726	5366	}
4727	5367
4728	5368	void refreshContents(boolean cp)
4729	5369	{
4730		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4731		- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	5370	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5371	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4732	5372	{
4733	5373	objEditor.ClearInfo(); // .GetMaterial());
4734	5374
..	..	@@ -4737,7 +5377,7 @@
4737	5377	Object3D child = (Object3D) group.selection.get(i);
4738	5378
4739	5379	objEditor.AddInfo(child, this, true);
4740		- System.err.println("info : " + child.GetPath());
	5380	+// System.err.println("info : " + child.GetPath());
4741	5381	}
4742	5382
4743	5383	objEditor.SetText(); // jan 2014
..	..	@@ -4827,8 +5467,8 @@
4827	5467
4828	5468	if (cut)
4829	5469	{
4830		- if (Globals.SAVEONMAKE)
4831		- Save();
	5470	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5471	+// Save();
4832	5472	//int indices[] = jList.getSelectedIndices();
4833	5473	//for (int i = indices.length - 1; i >= 0; i--)
4834	5474	//jList.remove(indices[i]);
..	..	@@ -4931,6 +5571,10 @@
4931	5571
4932	5572	void paste(boolean expand)
4933	5573	{
	5574	+ if (Globals.REPLACEONMAKE)
	5575	+ Save();
	5576	+ boolean keep = Globals.REPLACEONMAKE;
	5577	+ Globals.REPLACEONMAKE = false;
4934	5578	// if (GrafreeD.clipboard == null)
4935	5579	// return;
4936	5580	boolean first = true;
..	..	@@ -4990,6 +5634,7 @@
4990	5634	Grafreed.clipboard.get(0).parent = keepparent;
4991	5635	}
4992	5636
	5637	+ Globals.REPLACEONMAKE = keep;
4993	5638	ResetModel();
4994	5639	refreshContents();
4995	5640	}
..	..	@@ -5125,6 +5770,10 @@
5125	5770
5126	5771	void group(Object3D csg, boolean grab)
5127	5772	{
	5773	+ if (Globals.REPLACEONMAKE)
	5774	+ Save();
	5775	+ boolean keep = Globals.REPLACEONMAKE;
	5776	+ Globals.REPLACEONMAKE = false;
5128	5777	if (//false) // why??
5129	5778	!group.selection.isEmpty())
5130	5779	{
..	..	@@ -5238,10 +5887,15 @@
5238	5887	//node.add(csg);
5239	5888	//makeSomething(node);
5240	5889	makeSomething(csg);
	5890	+ Globals.REPLACEONMAKE = keep;
5241	5891	}
5242	5892
5243	5893	void Ungroup(Object3D g)
5244	5894	{
	5895	+ if (Globals.REPLACEONMAKE)
	5896	+ Save();
	5897	+ boolean keep = Globals.REPLACEONMAKE;
	5898	+ Globals.REPLACEONMAKE = false;
5245	5899	if (g instanceof HiddenObject)
5246	5900	{
5247	5901	HiddenObject h = (HiddenObject) g;
..	..	@@ -5258,6 +5912,7 @@
5258	5912	objEditor.makeSomething(g.get(i), false);
5259	5913	}
5260	5914	}
	5915	+ Globals.REPLACEONMAKE = keep;
5261	5916	}
5262	5917
5263	5918	void ungroup()
..	..	@@ -5548,7 +6203,6 @@
5548	6203
5549	6204	cButton restoreCameraButton;
5550	6205
5551		- cButton saveButton;
5552	6206	cButton oneStepButton;
5553	6207
5554	6208	cButton groupButton;
..	..	@@ -5557,6 +6211,22 @@
5557	6211	cButton switchButton;
5558	6212	cButton loopButton;
5559	6213	cButton textureButton;
	6214	+
	6215	+ cButton skybox1Button;
	6216	+ cButton skybox2Button;
	6217	+ cButton skybox3Button;
	6218	+ cButton skybox4Button;
	6219	+ cButton skybox5Button;
	6220	+ cButton skybox6Button;
	6221	+ cButton skybox7Button;
	6222	+
	6223	+ cButton skybox11Button;
	6224	+ cButton skybox12Button;
	6225	+ cButton skybox13Button;
	6226	+ cButton skybox14Button;
	6227	+ cButton skybox15Button;
	6228	+ cButton skybox16Button;
	6229	+ cButton skybox17Button;
5560	6230
5561	6231	cButton gridButton;
5562	6232	cButton boxButton;
..	..	@@ -5590,11 +6260,11 @@
5590	6260	private MenuItem lookAtItem;
5591	6261	private MenuItem lookFromItem;
5592	6262	private MenuItem switchViewItem;
5593		- private MenuItem cutItem;
	6263	+ private JMenuItem cutItem;
5594	6264	private MenuItem undoItem;
5595	6265	private MenuItem redoItem;
5596	6266	private JMenuItem duplicateItem;
5597		- private MenuItem cloneItem;
	6267	+ private JMenuItem cloneItem;
5598	6268	private MenuItem cloneSupportItem;
5599	6269	private MenuItem overwriteGeoItem;
5600	6270	private MenuItem overwriteMatItem;
..	..	@@ -5615,13 +6285,13 @@
5615	6285	private MenuItem cloneGeometriesItem;
5616	6286	private MenuItem shareGeometriesItem;
5617	6287	private MenuItem mergeGeometriesItem;
5618		- private MenuItem copyItem;
	6288	+ private JMenuItem copyItem;
5619	6289	private MenuItem pasteItem;
5620		- private MenuItem pasteIntoItem;
5621		- private MenuItem pasteLinkItem;
5622		- private MenuItem pasteCloneItem;
5623		- private MenuItem pasteExpandItem;
5624		- private MenuItem clearItem;
	6290	+ private JMenuItem pasteIntoItem;
	6291	+ private JMenuItem pasteLinkItem;
	6292	+ private JMenuItem pasteCloneItem;
	6293	+ private JMenuItem pasteExpandItem;
	6294	+ private JMenuItem deleteItem;
5625	6295	private MenuItem clearAllItem;
5626	6296	private MenuItem genUVItem;
5627	6297	private MenuItem genNormalsMESHItem;
..	..	@@ -5689,7 +6359,7 @@
5689	6359	private MenuItem switchTransfoItem;
5690	6360	private MenuItem morphItem;
5691	6361	private MenuItem linkerItem;
5692		- private MenuItem ungroupItem;
	6362	+ private JMenuItem ungroupItem;
5693	6363	private MenuItem editItem;
5694	6364	private MenuItem openWindowItem;
5695	6365	private MenuItem editLeafItem;
..	..	@@ -5705,6 +6375,8 @@
5705	6375	private MenuItem attachBumpItem;
5706	6376	private MenuItem detachBumpItem;
5707	6377	private MenuItem pigmentBumpItem;
	6378	+ private MenuItem embedTexturesItem;
	6379	+ private MenuItem deEmbedTexturesItem;
5708	6380
5709	6381	private MenuItem particleItem;
5710	6382	private MenuItem ragdollItem;