~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,350 @@
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	+
26	371	//ObjEditor objEditor;
27	372	public void closeUI2()
28	373	{
..	..	@@ -60,6 +405,16 @@
60	405	this.copy = this.group = group;
61	406	//selectees = this.group.selectees;
62	407
	408	+ assert(false);
	409	+
	410	+// if (copy.versionlist == null)
	411	+// {
	412	+// copy.versionlist = new Object3D[100];
	413	+// copy.versionindex = -1;
	414	+//
	415	+// //Save(true);
	416	+// }
	417	+
63	418	if(ui)
64	419	SetupUI(objEditor);
65	420	}
..	..	@@ -80,14 +435,22 @@
80	435	SetupViews(objEditor);
81	436
82	437	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	438	+
	439	+// if (copy.versionlist == null)
	440	+// {
	441	+// copy.versionlist = new Object3D[100];
	442	+// copy.versionindex = -1;
	443	+//
	444	+// //Save(true);
	445	+// }
83	446	}
84	447
85	448	void CloneSelection(boolean supports)
86	449	{
87		- if (Globals.SAVEONMAKE)
	450	+ if (Globals.REPLACEONMAKE)
88	451	Save();
89		- boolean keep = Globals.SAVEONMAKE;
90		- Globals.SAVEONMAKE = false;
	452	+ boolean keep = Globals.REPLACEONMAKE;
	453	+ Globals.REPLACEONMAKE = false;
91	454	// Object3D keep = GrafreeD.clipboard;
92	455	//Object3D obj;
93	456	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -98,7 +461,7 @@
98	461
99	462	makeSomething(clone, i==group.selection.size()-1);
100	463	}
101		- Globals.SAVEONMAKE = keep;
	464	+ Globals.REPLACEONMAKE = keep;
102	465	}
103	466
104	467	void CloneClipboard(boolean supports)
..	..	@@ -120,11 +483,16 @@
120	483
121	484	Object3D parent = obj.parent;
122	485	obj.parent = null;
	486	+
123	487	// Object3D support = obj.support;
124	488	// obj.support = null;
125	489	if (!supports)
126	490	obj.SaveSupports();
	491	+
127	492	Object3D clone = (Object3D)Grafreed.clone(obj);
	493	+
	494	+ clone.ResetUUIDs();
	495	+
128	496	obj.parent = parent;
129	497	// obj.support = support;
130	498	// clone.support = support; // aout 2013
..	..	@@ -169,33 +537,37 @@
169	537	// menu.add("-");
170	538	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
171	539	duplicateItem.addActionListener(this);
172		- cloneItem = menu.add(new MenuItem("Clone"));
	540	+
	541	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
173	542	cloneItem.addActionListener(this);
174		- if (Globals.ADVANCED)
	543	+ //if (Globals.ADVANCED)
175	544	{
176	545	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
177	546	cloneSupportItem.addActionListener(this);
178	547	}
	548	+ oe.jTree.popup.addSeparator();
179	549	menu.add("-");
180		- cutItem = menu.add(new MenuItem("Cut"));
	550	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
181	551	cutItem.addActionListener(this);
182		- copyItem = menu.add(new MenuItem("Copy"));
	552	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
183	553	copyItem.addActionListener(this);
184	554	pasteItem = menu.add(new MenuItem("Paste"));
185	555	pasteItem.addActionListener(this);
186	556
187		- menu.add("-");
188		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	557	+ oe.jTree.popup.addSeparator();
	558	+ //menu.add("-");
	559	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
189	560	pasteIntoItem.addActionListener(this);
190		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	561	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
191	562	pasteLinkItem.addActionListener(this);
192		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	563	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
193	564	pasteCloneItem.addActionListener(this);
194		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
195		-// pasteExpandItem.addActionListener(this);
196		- menu.add("-");
197		- clearItem = menu.add(new MenuItem("Clear"));
198		- clearItem.addActionListener(this);
	565	+// CRASH
	566	+ pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
	567	+//
	568	+ pasteExpandItem.addActionListener(this);
	569	+ //menu.add("-");
	570	+ oe.jTree.popup.addSeparator();
199	571
200	572	if (Globals.ADVANCED)
201	573	{
..	..	@@ -281,11 +653,9 @@
281	653	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
282	654	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
283	655	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
284		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
285	656	oe.cameraMenu.add("-");
286	657	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
287	658	openWindowItem.addActionListener(this);
288		- editLeafItem.addActionListener(this);
289	659	lookAtItem.addActionListener(this);
290	660	//lookFromItem.addActinoListener(this);
291	661	//switchViewItem.addActionListener(this);
..	..	@@ -332,9 +702,8 @@
332	702	setMasterItem.addActionListener(this);
333	703	}
334	704
335		- oe.menuBar.add(menu = new Menu("Group"));
336		-// grabItem = menu.add(new MenuItem("Grab"));
337		-// grabItem.addActionListener(this);
	705	+ oe.menuBar.add(menu = new Menu("Order"));
	706	+
338	707	backItem = menu.add(new MenuItem("Back"));
339	708	backItem.addActionListener(this);
340	709	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -342,13 +711,21 @@
342	711	// compositeItem = menu.add(new MenuItem("Composite"));
343	712	// compositeItem.addActionListener(this);
344	713
	714	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	715	+ grabItem.addActionListener(this);
	716	+
345	717	if (Globals.ADVANCED)
346	718	{
347	719	hideItem = menu.add(new MenuItem("Hidden Group"));
348	720	hideItem.addActionListener(this);
349	721	}
350		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	722	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
351	723	ungroupItem.addActionListener(this);
	724	+
	725	+ oe.jTree.popup.addSeparator();
	726	+
	727	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	728	+ deleteItem.addActionListener(this);
352	729
353	730	// menu.add("-");
354	731	//
..	..	@@ -385,9 +762,9 @@
385	762	shadowYItem.addActionListener(this);
386	763	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
387	764	shadowZItem.addActionListener(this);
	765	+
388	766	attributeItem = menu.add(new MenuItem("Attribute"));
389	767	attributeItem.addActionListener(this);
390		-
391	768	if (Globals.ADVANCED)
392	769	{
393	770	menu.add("-");
..	..	@@ -399,11 +776,18 @@
399	776	pointflowItem.addActionListener(this);
400	777	}
401	778	menu.add("-");
	779	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	780	+ textureRatioRItem.addActionListener(this);
	781	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	782	+ textureRatioGItem.addActionListener(this);
	783	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	784	+ textureRatioBItem.addActionListener(this);
	785	+ menu.add("-");
402	786	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
403	787	resetTransformItem.addActionListener(this);
404	788	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
405	789	resetCentroidItem.addActionListener(this);
406		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	790	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
407	791	resetCentroidXZItem.addActionListener(this);
408	792	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
409	793	transformGeometryItem.addActionListener(this);
..	..	@@ -419,9 +803,9 @@
419	803	genNormalsCADItem.addActionListener(this);
420	804	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
421	805	genNormalsMESHItem.addActionListener(this);
422		- if (Globals.ADVANCED)
	806	+ //if (Globals.ADVANCED)
423	807	{
424		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	808	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
425	809	genNormalsMINEItem.addActionListener(this);
426	810	}
427	811	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -455,6 +839,8 @@
455	839	}
456	840
457	841	oe.menuBar.add(menu = new Menu("Attributes"));
	842	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	843	+ clearVersionsItem.addActionListener(this);
458	844	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
459	845	clearMaterialsItem.addActionListener(this);
460	846	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -477,9 +863,9 @@
477	863	hideleavesItem.addActionListener(this);
478	864	showleavesItem = menu.add(new MenuItem("Show Leaves"));
479	865	showleavesItem.addActionListener(this);
480		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	866	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
481	867	markleavesItem.addActionListener(this);
482		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	868	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
483	869	unmarkleavesItem.addActionListener(this);
484	870	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
485	871	rewindleavesItem.addActionListener(this);
..	..	@@ -514,10 +900,15 @@
514	900	attachBumpItem.addActionListener(this);
515	901	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
516	902	pigmentBumpItem.addActionListener(this);
	903	+ //embedTexturesItem
517	904	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
518	905	detachPigmentItem.addActionListener(this);
519	906	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
520	907	detachBumpItem.addActionListener(this);
	908	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	909	+ embedTexturesItem.addActionListener(this);
	910	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	911	+ deEmbedTexturesItem.addActionListener(this);
521	912	menu.add("-");
522	913	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
523	914	sortbysizeItem.addActionListener(this);
..	..	@@ -528,6 +919,9 @@
528	919	shareGeometriesItem.addActionListener(this);
529	920	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
530	921	mergeGeometriesItem.addActionListener(this);
	922	+ menu.add("-");
	923	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	924	+ editLeafItem.addActionListener(this);
531	925	if (Globals.ADVANCED)
532	926	{
533	927	// Pretty much the same as duplicate and clone.
..	..	@@ -544,6 +938,85 @@
544	938	buildToolsMenu(menu);
545	939	}
546	940
	941	+ JTabbedPane resourcecontainer;
	942	+ cGridBag currenttab;
	943	+ //boolean added; // patch for jar
	944	+
	945	+ int totalcount = 0;
	946	+
	947	+ int tabcount = 0;
	948	+ int colcount = 0;
	949	+ int rowcount = 0;
	950	+ int texturecount = 0;
	951	+
	952	+ int columns = 5;
	953	+ int rows = 7;
	954	+
	955	+ public void ResourceCallBack(String[] path)
	956	+ {
	957	+// for (int i = 0; i < path.length; i++)
	958	+// System.out.print(path[i] + "/");
	959	+// System.out.println();
	960	+
	961	+ if (//rowcount == 0 \|\|
	962	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	963	+ {
	964	+ currenttab = new cGridBag();
	965	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	966	+ currenttab.setName(tabname);
	967	+ //added = false;
	968	+ resourcecontainer.add(currenttab);
	969	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
	970	+ rowcount = 1;
	971	+ colcount = 0;
	972	+ texturecount = 0;
	973	+ }
	974	+
	975	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	976	+ {
	977	+ //if (!added)
	978	+ {
	979	+ //added = true;
	980	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	981	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	982	+ }
	983	+
	984	+ columns = 5;
	985	+
	986	+ if (path[0].contains("D&R") \|\| path[0].contains("Paint"))
	987	+ columns = 4;
	988	+
	989	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	990	+ totalcount++;
	991	+
	992	+ if (++colcount >= columns)
	993	+ {
	994	+ colcount = 0;
	995	+ currenttab.Return();
	996	+
	997	+ if (rowcount++ >= rows)
	998	+ {
	999	+ rowcount = 0;
	1000	+ }
	1001	+ }
	1002	+ }
	1003	+ else
	1004	+ {
	1005	+// if (!path[path.length-1].equals("icons"))
	1006	+// resourcecontainer.Return();
	1007	+ }
	1008	+ }
	1009	+
	1010	+ void CreateTexturePanel(cGridBag container)
	1011	+ {
	1012	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1013	+ container.add(resourcecontainer);
	1014	+
	1015	+ Grafreed.ParseResources("textures", this);
	1016	+
	1017	+ // 935. System.out.println("Total = " + totalcount);
	1018	+ }
	1019	+
547	1020	void SetupUI2(ObjEditor oe)
548	1021	{
549	1022	// June 2019
..	..	@@ -561,11 +1034,6 @@
561	1034	//new Exception().printStackTrace();
562	1035
563	1036	oe.radioPanel = new JPanel(new GridBagLayout());
564		- oe.aConstraints.weightx = 1;
565		- oe.aConstraints.weighty = 0;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridwidth = 100;
568		- oe.aConstraints.gridheight = 1;
569	1037	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
570	1038
571	1039	oe.buttonGroup = new ButtonGroup();
..	..	@@ -586,9 +1054,9 @@
586	1054	oe.radioPanel.add(dummyButton);
587	1055	oe.buttonGroup.add(dummyButton);
588	1056	*/
589		- cGridBag copyOptionsPanel = new cGridBag();
	1057	+ cGridBag versionManagerPanel = new cGridBag();
590	1058
591		- copyOptionsPanel.preferredHeight = 1;
	1059	+ versionManagerPanel.preferredHeight = 4;
592	1060
593	1061	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
594	1062
..	..	@@ -598,46 +1066,103 @@
598	1066
599	1067	if (Globals.ADVANCED)
600	1068	{
601		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602		- maxButton.setToolTipText("Maximize window");
603		- maxButton.addActionListener(this);
	1069	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1070	+// maxButton.setToolTipText("Maximize window");
	1071	+// maxButton.addActionListener(this);
604	1072	}
605	1073
606		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
607		- fullButton.setToolTipText("Full-screen window");
608		- fullButton.addActionListener(this);
	1074	+ cButton gcButton;
609	1075
610		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1076	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+// gcButton.setToolTipText("Garbage collect");
	1078	+// gcButton.addActionListener(new ActionListener()
	1079	+// {
	1080	+// public void actionPerformed(ActionEvent e)
	1081	+// {
	1082	+// System.gc();
	1083	+// }
	1084	+// });
	1085	+
	1086	+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ fullScreenButton.setToolTipText("Full-screen window");
	1088	+ fullScreenButton.addActionListener(this);
	1089	+
	1090	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1091	+ collapseButton.setToolTipText("Collapse toolbar");
	1092	+ collapseButton.addActionListener(this);
	1093	+
	1094	+// oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1095	+// maximize3DButton.setToolTipText("Maximize 3D view");
	1096	+// maximize3DButton.addActionListener(this);
	1097	+
	1098	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1099	+ twoButton.setToolTipText("Show 3D view only");
	1100	+ twoButton.addActionListener(this);
	1101	+ this.fullscreenLayout = twoButton;
	1102	+
	1103	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ threeButton.setToolTipText("Show controls and 3D view");
	1105	+ threeButton.addActionListener(this);
	1106	+ if (Globals.ADVANCED)
	1107	+ {
	1108	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ sixButton.setToolTipText("Show 3D view and controls");
	1110	+ sixButton.addActionListener(this);
	1111	+ }
	1112	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+// sevenButton.setToolTipText("3-column layout");
	1114	+// sevenButton.addActionListener(this);
	1115	+ //
	1116	+
	1117	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
611	1118	screenfitButton.setToolTipText("Screen fit");
612	1119	screenfitButton.addActionListener(this);
613	1120
614		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1121	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
615	1122	restoreCameraButton.setToolTipText("Restore viewpoint");
616	1123	restoreCameraButton.addActionListener(this);
617	1124
618		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
619		- undoButton.setToolTipText("Undo changes");
620		- undoButton.addActionListener(this);
621		- undoButton.setEnabled(false);
	1125	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ saveVersionButton.setToolTipText("Duplicate current version");
	1127	+ saveVersionButton.addActionListener(this);
	1128	+
	1129	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ deleteVersionButton.setToolTipText("Delete current version");
	1131	+ deleteVersionButton.addActionListener(this);
	1132	+ deleteVersionButton.setEnabled(false);
	1133	+
	1134	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ previousVersionButton.setToolTipText("Previous version");
	1136	+ previousVersionButton.addActionListener(this);
	1137	+ previousVersionButton.setEnabled(false);
622	1138
623		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- redoButton.setToolTipText("Redo changes");
625		- redoButton.addActionListener(this);
626		- redoButton.setEnabled(false);
	1139	+ cGridBag updown = new cGridBag().setVertical(true);
	1140	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1141	+ restoreButton.setToolTipText("Undo (restore current version)");
	1142	+ restoreButton.addActionListener(this);
	1143	+ restoreButton.setEnabled(false);
627	1144
628		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- saveButton.setToolTipText("Save changes");
630		- saveButton.addActionListener(this);
	1145	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1146	+ replaceButton.setToolTipText("Save (replace current version)");
	1147	+ replaceButton.addActionListener(this);
	1148	+ replaceButton.setEnabled(false);
631	1149
632		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
633		- liveCB.setToolTipText("Enable animation");
634		- liveCB.addItemListener(this);
635		-
636		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1150	+ versionManagerPanel.add(updown);
	1151	+
	1152	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1153	+ nextVersionButton.setToolTipText("Next version");
	1154	+ nextVersionButton.addActionListener(this);
	1155	+ nextVersionButton.setEnabled(false);
	1156	+
	1157	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
637	1158	oneStepButton.setToolTipText("Animate one step forward");
638	1159	oneStepButton.addActionListener(this);
639	1160
640		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1161	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1162	+ liveCB.setToolTipText("Enable animation");
	1163	+ liveCB.addItemListener(this);
	1164	+
	1165	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
641	1166	fastCB.setToolTipText("Fast mode");
642	1167	fastCB.addItemListener(this);
643	1168
..	..	@@ -652,142 +1177,139 @@
652	1177
653	1178	if (Globals.ADVANCED)
654	1179	{
655		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
656	1181	snapobjectButton.addActionListener(this);
657	1182	snapobjectButton.setToolTipText("Snap Object");
	1183	+
	1184	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ fourButton.addActionListener(this);
	1186	+ fourButton.setToolTipText("Show control panel only");
658	1187	}
659	1188
660	1189	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
661	1190
662		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
663		- twoButton.setToolTipText("Show center view only");
664		- twoButton.addActionListener(this);
665		- this.fullscreenLayout = twoButton;
666		-
667		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668		- fourButton.addActionListener(this);
669		- fourButton.setToolTipText("Show left panel only");
670		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- sixButton.setToolTipText("2-column layout left");
672		- sixButton.addActionListener(this);
673		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674		- threeButton.setToolTipText("2-column layout right");
675		- threeButton.addActionListener(this);
676		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
677		- sevenButton.setToolTipText("3-column layout");
678		- sevenButton.addActionListener(this);
679		- //
680	1191
681		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682		- rootButton.setToolTipText("Edit selection in new tab");
	1192	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1193	+ rootButton.setToolTipText("Open selection in new tab");
683	1194	rootButton.addActionListener(this);
684	1195
685		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1196	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
686	1197	closeButton.setToolTipText("Close tab");
687	1198	closeButton.addActionListener(this);
688	1199	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
689	1200	//clearButton.addActionListener(this);
690	1201
	1202	+ cGridBag row1 = new cGridBag();
	1203	+ row1.preferredHeight = 8;
	1204	+
691	1205	// INSERT
692		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
693		- gridButton.setToolTipText("Create grid");
	1206	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ gridButton.setToolTipText("Create ground");
694	1208	gridButton.addActionListener(this);
695	1209
696		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
697	1211	boxButton.setToolTipText("Create box");
698	1212	boxButton.addActionListener(this);
699	1213
700		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
701		- sphereButton.setToolTipText("Create sphere");
702		- sphereButton.addActionListener(this);
703		-
704		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
705		- coneButton.setToolTipText("Create cone");
706		- coneButton.addActionListener(this);
707		-
708		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
709		- torusButton.setToolTipText("Create torus");
710		- torusButton.addActionListener(this);
711		-
712		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
713	1215	superButton.setToolTipText("Create superellipsoid");
714	1216	superButton.addActionListener(this);
715	1217
716		- if (Globals.ADVANCED)
	1218	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ sphereButton.setToolTipText("Create sphere");
	1220	+ sphereButton.addActionListener(this);
	1221	+
	1222	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ coneButton.setToolTipText("Create cone");
	1224	+ coneButton.addActionListener(this);
	1225	+
	1226	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ torusButton.setToolTipText("Create torus");
	1228	+ torusButton.addActionListener(this);
	1229	+
	1230	+ if (false) //Globals.ADVANCED)
717	1231	{
718		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
719	1233	kleinButton.setToolTipText("Create Klein bottle");
720	1234	kleinButton.addActionListener(this);
721	1235	}
722	1236
723		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
724	1238	particlesButton.setToolTipText("Create particle system");
725	1239	particlesButton.addActionListener(this);
726	1240
727		- oe.toolboxPanel.Return();
	1241	+ oe.toolboxPanel.add(row1);
728	1242
729		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1243	+ cGridBag row2 = new cGridBag();
	1244	+ row2.preferredHeight = 8;
	1245	+
	1246	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
730	1247	groupButton.setToolTipText("Create group");
731	1248	groupButton.addActionListener(this);
732	1249
733		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
734	1251	compositeButton.setToolTipText("Create composite");
735	1252	compositeButton.addActionListener(this);
736	1253
737		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1254	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
738	1255	switchButton.setToolTipText("Create item switcher");
739	1256	switchButton.addActionListener(this);
740	1257
741		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1258	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
742	1259	loopButton.setToolTipText("Create loop");
743	1260	loopButton.addActionListener(this);
744	1261
745		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1262	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
746	1263	textureButton.setToolTipText("Create texture");
747	1264	textureButton.addActionListener(this);
748	1265
749		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
750	1267	overlayButton.setToolTipText("Create overlay");
751	1268	overlayButton.addActionListener(this);
752	1269
753		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1270	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
754	1271	lightButton.setToolTipText("Create light");
755	1272	lightButton.addActionListener(this);
756	1273
757		- for (int i=6; --i>=0;)
758		- {
759		- oe.toolboxPanel.Return();
760		- oe.toolboxPanel.add(new cGridBag());
761		- oe.toolboxPanel.add(new cGridBag());
762		- oe.toolboxPanel.add(new cGridBag());
763		- oe.toolboxPanel.add(new cGridBag());
764		- oe.toolboxPanel.add(new cGridBag());
765		- oe.toolboxPanel.add(new cGridBag());
766		- oe.toolboxPanel.add(new cGridBag());
767		- }
	1274	+ oe.toolboxPanel.add(row2);
	1275	+
	1276	+ cGridBag textures = new cGridBag();
	1277	+
	1278	+ CreateTexturePanel(textures);
	1279	+
	1280	+ int tabCount = resourcecontainer.getTabCount();
	1281	+
	1282	+ if (tabCount > 0)
	1283	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1284	+
	1285	+ oe.toolboxPanel.add(textures);
	1286	+
	1287	+ textures.preferredHeight = 100;
	1288	+
	1289	+ CreateSkyboxPanel(oe.skyboxPanel);
768	1290
769	1291	// EDIT panel
770		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
771	1293	editButton.setToolTipText("Pin selection controls");
772	1294	editButton.addActionListener(this);
773	1295
774		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
775		- uneditButton.setToolTipText("Remove selection controls");
	1296	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1297	+ uneditButton.setToolTipText("Unpin and remove selection controls");
776	1298	uneditButton.addActionListener(this);
777	1299
778	1300	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
779		- allParamsButton.setToolTipText("Show all controle");
	1301	+ allParamsButton.setToolTipText("Show all controls");
780	1302	allParamsButton.addActionListener(this);
781	1303
782		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
783		- clearPanelButton.setToolTipText("Clear edit panel");
	1304	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1305	+ clearPanelButton.setToolTipText("Clear all controls");
784	1306	clearPanelButton.addActionListener(this);
785	1307
786		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
787		- unselectButton.setToolTipText("Unselect");
788		- unselectButton.addActionListener(this);
	1308	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1309	+ //unselectButton.setToolTipText("Unselect");
	1310	+ //unselectButton.addActionListener(this);
789	1311
790		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1312	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
791	1313	flashSelectionButton.setToolTipText("Highlight selection");
792	1314	flashSelectionButton.addActionListener(this);
793	1315
..	..	@@ -810,6 +1332,8 @@
810	1332
811	1333	cGridBag jSPPanel = new cGridBag();
812	1334
	1335	+ jSPPanel.preferredHeight = 20;
	1336	+
813	1337	JScrollPane jSP;
814	1338	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
815	1339	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -818,11 +1342,15 @@
818	1342	oe.treePanel.add(jSPPanel);
819	1343	oe.treePanel.Return();
820	1344
821		- oe.treePanel.add(copyOptionsPanel);
	1345	+ oe.treePanel.add(versionManagerPanel);
822	1346	oe.treePanel.Return();
823	1347
824		-// mainPanel.setDividerLocation(0.5); //1.0);
825		-// mainPanel.setResizeWeight(0.5);
	1348	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1349	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1350	+ versionSliderPane.preferredHeight = 3;
	1351	+
	1352	+// mainPanel.setDividerLocation(0.1); //1.0);
	1353	+ mainPanel.setResizeWeight(0.4);
826	1354
827	1355	//jList.addListSelectionListener(this);
828	1356	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -830,7 +1358,7 @@
830	1358	//jTree.setEditable(true);
831	1359	oe.jTree.setDragEnabled(true);
832	1360	//jTree.setPreferredSize(new Dimension(10,10));
833		- jSP.setPreferredSize(new Dimension(100,200));
	1361	+ //jSP.setPreferredSize(new Dimension(100,200));
834	1362
835	1363	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
836	1364
..	..	@@ -842,7 +1370,7 @@
842	1370	dgr.addDragGestureListener(this);
843	1371	}catch(Exception e) {}
844	1372	*/
845		- radio.layout = sevenButton;
	1373	+ radio.layout = threeButton; // sixButton;
846	1374	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
847	1375	}
848	1376
..	..	@@ -876,7 +1404,7 @@
876	1404	// supportCB.setToolTipText("Enable rigging");
877	1405	// supportCB.addItemListener(this);
878	1406
879		- panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1407	+ panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
880	1408	freezeCB.setToolTipText("Fast moving camera");
881	1409	freezeCB.addItemListener(this);
882	1410
..	..	@@ -885,42 +1413,44 @@
885	1413
886	1414	panel.Return();
887	1415
	1416	+ if (Globals.ADVANCED)
	1417	+ {
888	1418	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
889	1419	crowdCB.setToolTipText("Used for crowds");
890	1420	crowdCB.addItemListener(this);
	1421	+ }
891	1422
892	1423	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
893	1424	smoothCB.setToolTipText("Snapping delay");
894	1425	smoothCB.addItemListener(this);
895	1426
896		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
897		- slowCB.setToolTipText("Smooth interpolation");
898		- slowCB.addItemListener(this);
	1427	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1428	+// slowCB.setToolTipText("Smooth interpolation");
	1429	+// slowCB.addItemListener(this);
	1430	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1431	+ minshaderCB.setToolTipText("Minimal fast shader");
	1432	+ minshaderCB.addItemListener(this);
899	1433
900		-// constraints.gridy += 1;
901	1434	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
902	1435	// speakerMocapCB.addItemListener(this);
903	1436
904		- panel.Return();
905		-
906	1437	if (false)
907	1438	{
908	1439	// handled in scripts
909		- //constraints.gridy += 1;
910	1440	panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
911	1441	speakerCameraCB.addItemListener(this);
912	1442
913		- //constraints.gridy += 1;
914	1443	panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
915	1444	speakerFocusCB.addItemListener(this);
916	1445
917		- //constraints.gridy += 1;
918		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
919		- smoothfocusCB.addItemListener(this);
920	1446	panel.Return();
921	1447	}
922	1448
923		-//constraints.gridx += 1;
	1449	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1450	+ smoothfocusCB.addItemListener(this);
	1451	+
	1452	+ panel.Return();
	1453	+
924	1454	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
925	1455	// debugCB.addItemListener(this);
926	1456
..	..	@@ -945,9 +1475,9 @@
945	1475	toggleSwitchCB.setToolTipText("Choose a single item");
946	1476	toggleSwitchCB.addItemListener(this);
947	1477
948		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
949		- autosaveCB.setToolTipText("On structure change");
950		- autosaveCB.addItemListener(this);
	1478	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1479	+ autokeepCB.setToolTipText("On structure change");
	1480	+ autokeepCB.addItemListener(this);
951	1481
952	1482	panel.Return();
953	1483	if (Globals.ADVANCED)
..	..	@@ -974,6 +1504,14 @@
974	1504
975	1505	void EditObject(Object3D obj)
976	1506	{
	1507	+ //assert(obj instanceof Composite);
	1508	+
	1509	+// if (obj.versionlist == null)
	1510	+// {
	1511	+// obj.versionlist = new Object3D[100];
	1512	+// obj.versionindex = -1;
	1513	+// }
	1514	+
977	1515	cRadio radioButton = new cRadio(obj.name);
978	1516
979	1517	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -984,7 +1522,7 @@
984	1522	}
985	1523
986	1524	radioButton.SetObject(obj);
987		- radioButton.layout = sevenButton;
	1525	+ radioButton.layout = threeButton; // sixButton;
988	1526	radioButton.SetCamera(cameraView.renderCamera, false);
989	1527	radioButton.addActionListener(this);
990	1528	radioPanel.add(radioButton);
..	..	@@ -998,6 +1536,7 @@
998	1536
999	1537	oe.SetupViews();
1000	1538
	1539	+ if (Globals.DEBUG)
1001	1540	System.out.println("SetupViews");
1002	1541	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1003	1542	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1009,6 +1548,8 @@
1009	1548	cCheckBox localCB;
1010	1549	cCheckBox crowdCB;
1011	1550	cCheckBox smoothCB;
	1551	+ cCheckBox minshaderCB;
	1552	+
1012	1553	cToggleButton fastCB;
1013	1554	cCheckBox slowCB;
1014	1555	cCheckBox boxCB;
..	..	@@ -1024,7 +1565,7 @@
1024	1565
1025	1566	cCheckBox oeilCB;
1026	1567	cCheckBox shadowCB;
1027		- cCheckBox autosaveCB;
	1568	+ cCheckBox autokeepCB;
1028	1569	cCheckBox lookAtCB;
1029	1570
1030	1571	// static int COLOR = 1;
..	..	@@ -1079,6 +1620,12 @@
1079	1620	{
1080	1621	cameraView.ToggleInertia();
1081	1622	cameraView.repaint();
	1623	+ }
	1624	+ else if(e.getSource() == minshaderCB)
	1625	+ {
	1626	+ Globals.MINSHADER ^= true;
	1627	+ cameraView.programInitialized = false;
	1628	+ cameraView.repaint();
1082	1629	}
1083	1630	else if(e.getSource() == localCB)
1084	1631	{
..	..	@@ -1136,9 +1683,9 @@
1136	1683	{
1137	1684	Globals.FREEZEONMOVE ^= true;
1138	1685	}
1139		- else if(e.getSource() == autosaveCB)
	1686	+ else if(e.getSource() == autokeepCB)
1140	1687	{
1141		- Globals.SAVEONMAKE ^= true;
	1688	+ Globals.REPLACEONMAKE ^= true;
1142	1689	}
1143	1690	else if(e.getSource() == lookAtCB)
1144	1691	{
..	..	@@ -1356,7 +1903,12 @@
1356	1903	TreePath path;
1357	1904
1358	1905	public TransferableTreePath(TreePath tp) {
1359		- path = tp;
	1906	+ Object[] objs = new Object[tp.getPathCount()];
	1907	+ for (int i=0; i<objs.length; i++)
	1908	+ {
	1909	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1910	+ }
	1911	+ path = new TreePath(objs);
1360	1912	}
1361	1913
1362	1914	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1537,7 +2089,7 @@
1537	2089	Object3D obj = (Object3D)group.selection.elementAt(0);
1538	2090	objEditor.ScreenFit(obj, false);
1539	2091
1540		- cameraView.pingthread.StepToTarget(true);
	2092	+ cameraView.pingthread.StepToTarget(); //true);
1541	2093	refreshContents();
1542	2094	}
1543	2095
..	..	@@ -1574,7 +2126,7 @@
1574	2126	obj.parent.TransformToWorld(maxima); //, maxima);
1575	2127	}
1576	2128
1577		- Object3D shadow = new Object3D("Shadow " + obj.name);
	2129	+ Object3D shadow = new Object3D("Shadow" + obj.name);
1578	2130
1579	2131	shadow.toParent = LA.newMatrix();
1580	2132	shadow.fromParent = LA.newMatrix();
..	..	@@ -1588,24 +2140,24 @@
1588	2140	switch(axis)
1589	2141	{
1590	2142	case 0 :
1591		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1592		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1593		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1594		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2143	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2144	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2145	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2146	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1595	2147	norm = cVector.X;
1596	2148	break;
1597	2149	case 1 :
1598		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1599		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1600		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1601		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2150	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2151	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2152	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2153	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1602	2154	norm = cVector.Y;
1603	2155	break;
1604	2156	case 2 :
1605		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1606		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1607		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1608		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2157	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2158	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2159	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2160	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1609	2161	norm = cVector.Z;
1610	2162	break;
1611	2163	}
..	..	@@ -1646,7 +2198,11 @@
1646	2198	shadow.material = new cMaterial(obj.material);
1647	2199	shadow.material.diffuse = 0.0001f;
1648	2200	shadow.material.specular = 0.0001f;
1649		- //shadow.projectedVertices[1].x = 300;
	2201	+ shadow.material.opacity = 0.75f;
	2202	+
	2203	+ AllocProjectedVertices(shadow);
	2204	+
	2205	+ shadow.projectedVertices[1].x = 300;
1650	2206
1651	2207	makeSomething(shadow);
1652	2208	}
..	..	@@ -1663,6 +2219,16 @@
1663	2219	listUI.remove(i);
1664	2220	}
1665	2221	}
	2222	+ }
	2223	+
	2224	+ private void EditElement(Object3D elem, boolean newWindow)
	2225	+ {
	2226	+ // if (!(elem instanceof Composite))
	2227	+ // newWindow = false;
	2228	+ listUI.add(elem);
	2229	+ elem.openEditWindow(this, newWindow); //, false);
	2230	+ System.out.println("edit : " + elem);
	2231	+ elem.editWindow.refreshContents(true); // ? new
1666	2232	}
1667	2233
1668	2234	/**
..	..	@@ -2092,6 +2658,23 @@
2092	2658	{
2093	2659	makeSomething(new Light());
2094	2660	} else
	2661	+// if (source == skybox1Button \|\|
	2662	+// source == skybox2Button \|\|
	2663	+// source == skybox3Button \|\|
	2664	+// source == skybox4Button \|\|
	2665	+// source == skybox5Button \|\|
	2666	+// source == skybox6Button \|\|
	2667	+// source == skybox7Button \|\|
	2668	+// source == skybox11Button \|\|
	2669	+// source == skybox12Button \|\|
	2670	+// source == skybox13Button \|\|
	2671	+// source == skybox14Button \|\|
	2672	+// source == skybox15Button \|\|
	2673	+// source == skybox16Button \|\|
	2674	+// source == skybox17Button)
	2675	+// {
	2676	+// ChangeSkybox(source);
	2677	+// } else
2095	2678	if (source == csgItem)
2096	2679	{
2097	2680	group(new CSG());
..	..	@@ -2140,27 +2723,35 @@
2140	2723	} else
2141	2724	if (source == loopItem \|\| source == loopButton)
2142	2725	{
	2726	+ if (!group.selection.isEmpty())
	2727	+ {
2143	2728	Composite csg = new GroupLeaf();
2144		- csg.count = 5;
2145	2729	group(csg);
	2730	+ csg.count = 5;
2146	2731	Composite child = new cGroup("Branch");
2147	2732	csg.addChild(child);
2148	2733	child.addChild(csg);
	2734	+ }
2149	2735	} else
2150	2736	if (source == doubleItem)
2151	2737	{
	2738	+ if (!group.selection.isEmpty())
	2739	+ {
2152	2740	Composite csg = new GroupLeaf("Fork");
2153		- csg.count = 5;
2154	2741	group(csg);
	2742	+ csg.count = 5;
2155	2743	Composite child = new cGroup("Branch A");
2156	2744	csg.addChild(child);
2157	2745	child.addChild(csg);
2158	2746	child = new cGroup("Branch B");
2159	2747	csg.addChild(child);
2160	2748	child.addChild(csg);
	2749	+ }
2161	2750	} else
2162	2751	if (source == tripleItem)
2163	2752	{
	2753	+ if (!group.selection.isEmpty())
	2754	+ {
2164	2755	Composite csg = new GroupLeaf("Trident");
2165	2756	csg.count = 4;
2166	2757	group(csg);
..	..	@@ -2173,11 +2764,12 @@
2173	2764	child = new cGroup();
2174	2765	csg.addChild(child);
2175	2766	child.addChild(csg);
	2767	+ }
2176	2768	} else
2177	2769	if (source == computeAOItem)
2178	2770	{
2179	2771	Globals.drawMode = CameraPane.OCCLUSION;
2180		- Globals.theRenderer.repaint();
	2772	+ cameraView.repaint();
2181	2773	} else
2182	2774	if (source == recompileItem)
2183	2775	{
..	..	@@ -2192,7 +2784,7 @@
2192	2784	if (source == invariantsItem)
2193	2785	{
2194	2786	System.out.println("Invariants:");
2195		- Grafreed.grafreeD.universe.invariants();
	2787	+ Grafreed.grafreed.universe.invariants();
2196	2788	} else
2197	2789	if (source == memoryItem)
2198	2790	{
..	..	@@ -2219,23 +2811,56 @@
2219	2811	{
2220	2812	Maximize();
2221	2813	} else
2222		- if (source == fullButton)
	2814	+ if (source == fullScreenButton)
2223	2815	{
2224	2816	ToggleFullScreen();
2225	2817	} else
2226		- if (source == undoButton)
	2818	+ if (source == collapseButton)
2227	2819	{
2228		- if (!Undo())
	2820	+ this.expandedLayout = radio.layout;
	2821	+ CollapseToolbar();
	2822	+ } else
	2823	+// if (source == maximize3DButton)
	2824	+// {
	2825	+// this.expandedLayout = radio.layout;
	2826	+// radio.layout = twoButton;
	2827	+// CollapseToolbar();
	2828	+// Show3DView();
	2829	+// } else
	2830	+ if (source == previousVersionButton)
	2831	+ {
	2832	+ // Go to previous version
	2833	+ //if (!Undo())
	2834	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2835	+ PreviousVersion();
	2836	+ } else
	2837	+ if (source == restoreButton)
	2838	+ {
	2839	+ // Restore current version
	2840	+ Restore();
	2841	+ //restoreButton.setEnabled(false);
	2842	+ } else
	2843	+ if (source == replaceButton)
	2844	+ {
	2845	+ // Overwrite current version
	2846	+ Replace();
	2847	+ //replaceButton.setEnabled(false);
	2848	+ } else
	2849	+ if (source == nextVersionButton)
	2850	+ {
	2851	+ // Go to next version
	2852	+ NextVersion();
	2853	+ } else
	2854	+ if (source == saveVersionButton)
	2855	+ {
	2856	+ // Save a new version
	2857	+ if (!DuplicateVersion()) //true))
2229	2858	java.awt.Toolkit.getDefaultToolkit().beep();
2230	2859	} else
2231		- if (source == redoButton)
	2860	+ if (source == deleteVersionButton)
2232	2861	{
2233		- Redo();
2234		- } else
2235		- if (source == saveButton)
2236		- {
2237		- if (!Save(true))
2238		- java.awt.Toolkit.getDefaultToolkit().beep();
	2862	+ // Delete a new version
	2863	+ DeleteVersion();
2239	2864	} else
2240	2865	if (source == oneStepButton)
2241	2866	{
..	..	@@ -2290,11 +2915,11 @@
2290	2915	} else
2291	2916	if (source == undoItem)
2292	2917	{
2293		- Undo();
	2918	+ PreviousVersion();
2294	2919	} else
2295	2920	if (source == redoItem)
2296	2921	{
2297		- Redo();
	2922	+ NextVersion();
2298	2923	} else
2299	2924	if (source == duplicateItem)
2300	2925	{
..	..	@@ -2615,7 +3240,7 @@
2615	3240	{
2616	3241	StepAll();
2617	3242	} else
2618		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3243	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2619	3244	{
2620	3245	//int indices[] = jList.getSelectedIndices();
2621	3246	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2775,22 +3400,34 @@
2775	3400	} else
2776	3401	if (source == ungroupItem \|\| source == ungroupButton)
2777	3402	{
2778		- boolean hasRoot = false;
	3403	+ boolean canUngroup = true;
2779	3404
2780	3405	for (int i=0; i<group.selection.size(); i++)
2781	3406	{
2782		- if (group.selection.get(i) == group)
	3407	+ Object3D selectedItem = group.selection.get(i);
	3408	+
	3409	+ if (selectedItem.Size() == 0)
2783	3410	{
2784		- hasRoot = true;
	3411	+ // Cannot ungroup leaves
	3412	+ canUngroup = false;
	3413	+ break;
	3414	+ }
	3415	+
	3416	+ if (selectedItem == group)
	3417	+ {
	3418	+ // Cannot ungroup root
	3419	+ canUngroup = false;
2785	3420	break;
2786	3421	}
2787	3422	}
2788	3423
2789		- if (!hasRoot)
	3424	+ if (canUngroup)
2790	3425	{
2791	3426	for (int i=0; i<group.selection.size(); i++)
2792	3427	{
2793		- Ungroup(group.selection.get(i));
	3428	+ Object3D selectedItem = group.selection.get(i);
	3429	+
	3430	+ Ungroup(selectedItem);
2794	3431	}
2795	3432
2796	3433	ClearSelection(false);
..	..	@@ -2841,6 +3478,10 @@
2841	3478	if (source == clearMaterialsItem)
2842	3479	{
2843	3480	ClearMaterials();
	3481	+ } else
	3482	+ if (source == clearVersionsItem)
	3483	+ {
	3484	+ ClearVersions();
2844	3485	} else
2845	3486	if (source == liveleavesItem)
2846	3487	{
..	..	@@ -2982,6 +3623,18 @@
2982	3623	{
2983	3624	TransformChildren();
2984	3625	} else
	3626	+ if (source == textureRatioRItem)
	3627	+ {
	3628	+ TextureRatio(0);
	3629	+ } else
	3630	+ if (source == textureRatioGItem)
	3631	+ {
	3632	+ TextureRatio(1);
	3633	+ } else
	3634	+ if (source == textureRatioBItem)
	3635	+ {
	3636	+ TextureRatio(2);
	3637	+ } else
2985	3638	if (source == resetTransformItem)
2986	3639	{
2987	3640	ResetTransform();
..	..	@@ -3097,7 +3750,7 @@
3097	3750	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3098	3751	{
3099	3752	obj = (Object3D)e.nextElement();
3100		- obj.SetBumpTexture(null);
	3753	+ obj.ResetBumpTexture();
3101	3754	}
3102	3755
3103	3756	refreshContents();
..	..	@@ -3111,6 +3764,31 @@
3111	3764	obj.SetBumpTexture(obj.GetPigmentTexture());
3112	3765	}
3113	3766
	3767	+ refreshContents();
	3768	+ } else
	3769	+ if (source == embedTexturesItem)
	3770	+ {
	3771	+ Object3D obj;
	3772	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3773	+ {
	3774	+ obj = (Object3D)e.nextElement();
	3775	+ obj.EmbedTextures(true);
	3776	+ }
	3777	+
	3778	+ refreshContents();
	3779	+ } else
	3780	+ if (source == deEmbedTexturesItem)
	3781	+ {
	3782	+ Object3D obj;
	3783	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3784	+ {
	3785	+ obj = (Object3D)e.nextElement();
	3786	+ obj.EmbedTextures(false);
	3787	+ }
	3788	+
	3789	+ CameraPane.texturepigment.clear();
	3790	+ CameraPane.texturebump.clear();
	3791	+
3114	3792	refreshContents();
3115	3793	} else
3116	3794	if (source == flashSelectionButton)
..	..	@@ -3128,38 +3806,7 @@
3128	3806	if (CameraPane.FULLSCREEN)
3129	3807	fullscreenLayout = radio.layout;
3130	3808
3131		- // bug
3132		- //gridPanel.setDividerLocation(1.0);
3133		- //bigPanel.setDividerLocation(0.0);
3134		-// bigThree.remove(scenePanel);
3135		-// bigThree.remove(centralPanel);
3136		-// bigThree.remove(XYZPanel);
3137		-// aWindowConstraints.gridx = 0;
3138		-// aWindowConstraints.gridy = 0;
3139		-// aWindowConstraints.gridwidth = 1;
3140		-// // aConstraints.gridheight = 3;
3141		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3142		-// aWindowConstraints.weightx = 0;
3143		-// aWindowConstraints.weighty = 1;
3144		-// //bigThree.add(jtp, aWindowConstraints);
3145		-// aWindowConstraints.weightx = 1;
3146		-// aWindowConstraints.gridwidth = 3;
3147		-// // aConstraints.gridheight = 3;
3148		-// aWindowConstraints.gridx = 1;
3149		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3150		-// bigThree.add(centralPanel, aWindowConstraints);
3151		-// aWindowConstraints.weightx = 0;
3152		-// aWindowConstraints.gridx = 4;
3153		-// aWindowConstraints.gridwidth = 1;
3154		-// // aConstraints.gridheight = 3;
3155		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3156		-// //bigThree.add(XYZPanel, aWindowConstraints);
3157		-// scenePanel.setVisible(false);
3158		-// centralPanel.setVisible(true);
3159		-// XYZPanel.setVisible(false);
3160		- bigThree.ClearUI();
3161		- bigThree.add(centralPanel);
3162		- bigThree.FlushUI();
	3809	+ Show3DView();
3163	3810
3164	3811	cameraView.requestFocusInWindow();
3165	3812
..	..	@@ -3214,8 +3861,8 @@
3214	3861	// centralPanel.setVisible(true);
3215	3862	// XYZPanel.setVisible(true);
3216	3863	bigThree.ClearUI();
	3864	+ bigThree.add(scenePanel);
3217	3865	bigThree.add(centralPanel);
3218		- bigThree.add(XYZPanel);
3219	3866	bigThree.FlushUI();
3220	3867
3221	3868	cameraView.requestFocusInWindow();
..	..	@@ -3295,8 +3942,8 @@
3295	3942	// centralPanel.setVisible(true);
3296	3943	// XYZPanel.setVisible(false);
3297	3944	bigThree.ClearUI();
3298		- bigThree.add(scenePanel);
3299	3945	bigThree.add(centralPanel);
	3946	+ bigThree.add(scenePanel);
3300	3947	bigThree.FlushUI();
3301	3948
3302	3949	cameraView.requestFocusInWindow();
..	..	@@ -3345,6 +3992,7 @@
3345	3992	} else
3346	3993	if (source == rootButton)
3347	3994	{
	3995	+ Replace();
3348	3996	Object3D obj;
3349	3997	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3350	3998	{
..	..	@@ -3359,6 +4007,9 @@
3359	4007	if (source == closeButton)
3360	4008	{
3361	4009	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4010	+ if (copy.versionlist != null)
	4011	+ Replace();
	4012	+
3362	4013	cRadio ab;
3363	4014	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3364	4015	{
..	..	@@ -3402,10 +4053,10 @@
3402	4053	{
3403	4054	Object3D child = (Object3D)e.nextElement();
3404	4055	if(child.editWindow != null)
3405		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3406	4056	child.pinned = false;
3407	4057	child.CloseUI();
3408	4058	listUI.remove(child);
	4059	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3409	4060
3410	4061	//child.editWindow = null; // ???????????
3411	4062	}
..	..	@@ -3424,6 +4075,7 @@
3424	4075	obj.CloseUI();
3425	4076	}
3426	4077	listUI.clear();
	4078	+ SetPinStates(group.selection.size() > 0);
3427	4079	refreshContents(true);
3428	4080	} else
3429	4081	if (source == allParamsButton)
..	..	@@ -3456,6 +4108,9 @@
3456	4108	} else
3457	4109	if(source instanceof cRadio)
3458	4110	{
	4111	+ if (copy.versionlist != null)
	4112	+ Replace();
	4113	+
3459	4114	group.parent = keepparent;
3460	4115	group.attributes = 0;
3461	4116	//group.editWindow = null;
..	..	@@ -3479,6 +4134,7 @@
3479	4134	}
3480	4135
3481	4136	copy = group;
	4137	+
3482	4138	//Globals.theRenderer.object = group;
3483	4139	if(!useclient)
3484	4140	{
..	..	@@ -3506,9 +4162,38 @@
3506	4162	*/
3507	4163	radio.layout.doClick();
3508	4164
	4165	+ //assert(copy instanceof Composite);
	4166	+
	4167	+ if (copy.versionlist == null)
	4168	+ {
	4169	+ copy.versionindex = -1;
	4170	+
	4171	+ // Cannot work with loops
	4172	+ // To fix this issue, we first mark all nodes above the root,
	4173	+ // and check if any of these nodes are reachable below the root.
	4174	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4175	+
	4176	+ if (copy instanceof Composite && !copy.HasTags())
	4177	+ {
	4178	+ if (copy.versionlist == null)
	4179	+ copy.versionlist = new Object3D[100];
	4180	+
	4181	+ //Save(true);
	4182	+ }
	4183	+ else
	4184	+ copy.versionindex = -2;
	4185	+
	4186	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4187	+ }
	4188	+
	4189	+ SetVersionStates();
	4190	+
3509	4191	ClearUnpinned();
3510		- SetPinStates(group.selection.size() > 0);
3511		- if (group.selection.size() == 1)
	4192	+
	4193	+ //Grafreed.Assert(group != null);
	4194	+ //Grafreed.Assert(group.selection != null);
	4195	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4196	+ if (group.selection == null \|\| group.selection.size() == 1)
3512	4197	EditSelection(false);
3513	4198	keepparent = group.parent;
3514	4199	// PARENT = NULL or not???
..	..	@@ -3521,11 +4206,13 @@
3521	4206	} else if (event.getSource() == editCameraItem)
3522	4207	{
3523	4208	cameraView.ProtectCamera();
	4209	+ cameraView.requestFocusInWindow();
3524	4210	cameraView.repaint();
3525	4211	return;
3526	4212	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3527	4213	{
3528	4214	cameraView.RevertCamera();
	4215	+ cameraView.requestFocusInWindow();
3529	4216	cameraView.repaint();
3530	4217	return;
3531	4218	// } else if (event.getSource() == textureButton)
..	..	@@ -3614,9 +4301,46 @@
3614	4301	refreshContents();
3615	4302	}
3616	4303
	4304	+ void TextureRatio(int axis)
	4305	+ {
	4306	+ Object3D obj;
	4307	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4308	+ {
	4309	+ obj = (Object3D)e.nextElement();
	4310	+ obj.TextureRatio(axis);
	4311	+ }
	4312	+
	4313	+ refreshContents();
	4314	+ }
	4315	+
3617	4316	void ResetTransform()
3618	4317	{
3619	4318	ResetTransform(-1);
	4319	+ }
	4320	+
	4321	+ void ScaleSelection(int scale)
	4322	+ {
	4323	+ Object3D obj;
	4324	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4325	+ {
	4326	+ obj = (Object3D)e.nextElement();
	4327	+
	4328	+ if (obj.toParent == null)
	4329	+ continue;
	4330	+
	4331	+ obj.Scale(scale);
	4332	+
	4333	+ if (obj.parent == null)
	4334	+ {
	4335	+ System.out.println("NULL PARENT!");
	4336	+ // new Exception().printStackTrace();
	4337	+ }
	4338	+ else
	4339	+ TouchTransform(obj);
	4340	+ //obj.parent.Touch();
	4341	+ }
	4342	+
	4343	+ refreshContents();
3620	4344	}
3621	4345
3622	4346	void ResetTransform(int mask)
..	..	@@ -3629,42 +4353,8 @@
3629	4353	if (obj.toParent == null)
3630	4354	continue;
3631	4355
3632		- if (mask == -1)
3633		- {
3634		- if (obj instanceof Camera) // jan 2014
3635		- {
3636		- LA.matIdentity(obj.toParent);
3637		- LA.matIdentity(obj.fromParent);
3638		- }
3639		- else
3640		- {
3641		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3642		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3643		- }
3644		- TouchTransform(obj);
3645		- continue;
3646		- }
3647		- if ((mask&2) != 0) // Scale
3648		- {
3649		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3650		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3651		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3652		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3653		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3654		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3655		- }
3656		- if ((mask&4) != 0) // Rotation
3657		- {
3658		- // ?
3659		- }
3660		- if ((mask&1) != 0) // Translation
3661		- {
3662		- if (obj.toParent != null)
3663		- {
3664		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3665		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3666		- }
3667		- }
	4356	+ obj.ResetTransform(mask);
	4357	+
3668	4358	if (obj.parent == null)
3669	4359	{
3670	4360	System.out.println("NULL PARENT!");
..	..	@@ -4102,7 +4792,7 @@
4102	4792
4103	4793	try
4104	4794	{
4105		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4795	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4106	4796	}
4107	4797	catch (Exception e)
4108	4798	{
..	..	@@ -4173,10 +4863,17 @@
4173	4863	{
4174	4864	Object3D obj = group.selection.get(i);
4175	4865
	4866	+ if (obj.toParent == null)
	4867	+ {
	4868	+ obj.toParent = LA.newMatrix();
	4869	+ obj.fromParent = LA.newMatrix();
	4870	+ }
	4871	+
4176	4872	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4177	4873	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4178	4874	}
4179	4875
	4876	+ Globals.lighttouched = true;
4180	4877	refreshContents();
4181	4878	}
4182	4879
..	..	@@ -4464,6 +5161,12 @@
4464	5161	refreshContents();
4465	5162	}
4466	5163
	5164	+ void ClearVersions()
	5165	+ {
	5166	+ group.selection.ClearVersions();
	5167	+ refreshContents();
	5168	+ }
	5169	+
4467	5170	void FlipV(boolean flip)
4468	5171	{
4469	5172	group.selection.FlipV(flip);
..	..	@@ -4579,6 +5282,12 @@
4579	5282
4580	5283	void EditSelection(boolean newWindow)
4581	5284	{
	5285	+ if (group.selection == null)
	5286	+ {
	5287	+ EditElement(group, newWindow); // ? new
	5288	+ return;
	5289	+ }
	5290	+
4582	5291	// aConstraints.gridy = 0;
4583	5292	for (int i=0; i<group.selection.size(); i++)
4584	5293	{
..	..	@@ -4589,12 +5298,7 @@
4589	5298	Object3D elem = (Object3D)group.selection.elementAt(i);
4590	5299	if(elem != group \|\| !newWindow)
4591	5300	{
4592		- // if (!(elem instanceof Composite))
4593		- // newWindow = false;
4594		- listUI.add(elem);
4595		- elem.openEditWindow(this, newWindow); //, false);
4596		- System.out.println("edit : " + elem);
4597		- elem.editWindow.refreshContents(true); // ? new
	5301	+ EditElement(elem, newWindow); // ? new
4598	5302	}
4599	5303	}
4600	5304	}
..	..	@@ -4657,9 +5361,7 @@
4657	5361
4658	5362	freezemodel = false;
4659	5363	}
4660		-
4661		- boolean flashIt = true;
4662		-
	5364	+
4663	5365	public void valueChanged(TreeSelectionEvent e)
4664	5366	//public boolean handleEvent(Event event)
4665	5367	{
..	..	@@ -4703,10 +5405,10 @@
4703	5405	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4704	5406	// a camera
4705	5407	{
4706		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5408	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
4707	5409	{
4708	5410	CameraPane.camerachangeframe = 0; // don't refuse it
4709		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5411	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
4710	5412	}
4711	5413	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4712	5414	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
..	..	@@ -4732,13 +5434,31 @@
4732	5434	{
4733	5435	editButton.setEnabled(enabled);
4734	5436	uneditButton.setEnabled(enabled);
4735		- unselectButton.setEnabled(enabled);
	5437	+ //unselectButton.setEnabled(enabled);
4736	5438	flashSelectionButton.setEnabled(enabled);
	5439	+
	5440	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5441	+
	5442	+ boolean allComposites = true;
	5443	+
	5444	+ if (group.selection != null)
	5445	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5446	+ {
	5447	+ Object next = e.nextElement();
	5448	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5449	+ {
	5450	+ allComposites = false;
	5451	+ break;
	5452	+ }
	5453	+ }
	5454	+
	5455	+ rootButton.setEnabled(true); // allComposites);
4737	5456	}
4738	5457
4739	5458	void refreshContents(boolean cp)
4740	5459	{
4741		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	5460	+ if (Globals.SHOWINFO)
	5461	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4742	5462	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4743	5463	{
4744	5464	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -4748,7 +5468,7 @@
4748	5468	Object3D child = (Object3D) group.selection.get(i);
4749	5469
4750	5470	objEditor.AddInfo(child, this, true);
4751		- System.err.println("info : " + child.GetPath());
	5471	+// System.err.println("info : " + child.GetPath());
4752	5472	}
4753	5473
4754	5474	objEditor.SetText(); // jan 2014
..	..	@@ -4942,10 +5662,10 @@
4942	5662
4943	5663	void paste(boolean expand)
4944	5664	{
4945		- if (Globals.SAVEONMAKE)
	5665	+ if (Globals.REPLACEONMAKE)
4946	5666	Save();
4947		- boolean keep = Globals.SAVEONMAKE;
4948		- Globals.SAVEONMAKE = false;
	5667	+ boolean keep = Globals.REPLACEONMAKE;
	5668	+ Globals.REPLACEONMAKE = false;
4949	5669	// if (GrafreeD.clipboard == null)
4950	5670	// return;
4951	5671	boolean first = true;
..	..	@@ -5005,7 +5725,7 @@
5005	5725	Grafreed.clipboard.get(0).parent = keepparent;
5006	5726	}
5007	5727
5008		- Globals.SAVEONMAKE = keep;
	5728	+ Globals.REPLACEONMAKE = keep;
5009	5729	ResetModel();
5010	5730	refreshContents();
5011	5731	}
..	..	@@ -5141,10 +5861,10 @@
5141	5861
5142	5862	void group(Object3D csg, boolean grab)
5143	5863	{
5144		- if (Globals.SAVEONMAKE)
	5864	+ if (Globals.REPLACEONMAKE)
5145	5865	Save();
5146		- boolean keep = Globals.SAVEONMAKE;
5147		- Globals.SAVEONMAKE = false;
	5866	+ boolean keep = Globals.REPLACEONMAKE;
	5867	+ Globals.REPLACEONMAKE = false;
5148	5868	if (//false) // why??
5149	5869	!group.selection.isEmpty())
5150	5870	{
..	..	@@ -5258,15 +5978,15 @@
5258	5978	//node.add(csg);
5259	5979	//makeSomething(node);
5260	5980	makeSomething(csg);
5261		- Globals.SAVEONMAKE = keep;
	5981	+ Globals.REPLACEONMAKE = keep;
5262	5982	}
5263	5983
5264	5984	void Ungroup(Object3D g)
5265	5985	{
5266		- if (Globals.SAVEONMAKE)
	5986	+ if (Globals.REPLACEONMAKE)
5267	5987	Save();
5268		- boolean keep = Globals.SAVEONMAKE;
5269		- Globals.SAVEONMAKE = false;
	5988	+ boolean keep = Globals.REPLACEONMAKE;
	5989	+ Globals.REPLACEONMAKE = false;
5270	5990	if (g instanceof HiddenObject)
5271	5991	{
5272	5992	HiddenObject h = (HiddenObject) g;
..	..	@@ -5283,7 +6003,7 @@
5283	6003	objEditor.makeSomething(g.get(i), false);
5284	6004	}
5285	6005	}
5286		- Globals.SAVEONMAKE = keep;
	6006	+ Globals.REPLACEONMAKE = keep;
5287	6007	}
5288	6008
5289	6009	void ungroup()
..	..	@@ -5574,7 +6294,6 @@
5574	6294
5575	6295	cButton restoreCameraButton;
5576	6296
5577		- cButton saveButton;
5578	6297	cButton oneStepButton;
5579	6298
5580	6299	cButton groupButton;
..	..	@@ -5583,6 +6302,22 @@
5583	6302	cButton switchButton;
5584	6303	cButton loopButton;
5585	6304	cButton textureButton;
	6305	+
	6306	+ cButton skybox1Button;
	6307	+ cButton skybox2Button;
	6308	+ cButton skybox3Button;
	6309	+ cButton skybox4Button;
	6310	+ cButton skybox5Button;
	6311	+ cButton skybox6Button;
	6312	+ cButton skybox7Button;
	6313	+
	6314	+ cButton skybox11Button;
	6315	+ cButton skybox12Button;
	6316	+ cButton skybox13Button;
	6317	+ cButton skybox14Button;
	6318	+ cButton skybox15Button;
	6319	+ cButton skybox16Button;
	6320	+ cButton skybox17Button;
5586	6321
5587	6322	cButton gridButton;
5588	6323	cButton boxButton;
..	..	@@ -5616,11 +6351,11 @@
5616	6351	private MenuItem lookAtItem;
5617	6352	private MenuItem lookFromItem;
5618	6353	private MenuItem switchViewItem;
5619		- private MenuItem cutItem;
	6354	+ private JMenuItem cutItem;
5620	6355	private MenuItem undoItem;
5621	6356	private MenuItem redoItem;
5622	6357	private JMenuItem duplicateItem;
5623		- private MenuItem cloneItem;
	6358	+ private JMenuItem cloneItem;
5624	6359	private MenuItem cloneSupportItem;
5625	6360	private MenuItem overwriteGeoItem;
5626	6361	private MenuItem overwriteMatItem;
..	..	@@ -5641,13 +6376,13 @@
5641	6376	private MenuItem cloneGeometriesItem;
5642	6377	private MenuItem shareGeometriesItem;
5643	6378	private MenuItem mergeGeometriesItem;
5644		- private MenuItem copyItem;
	6379	+ private JMenuItem copyItem;
5645	6380	private MenuItem pasteItem;
5646		- private MenuItem pasteIntoItem;
5647		- private MenuItem pasteLinkItem;
5648		- private MenuItem pasteCloneItem;
5649		- private MenuItem pasteExpandItem;
5650		- private MenuItem clearItem;
	6381	+ private JMenuItem pasteIntoItem;
	6382	+ private JMenuItem pasteLinkItem;
	6383	+ private JMenuItem pasteCloneItem;
	6384	+ private JMenuItem pasteExpandItem;
	6385	+ private JMenuItem deleteItem;
5651	6386	private MenuItem clearAllItem;
5652	6387	private MenuItem genUVItem;
5653	6388	private MenuItem genNormalsMESHItem;
..	..	@@ -5673,6 +6408,7 @@
5673	6408	private MenuItem clipMeshItem;
5674	6409	private MenuItem smoothMeshItem;
5675	6410	private MenuItem clearMaterialsItem;
	6411	+ private MenuItem clearVersionsItem;
5676	6412
5677	6413	private MenuItem liveleavesItem;
5678	6414	private MenuItem unliveleavesItem;
..	..	@@ -5696,13 +6432,16 @@
5696	6432	private MenuItem maxTexturesItem;
5697	6433	private MenuItem panoTexturesItem;
5698	6434
	6435	+ private MenuItem textureRatioRItem;
	6436	+ private MenuItem textureRatioGItem;
	6437	+ private MenuItem textureRatioBItem;
5699	6438	private MenuItem resetCentroidItem;
5700	6439	private MenuItem resetCentroidXZItem;
5701	6440	private MenuItem resetTransformItem;
5702	6441	private MenuItem transformGeometryItem;
5703	6442	private MenuItem transformChildrenItem;
5704	6443	private MenuItem hideItem;
5705		- private MenuItem grabItem;
	6444	+ private JMenuItem grabItem;
5706	6445	private MenuItem backItem;
5707	6446	private MenuItem frontItem;
5708	6447	private MenuItem cameraItem;
..	..	@@ -5715,7 +6454,7 @@
5715	6454	private MenuItem switchTransfoItem;
5716	6455	private MenuItem morphItem;
5717	6456	private MenuItem linkerItem;
5718		- private MenuItem ungroupItem;
	6457	+ private JMenuItem ungroupItem;
5719	6458	private MenuItem editItem;
5720	6459	private MenuItem openWindowItem;
5721	6460	private MenuItem editLeafItem;
..	..	@@ -5731,6 +6470,8 @@
5731	6470	private MenuItem attachBumpItem;
5732	6471	private MenuItem detachBumpItem;
5733	6472	private MenuItem pigmentBumpItem;
	6473	+ private MenuItem embedTexturesItem;
	6474	+ private MenuItem deEmbedTexturesItem;
5734	6475
5735	6476	private MenuItem particleItem;
5736	6477	private MenuItem ragdollItem;