~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	{
..	..	@@ -220,7 +601,7 @@
220	601	// toggleSwitchItem.addItemListener(this);
221	602	// toggleSwitchItem.setState(CameraPane.SWITCH);
222	603
223		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	604	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	605	toggleHandleItem.addItemListener(this);
225	606	toggleHandleItem.setState(CameraPane.HANDLES);
226	607
..	..	@@ -276,11 +657,9 @@
276	657	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
277	658	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
278	659	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
280	660	oe.cameraMenu.add("-");
281	661	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
282	662	openWindowItem.addActionListener(this);
283		- editLeafItem.addActionListener(this);
284	663	lookAtItem.addActionListener(this);
285	664	//lookFromItem.addActinoListener(this);
286	665	//switchViewItem.addActionListener(this);
..	..	@@ -342,7 +721,7 @@
342	721	hideItem = menu.add(new MenuItem("Hidden Group"));
343	722	hideItem.addActionListener(this);
344	723	}
345		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
346	725	ungroupItem.addActionListener(this);
347	726
348	727	// menu.add("-");
..	..	@@ -380,13 +759,14 @@
380	759	shadowYItem.addActionListener(this);
381	760	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382	761	shadowZItem.addActionListener(this);
	762	+ attributeItem = menu.add(new MenuItem("Attribute"));
	763	+ attributeItem.addActionListener(this);
	764	+
383	765	if (Globals.ADVANCED)
384	766	{
385	767	menu.add("-");
386	768	linkerItem = menu.add(new MenuItem("Linker"));
387	769	linkerItem.addActionListener(this);
388		- attributeItem = menu.add(new MenuItem("Attribute"));
389		- attributeItem.addActionListener(this);
390	770	templateItem = menu.add(new MenuItem("Template"));
391	771	templateItem.addActionListener(this);
392	772	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -415,7 +795,7 @@
415	795	genNormalsMESHItem.addActionListener(this);
416	796	if (Globals.ADVANCED)
417	797	{
418		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	798	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419	799	genNormalsMINEItem.addActionListener(this);
420	800	}
421	801	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -508,10 +888,15 @@
508	888	attachBumpItem.addActionListener(this);
509	889	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
510	890	pigmentBumpItem.addActionListener(this);
	891	+ //embedTexturesItem
511	892	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
512	893	detachPigmentItem.addActionListener(this);
513	894	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
514	895	detachBumpItem.addActionListener(this);
	896	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	897	+ embedTexturesItem.addActionListener(this);
	898	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	899	+ deEmbedTexturesItem.addActionListener(this);
515	900	menu.add("-");
516	901	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
517	902	sortbysizeItem.addActionListener(this);
..	..	@@ -522,6 +907,9 @@
522	907	shareGeometriesItem.addActionListener(this);
523	908	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
524	909	mergeGeometriesItem.addActionListener(this);
	910	+ menu.add("-");
	911	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	912	+ editLeafItem.addActionListener(this);
525	913	if (Globals.ADVANCED)
526	914	{
527	915	// Pretty much the same as duplicate and clone.
..	..	@@ -538,6 +926,74 @@
538	926	buildToolsMenu(menu);
539	927	}
540	928
	929	+ JTabbedPane resourcecontainer;
	930	+ cGridBag currenttab;
	931	+ boolean added; // patch for jar
	932	+
	933	+ int tabcount = 0;
	934	+ int colcount = 0;
	935	+ int rowcount = 0;
	936	+ int texturecount = 0;
	937	+
	938	+ int columns = 5;
	939	+ int rows = 7;
	940	+
	941	+ public void ResourceCallBack(String[] path)
	942	+ {
	943	+ for (int i = 0; i < path.length; i++)
	944	+ System.out.print(path[i] + "/");
	945	+ System.out.println();
	946	+
	947	+ if (//rowcount == 0 \|\|
	948	+ path.length == 1)
	949	+ {
	950	+ currenttab = new cGridBag();
	951	+ added = false;
	952	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	953	+ currenttab.setName(tabname);
	954	+ rowcount = 1;
	955	+ colcount = 0;
	956	+ texturecount = 0;
	957	+ }
	958	+
	959	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	960	+ {
	961	+ if (!added)
	962	+ {
	963	+ added = true;
	964	+ resourcecontainer.add(currenttab);
	965	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	966	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	967	+ }
	968	+
	969	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	970	+
	971	+ if (++colcount >= columns)
	972	+ {
	973	+ colcount = 0;
	974	+ currenttab.Return();
	975	+
	976	+ if (rowcount++ >= rows)
	977	+ {
	978	+ rowcount = 0;
	979	+ }
	980	+ }
	981	+ }
	982	+ else
	983	+ {
	984	+// if (!path[path.length-1].equals("icons"))
	985	+// resourcecontainer.Return();
	986	+ }
	987	+ }
	988	+
	989	+ void CreateTexturePanel(cGridBag container)
	990	+ {
	991	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	992	+ container.add(resourcecontainer);
	993	+
	994	+ Grafreed.ParseResources("textures", this);
	995	+ }
	996	+
541	997	void SetupUI2(ObjEditor oe)
542	998	{
543	999	// June 2019
..	..	@@ -555,11 +1011,6 @@
555	1011	//new Exception().printStackTrace();
556	1012
557	1013	oe.radioPanel = new JPanel(new GridBagLayout());
558		- oe.aConstraints.weightx = 1;
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
561		- oe.aConstraints.gridwidth = 100;
562		- oe.aConstraints.gridheight = 1;
563	1014	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
564	1015
565	1016	oe.buttonGroup = new ButtonGroup();
..	..	@@ -590,50 +1041,109 @@
590	1041	//minButton.setToolTipText("Minimize window");
591	1042	//minButton.addActionListener(this);
592	1043
593		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- maxButton.setToolTipText("Maximize window");
595		- maxButton.addActionListener(this);
	1044	+ if (Globals.ADVANCED)
	1045	+ {
	1046	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1047	+// maxButton.setToolTipText("Maximize window");
	1048	+// maxButton.addActionListener(this);
	1049	+ }
	1050	+
	1051	+ cButton gcButton;
	1052	+
	1053	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// gcButton.setToolTipText("Garbage collect");
	1055	+// gcButton.addActionListener(new ActionListener()
	1056	+// {
	1057	+// public void actionPerformed(ActionEvent e)
	1058	+// {
	1059	+// System.gc();
	1060	+// }
	1061	+// });
	1062	+
	1063	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ collapseButton.setToolTipText("Collapse toolbar");
	1065	+ collapseButton.addActionListener(this);
	1066	+
	1067	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1069	+ maximize3DButton.addActionListener(this);
	1070	+
	1071	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ twoButton.setToolTipText("Show 3D view only");
	1073	+ twoButton.addActionListener(this);
	1074	+ this.fullscreenLayout = twoButton;
	1075	+
	1076	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ threeButton.setToolTipText("Show controls and 3D view");
	1078	+ threeButton.addActionListener(this);
	1079	+ if (Globals.ADVANCED)
	1080	+ {
	1081	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ sixButton.setToolTipText("Show 3D view and controls");
	1083	+ sixButton.addActionListener(this);
	1084	+ }
	1085	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1086	+// sevenButton.setToolTipText("3-column layout");
	1087	+// sevenButton.addActionListener(this);
	1088	+ //
596	1089
597	1090	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598	1091	fullButton.setToolTipText("Full-screen window");
599	1092	fullButton.addActionListener(this);
600	1093
	1094	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1095	+ screenfitButton.setToolTipText("Screen fit");
	1096	+ screenfitButton.addActionListener(this);
	1097	+
601	1098	oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	1099	restoreCameraButton.setToolTipText("Restore viewpoint");
603	1100	restoreCameraButton.addActionListener(this);
604	1101
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);
	1102	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ saveVersionButton.setToolTipText("Duplicate current version");
	1104	+ saveVersionButton.addActionListener(this);
	1105	+
	1106	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+ deleteVersionButton.setToolTipText("Delete current version");
	1108	+ deleteVersionButton.addActionListener(this);
	1109	+
	1110	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1111	+ previousVersionButton.setToolTipText("Previous version");
	1112	+ previousVersionButton.addActionListener(this);
	1113	+ previousVersionButton.setEnabled(false);
609	1114
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);
	1115	+ cGridBag updown = new cGridBag().setVertical(true);
	1116	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ restoreButton.setToolTipText("Undo (restore current version)");
	1118	+ restoreButton.addActionListener(this);
	1119	+ //restoreButton.setEnabled(false);
614	1120
615		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616		- saveButton.setToolTipText("Save changes");
617		- saveButton.addActionListener(this);
	1121	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1122	+ replaceButton.setToolTipText("Save (replace current version)");
	1123	+ replaceButton.addActionListener(this);
	1124	+ //replaceButton.setEnabled(false);
618	1125
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);
	1126	+ copyOptionsPanel.add(updown);
	1127	+
	1128	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ nextVersionButton.setToolTipText("Next version");
	1130	+ nextVersionButton.addActionListener(this);
	1131	+ nextVersionButton.setEnabled(false);
	1132	+
	1133	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624	1134	oneStepButton.setToolTipText("Animate one step forward");
625	1135	oneStepButton.addActionListener(this);
626	1136
627		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1137	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1138	+ liveCB.setToolTipText("Enable animation");
	1139	+ liveCB.addItemListener(this);
	1140	+
	1141	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
628	1142	fastCB.setToolTipText("Fast mode");
629	1143	fastCB.addItemListener(this);
630	1144
631	1145	//oe.toolboxPanel.Return();
632	1146
633		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- screenfitButton.setToolTipText("Screen fit");
635		- screenfitButton.addActionListener(this);
636		-
637	1147	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
638	1148	// trackCB.setToolTipText("Enable tracking");
639	1149	// trackCB.addItemListener(this);
..	..	@@ -646,31 +1156,17 @@
646	1156	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647	1157	snapobjectButton.addActionListener(this);
648	1158	snapobjectButton.setToolTipText("Snap Object");
	1159	+
	1160	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1161	+ fourButton.addActionListener(this);
	1162	+ fourButton.setToolTipText("Show control panel only");
649	1163	}
650	1164
651	1165	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
652	1166
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	1167
672		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
673		- rootButton.setToolTipText("Edit selection in new tab");
	1168	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ rootButton.setToolTipText("Open selection in new tab");
674	1170	rootButton.addActionListener(this);
675	1171
676	1172	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -679,28 +1175,30 @@
679	1175	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
680	1176	//clearButton.addActionListener(this);
681	1177
	1178	+ cGridBag row1 = new cGridBag();
	1179	+
682	1180	// INSERT
683		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684		- gridButton.setToolTipText("Create grid");
	1181	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ gridButton.setToolTipText("Create ground");
685	1183	gridButton.addActionListener(this);
686	1184
687		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688	1186	boxButton.setToolTipText("Create box");
689	1187	boxButton.addActionListener(this);
690	1188
691		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1189	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
692	1190	sphereButton.setToolTipText("Create sphere");
693	1191	sphereButton.addActionListener(this);
694	1192
695		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1193	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696	1194	coneButton.setToolTipText("Create cone");
697	1195	coneButton.addActionListener(this);
698	1196
699		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700	1198	torusButton.setToolTipText("Create torus");
701	1199	torusButton.addActionListener(this);
702	1200
703		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1201	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
704	1202	superButton.setToolTipText("Create superellipsoid");
705	1203	superButton.addActionListener(this);
706	1204
..	..	@@ -711,72 +1209,74 @@
711	1209	kleinButton.addActionListener(this);
712	1210	}
713	1211
714		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1212	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
715	1213	particlesButton.setToolTipText("Create particle system");
716	1214	particlesButton.addActionListener(this);
717	1215
718		- oe.toolboxPanel.Return();
	1216	+ oe.toolboxPanel.add(row1);
719	1217
720		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1218	+ cGridBag row2 = new cGridBag();
	1219	+
	1220	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
721	1221	groupButton.setToolTipText("Create group");
722	1222	groupButton.addActionListener(this);
723	1223
724		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
725	1225	compositeButton.setToolTipText("Create composite");
726	1226	compositeButton.addActionListener(this);
727	1227
728		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
729		- switchButton.setToolTipText("Create switch");
	1228	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ switchButton.setToolTipText("Create item switcher");
730	1230	switchButton.addActionListener(this);
731	1231
732		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
733	1233	loopButton.setToolTipText("Create loop");
734	1234	loopButton.addActionListener(this);
735	1235
736		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
737	1237	textureButton.setToolTipText("Create texture");
738	1238	textureButton.addActionListener(this);
739	1239
740		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
741	1241	overlayButton.setToolTipText("Create overlay");
742	1242	overlayButton.addActionListener(this);
743	1243
744		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1244	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
745	1245	lightButton.setToolTipText("Create light");
746	1246	lightButton.addActionListener(this);
747	1247
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		- }
	1248	+ oe.toolboxPanel.add(row2);
	1249	+
	1250	+ cGridBag textures = new cGridBag();
	1251	+
	1252	+ CreateTexturePanel(textures);
	1253	+
	1254	+ oe.toolboxPanel.add(textures);
	1255	+
	1256	+ textures.preferredHeight = 100;
	1257	+
	1258	+ CreateSkyboxPanel(oe.skyboxPanel);
759	1259
760	1260	// EDIT panel
761		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
762		- editButton.setToolTipText("Edit selection");
	1261	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1262	+ editButton.setToolTipText("Pin selection controls");
763	1263	editButton.addActionListener(this);
764	1264
765		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
766		- uneditButton.setToolTipText("Unedit selection");
	1265	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ uneditButton.setToolTipText("Unpin and remove selection controls");
767	1267	uneditButton.addActionListener(this);
768	1268
769	1269	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
770		- allParamsButton.setToolTipText("Edit all params");
	1270	+ allParamsButton.setToolTipText("Show all controls");
771	1271	allParamsButton.addActionListener(this);
772	1272
773		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
774		- clearPanelButton.setToolTipText("Clear edit panel");
	1273	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1274	+ clearPanelButton.setToolTipText("Clear all controls");
775	1275	clearPanelButton.addActionListener(this);
776	1276
777		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
778		- unselectButton.setToolTipText("Unselect");
779		- unselectButton.addActionListener(this);
	1277	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1278	+ //unselectButton.setToolTipText("Unselect");
	1279	+ //unselectButton.addActionListener(this);
780	1280
781	1281	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
782	1282	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -784,6 +1284,7 @@
784	1284
785	1285	editCommandsPanel.preferredHeight = 1;
786	1286
	1287	+ SetPinStates(false);
787	1288	// oe.treePanel.add(commandsPanel);
788	1289	// oe.treePanel.Return();
789	1290
..	..	@@ -810,9 +1311,12 @@
810	1311
811	1312	oe.treePanel.add(copyOptionsPanel);
812	1313	oe.treePanel.Return();
	1314	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1315	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1316	+ sliderPane.preferredHeight = 1;
813	1317
814		-// mainPanel.setDividerLocation(0.5); //1.0);
815		-// mainPanel.setResizeWeight(0.5);
	1318	+// mainPanel.setDividerLocation(0.1); //1.0);
	1319	+ mainPanel.setResizeWeight(0.4);
816	1320
817	1321	//jList.addListSelectionListener(this);
818	1322	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -820,7 +1324,7 @@
820	1324	//jTree.setEditable(true);
821	1325	oe.jTree.setDragEnabled(true);
822	1326	//jTree.setPreferredSize(new Dimension(10,10));
823		- jSP.setPreferredSize(new Dimension(100,200));
	1327	+ //jSP.setPreferredSize(new Dimension(100,200));
824	1328
825	1329	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
826	1330
..	..	@@ -832,7 +1336,7 @@
832	1336	dgr.addDragGestureListener(this);
833	1337	}catch(Exception e) {}
834	1338	*/
835		- radio.layout = sevenButton;
	1339	+ radio.layout = threeButton; // sixButton;
836	1340	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
837	1341	}
838	1342
..	..	@@ -857,14 +1361,18 @@
857	1361	boxCB.addItemListener(this);
858	1362
859	1363	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
860		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1364	+ zoomBoxCB.setToolTipText("Display only for wheel");
861	1365	zoomBoxCB.addItemListener(this);
862	1366
863	1367	if (true) // Globals.ADVANCED)
864	1368	{
865		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
866		- supportCB.setToolTipText("Enable rigging");
867		- supportCB.addItemListener(this);
	1369	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1370	+// supportCB.setToolTipText("Enable rigging");
	1371	+// supportCB.addItemListener(this);
	1372	+
	1373	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1374	+ freezeCB.setToolTipText("Fast moving camera");
	1375	+ freezeCB.addItemListener(this);
868	1376
869	1377	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
870	1378	// localCB.addItemListener(this);
..	..	@@ -879,9 +1387,12 @@
879	1387	smoothCB.setToolTipText("Snapping delay");
880	1388	smoothCB.addItemListener(this);
881	1389
882		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
883		- slowCB.setToolTipText("Smooth interpolation");
884		- slowCB.addItemListener(this);
	1390	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1391	+// slowCB.setToolTipText("Smooth interpolation");
	1392	+// slowCB.addItemListener(this);
	1393	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1394	+ minshaderCB.setToolTipText("Minimal fast shader");
	1395	+ minshaderCB.addItemListener(this);
885	1396
886	1397	// constraints.gridy += 1;
887	1398	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -919,7 +1430,7 @@
919	1430	oeilCB.addItemListener(this);
920	1431
921	1432	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
922		- shadowCB.setToolTipText("Compute shadows when live");
	1433	+ shadowCB.setToolTipText("When live compute shadows");
923	1434	shadowCB.addItemListener(this);
924	1435
925	1436	panel.Return();
..	..	@@ -928,12 +1439,12 @@
928	1439	toggleTextureCB.addItemListener(this);
929	1440
930	1441	panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
931		- toggleSwitchCB.setToolTipText("Use switch");
	1442	+ toggleSwitchCB.setToolTipText("Choose a single item");
932	1443	toggleSwitchCB.addItemListener(this);
933	1444
934		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
935		- autosaveCB.setToolTipText("Auto-save on structure change");
936		- autosaveCB.addItemListener(this);
	1445	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1446	+ autokeepCB.setToolTipText("On structure change");
	1447	+ autokeepCB.addItemListener(this);
937	1448
938	1449	panel.Return();
939	1450	if (Globals.ADVANCED)
..	..	@@ -960,9 +1471,17 @@
960	1471
961	1472	void EditObject(Object3D obj)
962	1473	{
	1474	+ assert(obj instanceof Composite);
	1475	+
	1476	+// if (obj.versionlist == null)
	1477	+// {
	1478	+// obj.versionlist = new Object3D[100];
	1479	+// obj.versionindex = -1;
	1480	+// }
	1481	+
963	1482	cRadio radioButton = new cRadio(obj.name);
964	1483
965		- // Patch to avoid bug with transparency.
	1484	+ // June 2019. Patch to avoid bug with transparency.
966	1485	radioButton.hadMaterial = obj.material != null;
967	1486	if (!radioButton.hadMaterial)
968	1487	{
..	..	@@ -970,7 +1489,7 @@
970	1489	}
971	1490
972	1491	radioButton.SetObject(obj);
973		- radioButton.layout = sevenButton;
	1492	+ radioButton.layout = threeButton; // sixButton;
974	1493	radioButton.SetCamera(cameraView.renderCamera, false);
975	1494	radioButton.addActionListener(this);
976	1495	radioPanel.add(radioButton);
..	..	@@ -995,10 +1514,13 @@
995	1514	cCheckBox localCB;
996	1515	cCheckBox crowdCB;
997	1516	cCheckBox smoothCB;
	1517	+ cCheckBox minshaderCB;
	1518	+
998	1519	cToggleButton fastCB;
999	1520	cCheckBox slowCB;
1000	1521	cCheckBox boxCB;
1001	1522	cCheckBox zoomBoxCB;
	1523	+ cCheckBox freezeCB;
1002	1524	//cToggleButton trackCB;
1003	1525	cCheckBox trackCB;
1004	1526	cCheckBox smoothfocusCB;
..	..	@@ -1009,7 +1531,7 @@
1009	1531
1010	1532	cCheckBox oeilCB;
1011	1533	cCheckBox shadowCB;
1012		- cCheckBox autosaveCB;
	1534	+ cCheckBox autokeepCB;
1013	1535	cCheckBox lookAtCB;
1014	1536
1015	1537	// static int COLOR = 1;
..	..	@@ -1065,6 +1587,12 @@
1065	1587	cameraView.ToggleInertia();
1066	1588	cameraView.repaint();
1067	1589	}
	1590	+ else if(e.getSource() == minshaderCB)
	1591	+ {
	1592	+ Globals.MINSHADER ^= true;
	1593	+ cameraView.programInitialized = false;
	1594	+ cameraView.repaint();
	1595	+ }
1068	1596	else if(e.getSource() == localCB)
1069	1597	{
1070	1598	cameraView.ToggleLocal();
..	..	@@ -1117,9 +1645,13 @@
1117	1645	{
1118	1646	Globals.COMPUTESHADOWWHENLIVE ^= true;
1119	1647	}
1120		- else if(e.getSource() == autosaveCB)
	1648	+ else if(e.getSource() == freezeCB)
1121	1649	{
1122		- Globals.SAVEONMAKE ^= true;
	1650	+ Globals.FREEZEONMOVE ^= true;
	1651	+ }
	1652	+ else if(e.getSource() == autokeepCB)
	1653	+ {
	1654	+ Globals.REPLACEONMAKE ^= true;
1123	1655	}
1124	1656	else if(e.getSource() == lookAtCB)
1125	1657	{
..	..	@@ -1201,8 +1733,6 @@
1201	1733	}
1202	1734	}
1203	1735
1204		- String string = (String) object;
1205		-
1206	1736	System.out.println("Transfer = " + object + "; drop : " + target);
1207	1737	// if( object instanceof java.io.File[])
1208	1738	// {
..	..	@@ -1210,6 +1740,8 @@
1210	1740	// objEditor.DropFile((java.io.File[]) object, true);
1211	1741	// return;
1212	1742	// }
	1743	+
	1744	+ String string = object.toString();
1213	1745
1214	1746	// File path for Mac and Windows
1215	1747	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1337,7 +1869,12 @@
1337	1869	TreePath path;
1338	1870
1339	1871	public TransferableTreePath(TreePath tp) {
1340		- path = tp;
	1872	+ Object[] objs = new Object[tp.getPathCount()];
	1873	+ for (int i=0; i<objs.length; i++)
	1874	+ {
	1875	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1876	+ }
	1877	+ path = new TreePath(objs);
1341	1878	}
1342	1879
1343	1880	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1459,6 +1996,9 @@
1459	1996	animationItem.addItemListener(this);
1460	1997	animationItem.setState(Globals.ANIMATION);
1461	1998
	1999	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2000	+ archiveItem.addActionListener(this);
	2001	+
1462	2002	menu.add("-");
1463	2003	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1464	2004	parseverticesItem.addActionListener(this);
..	..	@@ -1471,6 +2011,8 @@
1471	2011	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1472	2012	reduce34MorphItem.addActionListener(this);
1473	2013	menu.add("-");
	2014	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2015	+ memoryItem.addActionListener(this);
1474	2016	menu.add(computeAOItem = new MenuItem("Compute AO"));
1475	2017	computeAOItem.addActionListener(this);
1476	2018
..	..	@@ -1479,8 +2021,6 @@
1479	2021	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1480	2022	mirrorItem.addActionListener(this);
1481	2023	menu.add("-");
1482		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1483		- memoryItem.addActionListener(this);
1484	2024	menu.add(analyzeItem = new MenuItem("Analyze"));
1485	2025	analyzeItem.addActionListener(this);
1486	2026	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1628,6 +2168,30 @@
1628	2168
1629	2169	makeSomething(shadow);
1630	2170	}
	2171	+
	2172	+ private void ClearUnpinned()
	2173	+ {
	2174	+ //for (Object3D obj : listUI)
	2175	+ for (int i=listUI.size(); --i>=0;)
	2176	+ {
	2177	+ Object3D obj = listUI.elementAt(i);
	2178	+ if (!obj.pinned)
	2179	+ {
	2180	+ obj.CloseUI();
	2181	+ listUI.remove(i);
	2182	+ }
	2183	+ }
	2184	+ }
	2185	+
	2186	+ private void EditElement(Object3D elem, boolean newWindow)
	2187	+ {
	2188	+ // if (!(elem instanceof Composite))
	2189	+ // newWindow = false;
	2190	+ listUI.add(elem);
	2191	+ elem.openEditWindow(this, newWindow); //, false);
	2192	+ System.out.println("edit : " + elem);
	2193	+ elem.editWindow.refreshContents(true); // ? new
	2194	+ }
1631	2195
1632	2196	/**
1633	2197	* applyExample
..	..	@@ -2056,6 +2620,23 @@
2056	2620	{
2057	2621	makeSomething(new Light());
2058	2622	} else
	2623	+// if (source == skybox1Button \|\|
	2624	+// source == skybox2Button \|\|
	2625	+// source == skybox3Button \|\|
	2626	+// source == skybox4Button \|\|
	2627	+// source == skybox5Button \|\|
	2628	+// source == skybox6Button \|\|
	2629	+// source == skybox7Button \|\|
	2630	+// source == skybox11Button \|\|
	2631	+// source == skybox12Button \|\|
	2632	+// source == skybox13Button \|\|
	2633	+// source == skybox14Button \|\|
	2634	+// source == skybox15Button \|\|
	2635	+// source == skybox16Button \|\|
	2636	+// source == skybox17Button)
	2637	+// {
	2638	+// ChangeSkybox(source);
	2639	+// } else
2059	2640	if (source == csgItem)
2060	2641	{
2061	2642	group(new CSG());
..	..	@@ -2104,28 +2685,36 @@
2104	2685	} else
2105	2686	if (source == loopItem \|\| source == loopButton)
2106	2687	{
	2688	+ if (!group.selection.isEmpty())
	2689	+ {
2107	2690	Composite csg = new GroupLeaf();
2108	2691	csg.count = 5;
2109		- group(csg);
2110		- Composite child = new cGroup();
	2692	+ Composite child = new cGroup("Branch");
2111	2693	csg.addChild(child);
2112	2694	child.addChild(csg);
	2695	+ group(csg);
	2696	+ }
2113	2697	} else
2114	2698	if (source == doubleItem)
2115	2699	{
2116		- Composite csg = new GroupLeaf();
	2700	+ if (!group.selection.isEmpty())
	2701	+ {
	2702	+ Composite csg = new GroupLeaf("Fork");
2117	2703	csg.count = 5;
	2704	+ Composite child = new cGroup("Branch A");
	2705	+ csg.addChild(child);
	2706	+ child.addChild(csg);
	2707	+ child = new cGroup("Branch B");
	2708	+ csg.addChild(child);
	2709	+ child.addChild(csg);
2118	2710	group(csg);
2119		- Composite child = new cGroup();
2120		- csg.addChild(child);
2121		- child.addChild(csg);
2122		- child = new cGroup();
2123		- csg.addChild(child);
2124		- child.addChild(csg);
	2711	+ }
2125	2712	} else
2126	2713	if (source == tripleItem)
2127	2714	{
2128		- Composite csg = new GroupLeaf();
	2715	+ if (!group.selection.isEmpty())
	2716	+ {
	2717	+ Composite csg = new GroupLeaf("Trident");
2129	2718	csg.count = 4;
2130	2719	group(csg);
2131	2720	Composite child = new cGroup();
..	..	@@ -2137,11 +2726,12 @@
2137	2726	child = new cGroup();
2138	2727	csg.addChild(child);
2139	2728	child.addChild(csg);
	2729	+ }
2140	2730	} else
2141	2731	if (source == computeAOItem)
2142	2732	{
2143	2733	Globals.drawMode = CameraPane.OCCLUSION;
2144		- Globals.theRenderer.repaint();
	2734	+ cameraView.repaint();
2145	2735	} else
2146	2736	if (source == recompileItem)
2147	2737	{
..	..	@@ -2156,7 +2746,7 @@
2156	2746	if (source == invariantsItem)
2157	2747	{
2158	2748	System.out.println("Invariants:");
2159		- Grafreed.grafreeD.universe.invariants();
	2749	+ Grafreed.grafreed.universe.invariants();
2160	2750	} else
2161	2751	if (source == memoryItem)
2162	2752	{
..	..	@@ -2187,17 +2777,52 @@
2187	2777	{
2188	2778	ToggleFullScreen();
2189	2779	} else
2190		- if (source == undoButton)
	2780	+ if (source == collapseButton)
2191	2781	{
2192		- Undo();
	2782	+ this.expandedLayout = radio.layout;
	2783	+ CollapseToolbar();
2193	2784	} else
2194		- if (source == redoButton)
	2785	+ if (source == maximize3DButton)
2195	2786	{
2196		- Redo();
	2787	+ this.expandedLayout = radio.layout;
	2788	+ radio.layout = twoButton;
	2789	+ Show3DView();
	2790	+ CollapseToolbar();
2197	2791	} else
2198		- if (source == saveButton)
	2792	+ if (source == previousVersionButton)
2199	2793	{
2200		- Save();
	2794	+ // Go to previous version
	2795	+ //if (!Undo())
	2796	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2797	+ PreviousVersion();
	2798	+ } else
	2799	+ if (source == restoreButton)
	2800	+ {
	2801	+ // Restore current version
	2802	+ Restore();
	2803	+ //restoreButton.setEnabled(false);
	2804	+ } else
	2805	+ if (source == replaceButton)
	2806	+ {
	2807	+ // Overwrite current version
	2808	+ Replace();
	2809	+ //replaceButton.setEnabled(false);
	2810	+ } else
	2811	+ if (source == nextVersionButton)
	2812	+ {
	2813	+ // Go to next version
	2814	+ NextVersion();
	2815	+ } else
	2816	+ if (source == saveVersionButton)
	2817	+ {
	2818	+ // Save a new version
	2819	+ if (!Save(true))
	2820	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2821	+ } else
	2822	+ if (source == deleteVersionButton)
	2823	+ {
	2824	+ // Delete a new version
	2825	+ DeleteVersion();
2201	2826	} else
2202	2827	if (source == oneStepButton)
2203	2828	{
..	..	@@ -2206,17 +2831,14 @@
2206	2831	} else
2207	2832	if (source == screenfitButton)
2208	2833	{
2209		- //Reload(lastConverter, lastFilename, true);
2210	2834	ScreenFit();
2211	2835	} else
2212	2836	if (source == screenfitpointButton)
2213	2837	{
2214		- //Reload(lastConverter, lastFilename, true);
2215	2838	ScreenFitPoint();
2216	2839	} else
2217	2840	if (source == snapobjectButton)
2218	2841	{
2219		- //Reload(lastConverter, lastFilename, true);
2220	2842	SnapObject();
2221	2843	} else
2222	2844	// if (event.getSource() == recompileButton)
..	..	@@ -2255,11 +2877,11 @@
2255	2877	} else
2256	2878	if (source == undoItem)
2257	2879	{
2258		- Undo();
	2880	+ PreviousVersion();
2259	2881	} else
2260	2882	if (source == redoItem)
2261	2883	{
2262		- Redo();
	2884	+ NextVersion();
2263	2885	} else
2264	2886	if (source == duplicateItem)
2265	2887	{
..	..	@@ -2580,7 +3202,7 @@
2580	3202	{
2581	3203	StepAll();
2582	3204	} else
2583		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3205	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2584	3206	{
2585	3207	//int indices[] = jList.getSelectedIndices();
2586	3208	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2740,15 +3362,40 @@
2740	3362	} else
2741	3363	if (source == ungroupItem \|\| source == ungroupButton)
2742	3364	{
2743		- //ungroup();
	3365	+ boolean canUngroup = true;
	3366	+
2744	3367	for (int i=0; i<group.selection.size(); i++)
2745	3368	{
2746		- Ungroup(group.selection.get(i));
	3369	+ Object3D selectedItem = group.selection.get(i);
	3370	+
	3371	+ if (selectedItem.Size() == 0)
	3372	+ {
	3373	+ // Cannot ungroup leaves
	3374	+ canUngroup = false;
	3375	+ break;
	3376	+ }
	3377	+
	3378	+ if (selectedItem == group)
	3379	+ {
	3380	+ // Cannot ungroup root
	3381	+ canUngroup = false;
	3382	+ break;
	3383	+ }
2747	3384	}
2748	3385
2749		- ClearSelection(false);
2750		-
2751		- refreshContents();
	3386	+ if (canUngroup)
	3387	+ {
	3388	+ for (int i=0; i<group.selection.size(); i++)
	3389	+ {
	3390	+ Object3D selectedItem = group.selection.get(i);
	3391	+
	3392	+ Ungroup(selectedItem);
	3393	+ }
	3394	+
	3395	+ ClearSelection(false);
	3396	+
	3397	+ refreshContents();
	3398	+ }
2752	3399	} else
2753	3400	if (source == genUVItem)
2754	3401	{
..	..	@@ -3049,7 +3696,7 @@
3049	3696	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3050	3697	{
3051	3698	obj = (Object3D)e.nextElement();
3052		- obj.SetBumpTexture(null);
	3699	+ obj.ResetBumpTexture();
3053	3700	}
3054	3701
3055	3702	refreshContents();
..	..	@@ -3063,6 +3710,31 @@
3063	3710	obj.SetBumpTexture(obj.GetPigmentTexture());
3064	3711	}
3065	3712
	3713	+ refreshContents();
	3714	+ } else
	3715	+ if (source == embedTexturesItem)
	3716	+ {
	3717	+ Object3D obj;
	3718	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3719	+ {
	3720	+ obj = (Object3D)e.nextElement();
	3721	+ obj.EmbedTextures(true);
	3722	+ }
	3723	+
	3724	+ refreshContents();
	3725	+ } else
	3726	+ if (source == deEmbedTexturesItem)
	3727	+ {
	3728	+ Object3D obj;
	3729	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3730	+ {
	3731	+ obj = (Object3D)e.nextElement();
	3732	+ obj.EmbedTextures(false);
	3733	+ }
	3734	+
	3735	+ CameraPane.texturepigment.clear();
	3736	+ CameraPane.texturebump.clear();
	3737	+
3066	3738	refreshContents();
3067	3739	} else
3068	3740	if (source == flashSelectionButton)
..	..	@@ -3080,38 +3752,7 @@
3080	3752	if (CameraPane.FULLSCREEN)
3081	3753	fullscreenLayout = radio.layout;
3082	3754
3083		- // bug
3084		- //gridPanel.setDividerLocation(1.0);
3085		- //bigPanel.setDividerLocation(0.0);
3086		-// bigThree.remove(scenePanel);
3087		-// bigThree.remove(centralPanel);
3088		-// bigThree.remove(XYZPanel);
3089		-// aWindowConstraints.gridx = 0;
3090		-// aWindowConstraints.gridy = 0;
3091		-// aWindowConstraints.gridwidth = 1;
3092		-// // aConstraints.gridheight = 3;
3093		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3094		-// aWindowConstraints.weightx = 0;
3095		-// aWindowConstraints.weighty = 1;
3096		-// //bigThree.add(jtp, aWindowConstraints);
3097		-// aWindowConstraints.weightx = 1;
3098		-// aWindowConstraints.gridwidth = 3;
3099		-// // aConstraints.gridheight = 3;
3100		-// aWindowConstraints.gridx = 1;
3101		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3102		-// bigThree.add(centralPanel, aWindowConstraints);
3103		-// aWindowConstraints.weightx = 0;
3104		-// aWindowConstraints.gridx = 4;
3105		-// aWindowConstraints.gridwidth = 1;
3106		-// // aConstraints.gridheight = 3;
3107		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3108		-// //bigThree.add(XYZPanel, aWindowConstraints);
3109		-// scenePanel.setVisible(false);
3110		-// centralPanel.setVisible(true);
3111		-// XYZPanel.setVisible(false);
3112		- bigThree.ClearUI();
3113		- bigThree.add(centralPanel);
3114		- bigThree.FlushUI();
	3755	+ Show3DView();
3115	3756
3116	3757	cameraView.requestFocusInWindow();
3117	3758
..	..	@@ -3166,8 +3807,8 @@
3166	3807	// centralPanel.setVisible(true);
3167	3808	// XYZPanel.setVisible(true);
3168	3809	bigThree.ClearUI();
	3810	+ bigThree.add(scenePanel);
3169	3811	bigThree.add(centralPanel);
3170		- bigThree.add(XYZPanel);
3171	3812	bigThree.FlushUI();
3172	3813
3173	3814	cameraView.requestFocusInWindow();
..	..	@@ -3247,8 +3888,8 @@
3247	3888	// centralPanel.setVisible(true);
3248	3889	// XYZPanel.setVisible(false);
3249	3890	bigThree.ClearUI();
3250		- bigThree.add(scenePanel);
3251	3891	bigThree.add(centralPanel);
	3892	+ bigThree.add(scenePanel);
3252	3893	bigThree.FlushUI();
3253	3894
3254	3895	cameraView.requestFocusInWindow();
..	..	@@ -3297,6 +3938,7 @@
3297	3938	} else
3298	3939	if (source == rootButton)
3299	3940	{
	3941	+ Replace();
3300	3942	Object3D obj;
3301	3943	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3302	3944	{
..	..	@@ -3354,10 +3996,10 @@
3354	3996	{
3355	3997	Object3D child = (Object3D)e.nextElement();
3356	3998	if(child.editWindow != null)
3357		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3358	3999	child.pinned = false;
3359	4000	child.CloseUI();
3360	4001	listUI.remove(child);
	4002	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3361	4003
3362	4004	//child.editWindow = null; // ???????????
3363	4005	}
..	..	@@ -3372,10 +4014,11 @@
3372	4014	//copy.ClearUI();
3373	4015	for (Object3D obj : listUI)
3374	4016	{
3375		- obj.pinned = true;
	4017	+ obj.pinned = false;
3376	4018	obj.CloseUI();
3377	4019	}
3378	4020	listUI.clear();
	4021	+ SetPinStates(group.selection.size() > 0);
3379	4022	refreshContents(true);
3380	4023	} else
3381	4024	if (source == allParamsButton)
..	..	@@ -3431,6 +4074,7 @@
3431	4074	}
3432	4075
3433	4076	copy = group;
	4077	+
3434	4078	//Globals.theRenderer.object = group;
3435	4079	if(!useclient)
3436	4080	{
..	..	@@ -3457,6 +4101,26 @@
3457	4101	currentLayout = sevenButton;
3458	4102	*/
3459	4103	radio.layout.doClick();
	4104	+
	4105	+ assert(copy instanceof Composite);
	4106	+
	4107	+ if (copy.versionlist == null)
	4108	+ {
	4109	+ copy.versionlist = new Object3D[100];
	4110	+ copy.versionindex = -1;
	4111	+
	4112	+ Save(true);
	4113	+ }
	4114	+
	4115	+ SetVersionStates();
	4116	+
	4117	+ ClearUnpinned();
	4118	+
	4119	+ //Grafreed.Assert(group != null);
	4120	+ //Grafreed.Assert(group.selection != null);
	4121	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4122	+ if (group.selection == null \|\| group.selection.size() == 1)
	4123	+ EditSelection(false);
3460	4124	keepparent = group.parent;
3461	4125	// PARENT = NULL or not???
3462	4126	//group.parent = null; // ROOT
..	..	@@ -3468,11 +4132,13 @@
3468	4132	} else if (event.getSource() == editCameraItem)
3469	4133	{
3470	4134	cameraView.ProtectCamera();
	4135	+ cameraView.requestFocusInWindow();
3471	4136	cameraView.repaint();
3472	4137	return;
3473	4138	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3474	4139	{
3475	4140	cameraView.RevertCamera();
	4141	+ cameraView.requestFocusInWindow();
3476	4142	cameraView.repaint();
3477	4143	return;
3478	4144	// } else if (event.getSource() == textureButton)
..	..	@@ -4049,7 +4715,7 @@
4049	4715
4050	4716	try
4051	4717	{
4052		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4718	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4053	4719	}
4054	4720	catch (Exception e)
4055	4721	{
..	..	@@ -4526,6 +5192,12 @@
4526	5192
4527	5193	void EditSelection(boolean newWindow)
4528	5194	{
	5195	+ if (group.selection == null)
	5196	+ {
	5197	+ EditElement(group, newWindow); // ? new
	5198	+ return;
	5199	+ }
	5200	+
4529	5201	// aConstraints.gridy = 0;
4530	5202	for (int i=0; i<group.selection.size(); i++)
4531	5203	{
..	..	@@ -4536,12 +5208,7 @@
4536	5208	Object3D elem = (Object3D)group.selection.elementAt(i);
4537	5209	if(elem != group \|\| !newWindow)
4538	5210	{
4539		- // if (!(elem instanceof Composite))
4540		- // newWindow = false;
4541		- listUI.add(elem);
4542		- elem.openEditWindow(this, newWindow); //, false);
4543		- System.out.println("edit : " + elem);
4544		- elem.editWindow.refreshContents(true); // ? new
	5211	+ EditElement(elem, newWindow); // ? new
4545	5212	}
4546	5213	}
4547	5214	}
..	..	@@ -4604,9 +5271,7 @@
4604	5271
4605	5272	freezemodel = false;
4606	5273	}
4607		-
4608		- boolean flashIt = true;
4609		-
	5274	+
4610	5275	public void valueChanged(TreeSelectionEvent e)
4611	5276	//public boolean handleEvent(Event event)
4612	5277	{
..	..	@@ -4616,17 +5281,7 @@
4616	5281	//new Exception().printStackTrace();
4617	5282
4618	5283	freezemodel = true;
4619		-
4620		- //for (Object3D obj : listUI)
4621		- for (int i=listUI.size(); --i>=0;)
4622		- {
4623		- Object3D obj = listUI.elementAt(i);
4624		- if (!obj.pinned)
4625		- {
4626		- obj.CloseUI();
4627		- listUI.remove(i);
4628		- }
4629		- }
	5284	+ ClearUnpinned();
4630	5285
4631	5286	/**/
4632	5287	//switch (event.id)
..	..	@@ -4689,12 +5344,30 @@
4689	5344	{
4690	5345	editButton.setEnabled(enabled);
4691	5346	uneditButton.setEnabled(enabled);
	5347	+ //unselectButton.setEnabled(enabled);
	5348	+ flashSelectionButton.setEnabled(enabled);
	5349	+
	5350	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5351	+
	5352	+ boolean allComposites = true;
	5353	+
	5354	+ if (group.selection != null)
	5355	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5356	+ {
	5357	+ if (!(e.nextElement() instanceof Composite))
	5358	+ {
	5359	+ allComposites = false;
	5360	+ break;
	5361	+ }
	5362	+ }
	5363	+
	5364	+ rootButton.setEnabled(allComposites);
4692	5365	}
4693	5366
4694	5367	void refreshContents(boolean cp)
4695	5368	{
4696		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4697		- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	5369	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5370	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4698	5371	{
4699	5372	objEditor.ClearInfo(); // .GetMaterial());
4700	5373
..	..	@@ -4703,7 +5376,7 @@
4703	5376	Object3D child = (Object3D) group.selection.get(i);
4704	5377
4705	5378	objEditor.AddInfo(child, this, true);
4706		- System.err.println("info : " + child.GetPath());
	5379	+// System.err.println("info : " + child.GetPath());
4707	5380	}
4708	5381
4709	5382	objEditor.SetText(); // jan 2014
..	..	@@ -4793,8 +5466,8 @@
4793	5466
4794	5467	if (cut)
4795	5468	{
4796		- if (Globals.SAVEONMAKE)
4797		- Save();
	5469	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5470	+// Save();
4798	5471	//int indices[] = jList.getSelectedIndices();
4799	5472	//for (int i = indices.length - 1; i >= 0; i--)
4800	5473	//jList.remove(indices[i]);
..	..	@@ -4897,6 +5570,10 @@
4897	5570
4898	5571	void paste(boolean expand)
4899	5572	{
	5573	+ if (Globals.REPLACEONMAKE)
	5574	+ Save();
	5575	+ boolean keep = Globals.REPLACEONMAKE;
	5576	+ Globals.REPLACEONMAKE = false;
4900	5577	// if (GrafreeD.clipboard == null)
4901	5578	// return;
4902	5579	boolean first = true;
..	..	@@ -4956,6 +5633,7 @@
4956	5633	Grafreed.clipboard.get(0).parent = keepparent;
4957	5634	}
4958	5635
	5636	+ Globals.REPLACEONMAKE = keep;
4959	5637	ResetModel();
4960	5638	refreshContents();
4961	5639	}
..	..	@@ -5091,6 +5769,10 @@
5091	5769
5092	5770	void group(Object3D csg, boolean grab)
5093	5771	{
	5772	+ if (Globals.REPLACEONMAKE)
	5773	+ Save();
	5774	+ boolean keep = Globals.REPLACEONMAKE;
	5775	+ Globals.REPLACEONMAKE = false;
5094	5776	if (//false) // why??
5095	5777	!group.selection.isEmpty())
5096	5778	{
..	..	@@ -5204,10 +5886,15 @@
5204	5886	//node.add(csg);
5205	5887	//makeSomething(node);
5206	5888	makeSomething(csg);
	5889	+ Globals.REPLACEONMAKE = keep;
5207	5890	}
5208	5891
5209	5892	void Ungroup(Object3D g)
5210	5893	{
	5894	+ if (Globals.REPLACEONMAKE)
	5895	+ Save();
	5896	+ boolean keep = Globals.REPLACEONMAKE;
	5897	+ Globals.REPLACEONMAKE = false;
5211	5898	if (g instanceof HiddenObject)
5212	5899	{
5213	5900	HiddenObject h = (HiddenObject) g;
..	..	@@ -5224,6 +5911,7 @@
5224	5911	objEditor.makeSomething(g.get(i), false);
5225	5912	}
5226	5913	}
	5914	+ Globals.REPLACEONMAKE = keep;
5227	5915	}
5228	5916
5229	5917	void ungroup()
..	..	@@ -5514,10 +6202,6 @@
5514	6202
5515	6203	cButton restoreCameraButton;
5516	6204
5517		- cButton minButton;
5518		- cButton maxButton;
5519		- cButton fullButton;
5520		- cButton saveButton;
5521	6205	cButton oneStepButton;
5522	6206
5523	6207	cButton groupButton;
..	..	@@ -5526,6 +6210,22 @@
5526	6210	cButton switchButton;
5527	6211	cButton loopButton;
5528	6212	cButton textureButton;
	6213	+
	6214	+ cButton skybox1Button;
	6215	+ cButton skybox2Button;
	6216	+ cButton skybox3Button;
	6217	+ cButton skybox4Button;
	6218	+ cButton skybox5Button;
	6219	+ cButton skybox6Button;
	6220	+ cButton skybox7Button;
	6221	+
	6222	+ cButton skybox11Button;
	6223	+ cButton skybox12Button;
	6224	+ cButton skybox13Button;
	6225	+ cButton skybox14Button;
	6226	+ cButton skybox15Button;
	6227	+ cButton skybox16Button;
	6228	+ cButton skybox17Button;
5529	6229
5530	6230	cButton gridButton;
5531	6231	cButton boxButton;
..	..	@@ -5559,11 +6259,11 @@
5559	6259	private MenuItem lookAtItem;
5560	6260	private MenuItem lookFromItem;
5561	6261	private MenuItem switchViewItem;
5562		- private MenuItem cutItem;
	6262	+ private JMenuItem cutItem;
5563	6263	private MenuItem undoItem;
5564	6264	private MenuItem redoItem;
5565	6265	private JMenuItem duplicateItem;
5566		- private MenuItem cloneItem;
	6266	+ private JMenuItem cloneItem;
5567	6267	private MenuItem cloneSupportItem;
5568	6268	private MenuItem overwriteGeoItem;
5569	6269	private MenuItem overwriteMatItem;
..	..	@@ -5584,13 +6284,13 @@
5584	6284	private MenuItem cloneGeometriesItem;
5585	6285	private MenuItem shareGeometriesItem;
5586	6286	private MenuItem mergeGeometriesItem;
5587		- private MenuItem copyItem;
	6287	+ private JMenuItem copyItem;
5588	6288	private MenuItem pasteItem;
5589		- private MenuItem pasteIntoItem;
5590		- private MenuItem pasteLinkItem;
5591		- private MenuItem pasteCloneItem;
5592		- private MenuItem pasteExpandItem;
5593		- private MenuItem clearItem;
	6289	+ private JMenuItem pasteIntoItem;
	6290	+ private JMenuItem pasteLinkItem;
	6291	+ private JMenuItem pasteCloneItem;
	6292	+ private JMenuItem pasteExpandItem;
	6293	+ private JMenuItem deleteItem;
5594	6294	private MenuItem clearAllItem;
5595	6295	private MenuItem genUVItem;
5596	6296	private MenuItem genNormalsMESHItem;
..	..	@@ -5658,7 +6358,7 @@
5658	6358	private MenuItem switchTransfoItem;
5659	6359	private MenuItem morphItem;
5660	6360	private MenuItem linkerItem;
5661		- private MenuItem ungroupItem;
	6361	+ private JMenuItem ungroupItem;
5662	6362	private MenuItem editItem;
5663	6363	private MenuItem openWindowItem;
5664	6364	private MenuItem editLeafItem;
..	..	@@ -5674,6 +6374,8 @@
5674	6374	private MenuItem attachBumpItem;
5675	6375	private MenuItem detachBumpItem;
5676	6376	private MenuItem pigmentBumpItem;
	6377	+ private MenuItem embedTexturesItem;
	6378	+ private MenuItem deEmbedTexturesItem;
5677	6379
5678	6380	private MenuItem particleItem;
5679	6381	private MenuItem ragdollItem;