~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,14 +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);
383	770
384	771	if (Globals.ADVANCED)
385	772	{
386	773	menu.add("-");
387	774	linkerItem = menu.add(new MenuItem("Linker"));
388	775	linkerItem.addActionListener(this);
389		- attributeItem = menu.add(new MenuItem("Attribute"));
390		- attributeItem.addActionListener(this);
391	776	templateItem = menu.add(new MenuItem("Template"));
392	777	templateItem.addActionListener(this);
393	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -416,7 +801,7 @@
416	801	genNormalsMESHItem.addActionListener(this);
417	802	if (Globals.ADVANCED)
418	803	{
419		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	804	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
420	805	genNormalsMINEItem.addActionListener(this);
421	806	}
422	807	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -472,9 +857,9 @@
472	857	hideleavesItem.addActionListener(this);
473	858	showleavesItem = menu.add(new MenuItem("Show Leaves"));
474	859	showleavesItem.addActionListener(this);
475		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	860	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
476	861	markleavesItem.addActionListener(this);
477		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	862	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
478	863	unmarkleavesItem.addActionListener(this);
479	864	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
480	865	rewindleavesItem.addActionListener(this);
..	..	@@ -509,10 +894,15 @@
509	894	attachBumpItem.addActionListener(this);
510	895	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
511	896	pigmentBumpItem.addActionListener(this);
	897	+ //embedTexturesItem
512	898	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
513	899	detachPigmentItem.addActionListener(this);
514	900	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
515	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);
516	906	menu.add("-");
517	907	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
518	908	sortbysizeItem.addActionListener(this);
..	..	@@ -523,6 +913,9 @@
523	913	shareGeometriesItem.addActionListener(this);
524	914	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
525	915	mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
526	919	if (Globals.ADVANCED)
527	920	{
528	921	// Pretty much the same as duplicate and clone.
..	..	@@ -539,6 +932,80 @@
539	932	buildToolsMenu(menu);
540	933	}
541	934
	935	+ JTabbedPane resourcecontainer;
	936	+ cGridBag currenttab;
	937	+ //boolean added; // patch for jar
	938	+
	939	+ int totalcount = 0;
	940	+
	941	+ int tabcount = 0;
	942	+ int colcount = 0;
	943	+ int rowcount = 0;
	944	+ int texturecount = 0;
	945	+
	946	+ int columns = 5;
	947	+ int rows = 7;
	948	+
	949	+ public void ResourceCallBack(String[] path)
	950	+ {
	951	+// for (int i = 0; i < path.length; i++)
	952	+// System.out.print(path[i] + "/");
	953	+// System.out.println();
	954	+
	955	+ if (//rowcount == 0 \|\|
	956	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	957	+ {
	958	+ currenttab = new cGridBag();
	959	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	960	+ currenttab.setName(tabname);
	961	+ //added = false;
	962	+ resourcecontainer.add(currenttab);
	963	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	964	+ rowcount = 1;
	965	+ colcount = 0;
	966	+ texturecount = 0;
	967	+ }
	968	+
	969	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	970	+ {
	971	+ //if (!added)
	972	+ {
	973	+ //added = true;
	974	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	975	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	976	+ }
	977	+
	978	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	979	+ totalcount++;
	980	+
	981	+ if (++colcount >= columns)
	982	+ {
	983	+ colcount = 0;
	984	+ currenttab.Return();
	985	+
	986	+ if (rowcount++ >= rows)
	987	+ {
	988	+ rowcount = 0;
	989	+ }
	990	+ }
	991	+ }
	992	+ else
	993	+ {
	994	+// if (!path[path.length-1].equals("icons"))
	995	+// resourcecontainer.Return();
	996	+ }
	997	+ }
	998	+
	999	+ void CreateTexturePanel(cGridBag container)
	1000	+ {
	1001	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1002	+ container.add(resourcecontainer);
	1003	+
	1004	+ Grafreed.ParseResources("textures", this);
	1005	+
	1006	+ // 935. System.out.println("Total = " + totalcount);
	1007	+ }
	1008	+
542	1009	void SetupUI2(ObjEditor oe)
543	1010	{
544	1011	// June 2019
..	..	@@ -556,11 +1023,6 @@
556	1023	//new Exception().printStackTrace();
557	1024
558	1025	oe.radioPanel = new JPanel(new GridBagLayout());
559		- oe.aConstraints.weightx = 1;
560		- oe.aConstraints.weighty = 0;
561		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
562		- oe.aConstraints.gridwidth = 100;
563		- oe.aConstraints.gridheight = 1;
564	1026	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
565	1027
566	1028	oe.buttonGroup = new ButtonGroup();
..	..	@@ -581,9 +1043,9 @@
581	1043	oe.radioPanel.add(dummyButton);
582	1044	oe.buttonGroup.add(dummyButton);
583	1045	*/
584		- cGridBag copyOptionsPanel = new cGridBag();
	1046	+ cGridBag versionManagerPanel = new cGridBag();
585	1047
586		- copyOptionsPanel.preferredHeight = 1;
	1048	+ versionManagerPanel.preferredHeight = 4;
587	1049
588	1050	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
589	1051
..	..	@@ -593,46 +1055,103 @@
593	1055
594	1056	if (Globals.ADVANCED)
595	1057	{
596		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- maxButton.setToolTipText("Maximize window");
598		- maxButton.addActionListener(this);
	1058	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+// maxButton.setToolTipText("Maximize window");
	1060	+// maxButton.addActionListener(this);
599	1061	}
600	1062
601		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ cButton gcButton;
	1064	+
	1065	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1066	+// gcButton.setToolTipText("Garbage collect");
	1067	+// gcButton.addActionListener(new ActionListener()
	1068	+// {
	1069	+// public void actionPerformed(ActionEvent e)
	1070	+// {
	1071	+// System.gc();
	1072	+// }
	1073	+// });
	1074	+
	1075	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ collapseButton.setToolTipText("Collapse toolbar");
	1077	+ collapseButton.addActionListener(this);
	1078	+
	1079	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1080	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1081	+ maximize3DButton.addActionListener(this);
	1082	+
	1083	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ twoButton.setToolTipText("Show 3D view only");
	1085	+ twoButton.addActionListener(this);
	1086	+ this.fullscreenLayout = twoButton;
	1087	+
	1088	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ threeButton.setToolTipText("Show controls and 3D view");
	1090	+ threeButton.addActionListener(this);
	1091	+ if (Globals.ADVANCED)
	1092	+ {
	1093	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1094	+ sixButton.setToolTipText("Show 3D view and controls");
	1095	+ sixButton.addActionListener(this);
	1096	+ }
	1097	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+// sevenButton.setToolTipText("3-column layout");
	1099	+// sevenButton.addActionListener(this);
	1100	+ //
	1101	+
	1102	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
602	1103	fullButton.setToolTipText("Full-screen window");
603	1104	fullButton.addActionListener(this);
604	1105
605		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
606	1107	screenfitButton.setToolTipText("Screen fit");
607	1108	screenfitButton.addActionListener(this);
608	1109
609		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
610	1111	restoreCameraButton.setToolTipText("Restore viewpoint");
611	1112	restoreCameraButton.addActionListener(this);
612	1113
613		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
614		- undoButton.setToolTipText("Undo changes");
615		- undoButton.addActionListener(this);
616		- undoButton.setEnabled(false);
	1114	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ saveVersionButton.setToolTipText("Duplicate current version");
	1116	+ saveVersionButton.addActionListener(this);
	1117	+
	1118	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ deleteVersionButton.setToolTipText("Delete current version");
	1120	+ deleteVersionButton.addActionListener(this);
	1121	+ deleteVersionButton.setEnabled(false);
	1122	+
	1123	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ previousVersionButton.setToolTipText("Previous version");
	1125	+ previousVersionButton.addActionListener(this);
	1126	+ previousVersionButton.setEnabled(false);
617	1127
618		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
619		- redoButton.setToolTipText("Redo changes");
620		- redoButton.addActionListener(this);
621		- redoButton.setEnabled(false);
	1128	+ cGridBag updown = new cGridBag().setVertical(true);
	1129	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ restoreButton.setToolTipText("Undo (restore current version)");
	1131	+ restoreButton.addActionListener(this);
	1132	+ restoreButton.setEnabled(false);
622	1133
623		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- saveButton.setToolTipText("Save changes");
625		- saveButton.addActionListener(this);
	1134	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ replaceButton.setToolTipText("Save (replace current version)");
	1136	+ replaceButton.addActionListener(this);
	1137	+ replaceButton.setEnabled(false);
626	1138
627		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
628		- liveCB.setToolTipText("Enable animation");
629		- liveCB.addItemListener(this);
630		-
631		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1139	+ versionManagerPanel.add(updown);
	1140	+
	1141	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ nextVersionButton.setToolTipText("Next version");
	1143	+ nextVersionButton.addActionListener(this);
	1144	+ nextVersionButton.setEnabled(false);
	1145	+
	1146	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
632	1147	oneStepButton.setToolTipText("Animate one step forward");
633	1148	oneStepButton.addActionListener(this);
634	1149
635		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1150	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1151	+ liveCB.setToolTipText("Enable animation");
	1152	+ liveCB.addItemListener(this);
	1153	+
	1154	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
636	1155	fastCB.setToolTipText("Fast mode");
637	1156	fastCB.addItemListener(this);
638	1157
..	..	@@ -647,142 +1166,137 @@
647	1166
648	1167	if (Globals.ADVANCED)
649	1168	{
650		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
651	1170	snapobjectButton.addActionListener(this);
652	1171	snapobjectButton.setToolTipText("Snap Object");
	1172	+
	1173	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1174	+ fourButton.addActionListener(this);
	1175	+ fourButton.setToolTipText("Show control panel only");
653	1176	}
654	1177
655	1178	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
656	1179
657		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- twoButton.setToolTipText("Show center view only");
659		- twoButton.addActionListener(this);
660		- this.fullscreenLayout = twoButton;
661		-
662		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
663		- fourButton.addActionListener(this);
664		- fourButton.setToolTipText("Show left panel only");
665		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
666		- sixButton.setToolTipText("2-column layout left");
667		- sixButton.addActionListener(this);
668		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
669		- threeButton.setToolTipText("2-column layout right");
670		- threeButton.addActionListener(this);
671		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
672		- sevenButton.setToolTipText("3-column layout");
673		- sevenButton.addActionListener(this);
674		- //
675	1180
676		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
677		- rootButton.setToolTipText("Edit selection in new tab");
	1181	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ rootButton.setToolTipText("Open selection in new tab");
678	1183	rootButton.addActionListener(this);
679	1184
680		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
681	1186	closeButton.setToolTipText("Close tab");
682	1187	closeButton.addActionListener(this);
683	1188	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
684	1189	//clearButton.addActionListener(this);
685	1190
	1191	+ cGridBag row1 = new cGridBag();
	1192	+
686	1193	// INSERT
687		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688		- gridButton.setToolTipText("Create grid");
	1194	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ gridButton.setToolTipText("Create ground");
689	1196	gridButton.addActionListener(this);
690	1197
691		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
692	1199	boxButton.setToolTipText("Create box");
693	1200	boxButton.addActionListener(this);
694	1201
695		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696		- sphereButton.setToolTipText("Create sphere");
697		- sphereButton.addActionListener(this);
698		-
699		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700		- coneButton.setToolTipText("Create cone");
701		- coneButton.addActionListener(this);
702		-
703		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
704		- torusButton.setToolTipText("Create torus");
705		- torusButton.addActionListener(this);
706		-
707		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
708	1203	superButton.setToolTipText("Create superellipsoid");
709	1204	superButton.addActionListener(this);
710	1205
	1206	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ sphereButton.setToolTipText("Create sphere");
	1208	+ sphereButton.addActionListener(this);
	1209	+
	1210	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ coneButton.setToolTipText("Create cone");
	1212	+ coneButton.addActionListener(this);
	1213	+
	1214	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ torusButton.setToolTipText("Create torus");
	1216	+ torusButton.addActionListener(this);
	1217	+
711	1218	if (Globals.ADVANCED)
712	1219	{
713		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
714	1221	kleinButton.setToolTipText("Create Klein bottle");
715	1222	kleinButton.addActionListener(this);
716	1223	}
717	1224
718		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1225	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
719	1226	particlesButton.setToolTipText("Create particle system");
720	1227	particlesButton.addActionListener(this);
721	1228
722		- oe.toolboxPanel.Return();
	1229	+ oe.toolboxPanel.add(row1);
723	1230
724		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1231	+ cGridBag row2 = new cGridBag();
	1232	+
	1233	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
725	1234	groupButton.setToolTipText("Create group");
726	1235	groupButton.addActionListener(this);
727	1236
728		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
729	1238	compositeButton.setToolTipText("Create composite");
730	1239	compositeButton.addActionListener(this);
731	1240
732		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
733	1242	switchButton.setToolTipText("Create item switcher");
734	1243	switchButton.addActionListener(this);
735	1244
736		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
737	1246	loopButton.setToolTipText("Create loop");
738	1247	loopButton.addActionListener(this);
739	1248
740		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
741	1250	textureButton.setToolTipText("Create texture");
742	1251	textureButton.addActionListener(this);
743	1252
744		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1253	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
745	1254	overlayButton.setToolTipText("Create overlay");
746	1255	overlayButton.addActionListener(this);
747	1256
748		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1257	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
749	1258	lightButton.setToolTipText("Create light");
750	1259	lightButton.addActionListener(this);
751	1260
752		- for (int i=6; --i>=0;)
753		- {
754		- oe.toolboxPanel.Return();
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		- oe.toolboxPanel.add(new cGridBag());
762		- }
	1261	+ oe.toolboxPanel.add(row2);
	1262	+
	1263	+ cGridBag textures = new cGridBag();
	1264	+
	1265	+ CreateTexturePanel(textures);
	1266	+
	1267	+ int tabCount = resourcecontainer.getTabCount();
	1268	+
	1269	+ if (tabCount > 0)
	1270	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1271	+
	1272	+ oe.toolboxPanel.add(textures);
	1273	+
	1274	+ textures.preferredHeight = 100;
	1275	+
	1276	+ CreateSkyboxPanel(oe.skyboxPanel);
763	1277
764	1278	// EDIT panel
765		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
766	1280	editButton.setToolTipText("Pin selection controls");
767	1281	editButton.addActionListener(this);
768	1282
769		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
770		- uneditButton.setToolTipText("Remove selection controls");
	1283	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1284	+ uneditButton.setToolTipText("Unpin and remove selection controls");
771	1285	uneditButton.addActionListener(this);
772	1286
773	1287	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
774		- allParamsButton.setToolTipText("Show all controle");
	1288	+ allParamsButton.setToolTipText("Show all controls");
775	1289	allParamsButton.addActionListener(this);
776	1290
777		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
778		- clearPanelButton.setToolTipText("Clear edit panel");
	1291	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ clearPanelButton.setToolTipText("Clear all controls");
779	1293	clearPanelButton.addActionListener(this);
780	1294
781		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
782		- unselectButton.setToolTipText("Unselect");
783		- unselectButton.addActionListener(this);
	1295	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1296	+ //unselectButton.setToolTipText("Unselect");
	1297	+ //unselectButton.addActionListener(this);
784	1298
785		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1299	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
786	1300	flashSelectionButton.setToolTipText("Highlight selection");
787	1301	flashSelectionButton.addActionListener(this);
788	1302
..	..	@@ -805,6 +1319,8 @@
805	1319
806	1320	cGridBag jSPPanel = new cGridBag();
807	1321
	1322	+ jSPPanel.preferredHeight = 20;
	1323	+
808	1324	JScrollPane jSP;
809	1325	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
810	1326	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -813,11 +1329,14 @@
813	1329	oe.treePanel.add(jSPPanel);
814	1330	oe.treePanel.Return();
815	1331
816		- oe.treePanel.add(copyOptionsPanel);
	1332	+ oe.treePanel.add(versionManagerPanel);
817	1333	oe.treePanel.Return();
	1334	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1335	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1336	+ versionSliderPane.preferredHeight = 3;
818	1337
819		-// mainPanel.setDividerLocation(0.5); //1.0);
820		-// mainPanel.setResizeWeight(0.5);
	1338	+// mainPanel.setDividerLocation(0.1); //1.0);
	1339	+ mainPanel.setResizeWeight(0.4);
821	1340
822	1341	//jList.addListSelectionListener(this);
823	1342	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -825,7 +1344,7 @@
825	1344	//jTree.setEditable(true);
826	1345	oe.jTree.setDragEnabled(true);
827	1346	//jTree.setPreferredSize(new Dimension(10,10));
828		- jSP.setPreferredSize(new Dimension(100,200));
	1347	+ //jSP.setPreferredSize(new Dimension(100,200));
829	1348
830	1349	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
831	1350
..	..	@@ -837,7 +1356,7 @@
837	1356	dgr.addDragGestureListener(this);
838	1357	}catch(Exception e) {}
839	1358	*/
840		- radio.layout = sevenButton;
	1359	+ radio.layout = threeButton; // sixButton;
841	1360	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
842	1361	}
843	1362
..	..	@@ -888,9 +1407,12 @@
888	1407	smoothCB.setToolTipText("Snapping delay");
889	1408	smoothCB.addItemListener(this);
890	1409
891		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
892		- slowCB.setToolTipText("Smooth interpolation");
893		- slowCB.addItemListener(this);
	1410	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1411	+// slowCB.setToolTipText("Smooth interpolation");
	1412	+// slowCB.addItemListener(this);
	1413	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1414	+ minshaderCB.setToolTipText("Minimal fast shader");
	1415	+ minshaderCB.addItemListener(this);
894	1416
895	1417	// constraints.gridy += 1;
896	1418	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -940,9 +1462,9 @@
940	1462	toggleSwitchCB.setToolTipText("Choose a single item");
941	1463	toggleSwitchCB.addItemListener(this);
942	1464
943		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
944		- autosaveCB.setToolTipText("On structure change");
945		- autosaveCB.addItemListener(this);
	1465	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1466	+ autokeepCB.setToolTipText("On structure change");
	1467	+ autokeepCB.addItemListener(this);
946	1468
947	1469	panel.Return();
948	1470	if (Globals.ADVANCED)
..	..	@@ -969,9 +1491,17 @@
969	1491
970	1492	void EditObject(Object3D obj)
971	1493	{
	1494	+ assert(obj instanceof Composite);
	1495	+
	1496	+// if (obj.versionlist == null)
	1497	+// {
	1498	+// obj.versionlist = new Object3D[100];
	1499	+// obj.versionindex = -1;
	1500	+// }
	1501	+
972	1502	cRadio radioButton = new cRadio(obj.name);
973	1503
974		- // Patch to avoid bug with transparency.
	1504	+ // June 2019. Patch to avoid bug with transparency.
975	1505	radioButton.hadMaterial = obj.material != null;
976	1506	if (!radioButton.hadMaterial)
977	1507	{
..	..	@@ -979,7 +1509,7 @@
979	1509	}
980	1510
981	1511	radioButton.SetObject(obj);
982		- radioButton.layout = sevenButton;
	1512	+ radioButton.layout = threeButton; // sixButton;
983	1513	radioButton.SetCamera(cameraView.renderCamera, false);
984	1514	radioButton.addActionListener(this);
985	1515	radioPanel.add(radioButton);
..	..	@@ -993,6 +1523,7 @@
993	1523
994	1524	oe.SetupViews();
995	1525
	1526	+ if (Globals.DEBUG)
996	1527	System.out.println("SetupViews");
997	1528	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
998	1529	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1004,6 +1535,8 @@
1004	1535	cCheckBox localCB;
1005	1536	cCheckBox crowdCB;
1006	1537	cCheckBox smoothCB;
	1538	+ cCheckBox minshaderCB;
	1539	+
1007	1540	cToggleButton fastCB;
1008	1541	cCheckBox slowCB;
1009	1542	cCheckBox boxCB;
..	..	@@ -1019,7 +1552,7 @@
1019	1552
1020	1553	cCheckBox oeilCB;
1021	1554	cCheckBox shadowCB;
1022		- cCheckBox autosaveCB;
	1555	+ cCheckBox autokeepCB;
1023	1556	cCheckBox lookAtCB;
1024	1557
1025	1558	// static int COLOR = 1;
..	..	@@ -1074,6 +1607,12 @@
1074	1607	{
1075	1608	cameraView.ToggleInertia();
1076	1609	cameraView.repaint();
	1610	+ }
	1611	+ else if(e.getSource() == minshaderCB)
	1612	+ {
	1613	+ Globals.MINSHADER ^= true;
	1614	+ cameraView.programInitialized = false;
	1615	+ cameraView.repaint();
1077	1616	}
1078	1617	else if(e.getSource() == localCB)
1079	1618	{
..	..	@@ -1131,9 +1670,9 @@
1131	1670	{
1132	1671	Globals.FREEZEONMOVE ^= true;
1133	1672	}
1134		- else if(e.getSource() == autosaveCB)
	1673	+ else if(e.getSource() == autokeepCB)
1135	1674	{
1136		- Globals.SAVEONMAKE ^= true;
	1675	+ Globals.REPLACEONMAKE ^= true;
1137	1676	}
1138	1677	else if(e.getSource() == lookAtCB)
1139	1678	{
..	..	@@ -1223,7 +1762,7 @@
1223	1762	// return;
1224	1763	// }
1225	1764
1226		- String string = (String) object;
	1765	+ String string = object.toString();
1227	1766
1228	1767	// File path for Mac and Windows
1229	1768	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1351,7 +1890,12 @@
1351	1890	TreePath path;
1352	1891
1353	1892	public TransferableTreePath(TreePath tp) {
1354		- path = tp;
	1893	+ Object[] objs = new Object[tp.getPathCount()];
	1894	+ for (int i=0; i<objs.length; i++)
	1895	+ {
	1896	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1897	+ }
	1898	+ path = new TreePath(objs);
1355	1899	}
1356	1900
1357	1901	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1488,6 +2032,8 @@
1488	2032	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1489	2033	reduce34MorphItem.addActionListener(this);
1490	2034	menu.add("-");
	2035	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2036	+ memoryItem.addActionListener(this);
1491	2037	menu.add(computeAOItem = new MenuItem("Compute AO"));
1492	2038	computeAOItem.addActionListener(this);
1493	2039
..	..	@@ -1496,8 +2042,6 @@
1496	2042	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1497	2043	mirrorItem.addActionListener(this);
1498	2044	menu.add("-");
1499		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1500		- memoryItem.addActionListener(this);
1501	2045	menu.add(analyzeItem = new MenuItem("Analyze"));
1502	2046	analyzeItem.addActionListener(this);
1503	2047	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1641,7 +2185,11 @@
1641	2185	shadow.material = new cMaterial(obj.material);
1642	2186	shadow.material.diffuse = 0.0001f;
1643	2187	shadow.material.specular = 0.0001f;
1644		- //shadow.projectedVertices[1].x = 300;
	2188	+ shadow.material.opacity = 0.75f;
	2189	+
	2190	+ AllocProjectedVertices(shadow);
	2191	+
	2192	+ shadow.projectedVertices[1].x = 300;
1645	2193
1646	2194	makeSomething(shadow);
1647	2195	}
..	..	@@ -1658,6 +2206,16 @@
1658	2206	listUI.remove(i);
1659	2207	}
1660	2208	}
	2209	+ }
	2210	+
	2211	+ private void EditElement(Object3D elem, boolean newWindow)
	2212	+ {
	2213	+ // if (!(elem instanceof Composite))
	2214	+ // newWindow = false;
	2215	+ listUI.add(elem);
	2216	+ elem.openEditWindow(this, newWindow); //, false);
	2217	+ System.out.println("edit : " + elem);
	2218	+ elem.editWindow.refreshContents(true); // ? new
1661	2219	}
1662	2220
1663	2221	/**
..	..	@@ -2087,6 +2645,23 @@
2087	2645	{
2088	2646	makeSomething(new Light());
2089	2647	} else
	2648	+// if (source == skybox1Button \|\|
	2649	+// source == skybox2Button \|\|
	2650	+// source == skybox3Button \|\|
	2651	+// source == skybox4Button \|\|
	2652	+// source == skybox5Button \|\|
	2653	+// source == skybox6Button \|\|
	2654	+// source == skybox7Button \|\|
	2655	+// source == skybox11Button \|\|
	2656	+// source == skybox12Button \|\|
	2657	+// source == skybox13Button \|\|
	2658	+// source == skybox14Button \|\|
	2659	+// source == skybox15Button \|\|
	2660	+// source == skybox16Button \|\|
	2661	+// source == skybox17Button)
	2662	+// {
	2663	+// ChangeSkybox(source);
	2664	+// } else
2090	2665	if (source == csgItem)
2091	2666	{
2092	2667	group(new CSG());
..	..	@@ -2135,27 +2710,35 @@
2135	2710	} else
2136	2711	if (source == loopItem \|\| source == loopButton)
2137	2712	{
	2713	+ if (!group.selection.isEmpty())
	2714	+ {
2138	2715	Composite csg = new GroupLeaf();
2139	2716	csg.count = 5;
2140		- group(csg);
2141	2717	Composite child = new cGroup("Branch");
2142	2718	csg.addChild(child);
2143	2719	child.addChild(csg);
	2720	+ group(csg);
	2721	+ }
2144	2722	} else
2145	2723	if (source == doubleItem)
2146	2724	{
	2725	+ if (!group.selection.isEmpty())
	2726	+ {
2147	2727	Composite csg = new GroupLeaf("Fork");
2148	2728	csg.count = 5;
2149		- group(csg);
2150	2729	Composite child = new cGroup("Branch A");
2151	2730	csg.addChild(child);
2152	2731	child.addChild(csg);
2153	2732	child = new cGroup("Branch B");
2154	2733	csg.addChild(child);
2155	2734	child.addChild(csg);
	2735	+ group(csg);
	2736	+ }
2156	2737	} else
2157	2738	if (source == tripleItem)
2158	2739	{
	2740	+ if (!group.selection.isEmpty())
	2741	+ {
2159	2742	Composite csg = new GroupLeaf("Trident");
2160	2743	csg.count = 4;
2161	2744	group(csg);
..	..	@@ -2168,11 +2751,12 @@
2168	2751	child = new cGroup();
2169	2752	csg.addChild(child);
2170	2753	child.addChild(csg);
	2754	+ }
2171	2755	} else
2172	2756	if (source == computeAOItem)
2173	2757	{
2174	2758	Globals.drawMode = CameraPane.OCCLUSION;
2175		- Globals.theRenderer.repaint();
	2759	+ cameraView.repaint();
2176	2760	} else
2177	2761	if (source == recompileItem)
2178	2762	{
..	..	@@ -2187,7 +2771,7 @@
2187	2771	if (source == invariantsItem)
2188	2772	{
2189	2773	System.out.println("Invariants:");
2190		- Grafreed.grafreeD.universe.invariants();
	2774	+ Grafreed.grafreed.universe.invariants();
2191	2775	} else
2192	2776	if (source == memoryItem)
2193	2777	{
..	..	@@ -2218,19 +2802,52 @@
2218	2802	{
2219	2803	ToggleFullScreen();
2220	2804	} else
2221		- if (source == undoButton)
	2805	+ if (source == collapseButton)
2222	2806	{
2223		- if (!Undo())
2224		- java.awt.Toolkit.getDefaultToolkit().beep();
	2807	+ this.expandedLayout = radio.layout;
	2808	+ CollapseToolbar();
2225	2809	} else
2226		- if (source == redoButton)
	2810	+ if (source == maximize3DButton)
2227	2811	{
2228		- Redo();
	2812	+ this.expandedLayout = radio.layout;
	2813	+ radio.layout = twoButton;
	2814	+ Show3DView();
	2815	+ CollapseToolbar();
2229	2816	} else
2230		- if (source == saveButton)
	2817	+ if (source == previousVersionButton)
2231	2818	{
	2819	+ // Go to previous version
	2820	+ //if (!Undo())
	2821	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2822	+ PreviousVersion();
	2823	+ } else
	2824	+ if (source == restoreButton)
	2825	+ {
	2826	+ // Restore current version
	2827	+ Restore();
	2828	+ //restoreButton.setEnabled(false);
	2829	+ } else
	2830	+ if (source == replaceButton)
	2831	+ {
	2832	+ // Overwrite current version
	2833	+ Replace();
	2834	+ //replaceButton.setEnabled(false);
	2835	+ } else
	2836	+ if (source == nextVersionButton)
	2837	+ {
	2838	+ // Go to next version
	2839	+ NextVersion();
	2840	+ } else
	2841	+ if (source == saveVersionButton)
	2842	+ {
	2843	+ // Save a new version
2232	2844	if (!Save(true))
2233	2845	java.awt.Toolkit.getDefaultToolkit().beep();
	2846	+ } else
	2847	+ if (source == deleteVersionButton)
	2848	+ {
	2849	+ // Delete a new version
	2850	+ DeleteVersion();
2234	2851	} else
2235	2852	if (source == oneStepButton)
2236	2853	{
..	..	@@ -2285,11 +2902,11 @@
2285	2902	} else
2286	2903	if (source == undoItem)
2287	2904	{
2288		- Undo();
	2905	+ PreviousVersion();
2289	2906	} else
2290	2907	if (source == redoItem)
2291	2908	{
2292		- Redo();
	2909	+ NextVersion();
2293	2910	} else
2294	2911	if (source == duplicateItem)
2295	2912	{
..	..	@@ -2610,7 +3227,7 @@
2610	3227	{
2611	3228	StepAll();
2612	3229	} else
2613		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3230	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2614	3231	{
2615	3232	//int indices[] = jList.getSelectedIndices();
2616	3233	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2770,22 +3387,34 @@
2770	3387	} else
2771	3388	if (source == ungroupItem \|\| source == ungroupButton)
2772	3389	{
2773		- boolean hasRoot = false;
	3390	+ boolean canUngroup = true;
2774	3391
2775	3392	for (int i=0; i<group.selection.size(); i++)
2776	3393	{
2777		- if (group.selection.get(i) == group)
	3394	+ Object3D selectedItem = group.selection.get(i);
	3395	+
	3396	+ if (selectedItem.Size() == 0)
2778	3397	{
2779		- hasRoot = true;
	3398	+ // Cannot ungroup leaves
	3399	+ canUngroup = false;
	3400	+ break;
	3401	+ }
	3402	+
	3403	+ if (selectedItem == group)
	3404	+ {
	3405	+ // Cannot ungroup root
	3406	+ canUngroup = false;
2780	3407	break;
2781	3408	}
2782	3409	}
2783	3410
2784		- if (!hasRoot)
	3411	+ if (canUngroup)
2785	3412	{
2786	3413	for (int i=0; i<group.selection.size(); i++)
2787	3414	{
2788		- Ungroup(group.selection.get(i));
	3415	+ Object3D selectedItem = group.selection.get(i);
	3416	+
	3417	+ Ungroup(selectedItem);
2789	3418	}
2790	3419
2791	3420	ClearSelection(false);
..	..	@@ -3092,7 +3721,7 @@
3092	3721	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3093	3722	{
3094	3723	obj = (Object3D)e.nextElement();
3095		- obj.SetBumpTexture(null);
	3724	+ obj.ResetBumpTexture();
3096	3725	}
3097	3726
3098	3727	refreshContents();
..	..	@@ -3106,6 +3735,31 @@
3106	3735	obj.SetBumpTexture(obj.GetPigmentTexture());
3107	3736	}
3108	3737
	3738	+ refreshContents();
	3739	+ } else
	3740	+ if (source == embedTexturesItem)
	3741	+ {
	3742	+ Object3D obj;
	3743	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3744	+ {
	3745	+ obj = (Object3D)e.nextElement();
	3746	+ obj.EmbedTextures(true);
	3747	+ }
	3748	+
	3749	+ refreshContents();
	3750	+ } else
	3751	+ if (source == deEmbedTexturesItem)
	3752	+ {
	3753	+ Object3D obj;
	3754	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3755	+ {
	3756	+ obj = (Object3D)e.nextElement();
	3757	+ obj.EmbedTextures(false);
	3758	+ }
	3759	+
	3760	+ CameraPane.texturepigment.clear();
	3761	+ CameraPane.texturebump.clear();
	3762	+
3109	3763	refreshContents();
3110	3764	} else
3111	3765	if (source == flashSelectionButton)
..	..	@@ -3123,38 +3777,7 @@
3123	3777	if (CameraPane.FULLSCREEN)
3124	3778	fullscreenLayout = radio.layout;
3125	3779
3126		- // bug
3127		- //gridPanel.setDividerLocation(1.0);
3128		- //bigPanel.setDividerLocation(0.0);
3129		-// bigThree.remove(scenePanel);
3130		-// bigThree.remove(centralPanel);
3131		-// bigThree.remove(XYZPanel);
3132		-// aWindowConstraints.gridx = 0;
3133		-// aWindowConstraints.gridy = 0;
3134		-// aWindowConstraints.gridwidth = 1;
3135		-// // aConstraints.gridheight = 3;
3136		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3137		-// aWindowConstraints.weightx = 0;
3138		-// aWindowConstraints.weighty = 1;
3139		-// //bigThree.add(jtp, aWindowConstraints);
3140		-// aWindowConstraints.weightx = 1;
3141		-// aWindowConstraints.gridwidth = 3;
3142		-// // aConstraints.gridheight = 3;
3143		-// aWindowConstraints.gridx = 1;
3144		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3145		-// bigThree.add(centralPanel, aWindowConstraints);
3146		-// aWindowConstraints.weightx = 0;
3147		-// aWindowConstraints.gridx = 4;
3148		-// aWindowConstraints.gridwidth = 1;
3149		-// // aConstraints.gridheight = 3;
3150		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3151		-// //bigThree.add(XYZPanel, aWindowConstraints);
3152		-// scenePanel.setVisible(false);
3153		-// centralPanel.setVisible(true);
3154		-// XYZPanel.setVisible(false);
3155		- bigThree.ClearUI();
3156		- bigThree.add(centralPanel);
3157		- bigThree.FlushUI();
	3780	+ Show3DView();
3158	3781
3159	3782	cameraView.requestFocusInWindow();
3160	3783
..	..	@@ -3209,8 +3832,8 @@
3209	3832	// centralPanel.setVisible(true);
3210	3833	// XYZPanel.setVisible(true);
3211	3834	bigThree.ClearUI();
	3835	+ bigThree.add(scenePanel);
3212	3836	bigThree.add(centralPanel);
3213		- bigThree.add(XYZPanel);
3214	3837	bigThree.FlushUI();
3215	3838
3216	3839	cameraView.requestFocusInWindow();
..	..	@@ -3290,8 +3913,8 @@
3290	3913	// centralPanel.setVisible(true);
3291	3914	// XYZPanel.setVisible(false);
3292	3915	bigThree.ClearUI();
3293		- bigThree.add(scenePanel);
3294	3916	bigThree.add(centralPanel);
	3917	+ bigThree.add(scenePanel);
3295	3918	bigThree.FlushUI();
3296	3919
3297	3920	cameraView.requestFocusInWindow();
..	..	@@ -3340,6 +3963,7 @@
3340	3963	} else
3341	3964	if (source == rootButton)
3342	3965	{
	3966	+ Replace();
3343	3967	Object3D obj;
3344	3968	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3345	3969	{
..	..	@@ -3354,6 +3978,8 @@
3354	3978	if (source == closeButton)
3355	3979	{
3356	3980	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3981	+ Replace();
	3982	+
3357	3983	cRadio ab;
3358	3984	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3359	3985	{
..	..	@@ -3397,10 +4023,10 @@
3397	4023	{
3398	4024	Object3D child = (Object3D)e.nextElement();
3399	4025	if(child.editWindow != null)
3400		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3401	4026	child.pinned = false;
3402	4027	child.CloseUI();
3403	4028	listUI.remove(child);
	4029	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3404	4030
3405	4031	//child.editWindow = null; // ???????????
3406	4032	}
..	..	@@ -3419,6 +4045,7 @@
3419	4045	obj.CloseUI();
3420	4046	}
3421	4047	listUI.clear();
	4048	+ SetPinStates(group.selection.size() > 0);
3422	4049	refreshContents(true);
3423	4050	} else
3424	4051	if (source == allParamsButton)
..	..	@@ -3451,6 +4078,8 @@
3451	4078	} else
3452	4079	if(source instanceof cRadio)
3453	4080	{
	4081	+ Replace();
	4082	+
3454	4083	group.parent = keepparent;
3455	4084	group.attributes = 0;
3456	4085	//group.editWindow = null;
..	..	@@ -3474,6 +4103,7 @@
3474	4103	}
3475	4104
3476	4105	copy = group;
	4106	+
3477	4107	//Globals.theRenderer.object = group;
3478	4108	if(!useclient)
3479	4109	{
..	..	@@ -3501,9 +4131,35 @@
3501	4131	*/
3502	4132	radio.layout.doClick();
3503	4133
	4134	+ assert(copy instanceof Composite);
	4135	+
	4136	+ if (copy.versionlist == null)
	4137	+ {
	4138	+ copy.versionindex = -1;
	4139	+
	4140	+ // Cannot work with loops
	4141	+ // To fix this issue, we first mark all nodes above the root,
	4142	+ // and check if any of these nodes are reachable below the root.
	4143	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4144	+
	4145	+ if (!copy.HasTags())
	4146	+ {
	4147	+ copy.versionlist = new Object3D[100];
	4148	+
	4149	+ Save(true);
	4150	+ }
	4151	+
	4152	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4153	+ }
	4154	+
	4155	+ SetVersionStates();
	4156	+
3504	4157	ClearUnpinned();
3505		- SetPinStates(group.selection.size() > 0);
3506		- if (group.selection.size() == 1)
	4158	+
	4159	+ //Grafreed.Assert(group != null);
	4160	+ //Grafreed.Assert(group.selection != null);
	4161	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4162	+ if (group.selection == null \|\| group.selection.size() == 1)
3507	4163	EditSelection(false);
3508	4164	keepparent = group.parent;
3509	4165	// PARENT = NULL or not???
..	..	@@ -3516,11 +4172,13 @@
3516	4172	} else if (event.getSource() == editCameraItem)
3517	4173	{
3518	4174	cameraView.ProtectCamera();
	4175	+ cameraView.requestFocusInWindow();
3519	4176	cameraView.repaint();
3520	4177	return;
3521	4178	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3522	4179	{
3523	4180	cameraView.RevertCamera();
	4181	+ cameraView.requestFocusInWindow();
3524	4182	cameraView.repaint();
3525	4183	return;
3526	4184	// } else if (event.getSource() == textureButton)
..	..	@@ -3639,7 +4297,7 @@
3639	4297	TouchTransform(obj);
3640	4298	continue;
3641	4299	}
3642		- if ((mask&2) != 0) // Scale
	4300	+ if ((mask&2) != 0) // Scale/rotation
3643	4301	{
3644	4302	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3645	4303	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3647,10 +4305,6 @@
3647	4305	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3648	4306	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3649	4307	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3650		- }
3651		- if ((mask&4) != 0) // Rotation
3652		- {
3653		- // ?
3654	4308	}
3655	4309	if ((mask&1) != 0) // Translation
3656	4310	{
..	..	@@ -4097,7 +4751,7 @@
4097	4751
4098	4752	try
4099	4753	{
4100		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4754	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4101	4755	}
4102	4756	catch (Exception e)
4103	4757	{
..	..	@@ -4574,6 +5228,12 @@
4574	5228
4575	5229	void EditSelection(boolean newWindow)
4576	5230	{
	5231	+ if (group.selection == null)
	5232	+ {
	5233	+ EditElement(group, newWindow); // ? new
	5234	+ return;
	5235	+ }
	5236	+
4577	5237	// aConstraints.gridy = 0;
4578	5238	for (int i=0; i<group.selection.size(); i++)
4579	5239	{
..	..	@@ -4584,12 +5244,7 @@
4584	5244	Object3D elem = (Object3D)group.selection.elementAt(i);
4585	5245	if(elem != group \|\| !newWindow)
4586	5246	{
4587		- // if (!(elem instanceof Composite))
4588		- // newWindow = false;
4589		- listUI.add(elem);
4590		- elem.openEditWindow(this, newWindow); //, false);
4591		- System.out.println("edit : " + elem);
4592		- elem.editWindow.refreshContents(true); // ? new
	5247	+ EditElement(elem, newWindow); // ? new
4593	5248	}
4594	5249	}
4595	5250	}
..	..	@@ -4652,9 +5307,7 @@
4652	5307
4653	5308	freezemodel = false;
4654	5309	}
4655		-
4656		- boolean flashIt = true;
4657		-
	5310	+
4658	5311	public void valueChanged(TreeSelectionEvent e)
4659	5312	//public boolean handleEvent(Event event)
4660	5313	{
..	..	@@ -4727,13 +5380,31 @@
4727	5380	{
4728	5381	editButton.setEnabled(enabled);
4729	5382	uneditButton.setEnabled(enabled);
4730		- unselectButton.setEnabled(enabled);
	5383	+ //unselectButton.setEnabled(enabled);
4731	5384	flashSelectionButton.setEnabled(enabled);
	5385	+
	5386	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5387	+
	5388	+ boolean allComposites = true;
	5389	+
	5390	+ if (group.selection != null)
	5391	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5392	+ {
	5393	+ Object next = e.nextElement();
	5394	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5395	+ {
	5396	+ allComposites = false;
	5397	+ break;
	5398	+ }
	5399	+ }
	5400	+
	5401	+ rootButton.setEnabled(allComposites);
4732	5402	}
4733	5403
4734	5404	void refreshContents(boolean cp)
4735	5405	{
4736		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	5406	+ if (Globals.ADVANCED)
	5407	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4737	5408	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4738	5409	{
4739	5410	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4743,7 +5414,7 @@
4743	5414	Object3D child = (Object3D) group.selection.get(i);
4744	5415
4745	5416	objEditor.AddInfo(child, this, true);
4746		- System.err.println("info : " + child.GetPath());
	5417	+// System.err.println("info : " + child.GetPath());
4747	5418	}
4748	5419
4749	5420	objEditor.SetText(); // jan 2014
..	..	@@ -4833,8 +5504,8 @@
4833	5504
4834	5505	if (cut)
4835	5506	{
4836		- if (Globals.SAVEONMAKE)
4837		- Save();
	5507	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5508	+// Save();
4838	5509	//int indices[] = jList.getSelectedIndices();
4839	5510	//for (int i = indices.length - 1; i >= 0; i--)
4840	5511	//jList.remove(indices[i]);
..	..	@@ -4937,6 +5608,10 @@
4937	5608
4938	5609	void paste(boolean expand)
4939	5610	{
	5611	+ if (Globals.REPLACEONMAKE)
	5612	+ Save();
	5613	+ boolean keep = Globals.REPLACEONMAKE;
	5614	+ Globals.REPLACEONMAKE = false;
4940	5615	// if (GrafreeD.clipboard == null)
4941	5616	// return;
4942	5617	boolean first = true;
..	..	@@ -4996,6 +5671,7 @@
4996	5671	Grafreed.clipboard.get(0).parent = keepparent;
4997	5672	}
4998	5673
	5674	+ Globals.REPLACEONMAKE = keep;
4999	5675	ResetModel();
5000	5676	refreshContents();
5001	5677	}
..	..	@@ -5131,6 +5807,10 @@
5131	5807
5132	5808	void group(Object3D csg, boolean grab)
5133	5809	{
	5810	+ if (Globals.REPLACEONMAKE)
	5811	+ Save();
	5812	+ boolean keep = Globals.REPLACEONMAKE;
	5813	+ Globals.REPLACEONMAKE = false;
5134	5814	if (//false) // why??
5135	5815	!group.selection.isEmpty())
5136	5816	{
..	..	@@ -5244,10 +5924,15 @@
5244	5924	//node.add(csg);
5245	5925	//makeSomething(node);
5246	5926	makeSomething(csg);
	5927	+ Globals.REPLACEONMAKE = keep;
5247	5928	}
5248	5929
5249	5930	void Ungroup(Object3D g)
5250	5931	{
	5932	+ if (Globals.REPLACEONMAKE)
	5933	+ Save();
	5934	+ boolean keep = Globals.REPLACEONMAKE;
	5935	+ Globals.REPLACEONMAKE = false;
5251	5936	if (g instanceof HiddenObject)
5252	5937	{
5253	5938	HiddenObject h = (HiddenObject) g;
..	..	@@ -5264,6 +5949,7 @@
5264	5949	objEditor.makeSomething(g.get(i), false);
5265	5950	}
5266	5951	}
	5952	+ Globals.REPLACEONMAKE = keep;
5267	5953	}
5268	5954
5269	5955	void ungroup()
..	..	@@ -5554,7 +6240,6 @@
5554	6240
5555	6241	cButton restoreCameraButton;
5556	6242
5557		- cButton saveButton;
5558	6243	cButton oneStepButton;
5559	6244
5560	6245	cButton groupButton;
..	..	@@ -5563,6 +6248,22 @@
5563	6248	cButton switchButton;
5564	6249	cButton loopButton;
5565	6250	cButton textureButton;
	6251	+
	6252	+ cButton skybox1Button;
	6253	+ cButton skybox2Button;
	6254	+ cButton skybox3Button;
	6255	+ cButton skybox4Button;
	6256	+ cButton skybox5Button;
	6257	+ cButton skybox6Button;
	6258	+ cButton skybox7Button;
	6259	+
	6260	+ cButton skybox11Button;
	6261	+ cButton skybox12Button;
	6262	+ cButton skybox13Button;
	6263	+ cButton skybox14Button;
	6264	+ cButton skybox15Button;
	6265	+ cButton skybox16Button;
	6266	+ cButton skybox17Button;
5566	6267
5567	6268	cButton gridButton;
5568	6269	cButton boxButton;
..	..	@@ -5596,11 +6297,11 @@
5596	6297	private MenuItem lookAtItem;
5597	6298	private MenuItem lookFromItem;
5598	6299	private MenuItem switchViewItem;
5599		- private MenuItem cutItem;
	6300	+ private JMenuItem cutItem;
5600	6301	private MenuItem undoItem;
5601	6302	private MenuItem redoItem;
5602	6303	private JMenuItem duplicateItem;
5603		- private MenuItem cloneItem;
	6304	+ private JMenuItem cloneItem;
5604	6305	private MenuItem cloneSupportItem;
5605	6306	private MenuItem overwriteGeoItem;
5606	6307	private MenuItem overwriteMatItem;
..	..	@@ -5621,13 +6322,13 @@
5621	6322	private MenuItem cloneGeometriesItem;
5622	6323	private MenuItem shareGeometriesItem;
5623	6324	private MenuItem mergeGeometriesItem;
5624		- private MenuItem copyItem;
	6325	+ private JMenuItem copyItem;
5625	6326	private MenuItem pasteItem;
5626		- private MenuItem pasteIntoItem;
5627		- private MenuItem pasteLinkItem;
5628		- private MenuItem pasteCloneItem;
5629		- private MenuItem pasteExpandItem;
5630		- private MenuItem clearItem;
	6327	+ private JMenuItem pasteIntoItem;
	6328	+ private JMenuItem pasteLinkItem;
	6329	+ private JMenuItem pasteCloneItem;
	6330	+ private JMenuItem pasteExpandItem;
	6331	+ private JMenuItem deleteItem;
5631	6332	private MenuItem clearAllItem;
5632	6333	private MenuItem genUVItem;
5633	6334	private MenuItem genNormalsMESHItem;
..	..	@@ -5682,7 +6383,7 @@
5682	6383	private MenuItem transformGeometryItem;
5683	6384	private MenuItem transformChildrenItem;
5684	6385	private MenuItem hideItem;
5685		- private MenuItem grabItem;
	6386	+ private JMenuItem grabItem;
5686	6387	private MenuItem backItem;
5687	6388	private MenuItem frontItem;
5688	6389	private MenuItem cameraItem;
..	..	@@ -5695,7 +6396,7 @@
5695	6396	private MenuItem switchTransfoItem;
5696	6397	private MenuItem morphItem;
5697	6398	private MenuItem linkerItem;
5698		- private MenuItem ungroupItem;
	6399	+ private JMenuItem ungroupItem;
5699	6400	private MenuItem editItem;
5700	6401	private MenuItem openWindowItem;
5701	6402	private MenuItem editLeafItem;
..	..	@@ -5711,6 +6412,8 @@
5711	6412	private MenuItem attachBumpItem;
5712	6413	private MenuItem detachBumpItem;
5713	6414	private MenuItem pigmentBumpItem;
	6415	+ private MenuItem embedTexturesItem;
	6416	+ private MenuItem deEmbedTexturesItem;
5714	6417
5715	6418	private MenuItem particleItem;
5716	6419	private MenuItem ragdollItem;