~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();
	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
..	..	@@ -592,51 +1050,108 @@
592	1050
593	1051	if (Globals.ADVANCED)
594	1052	{
595		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596		- maxButton.setToolTipText("Maximize window");
597		- maxButton.addActionListener(this);
	1053	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// maxButton.setToolTipText("Maximize window");
	1055	+// maxButton.addActionListener(this);
598	1056	}
599	1057
600		- 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);
601	1098	fullButton.setToolTipText("Full-screen window");
602	1099	fullButton.addActionListener(this);
603	1100
604		- 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);
605	1106	restoreCameraButton.setToolTipText("Restore viewpoint");
606	1107	restoreCameraButton.addActionListener(this);
607	1108
608		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609		- undoButton.setToolTipText("Undo changes");
610		- undoButton.addActionListener(this);
611		- undoButton.setEnabled(false);
	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);
612	1122
613		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
614		- redoButton.setToolTipText("Redo changes");
615		- redoButton.addActionListener(this);
616		- redoButton.setEnabled(false);
	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);
617	1128
618		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
619		- saveButton.setToolTipText("Save changes");
620		- 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);
621	1133
622		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
623		- liveCB.setToolTipText("Enable animation");
624		- liveCB.addItemListener(this);
625		-
626		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	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);
627	1142	oneStepButton.setToolTipText("Animate one step forward");
628	1143	oneStepButton.addActionListener(this);
629	1144
630		- 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);
631	1150	fastCB.setToolTipText("Fast mode");
632	1151	fastCB.addItemListener(this);
633	1152
634	1153	//oe.toolboxPanel.Return();
635	1154
636		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637		- screenfitButton.setToolTipText("Screen fit");
638		- screenfitButton.addActionListener(this);
639		-
640	1155	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
641	1156	// trackCB.setToolTipText("Enable tracking");
642	1157	// trackCB.addItemListener(this);
..	..	@@ -646,142 +1161,134 @@
646	1161
647	1162	if (Globals.ADVANCED)
648	1163	{
649		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1164	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
650	1165	snapobjectButton.addActionListener(this);
651	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");
652	1171	}
653	1172
654	1173	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
655	1174
656		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657		- twoButton.setToolTipText("Show center view only");
658		- twoButton.addActionListener(this);
659		- this.fullscreenLayout = twoButton;
660		-
661		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662		- fourButton.addActionListener(this);
663		- fourButton.setToolTipText("Show left panel only");
664		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
665		- sixButton.setToolTipText("2-column layout left");
666		- sixButton.addActionListener(this);
667		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668		- threeButton.setToolTipText("2-column layout right");
669		- threeButton.addActionListener(this);
670		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- sevenButton.setToolTipText("3-column layout");
672		- sevenButton.addActionListener(this);
673		- //
674	1175
675		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
676		- 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");
677	1178	rootButton.addActionListener(this);
678	1179
679		- 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);
680	1181	closeButton.setToolTipText("Close tab");
681	1182	closeButton.addActionListener(this);
682	1183	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
683	1184	//clearButton.addActionListener(this);
684	1185
	1186	+ cGridBag row1 = new cGridBag();
	1187	+
685	1188	// INSERT
686		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
687		- gridButton.setToolTipText("Create grid");
	1189	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ gridButton.setToolTipText("Create ground");
688	1191	gridButton.addActionListener(this);
689	1192
690		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1193	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
691	1194	boxButton.setToolTipText("Create box");
692	1195	boxButton.addActionListener(this);
693	1196
694		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
695		- sphereButton.setToolTipText("Create sphere");
696		- sphereButton.addActionListener(this);
697		-
698		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
699		- coneButton.setToolTipText("Create cone");
700		- coneButton.addActionListener(this);
701		-
702		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
703		- torusButton.setToolTipText("Create torus");
704		- torusButton.addActionListener(this);
705		-
706		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
707	1198	superButton.setToolTipText("Create superellipsoid");
708	1199	superButton.addActionListener(this);
709	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	+
710	1213	if (Globals.ADVANCED)
711	1214	{
712		- 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);
713	1216	kleinButton.setToolTipText("Create Klein bottle");
714	1217	kleinButton.addActionListener(this);
715	1218	}
716	1219
717		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
718	1221	particlesButton.setToolTipText("Create particle system");
719	1222	particlesButton.addActionListener(this);
720	1223
721		- oe.toolboxPanel.Return();
	1224	+ oe.toolboxPanel.add(row1);
722	1225
723		- 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);
724	1229	groupButton.setToolTipText("Create group");
725	1230	groupButton.addActionListener(this);
726	1231
727		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
728	1233	compositeButton.setToolTipText("Create composite");
729	1234	compositeButton.addActionListener(this);
730	1235
731		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
732	1237	switchButton.setToolTipText("Create item switcher");
733	1238	switchButton.addActionListener(this);
734	1239
735		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
736	1241	loopButton.setToolTipText("Create loop");
737	1242	loopButton.addActionListener(this);
738	1243
739		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1244	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
740	1245	textureButton.setToolTipText("Create texture");
741	1246	textureButton.addActionListener(this);
742	1247
743		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1248	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
744	1249	overlayButton.setToolTipText("Create overlay");
745	1250	overlayButton.addActionListener(this);
746	1251
747		- 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);
748	1253	lightButton.setToolTipText("Create light");
749	1254	lightButton.addActionListener(this);
750	1255
751		- for (int i=6; --i>=0;)
752		- {
753		- oe.toolboxPanel.Return();
754		- oe.toolboxPanel.add(new cGridBag());
755		- oe.toolboxPanel.add(new cGridBag());
756		- oe.toolboxPanel.add(new cGridBag());
757		- oe.toolboxPanel.add(new cGridBag());
758		- oe.toolboxPanel.add(new cGridBag());
759		- oe.toolboxPanel.add(new cGridBag());
760		- oe.toolboxPanel.add(new cGridBag());
761		- }
	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);
762	1269
763	1270	// EDIT panel
764		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1271	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
765	1272	editButton.setToolTipText("Pin selection controls");
766	1273	editButton.addActionListener(this);
767	1274
768		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
769		- 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");
770	1277	uneditButton.addActionListener(this);
771	1278
772	1279	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
773		- allParamsButton.setToolTipText("Show all controle");
	1280	+ allParamsButton.setToolTipText("Show all controls");
774	1281	allParamsButton.addActionListener(this);
775	1282
776		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
777		- clearPanelButton.setToolTipText("Clear edit panel");
	1283	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1284	+ clearPanelButton.setToolTipText("Clear all controls");
778	1285	clearPanelButton.addActionListener(this);
779	1286
780		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
781		- unselectButton.setToolTipText("Unselect");
782		- unselectButton.addActionListener(this);
	1287	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1288	+ //unselectButton.setToolTipText("Unselect");
	1289	+ //unselectButton.addActionListener(this);
783	1290
784		- 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);
785	1292	flashSelectionButton.setToolTipText("Highlight selection");
786	1293	flashSelectionButton.addActionListener(this);
787	1294
..	..	@@ -804,6 +1311,8 @@
804	1311
805	1312	cGridBag jSPPanel = new cGridBag();
806	1313
	1314	+ jSPPanel.preferredHeight = 20;
	1315	+
807	1316	JScrollPane jSP;
808	1317	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
809	1318	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -812,11 +1321,14 @@
812	1321	oe.treePanel.add(jSPPanel);
813	1322	oe.treePanel.Return();
814	1323
815		- oe.treePanel.add(copyOptionsPanel);
	1324	+ oe.treePanel.add(versionManagerPanel);
816	1325	oe.treePanel.Return();
	1326	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1327	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1328	+ versionSliderPane.preferredHeight = 3;
817	1329
818		-// mainPanel.setDividerLocation(0.5); //1.0);
819		-// mainPanel.setResizeWeight(0.5);
	1330	+// mainPanel.setDividerLocation(0.1); //1.0);
	1331	+ mainPanel.setResizeWeight(0.4);
820	1332
821	1333	//jList.addListSelectionListener(this);
822	1334	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -824,7 +1336,7 @@
824	1336	//jTree.setEditable(true);
825	1337	oe.jTree.setDragEnabled(true);
826	1338	//jTree.setPreferredSize(new Dimension(10,10));
827		- jSP.setPreferredSize(new Dimension(100,200));
	1339	+ //jSP.setPreferredSize(new Dimension(100,200));
828	1340
829	1341	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
830	1342
..	..	@@ -836,7 +1348,7 @@
836	1348	dgr.addDragGestureListener(this);
837	1349	}catch(Exception e) {}
838	1350	*/
839		- radio.layout = sevenButton;
	1351	+ radio.layout = threeButton; // sixButton;
840	1352	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
841	1353	}
842	1354
..	..	@@ -887,9 +1399,12 @@
887	1399	smoothCB.setToolTipText("Snapping delay");
888	1400	smoothCB.addItemListener(this);
889	1401
890		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
891		- slowCB.setToolTipText("Smooth interpolation");
892		- 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);
893	1408
894	1409	// constraints.gridy += 1;
895	1410	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -939,9 +1454,9 @@
939	1454	toggleSwitchCB.setToolTipText("Choose a single item");
940	1455	toggleSwitchCB.addItemListener(this);
941	1456
942		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
943		- autosaveCB.setToolTipText("On structure change");
944		- autosaveCB.addItemListener(this);
	1457	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1458	+ autokeepCB.setToolTipText("On structure change");
	1459	+ autokeepCB.addItemListener(this);
945	1460
946	1461	panel.Return();
947	1462	if (Globals.ADVANCED)
..	..	@@ -968,9 +1483,17 @@
968	1483
969	1484	void EditObject(Object3D obj)
970	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	+
971	1494	cRadio radioButton = new cRadio(obj.name);
972	1495
973		- // Patch to avoid bug with transparency.
	1496	+ // June 2019. Patch to avoid bug with transparency.
974	1497	radioButton.hadMaterial = obj.material != null;
975	1498	if (!radioButton.hadMaterial)
976	1499	{
..	..	@@ -978,7 +1501,7 @@
978	1501	}
979	1502
980	1503	radioButton.SetObject(obj);
981		- radioButton.layout = sevenButton;
	1504	+ radioButton.layout = threeButton; // sixButton;
982	1505	radioButton.SetCamera(cameraView.renderCamera, false);
983	1506	radioButton.addActionListener(this);
984	1507	radioPanel.add(radioButton);
..	..	@@ -992,6 +1515,7 @@
992	1515
993	1516	oe.SetupViews();
994	1517
	1518	+ if (Globals.DEBUG)
995	1519	System.out.println("SetupViews");
996	1520	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
997	1521	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1003,6 +1527,8 @@
1003	1527	cCheckBox localCB;
1004	1528	cCheckBox crowdCB;
1005	1529	cCheckBox smoothCB;
	1530	+ cCheckBox minshaderCB;
	1531	+
1006	1532	cToggleButton fastCB;
1007	1533	cCheckBox slowCB;
1008	1534	cCheckBox boxCB;
..	..	@@ -1018,7 +1544,7 @@
1018	1544
1019	1545	cCheckBox oeilCB;
1020	1546	cCheckBox shadowCB;
1021		- cCheckBox autosaveCB;
	1547	+ cCheckBox autokeepCB;
1022	1548	cCheckBox lookAtCB;
1023	1549
1024	1550	// static int COLOR = 1;
..	..	@@ -1073,6 +1599,12 @@
1073	1599	{
1074	1600	cameraView.ToggleInertia();
1075	1601	cameraView.repaint();
	1602	+ }
	1603	+ else if(e.getSource() == minshaderCB)
	1604	+ {
	1605	+ Globals.MINSHADER ^= true;
	1606	+ cameraView.programInitialized = false;
	1607	+ cameraView.repaint();
1076	1608	}
1077	1609	else if(e.getSource() == localCB)
1078	1610	{
..	..	@@ -1130,9 +1662,9 @@
1130	1662	{
1131	1663	Globals.FREEZEONMOVE ^= true;
1132	1664	}
1133		- else if(e.getSource() == autosaveCB)
	1665	+ else if(e.getSource() == autokeepCB)
1134	1666	{
1135		- Globals.SAVEONMAKE ^= true;
	1667	+ Globals.REPLACEONMAKE ^= true;
1136	1668	}
1137	1669	else if(e.getSource() == lookAtCB)
1138	1670	{
..	..	@@ -1214,8 +1746,6 @@
1214	1746	}
1215	1747	}
1216	1748
1217		- String string = (String) object;
1218		-
1219	1749	System.out.println("Transfer = " + object + "; drop : " + target);
1220	1750	// if( object instanceof java.io.File[])
1221	1751	// {
..	..	@@ -1223,6 +1753,8 @@
1223	1753	// objEditor.DropFile((java.io.File[]) object, true);
1224	1754	// return;
1225	1755	// }
	1756	+
	1757	+ String string = object.toString();
1226	1758
1227	1759	// File path for Mac and Windows
1228	1760	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1350,7 +1882,12 @@
1350	1882	TreePath path;
1351	1883
1352	1884	public TransferableTreePath(TreePath tp) {
1353		- 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);
1354	1891	}
1355	1892
1356	1893	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1472,6 +2009,9 @@
1472	2009	animationItem.addItemListener(this);
1473	2010	animationItem.setState(Globals.ANIMATION);
1474	2011
	2012	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2013	+ archiveItem.addActionListener(this);
	2014	+
1475	2015	menu.add("-");
1476	2016	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1477	2017	parseverticesItem.addActionListener(this);
..	..	@@ -1484,6 +2024,8 @@
1484	2024	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1485	2025	reduce34MorphItem.addActionListener(this);
1486	2026	menu.add("-");
	2027	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2028	+ memoryItem.addActionListener(this);
1487	2029	menu.add(computeAOItem = new MenuItem("Compute AO"));
1488	2030	computeAOItem.addActionListener(this);
1489	2031
..	..	@@ -1492,8 +2034,6 @@
1492	2034	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1493	2035	mirrorItem.addActionListener(this);
1494	2036	menu.add("-");
1495		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1496		- memoryItem.addActionListener(this);
1497	2037	menu.add(analyzeItem = new MenuItem("Analyze"));
1498	2038	analyzeItem.addActionListener(this);
1499	2039	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1637,7 +2177,11 @@
1637	2177	shadow.material = new cMaterial(obj.material);
1638	2178	shadow.material.diffuse = 0.0001f;
1639	2179	shadow.material.specular = 0.0001f;
1640		- //shadow.projectedVertices[1].x = 300;
	2180	+ shadow.material.opacity = 0.75f;
	2181	+
	2182	+ AllocProjectedVertices(shadow);
	2183	+
	2184	+ shadow.projectedVertices[1].x = 300;
1641	2185
1642	2186	makeSomething(shadow);
1643	2187	}
..	..	@@ -1654,6 +2198,16 @@
1654	2198	listUI.remove(i);
1655	2199	}
1656	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
1657	2211	}
1658	2212
1659	2213	/**
..	..	@@ -2083,6 +2637,23 @@
2083	2637	{
2084	2638	makeSomething(new Light());
2085	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
2086	2657	if (source == csgItem)
2087	2658	{
2088	2659	group(new CSG());
..	..	@@ -2131,27 +2702,35 @@
2131	2702	} else
2132	2703	if (source == loopItem \|\| source == loopButton)
2133	2704	{
	2705	+ if (!group.selection.isEmpty())
	2706	+ {
2134	2707	Composite csg = new GroupLeaf();
2135	2708	csg.count = 5;
2136		- group(csg);
2137	2709	Composite child = new cGroup("Branch");
2138	2710	csg.addChild(child);
2139	2711	child.addChild(csg);
	2712	+ group(csg);
	2713	+ }
2140	2714	} else
2141	2715	if (source == doubleItem)
2142	2716	{
	2717	+ if (!group.selection.isEmpty())
	2718	+ {
2143	2719	Composite csg = new GroupLeaf("Fork");
2144	2720	csg.count = 5;
2145		- group(csg);
2146	2721	Composite child = new cGroup("Branch A");
2147	2722	csg.addChild(child);
2148	2723	child.addChild(csg);
2149	2724	child = new cGroup("Branch B");
2150	2725	csg.addChild(child);
2151	2726	child.addChild(csg);
	2727	+ group(csg);
	2728	+ }
2152	2729	} else
2153	2730	if (source == tripleItem)
2154	2731	{
	2732	+ if (!group.selection.isEmpty())
	2733	+ {
2155	2734	Composite csg = new GroupLeaf("Trident");
2156	2735	csg.count = 4;
2157	2736	group(csg);
..	..	@@ -2164,11 +2743,12 @@
2164	2743	child = new cGroup();
2165	2744	csg.addChild(child);
2166	2745	child.addChild(csg);
	2746	+ }
2167	2747	} else
2168	2748	if (source == computeAOItem)
2169	2749	{
2170	2750	Globals.drawMode = CameraPane.OCCLUSION;
2171		- Globals.theRenderer.repaint();
	2751	+ cameraView.repaint();
2172	2752	} else
2173	2753	if (source == recompileItem)
2174	2754	{
..	..	@@ -2183,7 +2763,7 @@
2183	2763	if (source == invariantsItem)
2184	2764	{
2185	2765	System.out.println("Invariants:");
2186		- Grafreed.grafreeD.universe.invariants();
	2766	+ Grafreed.grafreed.universe.invariants();
2187	2767	} else
2188	2768	if (source == memoryItem)
2189	2769	{
..	..	@@ -2214,17 +2794,52 @@
2214	2794	{
2215	2795	ToggleFullScreen();
2216	2796	} else
2217		- if (source == undoButton)
	2797	+ if (source == collapseButton)
2218	2798	{
2219		- Undo();
	2799	+ this.expandedLayout = radio.layout;
	2800	+ CollapseToolbar();
2220	2801	} else
2221		- if (source == redoButton)
	2802	+ if (source == maximize3DButton)
2222	2803	{
2223		- Redo();
	2804	+ this.expandedLayout = radio.layout;
	2805	+ radio.layout = twoButton;
	2806	+ Show3DView();
	2807	+ CollapseToolbar();
2224	2808	} else
2225		- if (source == saveButton)
	2809	+ if (source == previousVersionButton)
2226	2810	{
2227		- 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();
2228	2843	} else
2229	2844	if (source == oneStepButton)
2230	2845	{
..	..	@@ -2233,17 +2848,14 @@
2233	2848	} else
2234	2849	if (source == screenfitButton)
2235	2850	{
2236		- //Reload(lastConverter, lastFilename, true);
2237	2851	ScreenFit();
2238	2852	} else
2239	2853	if (source == screenfitpointButton)
2240	2854	{
2241		- //Reload(lastConverter, lastFilename, true);
2242	2855	ScreenFitPoint();
2243	2856	} else
2244	2857	if (source == snapobjectButton)
2245	2858	{
2246		- //Reload(lastConverter, lastFilename, true);
2247	2859	SnapObject();
2248	2860	} else
2249	2861	// if (event.getSource() == recompileButton)
..	..	@@ -2282,11 +2894,11 @@
2282	2894	} else
2283	2895	if (source == undoItem)
2284	2896	{
2285		- Undo();
	2897	+ PreviousVersion();
2286	2898	} else
2287	2899	if (source == redoItem)
2288	2900	{
2289		- Redo();
	2901	+ NextVersion();
2290	2902	} else
2291	2903	if (source == duplicateItem)
2292	2904	{
..	..	@@ -2607,7 +3219,7 @@
2607	3219	{
2608	3220	StepAll();
2609	3221	} else
2610		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3222	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2611	3223	{
2612	3224	//int indices[] = jList.getSelectedIndices();
2613	3225	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2767,22 +3379,34 @@
2767	3379	} else
2768	3380	if (source == ungroupItem \|\| source == ungroupButton)
2769	3381	{
2770		- boolean hasRoot = false;
	3382	+ boolean canUngroup = true;
2771	3383
2772	3384	for (int i=0; i<group.selection.size(); i++)
2773	3385	{
2774		- if (group.selection.get(i) == group)
	3386	+ Object3D selectedItem = group.selection.get(i);
	3387	+
	3388	+ if (selectedItem.Size() == 0)
2775	3389	{
2776		- 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;
2777	3399	break;
2778	3400	}
2779	3401	}
2780	3402
2781		- if (!hasRoot)
	3403	+ if (canUngroup)
2782	3404	{
2783	3405	for (int i=0; i<group.selection.size(); i++)
2784	3406	{
2785		- Ungroup(group.selection.get(i));
	3407	+ Object3D selectedItem = group.selection.get(i);
	3408	+
	3409	+ Ungroup(selectedItem);
2786	3410	}
2787	3411
2788	3412	ClearSelection(false);
..	..	@@ -3089,7 +3713,7 @@
3089	3713	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3090	3714	{
3091	3715	obj = (Object3D)e.nextElement();
3092		- obj.SetBumpTexture(null);
	3716	+ obj.ResetBumpTexture();
3093	3717	}
3094	3718
3095	3719	refreshContents();
..	..	@@ -3103,6 +3727,31 @@
3103	3727	obj.SetBumpTexture(obj.GetPigmentTexture());
3104	3728	}
3105	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	+
3106	3755	refreshContents();
3107	3756	} else
3108	3757	if (source == flashSelectionButton)
..	..	@@ -3120,38 +3769,7 @@
3120	3769	if (CameraPane.FULLSCREEN)
3121	3770	fullscreenLayout = radio.layout;
3122	3771
3123		- // bug
3124		- //gridPanel.setDividerLocation(1.0);
3125		- //bigPanel.setDividerLocation(0.0);
3126		-// bigThree.remove(scenePanel);
3127		-// bigThree.remove(centralPanel);
3128		-// bigThree.remove(XYZPanel);
3129		-// aWindowConstraints.gridx = 0;
3130		-// aWindowConstraints.gridy = 0;
3131		-// aWindowConstraints.gridwidth = 1;
3132		-// // aConstraints.gridheight = 3;
3133		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3134		-// aWindowConstraints.weightx = 0;
3135		-// aWindowConstraints.weighty = 1;
3136		-// //bigThree.add(jtp, aWindowConstraints);
3137		-// aWindowConstraints.weightx = 1;
3138		-// aWindowConstraints.gridwidth = 3;
3139		-// // aConstraints.gridheight = 3;
3140		-// aWindowConstraints.gridx = 1;
3141		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3142		-// bigThree.add(centralPanel, aWindowConstraints);
3143		-// aWindowConstraints.weightx = 0;
3144		-// aWindowConstraints.gridx = 4;
3145		-// aWindowConstraints.gridwidth = 1;
3146		-// // aConstraints.gridheight = 3;
3147		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3148		-// //bigThree.add(XYZPanel, aWindowConstraints);
3149		-// scenePanel.setVisible(false);
3150		-// centralPanel.setVisible(true);
3151		-// XYZPanel.setVisible(false);
3152		- bigThree.ClearUI();
3153		- bigThree.add(centralPanel);
3154		- bigThree.FlushUI();
	3772	+ Show3DView();
3155	3773
3156	3774	cameraView.requestFocusInWindow();
3157	3775
..	..	@@ -3206,8 +3824,8 @@
3206	3824	// centralPanel.setVisible(true);
3207	3825	// XYZPanel.setVisible(true);
3208	3826	bigThree.ClearUI();
	3827	+ bigThree.add(scenePanel);
3209	3828	bigThree.add(centralPanel);
3210		- bigThree.add(XYZPanel);
3211	3829	bigThree.FlushUI();
3212	3830
3213	3831	cameraView.requestFocusInWindow();
..	..	@@ -3287,8 +3905,8 @@
3287	3905	// centralPanel.setVisible(true);
3288	3906	// XYZPanel.setVisible(false);
3289	3907	bigThree.ClearUI();
3290		- bigThree.add(scenePanel);
3291	3908	bigThree.add(centralPanel);
	3909	+ bigThree.add(scenePanel);
3292	3910	bigThree.FlushUI();
3293	3911
3294	3912	cameraView.requestFocusInWindow();
..	..	@@ -3337,6 +3955,7 @@
3337	3955	} else
3338	3956	if (source == rootButton)
3339	3957	{
	3958	+ Replace();
3340	3959	Object3D obj;
3341	3960	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3342	3961	{
..	..	@@ -3351,6 +3970,8 @@
3351	3970	if (source == closeButton)
3352	3971	{
3353	3972	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3973	+ Replace();
	3974	+
3354	3975	cRadio ab;
3355	3976	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3356	3977	{
..	..	@@ -3394,10 +4015,10 @@
3394	4015	{
3395	4016	Object3D child = (Object3D)e.nextElement();
3396	4017	if(child.editWindow != null)
3397		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3398	4018	child.pinned = false;
3399	4019	child.CloseUI();
3400	4020	listUI.remove(child);
	4021	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3401	4022
3402	4023	//child.editWindow = null; // ???????????
3403	4024	}
..	..	@@ -3416,6 +4037,7 @@
3416	4037	obj.CloseUI();
3417	4038	}
3418	4039	listUI.clear();
	4040	+ SetPinStates(group.selection.size() > 0);
3419	4041	refreshContents(true);
3420	4042	} else
3421	4043	if (source == allParamsButton)
..	..	@@ -3448,6 +4070,8 @@
3448	4070	} else
3449	4071	if(source instanceof cRadio)
3450	4072	{
	4073	+ Replace();
	4074	+
3451	4075	group.parent = keepparent;
3452	4076	group.attributes = 0;
3453	4077	//group.editWindow = null;
..	..	@@ -3471,6 +4095,7 @@
3471	4095	}
3472	4096
3473	4097	copy = group;
	4098	+
3474	4099	//Globals.theRenderer.object = group;
3475	4100	if(!useclient)
3476	4101	{
..	..	@@ -3498,9 +4123,35 @@
3498	4123	*/
3499	4124	radio.layout.doClick();
3500	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	+
3501	4149	ClearUnpinned();
3502		- SetPinStates(group.selection.size() > 0);
3503		- 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)
3504	4155	EditSelection(false);
3505	4156	keepparent = group.parent;
3506	4157	// PARENT = NULL or not???
..	..	@@ -3513,11 +4164,13 @@
3513	4164	} else if (event.getSource() == editCameraItem)
3514	4165	{
3515	4166	cameraView.ProtectCamera();
	4167	+ cameraView.requestFocusInWindow();
3516	4168	cameraView.repaint();
3517	4169	return;
3518	4170	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3519	4171	{
3520	4172	cameraView.RevertCamera();
	4173	+ cameraView.requestFocusInWindow();
3521	4174	cameraView.repaint();
3522	4175	return;
3523	4176	// } else if (event.getSource() == textureButton)
..	..	@@ -3636,7 +4289,7 @@
3636	4289	TouchTransform(obj);
3637	4290	continue;
3638	4291	}
3639		- if ((mask&2) != 0) // Scale
	4292	+ if ((mask&2) != 0) // Scale/rotation
3640	4293	{
3641	4294	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3642	4295	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3644,10 +4297,6 @@
3644	4297	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3645	4298	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3646	4299	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3647		- }
3648		- if ((mask&4) != 0) // Rotation
3649		- {
3650		- // ?
3651	4300	}
3652	4301	if ((mask&1) != 0) // Translation
3653	4302	{
..	..	@@ -4094,7 +4743,7 @@
4094	4743
4095	4744	try
4096	4745	{
4097		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4746	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4098	4747	}
4099	4748	catch (Exception e)
4100	4749	{
..	..	@@ -4571,6 +5220,12 @@
4571	5220
4572	5221	void EditSelection(boolean newWindow)
4573	5222	{
	5223	+ if (group.selection == null)
	5224	+ {
	5225	+ EditElement(group, newWindow); // ? new
	5226	+ return;
	5227	+ }
	5228	+
4574	5229	// aConstraints.gridy = 0;
4575	5230	for (int i=0; i<group.selection.size(); i++)
4576	5231	{
..	..	@@ -4581,12 +5236,7 @@
4581	5236	Object3D elem = (Object3D)group.selection.elementAt(i);
4582	5237	if(elem != group \|\| !newWindow)
4583	5238	{
4584		- // if (!(elem instanceof Composite))
4585		- // newWindow = false;
4586		- listUI.add(elem);
4587		- elem.openEditWindow(this, newWindow); //, false);
4588		- System.out.println("edit : " + elem);
4589		- elem.editWindow.refreshContents(true); // ? new
	5239	+ EditElement(elem, newWindow); // ? new
4590	5240	}
4591	5241	}
4592	5242	}
..	..	@@ -4649,9 +5299,7 @@
4649	5299
4650	5300	freezemodel = false;
4651	5301	}
4652		-
4653		- boolean flashIt = true;
4654		-
	5302	+
4655	5303	public void valueChanged(TreeSelectionEvent e)
4656	5304	//public boolean handleEvent(Event event)
4657	5305	{
..	..	@@ -4724,14 +5372,32 @@
4724	5372	{
4725	5373	editButton.setEnabled(enabled);
4726	5374	uneditButton.setEnabled(enabled);
4727		- unselectButton.setEnabled(enabled);
	5375	+ //unselectButton.setEnabled(enabled);
4728	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);
4729	5394	}
4730	5395
4731	5396	void refreshContents(boolean cp)
4732	5397	{
4733		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4734		- 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)
4735	5401	{
4736	5402	objEditor.ClearInfo(); // .GetMaterial());
4737	5403
..	..	@@ -4740,7 +5406,7 @@
4740	5406	Object3D child = (Object3D) group.selection.get(i);
4741	5407
4742	5408	objEditor.AddInfo(child, this, true);
4743		- System.err.println("info : " + child.GetPath());
	5409	+// System.err.println("info : " + child.GetPath());
4744	5410	}
4745	5411
4746	5412	objEditor.SetText(); // jan 2014
..	..	@@ -4830,8 +5496,8 @@
4830	5496
4831	5497	if (cut)
4832	5498	{
4833		- if (Globals.SAVEONMAKE)
4834		- Save();
	5499	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5500	+// Save();
4835	5501	//int indices[] = jList.getSelectedIndices();
4836	5502	//for (int i = indices.length - 1; i >= 0; i--)
4837	5503	//jList.remove(indices[i]);
..	..	@@ -4934,6 +5600,10 @@
4934	5600
4935	5601	void paste(boolean expand)
4936	5602	{
	5603	+ if (Globals.REPLACEONMAKE)
	5604	+ Save();
	5605	+ boolean keep = Globals.REPLACEONMAKE;
	5606	+ Globals.REPLACEONMAKE = false;
4937	5607	// if (GrafreeD.clipboard == null)
4938	5608	// return;
4939	5609	boolean first = true;
..	..	@@ -4993,6 +5663,7 @@
4993	5663	Grafreed.clipboard.get(0).parent = keepparent;
4994	5664	}
4995	5665
	5666	+ Globals.REPLACEONMAKE = keep;
4996	5667	ResetModel();
4997	5668	refreshContents();
4998	5669	}
..	..	@@ -5128,6 +5799,10 @@
5128	5799
5129	5800	void group(Object3D csg, boolean grab)
5130	5801	{
	5802	+ if (Globals.REPLACEONMAKE)
	5803	+ Save();
	5804	+ boolean keep = Globals.REPLACEONMAKE;
	5805	+ Globals.REPLACEONMAKE = false;
5131	5806	if (//false) // why??
5132	5807	!group.selection.isEmpty())
5133	5808	{
..	..	@@ -5241,10 +5916,15 @@
5241	5916	//node.add(csg);
5242	5917	//makeSomething(node);
5243	5918	makeSomething(csg);
	5919	+ Globals.REPLACEONMAKE = keep;
5244	5920	}
5245	5921
5246	5922	void Ungroup(Object3D g)
5247	5923	{
	5924	+ if (Globals.REPLACEONMAKE)
	5925	+ Save();
	5926	+ boolean keep = Globals.REPLACEONMAKE;
	5927	+ Globals.REPLACEONMAKE = false;
5248	5928	if (g instanceof HiddenObject)
5249	5929	{
5250	5930	HiddenObject h = (HiddenObject) g;
..	..	@@ -5261,6 +5941,7 @@
5261	5941	objEditor.makeSomething(g.get(i), false);
5262	5942	}
5263	5943	}
	5944	+ Globals.REPLACEONMAKE = keep;
5264	5945	}
5265	5946
5266	5947	void ungroup()
..	..	@@ -5551,7 +6232,6 @@
5551	6232
5552	6233	cButton restoreCameraButton;
5553	6234
5554		- cButton saveButton;
5555	6235	cButton oneStepButton;
5556	6236
5557	6237	cButton groupButton;
..	..	@@ -5560,6 +6240,22 @@
5560	6240	cButton switchButton;
5561	6241	cButton loopButton;
5562	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;
5563	6259
5564	6260	cButton gridButton;
5565	6261	cButton boxButton;
..	..	@@ -5593,11 +6289,11 @@
5593	6289	private MenuItem lookAtItem;
5594	6290	private MenuItem lookFromItem;
5595	6291	private MenuItem switchViewItem;
5596		- private MenuItem cutItem;
	6292	+ private JMenuItem cutItem;
5597	6293	private MenuItem undoItem;
5598	6294	private MenuItem redoItem;
5599	6295	private JMenuItem duplicateItem;
5600		- private MenuItem cloneItem;
	6296	+ private JMenuItem cloneItem;
5601	6297	private MenuItem cloneSupportItem;
5602	6298	private MenuItem overwriteGeoItem;
5603	6299	private MenuItem overwriteMatItem;
..	..	@@ -5618,13 +6314,13 @@
5618	6314	private MenuItem cloneGeometriesItem;
5619	6315	private MenuItem shareGeometriesItem;
5620	6316	private MenuItem mergeGeometriesItem;
5621		- private MenuItem copyItem;
	6317	+ private JMenuItem copyItem;
5622	6318	private MenuItem pasteItem;
5623		- private MenuItem pasteIntoItem;
5624		- private MenuItem pasteLinkItem;
5625		- private MenuItem pasteCloneItem;
5626		- private MenuItem pasteExpandItem;
5627		- private MenuItem clearItem;
	6319	+ private JMenuItem pasteIntoItem;
	6320	+ private JMenuItem pasteLinkItem;
	6321	+ private JMenuItem pasteCloneItem;
	6322	+ private JMenuItem pasteExpandItem;
	6323	+ private JMenuItem deleteItem;
5628	6324	private MenuItem clearAllItem;
5629	6325	private MenuItem genUVItem;
5630	6326	private MenuItem genNormalsMESHItem;
..	..	@@ -5679,7 +6375,7 @@
5679	6375	private MenuItem transformGeometryItem;
5680	6376	private MenuItem transformChildrenItem;
5681	6377	private MenuItem hideItem;
5682		- private MenuItem grabItem;
	6378	+ private JMenuItem grabItem;
5683	6379	private MenuItem backItem;
5684	6380	private MenuItem frontItem;
5685	6381	private MenuItem cameraItem;
..	..	@@ -5692,7 +6388,7 @@
5692	6388	private MenuItem switchTransfoItem;
5693	6389	private MenuItem morphItem;
5694	6390	private MenuItem linkerItem;
5695		- private MenuItem ungroupItem;
	6391	+ private JMenuItem ungroupItem;
5696	6392	private MenuItem editItem;
5697	6393	private MenuItem openWindowItem;
5698	6394	private MenuItem editLeafItem;
..	..	@@ -5708,6 +6404,8 @@
5708	6404	private MenuItem attachBumpItem;
5709	6405	private MenuItem detachBumpItem;
5710	6406	private MenuItem pigmentBumpItem;
	6407	+ private MenuItem embedTexturesItem;
	6408	+ private MenuItem deEmbedTexturesItem;
5711	6409
5712	6410	private MenuItem particleItem;
5713	6411	private MenuItem ragdollItem;