~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	{
..	..	@@ -204,23 +584,23 @@
204	584	//zBufferItem.addActionListener(this);
205	585	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
206	586	//normalLensItem.addActionListener(this);
207		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
208		- revertCameraItem.addActionListener(this);
	587	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	588	+ restoreCameraItem.addActionListener(this);
209	589
210		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
211		- toggleFullScreenItem.addItemListener(this);
212		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
213		- cameraMenu.add("-");
	590	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	591	+// toggleFullScreenItem.addItemListener(this);
	592	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	593	+// cameraMenu.add("-");
	594	+//
	595	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	596	+// toggleTextureItem.addItemListener(this);
	597	+// toggleTextureItem.setState(CameraPane.textureon);
	598	+//
	599	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	600	+// toggleSwitchItem.addItemListener(this);
	601	+// toggleSwitchItem.setState(CameraPane.SWITCH);
214	602
215		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
216		- toggleTextureItem.addItemListener(this);
217		- toggleTextureItem.setState(CameraPane.textureon);
218		-
219		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
220		- toggleSwitchItem.addItemListener(this);
221		- toggleSwitchItem.setState(CameraPane.SWITCH);
222		-
223		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	603	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	604	toggleHandleItem.addItemListener(this);
225	605	toggleHandleItem.setState(CameraPane.HANDLES);
226	606
..	..	@@ -275,15 +655,13 @@
275	655	{
276	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
277	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
278		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
279		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	658	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
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		- //switchItem.addActionListener(this);
	664	+ //switchViewItem.addActionListener(this);
287	665	}
288	666
289	667	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,28 +705,35 @@
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"));
336	713	frontItem.addActionListener(this);
337		- compositeItem = menu.add(new MenuItem("Composite"));
338		- compositeItem.addActionListener(this);
	714	+// compositeItem = menu.add(new MenuItem("Composite"));
	715	+// compositeItem.addActionListener(this);
	716	+
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
339	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);
347	727
348		- menu.add("-");
	728	+ oe.jTree.popup.addSeparator();
349	729
350		- randomItem = menu.add(new MenuItem("Switch node"));
351		- randomItem.addActionListener(this);
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
	732	+
	733	+// menu.add("-");
	734	+//
	735	+// switchItem = menu.add(new MenuItem("Switch node"));
	736	+// switchItem.addActionListener(this);
352	737	if (Globals.ADVANCED)
353	738	{
354	739	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
..	..	@@ -365,13 +750,11 @@
365	750	frameselectorItem.addActionListener(this);
366	751	scriptNodeItem = menu.add(new MenuItem("Script Node"));
367	752	scriptNodeItem.addActionListener(this);
368		- cameraItem = menu.add(new MenuItem("Camera"));
369		- cameraItem.addActionListener(this);
370	753	}
371	754
372	755	oe.menuBar.add(menu = new Menu("Object"));
373		- textureItem = menu.add(new MenuItem("Texture"));
374		- textureItem.addActionListener(this);
	756	+// textureItem = menu.add(new MenuItem("Texture"));
	757	+// textureItem.addActionListener(this);
375	758	billboardItem = menu.add(new MenuItem("Billboard"));
376	759	billboardItem.addActionListener(this);
377	760	csgItem = menu.add(new MenuItem("CSG"));
..	..	@@ -382,24 +765,32 @@
382	765	shadowYItem.addActionListener(this);
383	766	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
384	767	shadowZItem.addActionListener(this);
	768	+
385	769	if (Globals.ADVANCED)
386	770	{
	771	+ attributeItem = menu.add(new MenuItem("Attribute"));
	772	+ attributeItem.addActionListener(this);
387	773	menu.add("-");
388	774	linkerItem = menu.add(new MenuItem("Linker"));
389	775	linkerItem.addActionListener(this);
390		- attributeItem = menu.add(new MenuItem("Attribute"));
391		- attributeItem.addActionListener(this);
392	776	templateItem = menu.add(new MenuItem("Template"));
393	777	templateItem.addActionListener(this);
394	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
395	779	pointflowItem.addActionListener(this);
396	780	}
397	781	menu.add("-");
	782	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	783	+ textureRatioRItem.addActionListener(this);
	784	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	785	+ textureRatioGItem.addActionListener(this);
	786	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	787	+ textureRatioBItem.addActionListener(this);
	788	+ menu.add("-");
398	789	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
399	790	resetTransformItem.addActionListener(this);
400	791	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
401	792	resetCentroidItem.addActionListener(this);
402		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	793	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
403	794	resetCentroidXZItem.addActionListener(this);
404	795	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
405	796	transformGeometryItem.addActionListener(this);
..	..	@@ -417,7 +808,7 @@
417	808	genNormalsMESHItem.addActionListener(this);
418	809	if (Globals.ADVANCED)
419	810	{
420		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	811	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
421	812	genNormalsMINEItem.addActionListener(this);
422	813	}
423	814	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -451,6 +842,8 @@
451	842	}
452	843
453	844	oe.menuBar.add(menu = new Menu("Attributes"));
	845	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	846	+ clearVersionsItem.addActionListener(this);
454	847	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
455	848	clearMaterialsItem.addActionListener(this);
456	849	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -473,9 +866,9 @@
473	866	hideleavesItem.addActionListener(this);
474	867	showleavesItem = menu.add(new MenuItem("Show Leaves"));
475	868	showleavesItem.addActionListener(this);
476		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	869	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
477	870	markleavesItem.addActionListener(this);
478		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	871	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
479	872	unmarkleavesItem.addActionListener(this);
480	873	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
481	874	rewindleavesItem.addActionListener(this);
..	..	@@ -510,10 +903,15 @@
510	903	attachBumpItem.addActionListener(this);
511	904	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
512	905	pigmentBumpItem.addActionListener(this);
	906	+ //embedTexturesItem
513	907	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
514	908	detachPigmentItem.addActionListener(this);
515	909	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
516	910	detachBumpItem.addActionListener(this);
	911	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	912	+ embedTexturesItem.addActionListener(this);
	913	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	914	+ deEmbedTexturesItem.addActionListener(this);
517	915	menu.add("-");
518	916	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
519	917	sortbysizeItem.addActionListener(this);
..	..	@@ -524,6 +922,9 @@
524	922	shareGeometriesItem.addActionListener(this);
525	923	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
526	924	mergeGeometriesItem.addActionListener(this);
	925	+ menu.add("-");
	926	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	927	+ editLeafItem.addActionListener(this);
527	928	if (Globals.ADVANCED)
528	929	{
529	930	// Pretty much the same as duplicate and clone.
..	..	@@ -540,6 +941,80 @@
540	941	buildToolsMenu(menu);
541	942	}
542	943
	944	+ JTabbedPane resourcecontainer;
	945	+ cGridBag currenttab;
	946	+ //boolean added; // patch for jar
	947	+
	948	+ int totalcount = 0;
	949	+
	950	+ int tabcount = 0;
	951	+ int colcount = 0;
	952	+ int rowcount = 0;
	953	+ int texturecount = 0;
	954	+
	955	+ int columns = 5;
	956	+ int rows = 7;
	957	+
	958	+ public void ResourceCallBack(String[] path)
	959	+ {
	960	+// for (int i = 0; i < path.length; i++)
	961	+// System.out.print(path[i] + "/");
	962	+// System.out.println();
	963	+
	964	+ if (//rowcount == 0 \|\|
	965	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	966	+ {
	967	+ currenttab = new cGridBag();
	968	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	969	+ currenttab.setName(tabname);
	970	+ //added = false;
	971	+ resourcecontainer.add(currenttab);
	972	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	973	+ rowcount = 1;
	974	+ colcount = 0;
	975	+ texturecount = 0;
	976	+ }
	977	+
	978	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	979	+ {
	980	+ //if (!added)
	981	+ {
	982	+ //added = true;
	983	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	984	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	985	+ }
	986	+
	987	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	988	+ totalcount++;
	989	+
	990	+ if (++colcount >= columns)
	991	+ {
	992	+ colcount = 0;
	993	+ currenttab.Return();
	994	+
	995	+ if (rowcount++ >= rows)
	996	+ {
	997	+ rowcount = 0;
	998	+ }
	999	+ }
	1000	+ }
	1001	+ else
	1002	+ {
	1003	+// if (!path[path.length-1].equals("icons"))
	1004	+// resourcecontainer.Return();
	1005	+ }
	1006	+ }
	1007	+
	1008	+ void CreateTexturePanel(cGridBag container)
	1009	+ {
	1010	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1011	+ container.add(resourcecontainer);
	1012	+
	1013	+ Grafreed.ParseResources("textures", this);
	1014	+
	1015	+ // 935. System.out.println("Total = " + totalcount);
	1016	+ }
	1017	+
543	1018	void SetupUI2(ObjEditor oe)
544	1019	{
545	1020	// June 2019
..	..	@@ -557,11 +1032,6 @@
557	1032	//new Exception().printStackTrace();
558	1033
559	1034	oe.radioPanel = new JPanel(new GridBagLayout());
560		- oe.aConstraints.weightx = 1;
561		- oe.aConstraints.weighty = 0;
562		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
563		- oe.aConstraints.gridwidth = 100;
564		- oe.aConstraints.gridheight = 1;
565	1035	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
566	1036
567	1037	oe.buttonGroup = new ButtonGroup();
..	..	@@ -582,168 +1052,266 @@
582	1052	oe.radioPanel.add(dummyButton);
583	1053	oe.buttonGroup.add(dummyButton);
584	1054	*/
	1055	+ cGridBag versionManagerPanel = new cGridBag();
	1056	+
	1057	+ versionManagerPanel.preferredHeight = 4;
	1058	+
585	1059	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
586	1060
587	1061	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	1062	//minButton.setToolTipText("Minimize window");
589	1063	//minButton.addActionListener(this);
590	1064
591		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- maxButton.setToolTipText("Maximize window");
593		- maxButton.addActionListener(this);
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+// maxButton.setToolTipText("Maximize window");
	1069	+// maxButton.addActionListener(this);
	1070	+ }
594	1071
595		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ cButton gcButton;
	1073	+
	1074	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+// gcButton.setToolTipText("Garbage collect");
	1076	+// gcButton.addActionListener(new ActionListener()
	1077	+// {
	1078	+// public void actionPerformed(ActionEvent e)
	1079	+// {
	1080	+// System.gc();
	1081	+// }
	1082	+// });
	1083	+
	1084	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ collapseButton.setToolTipText("Collapse toolbar");
	1086	+ collapseButton.addActionListener(this);
	1087	+
	1088	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1090	+ maximize3DButton.addActionListener(this);
	1091	+
	1092	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ twoButton.setToolTipText("Show 3D view only");
	1094	+ twoButton.addActionListener(this);
	1095	+ this.fullscreenLayout = twoButton;
	1096	+
	1097	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ threeButton.setToolTipText("Show controls and 3D view");
	1099	+ threeButton.addActionListener(this);
	1100	+ if (Globals.ADVANCED)
	1101	+ {
	1102	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ sixButton.setToolTipText("Show 3D view and controls");
	1104	+ sixButton.addActionListener(this);
	1105	+ }
	1106	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+// sevenButton.setToolTipText("3-column layout");
	1108	+// sevenButton.addActionListener(this);
	1109	+ //
	1110	+
	1111	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
596	1112	fullButton.setToolTipText("Full-screen window");
597	1113	fullButton.addActionListener(this);
598	1114
599		- oe.toolboxPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- undoButton.setToolTipText("Undo changes");
601		- undoButton.addActionListener(this);
602		-
603		- oe.toolboxPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
604		- redoButton.setToolTipText("Redo changes");
605		- redoButton.addActionListener(this);
606		-
607		- oe.toolboxPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608		- saveButton.setToolTipText("Save changes");
609		- saveButton.addActionListener(this);
610		-
611		- oe.toolboxPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
612		- liveCB.setToolTipText("Enable animation");
613		- liveCB.addItemListener(this);
	1115	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1116	+ screenfitButton.setToolTipText("Screen fit");
	1117	+ screenfitButton.addActionListener(this);
614	1118
615		- oe.toolboxPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1120	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1121	+ restoreCameraButton.addActionListener(this);
	1122	+
	1123	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ saveVersionButton.setToolTipText("Duplicate current version");
	1125	+ saveVersionButton.addActionListener(this);
	1126	+
	1127	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1128	+ deleteVersionButton.setToolTipText("Delete current version");
	1129	+ deleteVersionButton.addActionListener(this);
	1130	+ deleteVersionButton.setEnabled(false);
	1131	+
	1132	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1133	+ previousVersionButton.setToolTipText("Previous version");
	1134	+ previousVersionButton.addActionListener(this);
	1135	+ previousVersionButton.setEnabled(false);
	1136	+
	1137	+ cGridBag updown = new cGridBag().setVertical(true);
	1138	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1139	+ restoreButton.setToolTipText("Undo (restore current version)");
	1140	+ restoreButton.addActionListener(this);
	1141	+ restoreButton.setEnabled(false);
	1142	+
	1143	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ replaceButton.setToolTipText("Save (replace current version)");
	1145	+ replaceButton.addActionListener(this);
	1146	+ replaceButton.setEnabled(false);
	1147	+
	1148	+ versionManagerPanel.add(updown);
	1149	+
	1150	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1151	+ nextVersionButton.setToolTipText("Next version");
	1152	+ nextVersionButton.addActionListener(this);
	1153	+ nextVersionButton.setEnabled(false);
	1154	+
	1155	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
616	1156	oneStepButton.setToolTipText("Animate one step forward");
617	1157	oneStepButton.addActionListener(this);
618	1158
619		- oe.toolboxPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1159	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1160	+ liveCB.setToolTipText("Enable animation");
	1161	+ liveCB.addItemListener(this);
	1162	+
	1163	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
620	1164	fastCB.setToolTipText("Fast mode");
621	1165	fastCB.addItemListener(this);
622	1166
623		- oe.toolboxPanel.Return();
	1167	+ //oe.toolboxPanel.Return();
624	1168
625		- oe.toolboxPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
626		- trackCB.setToolTipText("Enable tracking");
627		- trackCB.addItemListener(this);
628		-
629		- oe.toolboxPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630		- screenfitButton.setToolTipText("Screen fit");
631		- screenfitButton.addActionListener(this);
	1169	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1170	+// trackCB.setToolTipText("Enable tracking");
	1171	+// trackCB.addItemListener(this);
632	1172
633	1173	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
634	1174	// screenfitpointButton.addActionListener(this);
635	1175
636	1176	if (Globals.ADVANCED)
637	1177	{
638		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1178	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
639	1179	snapobjectButton.addActionListener(this);
640	1180	snapobjectButton.setToolTipText("Snap Object");
	1181	+
	1182	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ fourButton.addActionListener(this);
	1184	+ fourButton.setToolTipText("Show control panel only");
641	1185	}
642	1186
643		- oe.toolboxPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644		- flashSelectionButton.setToolTipText("Highlight selection");
645		- flashSelectionButton.addActionListener(this);
646		-
647	1187	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
648	1188
649		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- twoButton.setToolTipText("Show center view only");
651		- twoButton.addActionListener(this);
652		- this.fullscreenLayout = twoButton;
653		-
654		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
655		- fourButton.addActionListener(this);
656		- fourButton.setToolTipText("Show left panel only");
657		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- sixButton.setToolTipText("2-column layout left");
659		- sixButton.addActionListener(this);
660		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
661		- threeButton.setToolTipText("2-column layout right");
662		- threeButton.addActionListener(this);
663		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
664		- sevenButton.setToolTipText("3-column layout");
665		- sevenButton.addActionListener(this);
666		- //
667	1189
668		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
669		- rootButton.setToolTipText("Edit selection in new tab");
	1190	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ rootButton.setToolTipText("Open selection in new tab");
670	1192	rootButton.addActionListener(this);
671	1193
672		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
673	1195	closeButton.setToolTipText("Close tab");
674	1196	closeButton.addActionListener(this);
675	1197	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
676	1198	//clearButton.addActionListener(this);
677	1199
	1200	+ cGridBag row1 = new cGridBag();
	1201	+
678	1202	// INSERT
679		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
680		- gridButton.setToolTipText("Create grid");
	1203	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ gridButton.setToolTipText("Create ground");
681	1205	gridButton.addActionListener(this);
682	1206
683		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
684	1208	boxButton.setToolTipText("Create box");
685	1209	boxButton.addActionListener(this);
686	1210
687		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688		- sphereButton.setToolTipText("Create sphere");
689		- sphereButton.addActionListener(this);
690		-
691		- oe.toolboxPanel.Return();
692		-
693		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694		- coneButton.setToolTipText("Create cone");
695		- coneButton.addActionListener(this);
696		-
697		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
698		- torusButton.setToolTipText("Create torus");
699		- torusButton.addActionListener(this);
700		-
701		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
702	1212	superButton.setToolTipText("Create superellipsoid");
703	1213	superButton.addActionListener(this);
704	1214
705		- if (Globals.ADVANCED)
	1215	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ sphereButton.setToolTipText("Create sphere");
	1217	+ sphereButton.addActionListener(this);
	1218	+
	1219	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ coneButton.setToolTipText("Create cone");
	1221	+ coneButton.addActionListener(this);
	1222	+
	1223	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ torusButton.setToolTipText("Create torus");
	1225	+ torusButton.addActionListener(this);
	1226	+
	1227	+ if (false) //Globals.ADVANCED)
706	1228	{
707		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
708	1230	kleinButton.setToolTipText("Create Klein bottle");
709	1231	kleinButton.addActionListener(this);
710	1232	}
711	1233
712		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
713	1235	particlesButton.setToolTipText("Create particle system");
714	1236	particlesButton.addActionListener(this);
715	1237
716		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1238	+ oe.toolboxPanel.add(row1);
	1239	+
	1240	+ cGridBag row2 = new cGridBag();
	1241	+
	1242	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1243	+ groupButton.setToolTipText("Create group");
	1244	+ groupButton.addActionListener(this);
	1245	+
	1246	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1247	+ compositeButton.setToolTipText("Create composite");
	1248	+ compositeButton.addActionListener(this);
	1249	+
	1250	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1251	+ switchButton.setToolTipText("Create item switcher");
	1252	+ switchButton.addActionListener(this);
	1253	+
	1254	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1255	+ loopButton.setToolTipText("Create loop");
	1256	+ loopButton.addActionListener(this);
	1257	+
	1258	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1259	+ textureButton.setToolTipText("Create texture");
	1260	+ textureButton.addActionListener(this);
	1261	+
	1262	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
717	1263	overlayButton.setToolTipText("Create overlay");
718	1264	overlayButton.addActionListener(this);
719	1265
720		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
721	1267	lightButton.setToolTipText("Create light");
722	1268	lightButton.addActionListener(this);
723	1269
	1270	+ oe.toolboxPanel.add(row2);
	1271	+
	1272	+ cGridBag textures = new cGridBag();
	1273	+
	1274	+ CreateTexturePanel(textures);
	1275	+
	1276	+ int tabCount = resourcecontainer.getTabCount();
	1277	+
	1278	+ if (tabCount > 0)
	1279	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1280	+
	1281	+ oe.toolboxPanel.add(textures);
	1282	+
	1283	+ textures.preferredHeight = 100;
	1284	+
	1285	+ CreateSkyboxPanel(oe.skyboxPanel);
	1286	+
724	1287	// EDIT panel
725		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
726		- editButton.setToolTipText("Edit selection");
	1288	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1289	+ editButton.setToolTipText("Pin selection controls");
727	1290	editButton.addActionListener(this);
728	1291
729		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730		- uneditButton.setToolTipText("Unedit selection");
	1292	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1293	+ uneditButton.setToolTipText("Unpin and remove selection controls");
731	1294	uneditButton.addActionListener(this);
732	1295
733	1296	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
734		- allParamsButton.setToolTipText("Edit all params");
	1297	+ allParamsButton.setToolTipText("Show all controls");
735	1298	allParamsButton.addActionListener(this);
736	1299
737		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738		- clearPanelButton.setToolTipText("Clear edit panel");
	1300	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1301	+ clearPanelButton.setToolTipText("Clear all controls");
739	1302	clearPanelButton.addActionListener(this);
740	1303
741		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
742		- unselectButton.setToolTipText("Unselect");
743		- unselectButton.addActionListener(this);
	1304	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1305	+ //unselectButton.setToolTipText("Unselect");
	1306	+ //unselectButton.addActionListener(this);
744	1307
	1308	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1309	+ flashSelectionButton.setToolTipText("Highlight selection");
	1310	+ flashSelectionButton.addActionListener(this);
	1311	+
745	1312	editCommandsPanel.preferredHeight = 1;
746	1313
	1314	+ SetPinStates(false);
747	1315	// oe.treePanel.add(commandsPanel);
748	1316	// oe.treePanel.Return();
749	1317
..	..	@@ -760,6 +1328,8 @@
760	1328
761	1329	cGridBag jSPPanel = new cGridBag();
762	1330
	1331	+ jSPPanel.preferredHeight = 20;
	1332	+
763	1333	JScrollPane jSP;
764	1334	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
765	1335	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -768,26 +1338,14 @@
768	1338	oe.treePanel.add(jSPPanel);
769	1339	oe.treePanel.Return();
770	1340
771		- cGridBag copyOptionsPanel = new cGridBag();
772		-
773		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
774		- colorCB.setToolTipText("Copy color when dropped");
775		- colorCB.addItemListener(this);
776		-
777		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
778		- materialCB.setToolTipText("Copy material when dropped");
779		- materialCB.addItemListener(this);
780		-
781		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
782		- textureCB.setToolTipText("Copy texture when dropped");
783		- textureCB.addItemListener(this);
784		-
785		- copyOptionsPanel.preferredHeight = 1;
786		- oe.treePanel.add(copyOptionsPanel);
	1341	+ oe.treePanel.add(versionManagerPanel);
787	1342	oe.treePanel.Return();
	1343	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1344	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1345	+ versionSliderPane.preferredHeight = 3;
788	1346
789		-// mainPanel.setDividerLocation(0.5); //1.0);
790		-// mainPanel.setResizeWeight(0.5);
	1347	+// mainPanel.setDividerLocation(0.1); //1.0);
	1348	+ mainPanel.setResizeWeight(0.4);
791	1349
792	1350	//jList.addListSelectionListener(this);
793	1351	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -795,7 +1353,7 @@
795	1353	//jTree.setEditable(true);
796	1354	oe.jTree.setDragEnabled(true);
797	1355	//jTree.setPreferredSize(new Dimension(10,10));
798		- jSP.setPreferredSize(new Dimension(100,200));
	1356	+ //jSP.setPreferredSize(new Dimension(100,200));
799	1357
800	1358	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
801	1359
..	..	@@ -807,29 +1365,49 @@
807	1365	dgr.addDragGestureListener(this);
808	1366	}catch(Exception e) {}
809	1367	*/
810		- radio.layout = sevenButton;
	1368	+ radio.layout = threeButton; // sixButton;
811	1369	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
812	1370	}
813	1371
814	1372	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
815	1373	{
	1374	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1375	+ colorCB.setToolTipText("Copy color when dropped");
	1376	+ colorCB.addItemListener(this);
	1377	+
	1378	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1379	+ materialCB.setToolTipText("Copy material when dropped");
	1380	+ materialCB.addItemListener(this);
	1381	+
	1382	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1383	+ textureCB.setToolTipText("Copy texture when dropped");
	1384	+ textureCB.addItemListener(this);
	1385	+
	1386	+ panel.Return();
	1387	+
816	1388	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
817	1389	boxCB.setToolTipText("Display bounding boxes");
818	1390	boxCB.addItemListener(this);
819	1391
820	1392	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
821		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1393	+ zoomBoxCB.setToolTipText("Display only for wheel");
822	1394	zoomBoxCB.addItemListener(this);
823	1395
824	1396	if (true) // Globals.ADVANCED)
825	1397	{
826		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
827		- supportCB.setToolTipText("Enable rigging");
828		- supportCB.addItemListener(this);
	1398	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1399	+// supportCB.setToolTipText("Enable rigging");
	1400	+// supportCB.addItemListener(this);
	1401	+
	1402	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1403	+ freezeCB.setToolTipText("Fast moving camera");
	1404	+ freezeCB.addItemListener(this);
829	1405
830	1406	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
831	1407	// localCB.addItemListener(this);
832	1408
	1409	+ panel.Return();
	1410	+
833	1411	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
834	1412	crowdCB.setToolTipText("Used for crowds");
835	1413	crowdCB.addItemListener(this);
..	..	@@ -838,14 +1416,19 @@
838	1416	smoothCB.setToolTipText("Snapping delay");
839	1417	smoothCB.addItemListener(this);
840	1418
841		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
842		- slowCB.setToolTipText("Smooth interpolation");
843		- slowCB.addItemListener(this);
	1419	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1420	+// slowCB.setToolTipText("Smooth interpolation");
	1421	+// slowCB.addItemListener(this);
	1422	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1423	+ minshaderCB.setToolTipText("Minimal fast shader");
	1424	+ minshaderCB.addItemListener(this);
844	1425
845	1426	// constraints.gridy += 1;
846	1427	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
847	1428	// speakerMocapCB.addItemListener(this);
848	1429
	1430	+ panel.Return();
	1431	+
849	1432	if (false)
850	1433	{
851	1434	// handled in scripts
..	..	@@ -860,24 +1443,39 @@
860	1443	//constraints.gridy += 1;
861	1444	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
862	1445	smoothfocusCB.addItemListener(this);
	1446	+ panel.Return();
863	1447	}
864	1448
865	1449	//constraints.gridx += 1;
866	1450	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
867	1451	// debugCB.addItemListener(this);
868	1452
	1453	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1454	+ trackCB.setToolTipText("Enable tracking target");
	1455	+ trackCB.addItemListener(this);
	1456	+
869	1457	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
870		- oeilCB.setToolTipText("Move camera when tracking target");
	1458	+ oeilCB.setToolTipText("Move camera when tracking");
871	1459	oeilCB.addItemListener(this);
872	1460
873	1461	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
874		- shadowCB.setToolTipText("Compute shadows when live");
	1462	+ shadowCB.setToolTipText("When live compute shadows");
875	1463	shadowCB.addItemListener(this);
876	1464
877		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
878		- autosaveCB.setToolTipText("Auto-save on structure change");
879		- autosaveCB.addItemListener(this);
	1465	+ panel.Return();
	1466	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1467	+ toggleTextureCB.setToolTipText("Load textures");
	1468	+ toggleTextureCB.addItemListener(this);
	1469	+
	1470	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1471	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1472	+ toggleSwitchCB.addItemListener(this);
	1473	+
	1474	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1475	+ autokeepCB.setToolTipText("On structure change");
	1476	+ autokeepCB.addItemListener(this);
880	1477
	1478	+ panel.Return();
881	1479	if (Globals.ADVANCED)
882	1480	{
883	1481	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..	..	@@ -888,18 +1486,31 @@
888	1486	}
889	1487
890	1488	cGridBag fill = new cGridBag();
891		-
892	1489	fill.preferredHeight = 200;
	1490	+ cGridBag fill2 = new cGridBag();
	1491	+ fill2.preferredHeight = 200;
	1492	+ cGridBag fill3 = new cGridBag();
	1493	+ fill3.preferredHeight = 200;
893	1494
894	1495	panel.add(fill);
	1496	+ panel.add(fill2);
	1497	+ panel.add(fill3);
895	1498
896	1499	}
897	1500
898	1501	void EditObject(Object3D obj)
899	1502	{
	1503	+ //assert(obj instanceof Composite);
	1504	+
	1505	+// if (obj.versionlist == null)
	1506	+// {
	1507	+// obj.versionlist = new Object3D[100];
	1508	+// obj.versionindex = -1;
	1509	+// }
	1510	+
900	1511	cRadio radioButton = new cRadio(obj.name);
901	1512
902		- // Patch to avoid bug with transparency.
	1513	+ // June 2019. Patch to avoid bug with transparency.
903	1514	radioButton.hadMaterial = obj.material != null;
904	1515	if (!radioButton.hadMaterial)
905	1516	{
..	..	@@ -907,7 +1518,7 @@
907	1518	}
908	1519
909	1520	radioButton.SetObject(obj);
910		- radioButton.layout = sevenButton;
	1521	+ radioButton.layout = threeButton; // sixButton;
911	1522	radioButton.SetCamera(cameraView.renderCamera, false);
912	1523	radioButton.addActionListener(this);
913	1524	radioPanel.add(radioButton);
..	..	@@ -921,6 +1532,7 @@
921	1532
922	1533	oe.SetupViews();
923	1534
	1535	+ if (Globals.DEBUG)
924	1536	System.out.println("SetupViews");
925	1537	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
926	1538	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -932,11 +1544,15 @@
932	1544	cCheckBox localCB;
933	1545	cCheckBox crowdCB;
934	1546	cCheckBox smoothCB;
	1547	+ cCheckBox minshaderCB;
	1548	+
935	1549	cToggleButton fastCB;
936	1550	cCheckBox slowCB;
937	1551	cCheckBox boxCB;
938	1552	cCheckBox zoomBoxCB;
939		- cToggleButton trackCB;
	1553	+ cCheckBox freezeCB;
	1554	+ //cToggleButton trackCB;
	1555	+ cCheckBox trackCB;
940	1556	cCheckBox smoothfocusCB;
941	1557	// JCheckBox speakerMocapCB;
942	1558	cCheckBox speakerCameraCB;
..	..	@@ -945,7 +1561,7 @@
945	1561
946	1562	cCheckBox oeilCB;
947	1563	cCheckBox shadowCB;
948		- cCheckBox autosaveCB;
	1564	+ cCheckBox autokeepCB;
949	1565	cCheckBox lookAtCB;
950	1566
951	1567	// static int COLOR = 1;
..	..	@@ -1001,6 +1617,12 @@
1001	1617	cameraView.ToggleInertia();
1002	1618	cameraView.repaint();
1003	1619	}
	1620	+ else if(e.getSource() == minshaderCB)
	1621	+ {
	1622	+ Globals.MINSHADER ^= true;
	1623	+ cameraView.programInitialized = false;
	1624	+ cameraView.repaint();
	1625	+ }
1004	1626	else if(e.getSource() == localCB)
1005	1627	{
1006	1628	cameraView.ToggleLocal();
..	..	@@ -1053,9 +1675,13 @@
1053	1675	{
1054	1676	Globals.COMPUTESHADOWWHENLIVE ^= true;
1055	1677	}
1056		- else if(e.getSource() == autosaveCB)
	1678	+ else if(e.getSource() == freezeCB)
1057	1679	{
1058		- Globals.SAVEONMAKE ^= true;
	1680	+ Globals.FREEZEONMOVE ^= true;
	1681	+ }
	1682	+ else if(e.getSource() == autokeepCB)
	1683	+ {
	1684	+ Globals.REPLACEONMAKE ^= true;
1059	1685	}
1060	1686	else if(e.getSource() == lookAtCB)
1061	1687	{
..	..	@@ -1137,8 +1763,6 @@
1137	1763	}
1138	1764	}
1139	1765
1140		- String string = (String) object;
1141		-
1142	1766	System.out.println("Transfer = " + object + "; drop : " + target);
1143	1767	// if( object instanceof java.io.File[])
1144	1768	// {
..	..	@@ -1146,6 +1770,8 @@
1146	1770	// objEditor.DropFile((java.io.File[]) object, true);
1147	1771	// return;
1148	1772	// }
	1773	+
	1774	+ String string = object.toString();
1149	1775
1150	1776	// File path for Mac and Windows
1151	1777	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1191,13 +1817,23 @@
1191	1817
1192	1818	assert target == objEditor.jTree;
1193	1819	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1820	+ Object3D destinationLeaf;
1194	1821	try {
1195		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1822	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1196	1823	} catch (Exception e) {
1197	1824	System.out.println("destinationPath : " + destinationPath);
1198	1825	return;
1199	1826	}
1200	1827
	1828	+ for (int i=group.selection.size(); --i>=0;)
	1829	+ {
	1830	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1831	+
	1832	+ // Cannot move into itself
	1833	+ if (child == destinationLeaf)
	1834	+ return;
	1835	+ }
	1836	+
1201	1837	// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1202	1838	// {
1203	1839	loadClipboard(true);
..	..	@@ -1263,7 +1899,12 @@
1263	1899	TreePath path;
1264	1900
1265	1901	public TransferableTreePath(TreePath tp) {
1266		- path = tp;
	1902	+ Object[] objs = new Object[tp.getPathCount()];
	1903	+ for (int i=0; i<objs.length; i++)
	1904	+ {
	1905	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1906	+ }
	1907	+ path = new TreePath(objs);
1267	1908	}
1268	1909
1269	1910	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1312,22 +1953,30 @@
1312	1953	{
1313	1954	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1314	1955	//heightFieldItem.addActionListener(this);
1315		- gridItem = menu.add(new MenuItem("Grid"));
1316		- gridItem.addActionListener(this);
1317		- rectoidItem = menu.add(new MenuItem("Box"));
1318		- rectoidItem.addActionListener(this);
1319		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1320		- ellipsoidItem.addActionListener(this);
1321		- coneItem = menu.add(new MenuItem("Cone"));
1322		- coneItem.addActionListener(this);
1323		- torusItem = menu.add(new MenuItem("Torus"));
1324		- torusItem.addActionListener(this);
1325		- superItem = menu.add(new MenuItem("Superellipsoid"));
1326		- superItem.addActionListener(this);
	1956	+// gridItem = menu.add(new MenuItem("Grid"));
	1957	+// gridItem.addActionListener(this);
	1958	+// rectoidItem = menu.add(new MenuItem("Box"));
	1959	+// rectoidItem.addActionListener(this);
	1960	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1961	+// ellipsoidItem.addActionListener(this);
	1962	+// coneItem = menu.add(new MenuItem("Cone"));
	1963	+// coneItem.addActionListener(this);
	1964	+// torusItem = menu.add(new MenuItem("Torus"));
	1965	+// torusItem.addActionListener(this);
	1966	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1967	+// superItem.addActionListener(this);
	1968	+
	1969	+ cameraItem = menu.add(new MenuItem("Camera"));
	1970	+ cameraItem.addActionListener(this);
	1971	+
	1972	+ if (!Globals.ADVANCED)
	1973	+ {
1327	1974	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1328	1975	kleinItem.addActionListener(this);
1329		- particleItem = menu.add(new MenuItem("Particle system"));
1330		- particleItem.addActionListener(this);
	1976	+ }
	1977	+
	1978	+// particleItem = menu.add(new MenuItem("Particle system"));
	1979	+// particleItem.addActionListener(this);
1331	1980	if (Globals.ADVANCED)
1332	1981	{
1333	1982	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1353,15 +2002,15 @@
1353	2002	}
1354	2003	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1355	2004	bezierItem.addActionListener(this);
1356		- overlayItem = menu.add(new MenuItem("Overlay"));
1357		- overlayItem.addActionListener(this);
1358		- lightItem = menu.add(new MenuItem("Light"));
1359		- lightItem.addActionListener(this);
	2005	+// overlayItem = menu.add(new MenuItem("Overlay"));
	2006	+// overlayItem.addActionListener(this);
	2007	+// lightItem = menu.add(new MenuItem("Light"));
	2008	+// lightItem.addActionListener(this);
1360	2009	menu.add("-");
1361	2010	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1362	2011	//superLoopItem.addActionListener(this);
1363		- loopItem = menu.add(new MenuItem("Loop"));
1364		- loopItem.addActionListener(this);
	2012	+// loopItem = menu.add(new MenuItem("Loop"));
	2013	+// loopItem.addActionListener(this);
1365	2014	doubleItem = menu.add(new MenuItem("Fork"));
1366	2015	doubleItem.addActionListener(this);
1367	2016	if (Globals.ADVANCED)
..	..	@@ -1377,6 +2026,9 @@
1377	2026	animationItem.addItemListener(this);
1378	2027	animationItem.setState(Globals.ANIMATION);
1379	2028
	2029	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2030	+ archiveItem.addActionListener(this);
	2031	+
1380	2032	menu.add("-");
1381	2033	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1382	2034	parseverticesItem.addActionListener(this);
..	..	@@ -1389,6 +2041,8 @@
1389	2041	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1390	2042	reduce34MorphItem.addActionListener(this);
1391	2043	menu.add("-");
	2044	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2045	+ memoryItem.addActionListener(this);
1392	2046	menu.add(computeAOItem = new MenuItem("Compute AO"));
1393	2047	computeAOItem.addActionListener(this);
1394	2048
..	..	@@ -1397,8 +2051,6 @@
1397	2051	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1398	2052	mirrorItem.addActionListener(this);
1399	2053	menu.add("-");
1400		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1401		- memoryItem.addActionListener(this);
1402	2054	menu.add(analyzeItem = new MenuItem("Analyze"));
1403	2055	analyzeItem.addActionListener(this);
1404	2056	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1484,24 +2136,24 @@
1484	2136	switch(axis)
1485	2137	{
1486	2138	case 0 :
1487		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1488		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1489		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1490		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2139	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2140	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2141	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2142	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1491	2143	norm = cVector.X;
1492	2144	break;
1493	2145	case 1 :
1494		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1495		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1496		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1497		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2146	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2147	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2148	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2149	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1498	2150	norm = cVector.Y;
1499	2151	break;
1500	2152	case 2 :
1501		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1502		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1503		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1504		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2153	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2154	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2155	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2156	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1505	2157	norm = cVector.Z;
1506	2158	break;
1507	2159	}
..	..	@@ -1542,10 +2194,38 @@
1542	2194	shadow.material = new cMaterial(obj.material);
1543	2195	shadow.material.diffuse = 0.0001f;
1544	2196	shadow.material.specular = 0.0001f;
1545		- //shadow.projectedVertices[1].x = 300;
	2197	+ shadow.material.opacity = 0.75f;
	2198	+
	2199	+ AllocProjectedVertices(shadow);
	2200	+
	2201	+ shadow.projectedVertices[1].x = 300;
1546	2202
1547	2203	makeSomething(shadow);
1548	2204	}
	2205	+
	2206	+ private void ClearUnpinned()
	2207	+ {
	2208	+ //for (Object3D obj : listUI)
	2209	+ for (int i=listUI.size(); --i>=0;)
	2210	+ {
	2211	+ Object3D obj = listUI.elementAt(i);
	2212	+ if (!obj.pinned)
	2213	+ {
	2214	+ obj.CloseUI();
	2215	+ listUI.remove(i);
	2216	+ }
	2217	+ }
	2218	+ }
	2219	+
	2220	+ private void EditElement(Object3D elem, boolean newWindow)
	2221	+ {
	2222	+ // if (!(elem instanceof Composite))
	2223	+ // newWindow = false;
	2224	+ listUI.add(elem);
	2225	+ elem.openEditWindow(this, newWindow); //, false);
	2226	+ System.out.println("edit : " + elem);
	2227	+ elem.editWindow.refreshContents(true); // ? new
	2228	+ }
1549	2229
1550	2230	/**
1551	2231	* applyExample
..	..	@@ -1790,7 +2470,7 @@
1790	2470	{
1791	2471	ScreenFit();
1792	2472	} else
1793		- if (source == switchItem)
	2473	+ if (source == switchViewItem)
1794	2474	{
1795	2475	cVector v1 = new cVector();
1796	2476	cVector v2 = new cVector();
..	..	@@ -1974,6 +2654,23 @@
1974	2654	{
1975	2655	makeSomething(new Light());
1976	2656	} else
	2657	+// if (source == skybox1Button \|\|
	2658	+// source == skybox2Button \|\|
	2659	+// source == skybox3Button \|\|
	2660	+// source == skybox4Button \|\|
	2661	+// source == skybox5Button \|\|
	2662	+// source == skybox6Button \|\|
	2663	+// source == skybox7Button \|\|
	2664	+// source == skybox11Button \|\|
	2665	+// source == skybox12Button \|\|
	2666	+// source == skybox13Button \|\|
	2667	+// source == skybox14Button \|\|
	2668	+// source == skybox15Button \|\|
	2669	+// source == skybox16Button \|\|
	2670	+// source == skybox17Button)
	2671	+// {
	2672	+// ChangeSkybox(source);
	2673	+// } else
1977	2674	if (source == csgItem)
1978	2675	{
1979	2676	group(new CSG());
..	..	@@ -2020,30 +2717,38 @@
2020	2717
2021	2718	group(g);
2022	2719	} else
2023		- if (source == loopItem)
	2720	+ if (source == loopItem \|\| source == loopButton)
2024	2721	{
	2722	+ if (!group.selection.isEmpty())
	2723	+ {
2025	2724	Composite csg = new GroupLeaf();
2026	2725	csg.count = 5;
2027		- group(csg);
2028		- Composite child = new cGroup();
	2726	+ Composite child = new cGroup("Branch");
2029	2727	csg.addChild(child);
2030	2728	child.addChild(csg);
	2729	+ group(csg);
	2730	+ }
2031	2731	} else
2032	2732	if (source == doubleItem)
2033	2733	{
2034		- Composite csg = new GroupLeaf();
	2734	+ if (!group.selection.isEmpty())
	2735	+ {
	2736	+ Composite csg = new GroupLeaf("Fork");
2035	2737	csg.count = 5;
	2738	+ Composite child = new cGroup("Branch A");
	2739	+ csg.addChild(child);
	2740	+ child.addChild(csg);
	2741	+ child = new cGroup("Branch B");
	2742	+ csg.addChild(child);
	2743	+ child.addChild(csg);
2036	2744	group(csg);
2037		- Composite child = new cGroup();
2038		- csg.addChild(child);
2039		- child.addChild(csg);
2040		- child = new cGroup();
2041		- csg.addChild(child);
2042		- child.addChild(csg);
	2745	+ }
2043	2746	} else
2044	2747	if (source == tripleItem)
2045	2748	{
2046		- Composite csg = new GroupLeaf();
	2749	+ if (!group.selection.isEmpty())
	2750	+ {
	2751	+ Composite csg = new GroupLeaf("Trident");
2047	2752	csg.count = 4;
2048	2753	group(csg);
2049	2754	Composite child = new cGroup();
..	..	@@ -2055,11 +2760,12 @@
2055	2760	child = new cGroup();
2056	2761	csg.addChild(child);
2057	2762	child.addChild(csg);
	2763	+ }
2058	2764	} else
2059	2765	if (source == computeAOItem)
2060	2766	{
2061	2767	Globals.drawMode = CameraPane.OCCLUSION;
2062		- Globals.theRenderer.repaint();
	2768	+ cameraView.repaint();
2063	2769	} else
2064	2770	if (source == recompileItem)
2065	2771	{
..	..	@@ -2074,7 +2780,7 @@
2074	2780	if (source == invariantsItem)
2075	2781	{
2076	2782	System.out.println("Invariants:");
2077		- Grafreed.grafreeD.universe.invariants();
	2783	+ Grafreed.grafreed.universe.invariants();
2078	2784	} else
2079	2785	if (source == memoryItem)
2080	2786	{
..	..	@@ -2105,17 +2811,52 @@
2105	2811	{
2106	2812	ToggleFullScreen();
2107	2813	} else
2108		- if (source == undoButton)
	2814	+ if (source == collapseButton)
2109	2815	{
2110		- Undo();
	2816	+ this.expandedLayout = radio.layout;
	2817	+ CollapseToolbar();
2111	2818	} else
2112		- if (source == redoButton)
	2819	+ if (source == maximize3DButton)
2113	2820	{
2114		- Redo();
	2821	+ this.expandedLayout = radio.layout;
	2822	+ radio.layout = twoButton;
	2823	+ Show3DView();
	2824	+ CollapseToolbar();
2115	2825	} else
2116		- if (source == saveButton)
	2826	+ if (source == previousVersionButton)
2117	2827	{
2118		- Save();
	2828	+ // Go to previous version
	2829	+ //if (!Undo())
	2830	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2831	+ PreviousVersion();
	2832	+ } else
	2833	+ if (source == restoreButton)
	2834	+ {
	2835	+ // Restore current version
	2836	+ Restore();
	2837	+ //restoreButton.setEnabled(false);
	2838	+ } else
	2839	+ if (source == replaceButton)
	2840	+ {
	2841	+ // Overwrite current version
	2842	+ Replace();
	2843	+ //replaceButton.setEnabled(false);
	2844	+ } else
	2845	+ if (source == nextVersionButton)
	2846	+ {
	2847	+ // Go to next version
	2848	+ NextVersion();
	2849	+ } else
	2850	+ if (source == saveVersionButton)
	2851	+ {
	2852	+ // Save a new version
	2853	+ if (!Save(true))
	2854	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2855	+ } else
	2856	+ if (source == deleteVersionButton)
	2857	+ {
	2858	+ // Delete a new version
	2859	+ DeleteVersion();
2119	2860	} else
2120	2861	if (source == oneStepButton)
2121	2862	{
..	..	@@ -2124,17 +2865,14 @@
2124	2865	} else
2125	2866	if (source == screenfitButton)
2126	2867	{
2127		- //Reload(lastConverter, lastFilename, true);
2128	2868	ScreenFit();
2129	2869	} else
2130	2870	if (source == screenfitpointButton)
2131	2871	{
2132		- //Reload(lastConverter, lastFilename, true);
2133	2872	ScreenFitPoint();
2134	2873	} else
2135	2874	if (source == snapobjectButton)
2136	2875	{
2137		- //Reload(lastConverter, lastFilename, true);
2138	2876	SnapObject();
2139	2877	} else
2140	2878	// if (event.getSource() == recompileButton)
..	..	@@ -2173,11 +2911,11 @@
2173	2911	} else
2174	2912	if (source == undoItem)
2175	2913	{
2176		- Undo();
	2914	+ PreviousVersion();
2177	2915	} else
2178	2916	if (source == redoItem)
2179	2917	{
2180		- Redo();
	2918	+ NextVersion();
2181	2919	} else
2182	2920	if (source == duplicateItem)
2183	2921	{
..	..	@@ -2498,7 +3236,7 @@
2498	3236	{
2499	3237	StepAll();
2500	3238	} else
2501		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3239	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2502	3240	{
2503	3241	//int indices[] = jList.getSelectedIndices();
2504	3242	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2510,9 +3248,9 @@
2510	3248	{
2511	3249	ClearSelection(true);
2512	3250	} else
2513		- if (source == grabItem)
	3251	+ if (source == grabItem \|\| source == groupButton)
2514	3252	{
2515		- group(new cGroup(), true);
	3253	+ group(new cGroup(), false); // true);
2516	3254	} else
2517	3255	if (source == hideItem)
2518	3256	{
..	..	@@ -2530,11 +3268,11 @@
2530	3268	{
2531	3269	makeSomething(new Camera());
2532	3270	} else
2533		- if (source == compositeItem)
	3271	+ if (source == compositeItem \|\| source == compositeButton)
2534	3272	{
2535	3273	group(new Composite());
2536	3274	} else
2537		- if (source == randomItem)
	3275	+ if (source == switchItem \|\| source == switchButton)
2538	3276	{
2539	3277	RandomNode random = new RandomNode();
2540	3278	group(random);
..	..	@@ -2636,7 +3374,7 @@
2636	3374	{
2637	3375	group(new cLinker());
2638	3376	} else
2639		- if (source == textureItem)
	3377	+ if (source == textureItem \|\| source == textureButton)
2640	3378	{
2641	3379	group(new TextureNode());
2642	3380	} else
..	..	@@ -2658,15 +3396,40 @@
2658	3396	} else
2659	3397	if (source == ungroupItem \|\| source == ungroupButton)
2660	3398	{
2661		- //ungroup();
	3399	+ boolean canUngroup = true;
	3400	+
2662	3401	for (int i=0; i<group.selection.size(); i++)
2663	3402	{
2664		- Ungroup(group.selection.get(i));
	3403	+ Object3D selectedItem = group.selection.get(i);
	3404	+
	3405	+ if (selectedItem.Size() == 0)
	3406	+ {
	3407	+ // Cannot ungroup leaves
	3408	+ canUngroup = false;
	3409	+ break;
	3410	+ }
	3411	+
	3412	+ if (selectedItem == group)
	3413	+ {
	3414	+ // Cannot ungroup root
	3415	+ canUngroup = false;
	3416	+ break;
	3417	+ }
2665	3418	}
2666	3419
2667		- ClearSelection(false);
2668		-
2669		- refreshContents();
	3420	+ if (canUngroup)
	3421	+ {
	3422	+ for (int i=0; i<group.selection.size(); i++)
	3423	+ {
	3424	+ Object3D selectedItem = group.selection.get(i);
	3425	+
	3426	+ Ungroup(selectedItem);
	3427	+ }
	3428	+
	3429	+ ClearSelection(false);
	3430	+
	3431	+ refreshContents();
	3432	+ }
2670	3433	} else
2671	3434	if (source == genUVItem)
2672	3435	{
..	..	@@ -2711,6 +3474,10 @@
2711	3474	if (source == clearMaterialsItem)
2712	3475	{
2713	3476	ClearMaterials();
	3477	+ } else
	3478	+ if (source == clearVersionsItem)
	3479	+ {
	3480	+ ClearVersions();
2714	3481	} else
2715	3482	if (source == liveleavesItem)
2716	3483	{
..	..	@@ -2852,6 +3619,18 @@
2852	3619	{
2853	3620	TransformChildren();
2854	3621	} else
	3622	+ if (source == textureRatioRItem)
	3623	+ {
	3624	+ TextureRatio(0);
	3625	+ } else
	3626	+ if (source == textureRatioGItem)
	3627	+ {
	3628	+ TextureRatio(1);
	3629	+ } else
	3630	+ if (source == textureRatioBItem)
	3631	+ {
	3632	+ TextureRatio(2);
	3633	+ } else
2855	3634	if (source == resetTransformItem)
2856	3635	{
2857	3636	ResetTransform();
..	..	@@ -2967,7 +3746,7 @@
2967	3746	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2968	3747	{
2969	3748	obj = (Object3D)e.nextElement();
2970		- obj.SetBumpTexture(null);
	3749	+ obj.ResetBumpTexture();
2971	3750	}
2972	3751
2973	3752	refreshContents();
..	..	@@ -2981,6 +3760,31 @@
2981	3760	obj.SetBumpTexture(obj.GetPigmentTexture());
2982	3761	}
2983	3762
	3763	+ refreshContents();
	3764	+ } else
	3765	+ if (source == embedTexturesItem)
	3766	+ {
	3767	+ Object3D obj;
	3768	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3769	+ {
	3770	+ obj = (Object3D)e.nextElement();
	3771	+ obj.EmbedTextures(true);
	3772	+ }
	3773	+
	3774	+ refreshContents();
	3775	+ } else
	3776	+ if (source == deEmbedTexturesItem)
	3777	+ {
	3778	+ Object3D obj;
	3779	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3780	+ {
	3781	+ obj = (Object3D)e.nextElement();
	3782	+ obj.EmbedTextures(false);
	3783	+ }
	3784	+
	3785	+ CameraPane.texturepigment.clear();
	3786	+ CameraPane.texturebump.clear();
	3787	+
2984	3788	refreshContents();
2985	3789	} else
2986	3790	if (source == flashSelectionButton)
..	..	@@ -2998,38 +3802,7 @@
2998	3802	if (CameraPane.FULLSCREEN)
2999	3803	fullscreenLayout = radio.layout;
3000	3804
3001		- // bug
3002		- //gridPanel.setDividerLocation(1.0);
3003		- //bigPanel.setDividerLocation(0.0);
3004		-// bigThree.remove(scenePanel);
3005		-// bigThree.remove(centralPanel);
3006		-// bigThree.remove(XYZPanel);
3007		-// aWindowConstraints.gridx = 0;
3008		-// aWindowConstraints.gridy = 0;
3009		-// aWindowConstraints.gridwidth = 1;
3010		-// // aConstraints.gridheight = 3;
3011		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3012		-// aWindowConstraints.weightx = 0;
3013		-// aWindowConstraints.weighty = 1;
3014		-// //bigThree.add(jtp, aWindowConstraints);
3015		-// aWindowConstraints.weightx = 1;
3016		-// aWindowConstraints.gridwidth = 3;
3017		-// // aConstraints.gridheight = 3;
3018		-// aWindowConstraints.gridx = 1;
3019		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3020		-// bigThree.add(centralPanel, aWindowConstraints);
3021		-// aWindowConstraints.weightx = 0;
3022		-// aWindowConstraints.gridx = 4;
3023		-// aWindowConstraints.gridwidth = 1;
3024		-// // aConstraints.gridheight = 3;
3025		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3026		-// //bigThree.add(XYZPanel, aWindowConstraints);
3027		-// scenePanel.setVisible(false);
3028		-// centralPanel.setVisible(true);
3029		-// XYZPanel.setVisible(false);
3030		- bigThree.ClearUI();
3031		- bigThree.add(centralPanel);
3032		- bigThree.FlushUI();
	3805	+ Show3DView();
3033	3806
3034	3807	cameraView.requestFocusInWindow();
3035	3808
..	..	@@ -3084,8 +3857,8 @@
3084	3857	// centralPanel.setVisible(true);
3085	3858	// XYZPanel.setVisible(true);
3086	3859	bigThree.ClearUI();
	3860	+ bigThree.add(scenePanel);
3087	3861	bigThree.add(centralPanel);
3088		- bigThree.add(XYZPanel);
3089	3862	bigThree.FlushUI();
3090	3863
3091	3864	cameraView.requestFocusInWindow();
..	..	@@ -3165,8 +3938,8 @@
3165	3938	// centralPanel.setVisible(true);
3166	3939	// XYZPanel.setVisible(false);
3167	3940	bigThree.ClearUI();
3168		- bigThree.add(scenePanel);
3169	3941	bigThree.add(centralPanel);
	3942	+ bigThree.add(scenePanel);
3170	3943	bigThree.FlushUI();
3171	3944
3172	3945	cameraView.requestFocusInWindow();
..	..	@@ -3215,6 +3988,7 @@
3215	3988	} else
3216	3989	if (source == rootButton)
3217	3990	{
	3991	+ Replace();
3218	3992	Object3D obj;
3219	3993	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3220	3994	{
..	..	@@ -3229,6 +4003,9 @@
3229	4003	if (source == closeButton)
3230	4004	{
3231	4005	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4006	+ if (copy.versionlist != null)
	4007	+ Replace();
	4008	+
3232	4009	cRadio ab;
3233	4010	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3234	4011	{
..	..	@@ -3258,6 +4035,12 @@
3258	4035	} else
3259	4036	if (source == editItem \|\| source == editButton)
3260	4037	{
	4038	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4039	+ {
	4040	+ Object3D child = (Object3D)e.nextElement();
	4041	+ child.pinned = true;
	4042	+ }
	4043	+
3261	4044	EditSelection(false);
3262	4045	} else
3263	4046	if (source == uneditButton)
..	..	@@ -3266,9 +4049,10 @@
3266	4049	{
3267	4050	Object3D child = (Object3D)e.nextElement();
3268	4051	if(child.editWindow != null)
3269		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4052	+ child.pinned = false;
3270	4053	child.CloseUI();
3271	4054	listUI.remove(child);
	4055	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3272	4056
3273	4057	//child.editWindow = null; // ???????????
3274	4058	}
..	..	@@ -3283,16 +4067,18 @@
3283	4067	//copy.ClearUI();
3284	4068	for (Object3D obj : listUI)
3285	4069	{
	4070	+ obj.pinned = false;
3286	4071	obj.CloseUI();
3287	4072	}
3288	4073	listUI.clear();
	4074	+ SetPinStates(group.selection.size() > 0);
3289	4075	refreshContents(true);
3290	4076	} else
3291	4077	if (source == allParamsButton)
3292	4078	{
3293	4079	assert(copy == group);
3294	4080
3295		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4081	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3296	4082
3297	4083	for (Object3D obj : listUI)
3298	4084	{
..	..	@@ -3318,6 +4104,9 @@
3318	4104	} else
3319	4105	if(source instanceof cRadio)
3320	4106	{
	4107	+ if (copy.versionlist != null)
	4108	+ Replace();
	4109	+
3321	4110	group.parent = keepparent;
3322	4111	group.attributes = 0;
3323	4112	//group.editWindow = null;
..	..	@@ -3341,6 +4130,7 @@
3341	4130	}
3342	4131
3343	4132	copy = group;
	4133	+
3344	4134	//Globals.theRenderer.object = group;
3345	4135	if(!useclient)
3346	4136	{
..	..	@@ -3367,6 +4157,39 @@
3367	4157	currentLayout = sevenButton;
3368	4158	*/
3369	4159	radio.layout.doClick();
	4160	+
	4161	+ //assert(copy instanceof Composite);
	4162	+
	4163	+ if (copy.versionlist == null)
	4164	+ {
	4165	+ copy.versionindex = -1;
	4166	+
	4167	+ // Cannot work with loops
	4168	+ // To fix this issue, we first mark all nodes above the root,
	4169	+ // and check if any of these nodes are reachable below the root.
	4170	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4171	+
	4172	+ if (copy instanceof Composite && copy.versionlist == null && !copy.HasTags())
	4173	+ {
	4174	+ copy.versionlist = new Object3D[100];
	4175	+
	4176	+ //Save(true);
	4177	+ }
	4178	+ else
	4179	+ copy.versionindex = -2;
	4180	+
	4181	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4182	+ }
	4183	+
	4184	+ SetVersionStates();
	4185	+
	4186	+ ClearUnpinned();
	4187	+
	4188	+ //Grafreed.Assert(group != null);
	4189	+ //Grafreed.Assert(group.selection != null);
	4190	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4191	+ if (group.selection == null \|\| group.selection.size() == 1)
	4192	+ EditSelection(false);
3370	4193	keepparent = group.parent;
3371	4194	// PARENT = NULL or not???
3372	4195	//group.parent = null; // ROOT
..	..	@@ -3378,11 +4201,13 @@
3378	4201	} else if (event.getSource() == editCameraItem)
3379	4202	{
3380	4203	cameraView.ProtectCamera();
	4204	+ cameraView.requestFocusInWindow();
3381	4205	cameraView.repaint();
3382	4206	return;
3383		- } else if (event.getSource() == revertCameraItem)
	4207	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3384	4208	{
3385	4209	cameraView.RevertCamera();
	4210	+ cameraView.requestFocusInWindow();
3386	4211	cameraView.repaint();
3387	4212	return;
3388	4213	// } else if (event.getSource() == textureButton)
..	..	@@ -3471,6 +4296,18 @@
3471	4296	refreshContents();
3472	4297	}
3473	4298
	4299	+ void TextureRatio(int axis)
	4300	+ {
	4301	+ Object3D obj;
	4302	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4303	+ {
	4304	+ obj = (Object3D)e.nextElement();
	4305	+ obj.TextureRatio(axis);
	4306	+ }
	4307	+
	4308	+ refreshContents();
	4309	+ }
	4310	+
3474	4311	void ResetTransform()
3475	4312	{
3476	4313	ResetTransform(-1);
..	..	@@ -3486,42 +4323,8 @@
3486	4323	if (obj.toParent == null)
3487	4324	continue;
3488	4325
3489		- if (mask == -1)
3490		- {
3491		- if (obj instanceof Camera) // jan 2014
3492		- {
3493		- LA.matIdentity(obj.toParent);
3494		- LA.matIdentity(obj.fromParent);
3495		- }
3496		- else
3497		- {
3498		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3499		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3500		- }
3501		- TouchTransform(obj);
3502		- continue;
3503		- }
3504		- if ((mask&2) != 0) // Scale
3505		- {
3506		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3507		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3508		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3509		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3510		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3511		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3512		- }
3513		- if ((mask&4) != 0) // Rotation
3514		- {
3515		- // ?
3516		- }
3517		- if ((mask&1) != 0) // Translation
3518		- {
3519		- if (obj.toParent != null)
3520		- {
3521		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3522		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3523		- }
3524		- }
	4326	+ obj.ResetTransform(mask);
	4327	+
3525	4328	if (obj.parent == null)
3526	4329	{
3527	4330	System.out.println("NULL PARENT!");
..	..	@@ -3959,7 +4762,7 @@
3959	4762
3960	4763	try
3961	4764	{
3962		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4765	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3963	4766	}
3964	4767	catch (Exception e)
3965	4768	{
..	..	@@ -4029,6 +4832,12 @@
4029	4832	for (int i=0; i<group.selection.size(); i++)
4030	4833	{
4031	4834	Object3D obj = group.selection.get(i);
	4835	+
	4836	+ if (obj.toParent == null)
	4837	+ {
	4838	+ obj.toParent = LA.newMatrix();
	4839	+ obj.fromParent = LA.newMatrix();
	4840	+ }
4032	4841
4033	4842	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4034	4843	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
..	..	@@ -4321,6 +5130,12 @@
4321	5130	refreshContents();
4322	5131	}
4323	5132
	5133	+ void ClearVersions()
	5134	+ {
	5135	+ group.selection.ClearVersions();
	5136	+ refreshContents();
	5137	+ }
	5138	+
4324	5139	void FlipV(boolean flip)
4325	5140	{
4326	5141	group.selection.FlipV(flip);
..	..	@@ -4434,12 +5249,14 @@
4434	5249	// }
4435	5250	// }
4436	5251
4437		- static boolean allparams = true;
4438		-
4439		- static Vector<Object3D> listUI = new Vector<Object3D>();
4440		-
4441	5252	void EditSelection(boolean newWindow)
4442	5253	{
	5254	+ if (group.selection == null)
	5255	+ {
	5256	+ EditElement(group, newWindow); // ? new
	5257	+ return;
	5258	+ }
	5259	+
4443	5260	// aConstraints.gridy = 0;
4444	5261	for (int i=0; i<group.selection.size(); i++)
4445	5262	{
..	..	@@ -4450,12 +5267,7 @@
4450	5267	Object3D elem = (Object3D)group.selection.elementAt(i);
4451	5268	if(elem != group \|\| !newWindow)
4452	5269	{
4453		- // if (!(elem instanceof Composite))
4454		- // newWindow = false;
4455		- listUI.add(elem);
4456		- elem.openEditWindow(this, newWindow); //, false);
4457		- System.out.println("edit : " + elem);
4458		- elem.editWindow.refreshContents(true); // ? new
	5270	+ EditElement(elem, newWindow); // ? new
4459	5271	}
4460	5272	}
4461	5273	}
..	..	@@ -4518,9 +5330,7 @@
4518	5330
4519	5331	freezemodel = false;
4520	5332	}
4521		-
4522		- boolean flashIt = true;
4523		-
	5333	+
4524	5334	public void valueChanged(TreeSelectionEvent e)
4525	5335	//public boolean handleEvent(Event event)
4526	5336	{
..	..	@@ -4530,7 +5340,8 @@
4530	5340	//new Exception().printStackTrace();
4531	5341
4532	5342	freezemodel = true;
4533		-
	5343	+ ClearUnpinned();
	5344	+
4534	5345	/**/
4535	5346	//switch (event.id)
4536	5347	{
..	..	@@ -4563,7 +5374,7 @@
4563	5374	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4564	5375	// a camera
4565	5376	{
4566		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5377	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4567	5378	{
4568	5379	CameraPane.camerachangeframe = 0; // don't refuse it
4569	5380	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4572,6 +5383,13 @@
4572	5383	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4573	5384	}
4574	5385
	5386	+ if (tps != null && tps.length == 1)
	5387	+ {
	5388	+ EditSelection(false);
	5389	+ }
	5390	+
	5391	+ SetPinStates(tps != null && tps.length > 0);
	5392	+
4575	5393	refreshContents();
4576	5394	//return true;
4577	5395	}
..	..	@@ -4581,9 +5399,36 @@
4581	5399	freezemodel = false;
4582	5400	}
4583	5401
	5402	+ void SetPinStates(boolean enabled)
	5403	+ {
	5404	+ editButton.setEnabled(enabled);
	5405	+ uneditButton.setEnabled(enabled);
	5406	+ //unselectButton.setEnabled(enabled);
	5407	+ flashSelectionButton.setEnabled(enabled);
	5408	+
	5409	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5410	+
	5411	+ boolean allComposites = true;
	5412	+
	5413	+ if (group.selection != null)
	5414	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5415	+ {
	5416	+ Object next = e.nextElement();
	5417	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5418	+ {
	5419	+ allComposites = false;
	5420	+ break;
	5421	+ }
	5422	+ }
	5423	+
	5424	+ rootButton.setEnabled(true); // allComposites);
	5425	+ }
	5426	+
4584	5427	void refreshContents(boolean cp)
4585	5428	{
4586		- if (!Globals.MOUSEDRAGGED)
	5429	+ if (Globals.ADVANCED)
	5430	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5431	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4587	5432	{
4588	5433	objEditor.ClearInfo(); // .GetMaterial());
4589	5434
..	..	@@ -4592,7 +5437,7 @@
4592	5437	Object3D child = (Object3D) group.selection.get(i);
4593	5438
4594	5439	objEditor.AddInfo(child, this, true);
4595		- System.err.println("info : " + child.GetPath());
	5440	+// System.err.println("info : " + child.GetPath());
4596	5441	}
4597	5442
4598	5443	objEditor.SetText(); // jan 2014
..	..	@@ -4682,8 +5527,8 @@
4682	5527
4683	5528	if (cut)
4684	5529	{
4685		- if (Globals.SAVEONMAKE)
4686		- Save();
	5530	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5531	+// Save();
4687	5532	//int indices[] = jList.getSelectedIndices();
4688	5533	//for (int i = indices.length - 1; i >= 0; i--)
4689	5534	//jList.remove(indices[i]);
..	..	@@ -4786,6 +5631,10 @@
4786	5631
4787	5632	void paste(boolean expand)
4788	5633	{
	5634	+ if (Globals.REPLACEONMAKE)
	5635	+ Save();
	5636	+ boolean keep = Globals.REPLACEONMAKE;
	5637	+ Globals.REPLACEONMAKE = false;
4789	5638	// if (GrafreeD.clipboard == null)
4790	5639	// return;
4791	5640	boolean first = true;
..	..	@@ -4845,6 +5694,7 @@
4845	5694	Grafreed.clipboard.get(0).parent = keepparent;
4846	5695	}
4847	5696
	5697	+ Globals.REPLACEONMAKE = keep;
4848	5698	ResetModel();
4849	5699	refreshContents();
4850	5700	}
..	..	@@ -4980,6 +5830,10 @@
4980	5830
4981	5831	void group(Object3D csg, boolean grab)
4982	5832	{
	5833	+ if (Globals.REPLACEONMAKE)
	5834	+ Save();
	5835	+ boolean keep = Globals.REPLACEONMAKE;
	5836	+ Globals.REPLACEONMAKE = false;
4983	5837	if (//false) // why??
4984	5838	!group.selection.isEmpty())
4985	5839	{
..	..	@@ -5093,10 +5947,15 @@
5093	5947	//node.add(csg);
5094	5948	//makeSomething(node);
5095	5949	makeSomething(csg);
	5950	+ Globals.REPLACEONMAKE = keep;
5096	5951	}
5097	5952
5098	5953	void Ungroup(Object3D g)
5099	5954	{
	5955	+ if (Globals.REPLACEONMAKE)
	5956	+ Save();
	5957	+ boolean keep = Globals.REPLACEONMAKE;
	5958	+ Globals.REPLACEONMAKE = false;
5100	5959	if (g instanceof HiddenObject)
5101	5960	{
5102	5961	HiddenObject h = (HiddenObject) g;
..	..	@@ -5113,6 +5972,7 @@
5113	5972	objEditor.makeSomething(g.get(i), false);
5114	5973	}
5115	5974	}
	5975	+ Globals.REPLACEONMAKE = keep;
5116	5976	}
5117	5977
5118	5978	void ungroup()
..	..	@@ -5401,17 +6261,32 @@
5401	6261	cButton clearpanelButton;
5402	6262	cButton unselectButton;
5403	6263
5404		- cButton minButton;
5405		- cButton maxButton;
5406		- cButton fullButton;
5407		- cButton undoButton;
5408		- cButton redoButton;
5409		- cButton saveButton;
	6264	+ cButton restoreCameraButton;
	6265	+
5410	6266	cButton oneStepButton;
5411	6267
5412	6268	cButton groupButton;
5413	6269	cButton ungroupButton;
5414	6270	cButton compositeButton;
	6271	+ cButton switchButton;
	6272	+ cButton loopButton;
	6273	+ cButton textureButton;
	6274	+
	6275	+ cButton skybox1Button;
	6276	+ cButton skybox2Button;
	6277	+ cButton skybox3Button;
	6278	+ cButton skybox4Button;
	6279	+ cButton skybox5Button;
	6280	+ cButton skybox6Button;
	6281	+ cButton skybox7Button;
	6282	+
	6283	+ cButton skybox11Button;
	6284	+ cButton skybox12Button;
	6285	+ cButton skybox13Button;
	6286	+ cButton skybox14Button;
	6287	+ cButton skybox15Button;
	6288	+ cButton skybox16Button;
	6289	+ cButton skybox17Button;
5415	6290
5416	6291	cButton gridButton;
5417	6292	cButton boxButton;
..	..	@@ -5444,12 +6319,12 @@
5444	6319	//JTree jTree;
5445	6320	private MenuItem lookAtItem;
5446	6321	private MenuItem lookFromItem;
5447		- private MenuItem switchItem;
5448		- private MenuItem cutItem;
	6322	+ private MenuItem switchViewItem;
	6323	+ private JMenuItem cutItem;
5449	6324	private MenuItem undoItem;
5450	6325	private MenuItem redoItem;
5451	6326	private JMenuItem duplicateItem;
5452		- private MenuItem cloneItem;
	6327	+ private JMenuItem cloneItem;
5453	6328	private MenuItem cloneSupportItem;
5454	6329	private MenuItem overwriteGeoItem;
5455	6330	private MenuItem overwriteMatItem;
..	..	@@ -5470,13 +6345,13 @@
5470	6345	private MenuItem cloneGeometriesItem;
5471	6346	private MenuItem shareGeometriesItem;
5472	6347	private MenuItem mergeGeometriesItem;
5473		- private MenuItem copyItem;
	6348	+ private JMenuItem copyItem;
5474	6349	private MenuItem pasteItem;
5475		- private MenuItem pasteIntoItem;
5476		- private MenuItem pasteLinkItem;
5477		- private MenuItem pasteCloneItem;
5478		- private MenuItem pasteExpandItem;
5479		- private MenuItem clearItem;
	6350	+ private JMenuItem pasteIntoItem;
	6351	+ private JMenuItem pasteLinkItem;
	6352	+ private JMenuItem pasteCloneItem;
	6353	+ private JMenuItem pasteExpandItem;
	6354	+ private JMenuItem deleteItem;
5480	6355	private MenuItem clearAllItem;
5481	6356	private MenuItem genUVItem;
5482	6357	private MenuItem genNormalsMESHItem;
..	..	@@ -5502,6 +6377,7 @@
5502	6377	private MenuItem clipMeshItem;
5503	6378	private MenuItem smoothMeshItem;
5504	6379	private MenuItem clearMaterialsItem;
	6380	+ private MenuItem clearVersionsItem;
5505	6381
5506	6382	private MenuItem liveleavesItem;
5507	6383	private MenuItem unliveleavesItem;
..	..	@@ -5525,18 +6401,21 @@
5525	6401	private MenuItem maxTexturesItem;
5526	6402	private MenuItem panoTexturesItem;
5527	6403
	6404	+ private MenuItem textureRatioRItem;
	6405	+ private MenuItem textureRatioGItem;
	6406	+ private MenuItem textureRatioBItem;
5528	6407	private MenuItem resetCentroidItem;
5529	6408	private MenuItem resetCentroidXZItem;
5530	6409	private MenuItem resetTransformItem;
5531	6410	private MenuItem transformGeometryItem;
5532	6411	private MenuItem transformChildrenItem;
5533	6412	private MenuItem hideItem;
5534		- private MenuItem grabItem;
	6413	+ private JMenuItem grabItem;
5535	6414	private MenuItem backItem;
5536	6415	private MenuItem frontItem;
5537	6416	private MenuItem cameraItem;
5538	6417	private MenuItem compositeItem;
5539		- private MenuItem randomItem;
	6418	+ private MenuItem switchItem;
5540	6419	private MenuItem physicsItem;
5541	6420	private MenuItem frameselectorItem;
5542	6421	private MenuItem scriptNodeItem;
..	..	@@ -5544,7 +6423,7 @@
5544	6423	private MenuItem switchTransfoItem;
5545	6424	private MenuItem morphItem;
5546	6425	private MenuItem linkerItem;
5547		- private MenuItem ungroupItem;
	6426	+ private JMenuItem ungroupItem;
5548	6427	private MenuItem editItem;
5549	6428	private MenuItem openWindowItem;
5550	6429	private MenuItem editLeafItem;
..	..	@@ -5560,6 +6439,8 @@
5560	6439	private MenuItem attachBumpItem;
5561	6440	private MenuItem detachBumpItem;
5562	6441	private MenuItem pigmentBumpItem;
	6442	+ private MenuItem embedTexturesItem;
	6443	+ private MenuItem deEmbedTexturesItem;
5563	6444
5564	6445	private MenuItem particleItem;
5565	6446	private MenuItem ragdollItem;
..	..	@@ -5610,5 +6491,5 @@
5610	6491
5611	6492	Menu cameraMenu;
5612	6493	MenuItem editCameraItem;
5613		- MenuItem revertCameraItem;
	6494	+ MenuItem restoreCameraItem;
5614	6495	}