~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", !Globals.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, !Globals.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(JTabbedPane.LEFT);
	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,16 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ assert(false);
	419	+
	420	+ if (copy.versionlist == null)
	421	+ {
	422	+ copy.versionlist = new Object3D[100];
	423	+ copy.versionindex = -1;
	424	+
	425	+ //Save(true);
	426	+ }
	427	+
63	428	if(ui)
64	429	SetupUI(objEditor);
65	430	}
..	..	@@ -80,10 +445,22 @@
80	445	SetupViews(objEditor);
81	446
82	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	448	+
	449	+ if (copy.versionlist == null)
	450	+ {
	451	+ copy.versionlist = new Object3D[100];
	452	+ copy.versionindex = -1;
	453	+
	454	+ //Save(true);
	455	+ }
83	456	}
84	457
85	458	void CloneSelection(boolean supports)
86	459	{
	460	+ if (Globals.REPLACEONMAKE)
	461	+ Save();
	462	+ boolean keep = Globals.REPLACEONMAKE;
	463	+ Globals.REPLACEONMAKE = false;
87	464	// Object3D keep = GrafreeD.clipboard;
88	465	//Object3D obj;
89	466	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +471,7 @@
94	471
95	472	makeSomething(clone, i==group.selection.size()-1);
96	473	}
	474	+ Globals.REPLACEONMAKE = keep;
97	475	}
98	476
99	477	void CloneClipboard(boolean supports)
..	..	@@ -164,33 +542,35 @@
164	542	// menu.add("-");
165	543	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
166	544	duplicateItem.addActionListener(this);
167		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
168	547	cloneItem.addActionListener(this);
169		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
170	549	{
171	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
172	551	cloneSupportItem.addActionListener(this);
173	552	}
	553	+ oe.jTree.popup.addSeparator();
174	554	menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
176	556	cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
178	558	copyItem.addActionListener(this);
179	559	pasteItem = menu.add(new MenuItem("Paste"));
180	560	pasteItem.addActionListener(this);
181	561
182		- menu.add("-");
183		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
184	565	pasteIntoItem.addActionListener(this);
185		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
186	567	pasteLinkItem.addActionListener(this);
187		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
188	569	pasteCloneItem.addActionListener(this);
189		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
190	571	// pasteExpandItem.addActionListener(this);
191		- menu.add("-");
192		- clearItem = menu.add(new MenuItem("Clear"));
193		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
194	574
195	575	if (Globals.ADVANCED)
196	576	{
..	..	@@ -276,11 +656,9 @@
276	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
277	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
278	658	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
280	659	oe.cameraMenu.add("-");
281	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
282	661	openWindowItem.addActionListener(this);
283		- editLeafItem.addActionListener(this);
284	662	lookAtItem.addActionListener(this);
285	663	//lookFromItem.addActinoListener(this);
286	664	//switchViewItem.addActionListener(this);
..	..	@@ -327,9 +705,8 @@
327	705	setMasterItem.addActionListener(this);
328	706	}
329	707
330		- oe.menuBar.add(menu = new Menu("Group"));
331		-// grabItem = menu.add(new MenuItem("Grab"));
332		-// grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
333	710	backItem = menu.add(new MenuItem("Back"));
334	711	backItem.addActionListener(this);
335	712	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -337,13 +714,21 @@
337	714	// compositeItem = menu.add(new MenuItem("Composite"));
338	715	// compositeItem.addActionListener(this);
339	716
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
340	720	if (Globals.ADVANCED)
341	721	{
342	722	hideItem = menu.add(new MenuItem("Hidden Group"));
343	723	hideItem.addActionListener(this);
344	724	}
345		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
346	726	ungroupItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
347	732
348	733	// menu.add("-");
349	734	//
..	..	@@ -380,13 +765,14 @@
380	765	shadowYItem.addActionListener(this);
381	766	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382	767	shadowZItem.addActionListener(this);
	768	+ attributeItem = menu.add(new MenuItem("Attribute"));
	769	+ attributeItem.addActionListener(this);
	770	+
383	771	if (Globals.ADVANCED)
384	772	{
385	773	menu.add("-");
386	774	linkerItem = menu.add(new MenuItem("Linker"));
387	775	linkerItem.addActionListener(this);
388		- attributeItem = menu.add(new MenuItem("Attribute"));
389		- attributeItem.addActionListener(this);
390	776	templateItem = menu.add(new MenuItem("Template"));
391	777	templateItem.addActionListener(this);
392	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -415,7 +801,7 @@
415	801	genNormalsMESHItem.addActionListener(this);
416	802	if (Globals.ADVANCED)
417	803	{
418		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	804	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419	805	genNormalsMINEItem.addActionListener(this);
420	806	}
421	807	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -471,9 +857,9 @@
471	857	hideleavesItem.addActionListener(this);
472	858	showleavesItem = menu.add(new MenuItem("Show Leaves"));
473	859	showleavesItem.addActionListener(this);
474		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	860	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
475	861	markleavesItem.addActionListener(this);
476		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	862	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
477	863	unmarkleavesItem.addActionListener(this);
478	864	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
479	865	rewindleavesItem.addActionListener(this);
..	..	@@ -508,10 +894,15 @@
508	894	attachBumpItem.addActionListener(this);
509	895	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
510	896	pigmentBumpItem.addActionListener(this);
	897	+ //embedTexturesItem
511	898	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
512	899	detachPigmentItem.addActionListener(this);
513	900	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
514	901	detachBumpItem.addActionListener(this);
	902	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	903	+ embedTexturesItem.addActionListener(this);
	904	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	905	+ deEmbedTexturesItem.addActionListener(this);
515	906	menu.add("-");
516	907	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
517	908	sortbysizeItem.addActionListener(this);
..	..	@@ -522,6 +913,9 @@
522	913	shareGeometriesItem.addActionListener(this);
523	914	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
524	915	mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
525	919	if (Globals.ADVANCED)
526	920	{
527	921	// Pretty much the same as duplicate and clone.
..	..	@@ -538,6 +932,75 @@
538	932	buildToolsMenu(menu);
539	933	}
540	934
	935	+ JTabbedPane resourcecontainer;
	936	+ cGridBag currenttab;
	937	+ //boolean added; // patch for jar
	938	+
	939	+ int tabcount = 0;
	940	+ int colcount = 0;
	941	+ int rowcount = 0;
	942	+ int texturecount = 0;
	943	+
	944	+ int columns = 5;
	945	+ int rows = 7;
	946	+
	947	+ public void ResourceCallBack(String[] path)
	948	+ {
	949	+// for (int i = 0; i < path.length; i++)
	950	+// System.out.print(path[i] + "/");
	951	+// System.out.println();
	952	+
	953	+ if (//rowcount == 0 \|\|
	954	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	955	+ {
	956	+ currenttab = new cGridBag();
	957	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	958	+ currenttab.setName(tabname);
	959	+ //added = false;
	960	+ resourcecontainer.add(currenttab);
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ rowcount = 1;
	963	+ colcount = 0;
	964	+ texturecount = 0;
	965	+ }
	966	+
	967	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	968	+ {
	969	+ //if (!added)
	970	+ {
	971	+ //added = true;
	972	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	973	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	974	+ }
	975	+
	976	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	977	+
	978	+ if (++colcount >= columns)
	979	+ {
	980	+ colcount = 0;
	981	+ currenttab.Return();
	982	+
	983	+ if (rowcount++ >= rows)
	984	+ {
	985	+ rowcount = 0;
	986	+ }
	987	+ }
	988	+ }
	989	+ else
	990	+ {
	991	+// if (!path[path.length-1].equals("icons"))
	992	+// resourcecontainer.Return();
	993	+ }
	994	+ }
	995	+
	996	+ void CreateTexturePanel(cGridBag container)
	997	+ {
	998	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	999	+ container.add(resourcecontainer);
	1000	+
	1001	+ Grafreed.ParseResources("textures", this);
	1002	+ }
	1003	+
541	1004	void SetupUI2(ObjEditor oe)
542	1005	{
543	1006	// June 2019
..	..	@@ -555,11 +1018,6 @@
555	1018	//new Exception().printStackTrace();
556	1019
557	1020	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	1021	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
564	1022
565	1023	oe.buttonGroup = new ButtonGroup();
..	..	@@ -580,9 +1038,9 @@
580	1038	oe.radioPanel.add(dummyButton);
581	1039	oe.buttonGroup.add(dummyButton);
582	1040	*/
583		- cGridBag copyOptionsPanel = new cGridBag();
	1041	+ cGridBag versionManagerPanel = new cGridBag();
584	1042
585		- copyOptionsPanel.preferredHeight = 1;
	1043	+ versionManagerPanel.preferredHeight = 4;
586	1044
587	1045	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
588	1046
..	..	@@ -590,50 +1048,110 @@
590	1048	//minButton.setToolTipText("Minimize window");
591	1049	//minButton.addActionListener(this);
592	1050
593		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- maxButton.setToolTipText("Maximize window");
595		- maxButton.addActionListener(this);
	1051	+ if (Globals.ADVANCED)
	1052	+ {
	1053	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// maxButton.setToolTipText("Maximize window");
	1055	+// maxButton.addActionListener(this);
	1056	+ }
596	1057
597		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ cButton gcButton;
	1059	+
	1060	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+// gcButton.setToolTipText("Garbage collect");
	1062	+// gcButton.addActionListener(new ActionListener()
	1063	+// {
	1064	+// public void actionPerformed(ActionEvent e)
	1065	+// {
	1066	+// System.gc();
	1067	+// }
	1068	+// });
	1069	+
	1070	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1071	+ collapseButton.setToolTipText("Collapse toolbar");
	1072	+ collapseButton.addActionListener(this);
	1073	+
	1074	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1076	+ maximize3DButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ twoButton.setToolTipText("Show 3D view only");
	1080	+ twoButton.addActionListener(this);
	1081	+ this.fullscreenLayout = twoButton;
	1082	+
	1083	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ threeButton.setToolTipText("Show controls and 3D view");
	1085	+ threeButton.addActionListener(this);
	1086	+ if (Globals.ADVANCED)
	1087	+ {
	1088	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ sixButton.setToolTipText("Show 3D view and controls");
	1090	+ sixButton.addActionListener(this);
	1091	+ }
	1092	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+// sevenButton.setToolTipText("3-column layout");
	1094	+// sevenButton.addActionListener(this);
	1095	+ //
	1096	+
	1097	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
598	1098	fullButton.setToolTipText("Full-screen window");
599	1099	fullButton.addActionListener(this);
600	1100
601		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1101	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ screenfitButton.setToolTipText("Screen fit");
	1103	+ screenfitButton.addActionListener(this);
	1104	+
	1105	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
602	1106	restoreCameraButton.setToolTipText("Restore viewpoint");
603	1107	restoreCameraButton.addActionListener(this);
604	1108
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);
	1109	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ saveVersionButton.setToolTipText("Duplicate current version");
	1111	+ saveVersionButton.addActionListener(this);
	1112	+
	1113	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ deleteVersionButton.setToolTipText("Delete current version");
	1115	+ deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
	1117	+
	1118	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ previousVersionButton.setToolTipText("Previous version");
	1120	+ previousVersionButton.addActionListener(this);
	1121	+ previousVersionButton.setEnabled(false);
609	1122
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);
	1123	+ cGridBag updown = new cGridBag().setVertical(true);
	1124	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1125	+ restoreButton.setToolTipText("Undo (restore current version)");
	1126	+ restoreButton.addActionListener(this);
	1127	+ restoreButton.setEnabled(false);
614	1128
615		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616		- saveButton.setToolTipText("Save changes");
617		- saveButton.addActionListener(this);
	1129	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ replaceButton.setToolTipText("Save (replace current version)");
	1131	+ replaceButton.addActionListener(this);
	1132	+ replaceButton.setEnabled(false);
618	1133
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);
	1134	+ versionManagerPanel.add(updown);
	1135	+
	1136	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ nextVersionButton.setToolTipText("Next version");
	1138	+ nextVersionButton.addActionListener(this);
	1139	+ nextVersionButton.setEnabled(false);
	1140	+
	1141	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
624	1142	oneStepButton.setToolTipText("Animate one step forward");
625	1143	oneStepButton.addActionListener(this);
626	1144
627		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1145	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1146	+ liveCB.setToolTipText("Enable animation");
	1147	+ liveCB.addItemListener(this);
	1148	+
	1149	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
628	1150	fastCB.setToolTipText("Fast mode");
629	1151	fastCB.addItemListener(this);
630	1152
631	1153	//oe.toolboxPanel.Return();
632	1154
633		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- screenfitButton.setToolTipText("Screen fit");
635		- screenfitButton.addActionListener(this);
636		-
637	1155	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
638	1156	// trackCB.setToolTipText("Enable tracking");
639	1157	// trackCB.addItemListener(this);
..	..	@@ -643,142 +1161,134 @@
643	1161
644	1162	if (Globals.ADVANCED)
645	1163	{
646		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1164	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
647	1165	snapobjectButton.addActionListener(this);
648	1166	snapobjectButton.setToolTipText("Snap Object");
	1167	+
	1168	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ fourButton.addActionListener(this);
	1170	+ fourButton.setToolTipText("Show control panel only");
649	1171	}
650	1172
651	1173	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
652	1174
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	1175
672		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
673		- rootButton.setToolTipText("Edit selection in new tab");
	1176	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ rootButton.setToolTipText("Open selection in new tab");
674	1178	rootButton.addActionListener(this);
675	1179
676		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
677	1181	closeButton.setToolTipText("Close tab");
678	1182	closeButton.addActionListener(this);
679	1183	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
680	1184	//clearButton.addActionListener(this);
681	1185
	1186	+ cGridBag row1 = new cGridBag();
	1187	+
682	1188	// INSERT
683		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
684		- gridButton.setToolTipText("Create grid");
	1189	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ gridButton.setToolTipText("Create ground");
685	1191	gridButton.addActionListener(this);
686	1192
687		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1193	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
688	1194	boxButton.setToolTipText("Create box");
689	1195	boxButton.addActionListener(this);
690	1196
691		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
692		- sphereButton.setToolTipText("Create sphere");
693		- sphereButton.addActionListener(this);
694		-
695		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696		- coneButton.setToolTipText("Create cone");
697		- coneButton.addActionListener(this);
698		-
699		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700		- torusButton.setToolTipText("Create torus");
701		- torusButton.addActionListener(this);
702		-
703		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
704	1198	superButton.setToolTipText("Create superellipsoid");
705	1199	superButton.addActionListener(this);
706	1200
	1201	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ sphereButton.setToolTipText("Create sphere");
	1203	+ sphereButton.addActionListener(this);
	1204	+
	1205	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ coneButton.setToolTipText("Create cone");
	1207	+ coneButton.addActionListener(this);
	1208	+
	1209	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ torusButton.setToolTipText("Create torus");
	1211	+ torusButton.addActionListener(this);
	1212	+
707	1213	if (Globals.ADVANCED)
708	1214	{
709		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
710	1216	kleinButton.setToolTipText("Create Klein bottle");
711	1217	kleinButton.addActionListener(this);
712	1218	}
713	1219
714		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
715	1221	particlesButton.setToolTipText("Create particle system");
716	1222	particlesButton.addActionListener(this);
717	1223
718		- oe.toolboxPanel.Return();
	1224	+ oe.toolboxPanel.add(row1);
719	1225
720		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ cGridBag row2 = new cGridBag();
	1227	+
	1228	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
721	1229	groupButton.setToolTipText("Create group");
722	1230	groupButton.addActionListener(this);
723	1231
724		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
725	1233	compositeButton.setToolTipText("Create composite");
726	1234	compositeButton.addActionListener(this);
727	1235
728		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
729	1237	switchButton.setToolTipText("Create item switcher");
730	1238	switchButton.addActionListener(this);
731	1239
732		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
733	1241	loopButton.setToolTipText("Create loop");
734	1242	loopButton.addActionListener(this);
735	1243
736		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1244	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
737	1245	textureButton.setToolTipText("Create texture");
738	1246	textureButton.addActionListener(this);
739	1247
740		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1248	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
741	1249	overlayButton.setToolTipText("Create overlay");
742	1250	overlayButton.addActionListener(this);
743	1251
744		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1252	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
745	1253	lightButton.setToolTipText("Create light");
746	1254	lightButton.addActionListener(this);
747	1255
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		- }
	1256	+ oe.toolboxPanel.add(row2);
	1257	+
	1258	+ cGridBag textures = new cGridBag();
	1259	+
	1260	+ CreateTexturePanel(textures);
	1261	+
	1262	+ resourcecontainer.setSelectedIndex((int)(Math.random() * resourcecontainer.getTabCount()));
	1263	+
	1264	+ oe.toolboxPanel.add(textures);
	1265	+
	1266	+ textures.preferredHeight = 100;
	1267	+
	1268	+ CreateSkyboxPanel(oe.skyboxPanel);
759	1269
760	1270	// EDIT panel
761		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1271	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
762	1272	editButton.setToolTipText("Pin selection controls");
763	1273	editButton.addActionListener(this);
764	1274
765		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
766		- uneditButton.setToolTipText("Remove selection controls");
	1275	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1276	+ uneditButton.setToolTipText("Unpin and remove selection controls");
767	1277	uneditButton.addActionListener(this);
768	1278
769	1279	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
770		- allParamsButton.setToolTipText("Show all controle");
	1280	+ allParamsButton.setToolTipText("Show all controls");
771	1281	allParamsButton.addActionListener(this);
772	1282
773		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
774		- clearPanelButton.setToolTipText("Clear edit panel");
	1283	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1284	+ clearPanelButton.setToolTipText("Clear all controls");
775	1285	clearPanelButton.addActionListener(this);
776	1286
777		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
778		- unselectButton.setToolTipText("Unselect");
779		- unselectButton.addActionListener(this);
	1287	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1288	+ //unselectButton.setToolTipText("Unselect");
	1289	+ //unselectButton.addActionListener(this);
780	1290
781		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1291	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
782	1292	flashSelectionButton.setToolTipText("Highlight selection");
783	1293	flashSelectionButton.addActionListener(this);
784	1294
..	..	@@ -801,6 +1311,8 @@
801	1311
802	1312	cGridBag jSPPanel = new cGridBag();
803	1313
	1314	+ jSPPanel.preferredHeight = 20;
	1315	+
804	1316	JScrollPane jSP;
805	1317	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
806	1318	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -809,11 +1321,14 @@
809	1321	oe.treePanel.add(jSPPanel);
810	1322	oe.treePanel.Return();
811	1323
812		- oe.treePanel.add(copyOptionsPanel);
	1324	+ oe.treePanel.add(versionManagerPanel);
813	1325	oe.treePanel.Return();
	1326	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1327	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1328	+ versionSliderPane.preferredHeight = 3;
814	1329
815		-// mainPanel.setDividerLocation(0.5); //1.0);
816		-// mainPanel.setResizeWeight(0.5);
	1330	+// mainPanel.setDividerLocation(0.1); //1.0);
	1331	+ mainPanel.setResizeWeight(0.4);
817	1332
818	1333	//jList.addListSelectionListener(this);
819	1334	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -821,7 +1336,7 @@
821	1336	//jTree.setEditable(true);
822	1337	oe.jTree.setDragEnabled(true);
823	1338	//jTree.setPreferredSize(new Dimension(10,10));
824		- jSP.setPreferredSize(new Dimension(100,200));
	1339	+ //jSP.setPreferredSize(new Dimension(100,200));
825	1340
826	1341	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
827	1342
..	..	@@ -833,7 +1348,7 @@
833	1348	dgr.addDragGestureListener(this);
834	1349	}catch(Exception e) {}
835	1350	*/
836		- radio.layout = sevenButton;
	1351	+ radio.layout = threeButton; // sixButton;
837	1352	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
838	1353	}
839	1354
..	..	@@ -884,9 +1399,12 @@
884	1399	smoothCB.setToolTipText("Snapping delay");
885	1400	smoothCB.addItemListener(this);
886	1401
887		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
888		- slowCB.setToolTipText("Smooth interpolation");
889		- slowCB.addItemListener(this);
	1402	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1403	+// slowCB.setToolTipText("Smooth interpolation");
	1404	+// slowCB.addItemListener(this);
	1405	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1406	+ minshaderCB.setToolTipText("Minimal fast shader");
	1407	+ minshaderCB.addItemListener(this);
890	1408
891	1409	// constraints.gridy += 1;
892	1410	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -936,9 +1454,9 @@
936	1454	toggleSwitchCB.setToolTipText("Choose a single item");
937	1455	toggleSwitchCB.addItemListener(this);
938	1456
939		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
940		- autosaveCB.setToolTipText("On structure change");
941		- autosaveCB.addItemListener(this);
	1457	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1458	+ autokeepCB.setToolTipText("On structure change");
	1459	+ autokeepCB.addItemListener(this);
942	1460
943	1461	panel.Return();
944	1462	if (Globals.ADVANCED)
..	..	@@ -965,9 +1483,17 @@
965	1483
966	1484	void EditObject(Object3D obj)
967	1485	{
	1486	+ assert(obj instanceof Composite);
	1487	+
	1488	+// if (obj.versionlist == null)
	1489	+// {
	1490	+// obj.versionlist = new Object3D[100];
	1491	+// obj.versionindex = -1;
	1492	+// }
	1493	+
968	1494	cRadio radioButton = new cRadio(obj.name);
969	1495
970		- // Patch to avoid bug with transparency.
	1496	+ // June 2019. Patch to avoid bug with transparency.
971	1497	radioButton.hadMaterial = obj.material != null;
972	1498	if (!radioButton.hadMaterial)
973	1499	{
..	..	@@ -975,7 +1501,7 @@
975	1501	}
976	1502
977	1503	radioButton.SetObject(obj);
978		- radioButton.layout = sevenButton;
	1504	+ radioButton.layout = threeButton; // sixButton;
979	1505	radioButton.SetCamera(cameraView.renderCamera, false);
980	1506	radioButton.addActionListener(this);
981	1507	radioPanel.add(radioButton);
..	..	@@ -989,6 +1515,7 @@
989	1515
990	1516	oe.SetupViews();
991	1517
	1518	+ if (Globals.DEBUG)
992	1519	System.out.println("SetupViews");
993	1520	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
994	1521	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1000,6 +1527,8 @@
1000	1527	cCheckBox localCB;
1001	1528	cCheckBox crowdCB;
1002	1529	cCheckBox smoothCB;
	1530	+ cCheckBox minshaderCB;
	1531	+
1003	1532	cToggleButton fastCB;
1004	1533	cCheckBox slowCB;
1005	1534	cCheckBox boxCB;
..	..	@@ -1015,7 +1544,7 @@
1015	1544
1016	1545	cCheckBox oeilCB;
1017	1546	cCheckBox shadowCB;
1018		- cCheckBox autosaveCB;
	1547	+ cCheckBox autokeepCB;
1019	1548	cCheckBox lookAtCB;
1020	1549
1021	1550	// static int COLOR = 1;
..	..	@@ -1070,6 +1599,12 @@
1070	1599	{
1071	1600	cameraView.ToggleInertia();
1072	1601	cameraView.repaint();
	1602	+ }
	1603	+ else if(e.getSource() == minshaderCB)
	1604	+ {
	1605	+ Globals.MINSHADER ^= true;
	1606	+ cameraView.programInitialized = false;
	1607	+ cameraView.repaint();
1073	1608	}
1074	1609	else if(e.getSource() == localCB)
1075	1610	{
..	..	@@ -1127,9 +1662,9 @@
1127	1662	{
1128	1663	Globals.FREEZEONMOVE ^= true;
1129	1664	}
1130		- else if(e.getSource() == autosaveCB)
	1665	+ else if(e.getSource() == autokeepCB)
1131	1666	{
1132		- Globals.SAVEONMAKE ^= true;
	1667	+ Globals.REPLACEONMAKE ^= true;
1133	1668	}
1134	1669	else if(e.getSource() == lookAtCB)
1135	1670	{
..	..	@@ -1211,8 +1746,6 @@
1211	1746	}
1212	1747	}
1213	1748
1214		- String string = (String) object;
1215		-
1216	1749	System.out.println("Transfer = " + object + "; drop : " + target);
1217	1750	// if( object instanceof java.io.File[])
1218	1751	// {
..	..	@@ -1220,6 +1753,8 @@
1220	1753	// objEditor.DropFile((java.io.File[]) object, true);
1221	1754	// return;
1222	1755	// }
	1756	+
	1757	+ String string = object.toString();
1223	1758
1224	1759	// File path for Mac and Windows
1225	1760	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1347,7 +1882,12 @@
1347	1882	TreePath path;
1348	1883
1349	1884	public TransferableTreePath(TreePath tp) {
1350		- path = tp;
	1885	+ Object[] objs = new Object[tp.getPathCount()];
	1886	+ for (int i=0; i<objs.length; i++)
	1887	+ {
	1888	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1889	+ }
	1890	+ path = new TreePath(objs);
1351	1891	}
1352	1892
1353	1893	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1469,6 +2009,9 @@
1469	2009	animationItem.addItemListener(this);
1470	2010	animationItem.setState(Globals.ANIMATION);
1471	2011
	2012	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2013	+ archiveItem.addActionListener(this);
	2014	+
1472	2015	menu.add("-");
1473	2016	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1474	2017	parseverticesItem.addActionListener(this);
..	..	@@ -1481,6 +2024,8 @@
1481	2024	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1482	2025	reduce34MorphItem.addActionListener(this);
1483	2026	menu.add("-");
	2027	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2028	+ memoryItem.addActionListener(this);
1484	2029	menu.add(computeAOItem = new MenuItem("Compute AO"));
1485	2030	computeAOItem.addActionListener(this);
1486	2031
..	..	@@ -1489,8 +2034,6 @@
1489	2034	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1490	2035	mirrorItem.addActionListener(this);
1491	2036	menu.add("-");
1492		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1493		- memoryItem.addActionListener(this);
1494	2037	menu.add(analyzeItem = new MenuItem("Analyze"));
1495	2038	analyzeItem.addActionListener(this);
1496	2039	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1634,7 +2177,11 @@
1634	2177	shadow.material = new cMaterial(obj.material);
1635	2178	shadow.material.diffuse = 0.0001f;
1636	2179	shadow.material.specular = 0.0001f;
1637		- //shadow.projectedVertices[1].x = 300;
	2180	+ shadow.material.opacity = 0.75f;
	2181	+
	2182	+ AllocProjectedVertices(shadow);
	2183	+
	2184	+ shadow.projectedVertices[1].x = 300;
1638	2185
1639	2186	makeSomething(shadow);
1640	2187	}
..	..	@@ -1651,6 +2198,16 @@
1651	2198	listUI.remove(i);
1652	2199	}
1653	2200	}
	2201	+ }
	2202	+
	2203	+ private void EditElement(Object3D elem, boolean newWindow)
	2204	+ {
	2205	+ // if (!(elem instanceof Composite))
	2206	+ // newWindow = false;
	2207	+ listUI.add(elem);
	2208	+ elem.openEditWindow(this, newWindow); //, false);
	2209	+ System.out.println("edit : " + elem);
	2210	+ elem.editWindow.refreshContents(true); // ? new
1654	2211	}
1655	2212
1656	2213	/**
..	..	@@ -2080,6 +2637,23 @@
2080	2637	{
2081	2638	makeSomething(new Light());
2082	2639	} else
	2640	+// if (source == skybox1Button \|\|
	2641	+// source == skybox2Button \|\|
	2642	+// source == skybox3Button \|\|
	2643	+// source == skybox4Button \|\|
	2644	+// source == skybox5Button \|\|
	2645	+// source == skybox6Button \|\|
	2646	+// source == skybox7Button \|\|
	2647	+// source == skybox11Button \|\|
	2648	+// source == skybox12Button \|\|
	2649	+// source == skybox13Button \|\|
	2650	+// source == skybox14Button \|\|
	2651	+// source == skybox15Button \|\|
	2652	+// source == skybox16Button \|\|
	2653	+// source == skybox17Button)
	2654	+// {
	2655	+// ChangeSkybox(source);
	2656	+// } else
2083	2657	if (source == csgItem)
2084	2658	{
2085	2659	group(new CSG());
..	..	@@ -2128,27 +2702,35 @@
2128	2702	} else
2129	2703	if (source == loopItem \|\| source == loopButton)
2130	2704	{
	2705	+ if (!group.selection.isEmpty())
	2706	+ {
2131	2707	Composite csg = new GroupLeaf();
2132	2708	csg.count = 5;
2133		- group(csg);
2134	2709	Composite child = new cGroup("Branch");
2135	2710	csg.addChild(child);
2136	2711	child.addChild(csg);
	2712	+ group(csg);
	2713	+ }
2137	2714	} else
2138	2715	if (source == doubleItem)
2139	2716	{
	2717	+ if (!group.selection.isEmpty())
	2718	+ {
2140	2719	Composite csg = new GroupLeaf("Fork");
2141	2720	csg.count = 5;
2142		- group(csg);
2143	2721	Composite child = new cGroup("Branch A");
2144	2722	csg.addChild(child);
2145	2723	child.addChild(csg);
2146	2724	child = new cGroup("Branch B");
2147	2725	csg.addChild(child);
2148	2726	child.addChild(csg);
	2727	+ group(csg);
	2728	+ }
2149	2729	} else
2150	2730	if (source == tripleItem)
2151	2731	{
	2732	+ if (!group.selection.isEmpty())
	2733	+ {
2152	2734	Composite csg = new GroupLeaf("Trident");
2153	2735	csg.count = 4;
2154	2736	group(csg);
..	..	@@ -2161,11 +2743,12 @@
2161	2743	child = new cGroup();
2162	2744	csg.addChild(child);
2163	2745	child.addChild(csg);
	2746	+ }
2164	2747	} else
2165	2748	if (source == computeAOItem)
2166	2749	{
2167	2750	Globals.drawMode = CameraPane.OCCLUSION;
2168		- Globals.theRenderer.repaint();
	2751	+ cameraView.repaint();
2169	2752	} else
2170	2753	if (source == recompileItem)
2171	2754	{
..	..	@@ -2180,7 +2763,7 @@
2180	2763	if (source == invariantsItem)
2181	2764	{
2182	2765	System.out.println("Invariants:");
2183		- Grafreed.grafreeD.universe.invariants();
	2766	+ Grafreed.grafreed.universe.invariants();
2184	2767	} else
2185	2768	if (source == memoryItem)
2186	2769	{
..	..	@@ -2211,17 +2794,52 @@
2211	2794	{
2212	2795	ToggleFullScreen();
2213	2796	} else
2214		- if (source == undoButton)
	2797	+ if (source == collapseButton)
2215	2798	{
2216		- Undo();
	2799	+ this.expandedLayout = radio.layout;
	2800	+ CollapseToolbar();
2217	2801	} else
2218		- if (source == redoButton)
	2802	+ if (source == maximize3DButton)
2219	2803	{
2220		- Redo();
	2804	+ this.expandedLayout = radio.layout;
	2805	+ radio.layout = twoButton;
	2806	+ Show3DView();
	2807	+ CollapseToolbar();
2221	2808	} else
2222		- if (source == saveButton)
	2809	+ if (source == previousVersionButton)
2223	2810	{
2224		- Save();
	2811	+ // Go to previous version
	2812	+ //if (!Undo())
	2813	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2814	+ PreviousVersion();
	2815	+ } else
	2816	+ if (source == restoreButton)
	2817	+ {
	2818	+ // Restore current version
	2819	+ Restore();
	2820	+ //restoreButton.setEnabled(false);
	2821	+ } else
	2822	+ if (source == replaceButton)
	2823	+ {
	2824	+ // Overwrite current version
	2825	+ Replace();
	2826	+ //replaceButton.setEnabled(false);
	2827	+ } else
	2828	+ if (source == nextVersionButton)
	2829	+ {
	2830	+ // Go to next version
	2831	+ NextVersion();
	2832	+ } else
	2833	+ if (source == saveVersionButton)
	2834	+ {
	2835	+ // Save a new version
	2836	+ if (!Save(true))
	2837	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2838	+ } else
	2839	+ if (source == deleteVersionButton)
	2840	+ {
	2841	+ // Delete a new version
	2842	+ DeleteVersion();
2225	2843	} else
2226	2844	if (source == oneStepButton)
2227	2845	{
..	..	@@ -2230,17 +2848,14 @@
2230	2848	} else
2231	2849	if (source == screenfitButton)
2232	2850	{
2233		- //Reload(lastConverter, lastFilename, true);
2234	2851	ScreenFit();
2235	2852	} else
2236	2853	if (source == screenfitpointButton)
2237	2854	{
2238		- //Reload(lastConverter, lastFilename, true);
2239	2855	ScreenFitPoint();
2240	2856	} else
2241	2857	if (source == snapobjectButton)
2242	2858	{
2243		- //Reload(lastConverter, lastFilename, true);
2244	2859	SnapObject();
2245	2860	} else
2246	2861	// if (event.getSource() == recompileButton)
..	..	@@ -2279,11 +2894,11 @@
2279	2894	} else
2280	2895	if (source == undoItem)
2281	2896	{
2282		- Undo();
	2897	+ PreviousVersion();
2283	2898	} else
2284	2899	if (source == redoItem)
2285	2900	{
2286		- Redo();
	2901	+ NextVersion();
2287	2902	} else
2288	2903	if (source == duplicateItem)
2289	2904	{
..	..	@@ -2604,7 +3219,7 @@
2604	3219	{
2605	3220	StepAll();
2606	3221	} else
2607		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3222	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2608	3223	{
2609	3224	//int indices[] = jList.getSelectedIndices();
2610	3225	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2764,22 +3379,34 @@
2764	3379	} else
2765	3380	if (source == ungroupItem \|\| source == ungroupButton)
2766	3381	{
2767		- boolean hasRoot = false;
	3382	+ boolean canUngroup = true;
2768	3383
2769	3384	for (int i=0; i<group.selection.size(); i++)
2770	3385	{
2771		- if (group.selection.get(i) == group)
	3386	+ Object3D selectedItem = group.selection.get(i);
	3387	+
	3388	+ if (selectedItem.Size() == 0)
2772	3389	{
2773		- hasRoot = true;
	3390	+ // Cannot ungroup leaves
	3391	+ canUngroup = false;
	3392	+ break;
	3393	+ }
	3394	+
	3395	+ if (selectedItem == group)
	3396	+ {
	3397	+ // Cannot ungroup root
	3398	+ canUngroup = false;
2774	3399	break;
2775	3400	}
2776	3401	}
2777	3402
2778		- if (!hasRoot)
	3403	+ if (canUngroup)
2779	3404	{
2780	3405	for (int i=0; i<group.selection.size(); i++)
2781	3406	{
2782		- Ungroup(group.selection.get(i));
	3407	+ Object3D selectedItem = group.selection.get(i);
	3408	+
	3409	+ Ungroup(selectedItem);
2783	3410	}
2784	3411
2785	3412	ClearSelection(false);
..	..	@@ -3086,7 +3713,7 @@
3086	3713	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3087	3714	{
3088	3715	obj = (Object3D)e.nextElement();
3089		- obj.SetBumpTexture(null);
	3716	+ obj.ResetBumpTexture();
3090	3717	}
3091	3718
3092	3719	refreshContents();
..	..	@@ -3100,6 +3727,31 @@
3100	3727	obj.SetBumpTexture(obj.GetPigmentTexture());
3101	3728	}
3102	3729
	3730	+ refreshContents();
	3731	+ } else
	3732	+ if (source == embedTexturesItem)
	3733	+ {
	3734	+ Object3D obj;
	3735	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3736	+ {
	3737	+ obj = (Object3D)e.nextElement();
	3738	+ obj.EmbedTextures(true);
	3739	+ }
	3740	+
	3741	+ refreshContents();
	3742	+ } else
	3743	+ if (source == deEmbedTexturesItem)
	3744	+ {
	3745	+ Object3D obj;
	3746	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3747	+ {
	3748	+ obj = (Object3D)e.nextElement();
	3749	+ obj.EmbedTextures(false);
	3750	+ }
	3751	+
	3752	+ CameraPane.texturepigment.clear();
	3753	+ CameraPane.texturebump.clear();
	3754	+
3103	3755	refreshContents();
3104	3756	} else
3105	3757	if (source == flashSelectionButton)
..	..	@@ -3117,38 +3769,7 @@
3117	3769	if (CameraPane.FULLSCREEN)
3118	3770	fullscreenLayout = radio.layout;
3119	3771
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();
	3772	+ Show3DView();
3152	3773
3153	3774	cameraView.requestFocusInWindow();
3154	3775
..	..	@@ -3203,8 +3824,8 @@
3203	3824	// centralPanel.setVisible(true);
3204	3825	// XYZPanel.setVisible(true);
3205	3826	bigThree.ClearUI();
	3827	+ bigThree.add(scenePanel);
3206	3828	bigThree.add(centralPanel);
3207		- bigThree.add(XYZPanel);
3208	3829	bigThree.FlushUI();
3209	3830
3210	3831	cameraView.requestFocusInWindow();
..	..	@@ -3284,8 +3905,8 @@
3284	3905	// centralPanel.setVisible(true);
3285	3906	// XYZPanel.setVisible(false);
3286	3907	bigThree.ClearUI();
3287		- bigThree.add(scenePanel);
3288	3908	bigThree.add(centralPanel);
	3909	+ bigThree.add(scenePanel);
3289	3910	bigThree.FlushUI();
3290	3911
3291	3912	cameraView.requestFocusInWindow();
..	..	@@ -3334,6 +3955,7 @@
3334	3955	} else
3335	3956	if (source == rootButton)
3336	3957	{
	3958	+ Replace();
3337	3959	Object3D obj;
3338	3960	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3339	3961	{
..	..	@@ -3348,6 +3970,8 @@
3348	3970	if (source == closeButton)
3349	3971	{
3350	3972	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3973	+ Replace();
	3974	+
3351	3975	cRadio ab;
3352	3976	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3353	3977	{
..	..	@@ -3391,10 +4015,10 @@
3391	4015	{
3392	4016	Object3D child = (Object3D)e.nextElement();
3393	4017	if(child.editWindow != null)
3394		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3395	4018	child.pinned = false;
3396	4019	child.CloseUI();
3397	4020	listUI.remove(child);
	4021	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3398	4022
3399	4023	//child.editWindow = null; // ???????????
3400	4024	}
..	..	@@ -3413,6 +4037,7 @@
3413	4037	obj.CloseUI();
3414	4038	}
3415	4039	listUI.clear();
	4040	+ SetPinStates(group.selection.size() > 0);
3416	4041	refreshContents(true);
3417	4042	} else
3418	4043	if (source == allParamsButton)
..	..	@@ -3445,6 +4070,8 @@
3445	4070	} else
3446	4071	if(source instanceof cRadio)
3447	4072	{
	4073	+ Replace();
	4074	+
3448	4075	group.parent = keepparent;
3449	4076	group.attributes = 0;
3450	4077	//group.editWindow = null;
..	..	@@ -3468,6 +4095,7 @@
3468	4095	}
3469	4096
3470	4097	copy = group;
	4098	+
3471	4099	//Globals.theRenderer.object = group;
3472	4100	if(!useclient)
3473	4101	{
..	..	@@ -3495,9 +4123,35 @@
3495	4123	*/
3496	4124	radio.layout.doClick();
3497	4125
	4126	+ assert(copy instanceof Composite);
	4127	+
	4128	+ if (copy.versionlist == null)
	4129	+ {
	4130	+ copy.versionindex = -1;
	4131	+
	4132	+ // Cannot work with loops
	4133	+ // To fix this issue, we first mark all nodes above the root,
	4134	+ // and check if any of these nodes are reachable below the root.
	4135	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4136	+
	4137	+ if (!copy.HasTags())
	4138	+ {
	4139	+ copy.versionlist = new Object3D[100];
	4140	+
	4141	+ Save(true);
	4142	+ }
	4143	+
	4144	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4145	+ }
	4146	+
	4147	+ SetVersionStates();
	4148	+
3498	4149	ClearUnpinned();
3499		- SetPinStates(group.selection.size() > 0);
3500		- if (group.selection.size() == 1)
	4150	+
	4151	+ //Grafreed.Assert(group != null);
	4152	+ //Grafreed.Assert(group.selection != null);
	4153	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4154	+ if (group.selection == null \|\| group.selection.size() == 1)
3501	4155	EditSelection(false);
3502	4156	keepparent = group.parent;
3503	4157	// PARENT = NULL or not???
..	..	@@ -3510,11 +4164,13 @@
3510	4164	} else if (event.getSource() == editCameraItem)
3511	4165	{
3512	4166	cameraView.ProtectCamera();
	4167	+ cameraView.requestFocusInWindow();
3513	4168	cameraView.repaint();
3514	4169	return;
3515	4170	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3516	4171	{
3517	4172	cameraView.RevertCamera();
	4173	+ cameraView.requestFocusInWindow();
3518	4174	cameraView.repaint();
3519	4175	return;
3520	4176	// } else if (event.getSource() == textureButton)
..	..	@@ -3633,7 +4289,7 @@
3633	4289	TouchTransform(obj);
3634	4290	continue;
3635	4291	}
3636		- if ((mask&2) != 0) // Scale
	4292	+ if ((mask&2) != 0) // Scale/rotation
3637	4293	{
3638	4294	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3639	4295	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3641,10 +4297,6 @@
3641	4297	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3642	4298	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3643	4299	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3644		- }
3645		- if ((mask&4) != 0) // Rotation
3646		- {
3647		- // ?
3648	4300	}
3649	4301	if ((mask&1) != 0) // Translation
3650	4302	{
..	..	@@ -4091,7 +4743,7 @@
4091	4743
4092	4744	try
4093	4745	{
4094		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4746	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4095	4747	}
4096	4748	catch (Exception e)
4097	4749	{
..	..	@@ -4568,6 +5220,12 @@
4568	5220
4569	5221	void EditSelection(boolean newWindow)
4570	5222	{
	5223	+ if (group.selection == null)
	5224	+ {
	5225	+ EditElement(group, newWindow); // ? new
	5226	+ return;
	5227	+ }
	5228	+
4571	5229	// aConstraints.gridy = 0;
4572	5230	for (int i=0; i<group.selection.size(); i++)
4573	5231	{
..	..	@@ -4578,12 +5236,7 @@
4578	5236	Object3D elem = (Object3D)group.selection.elementAt(i);
4579	5237	if(elem != group \|\| !newWindow)
4580	5238	{
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
	5239	+ EditElement(elem, newWindow); // ? new
4587	5240	}
4588	5241	}
4589	5242	}
..	..	@@ -4646,9 +5299,7 @@
4646	5299
4647	5300	freezemodel = false;
4648	5301	}
4649		-
4650		- boolean flashIt = true;
4651		-
	5302	+
4652	5303	public void valueChanged(TreeSelectionEvent e)
4653	5304	//public boolean handleEvent(Event event)
4654	5305	{
..	..	@@ -4721,14 +5372,32 @@
4721	5372	{
4722	5373	editButton.setEnabled(enabled);
4723	5374	uneditButton.setEnabled(enabled);
4724		- unselectButton.setEnabled(enabled);
	5375	+ //unselectButton.setEnabled(enabled);
4725	5376	flashSelectionButton.setEnabled(enabled);
	5377	+
	5378	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5379	+
	5380	+ boolean allComposites = true;
	5381	+
	5382	+ if (group.selection != null)
	5383	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5384	+ {
	5385	+ Object next = e.nextElement();
	5386	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5387	+ {
	5388	+ allComposites = false;
	5389	+ break;
	5390	+ }
	5391	+ }
	5392	+
	5393	+ rootButton.setEnabled(allComposites);
4726	5394	}
4727	5395
4728	5396	void refreshContents(boolean cp)
4729	5397	{
4730		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4731		- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	5398	+ if (Globals.ADVANCED)
	5399	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5400	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4732	5401	{
4733	5402	objEditor.ClearInfo(); // .GetMaterial());
4734	5403
..	..	@@ -4737,7 +5406,7 @@
4737	5406	Object3D child = (Object3D) group.selection.get(i);
4738	5407
4739	5408	objEditor.AddInfo(child, this, true);
4740		- System.err.println("info : " + child.GetPath());
	5409	+// System.err.println("info : " + child.GetPath());
4741	5410	}
4742	5411
4743	5412	objEditor.SetText(); // jan 2014
..	..	@@ -4827,8 +5496,8 @@
4827	5496
4828	5497	if (cut)
4829	5498	{
4830		- if (Globals.SAVEONMAKE)
4831		- Save();
	5499	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5500	+// Save();
4832	5501	//int indices[] = jList.getSelectedIndices();
4833	5502	//for (int i = indices.length - 1; i >= 0; i--)
4834	5503	//jList.remove(indices[i]);
..	..	@@ -4931,6 +5600,10 @@
4931	5600
4932	5601	void paste(boolean expand)
4933	5602	{
	5603	+ if (Globals.REPLACEONMAKE)
	5604	+ Save();
	5605	+ boolean keep = Globals.REPLACEONMAKE;
	5606	+ Globals.REPLACEONMAKE = false;
4934	5607	// if (GrafreeD.clipboard == null)
4935	5608	// return;
4936	5609	boolean first = true;
..	..	@@ -4990,6 +5663,7 @@
4990	5663	Grafreed.clipboard.get(0).parent = keepparent;
4991	5664	}
4992	5665
	5666	+ Globals.REPLACEONMAKE = keep;
4993	5667	ResetModel();
4994	5668	refreshContents();
4995	5669	}
..	..	@@ -5125,6 +5799,10 @@
5125	5799
5126	5800	void group(Object3D csg, boolean grab)
5127	5801	{
	5802	+ if (Globals.REPLACEONMAKE)
	5803	+ Save();
	5804	+ boolean keep = Globals.REPLACEONMAKE;
	5805	+ Globals.REPLACEONMAKE = false;
5128	5806	if (//false) // why??
5129	5807	!group.selection.isEmpty())
5130	5808	{
..	..	@@ -5238,10 +5916,15 @@
5238	5916	//node.add(csg);
5239	5917	//makeSomething(node);
5240	5918	makeSomething(csg);
	5919	+ Globals.REPLACEONMAKE = keep;
5241	5920	}
5242	5921
5243	5922	void Ungroup(Object3D g)
5244	5923	{
	5924	+ if (Globals.REPLACEONMAKE)
	5925	+ Save();
	5926	+ boolean keep = Globals.REPLACEONMAKE;
	5927	+ Globals.REPLACEONMAKE = false;
5245	5928	if (g instanceof HiddenObject)
5246	5929	{
5247	5930	HiddenObject h = (HiddenObject) g;
..	..	@@ -5258,6 +5941,7 @@
5258	5941	objEditor.makeSomething(g.get(i), false);
5259	5942	}
5260	5943	}
	5944	+ Globals.REPLACEONMAKE = keep;
5261	5945	}
5262	5946
5263	5947	void ungroup()
..	..	@@ -5548,7 +6232,6 @@
5548	6232
5549	6233	cButton restoreCameraButton;
5550	6234
5551		- cButton saveButton;
5552	6235	cButton oneStepButton;
5553	6236
5554	6237	cButton groupButton;
..	..	@@ -5557,6 +6240,22 @@
5557	6240	cButton switchButton;
5558	6241	cButton loopButton;
5559	6242	cButton textureButton;
	6243	+
	6244	+ cButton skybox1Button;
	6245	+ cButton skybox2Button;
	6246	+ cButton skybox3Button;
	6247	+ cButton skybox4Button;
	6248	+ cButton skybox5Button;
	6249	+ cButton skybox6Button;
	6250	+ cButton skybox7Button;
	6251	+
	6252	+ cButton skybox11Button;
	6253	+ cButton skybox12Button;
	6254	+ cButton skybox13Button;
	6255	+ cButton skybox14Button;
	6256	+ cButton skybox15Button;
	6257	+ cButton skybox16Button;
	6258	+ cButton skybox17Button;
5560	6259
5561	6260	cButton gridButton;
5562	6261	cButton boxButton;
..	..	@@ -5590,11 +6289,11 @@
5590	6289	private MenuItem lookAtItem;
5591	6290	private MenuItem lookFromItem;
5592	6291	private MenuItem switchViewItem;
5593		- private MenuItem cutItem;
	6292	+ private JMenuItem cutItem;
5594	6293	private MenuItem undoItem;
5595	6294	private MenuItem redoItem;
5596	6295	private JMenuItem duplicateItem;
5597		- private MenuItem cloneItem;
	6296	+ private JMenuItem cloneItem;
5598	6297	private MenuItem cloneSupportItem;
5599	6298	private MenuItem overwriteGeoItem;
5600	6299	private MenuItem overwriteMatItem;
..	..	@@ -5615,13 +6314,13 @@
5615	6314	private MenuItem cloneGeometriesItem;
5616	6315	private MenuItem shareGeometriesItem;
5617	6316	private MenuItem mergeGeometriesItem;
5618		- private MenuItem copyItem;
	6317	+ private JMenuItem copyItem;
5619	6318	private MenuItem pasteItem;
5620		- private MenuItem pasteIntoItem;
5621		- private MenuItem pasteLinkItem;
5622		- private MenuItem pasteCloneItem;
5623		- private MenuItem pasteExpandItem;
5624		- private MenuItem clearItem;
	6319	+ private JMenuItem pasteIntoItem;
	6320	+ private JMenuItem pasteLinkItem;
	6321	+ private JMenuItem pasteCloneItem;
	6322	+ private JMenuItem pasteExpandItem;
	6323	+ private JMenuItem deleteItem;
5625	6324	private MenuItem clearAllItem;
5626	6325	private MenuItem genUVItem;
5627	6326	private MenuItem genNormalsMESHItem;
..	..	@@ -5676,7 +6375,7 @@
5676	6375	private MenuItem transformGeometryItem;
5677	6376	private MenuItem transformChildrenItem;
5678	6377	private MenuItem hideItem;
5679		- private MenuItem grabItem;
	6378	+ private JMenuItem grabItem;
5680	6379	private MenuItem backItem;
5681	6380	private MenuItem frontItem;
5682	6381	private MenuItem cameraItem;
..	..	@@ -5689,7 +6388,7 @@
5689	6388	private MenuItem switchTransfoItem;
5690	6389	private MenuItem morphItem;
5691	6390	private MenuItem linkerItem;
5692		- private MenuItem ungroupItem;
	6391	+ private JMenuItem ungroupItem;
5693	6392	private MenuItem editItem;
5694	6393	private MenuItem openWindowItem;
5695	6394	private MenuItem editLeafItem;
..	..	@@ -5705,6 +6404,8 @@
5705	6404	private MenuItem attachBumpItem;
5706	6405	private MenuItem detachBumpItem;
5707	6406	private MenuItem pigmentBumpItem;
	6407	+ private MenuItem embedTexturesItem;
	6408	+ private MenuItem deEmbedTexturesItem;
5708	6409
5709	6410	private MenuItem particleItem;
5710	6411	private MenuItem ragdollItem;