~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", !Grafreed.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, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane();
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,14 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ if (copy.versionlist == null)
	419	+ {
	420	+ copy.versionlist = new Object3D[100];
	421	+ copy.versionindex = -1;
	422	+
	423	+ Save(true);
	424	+ }
	425	+
63	426	if(ui)
64	427	SetupUI(objEditor);
65	428	}
..	..	@@ -80,10 +443,22 @@
80	443	SetupViews(objEditor);
81	444
82	445	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	446	+
	447	+ if (copy.versionlist == null)
	448	+ {
	449	+ copy.versionlist = new Object3D[100];
	450	+ copy.versionindex = -1;
	451	+
	452	+ Save(true);
	453	+ }
83	454	}
84	455
85	456	void CloneSelection(boolean supports)
86	457	{
	458	+ if (Globals.REPLACEONMAKE)
	459	+ Save();
	460	+ boolean keep = Globals.REPLACEONMAKE;
	461	+ Globals.REPLACEONMAKE = false;
87	462	// Object3D keep = GrafreeD.clipboard;
88	463	//Object3D obj;
89	464	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +469,7 @@
94	469
95	470	makeSomething(clone, i==group.selection.size()-1);
96	471	}
	472	+ Globals.REPLACEONMAKE = keep;
97	473	}
98	474
99	475	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +526,8 @@
150	526
151	527	void SetupMenu2(GroupEditor oe)
152	528	{
	529	+ oe.jTree = new cTree();
	530	+
153	531	Menu menu;
154	532	oe.menuBar.add(menu = new Menu("Edit"));
155	533	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,36 +538,40 @@
160	538	// redoItem = menu.add(new MenuItem("Redo"));
161	539	// redoItem.addActionListener(this);
162	540	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	541	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	542	duplicateItem.addActionListener(this);
165		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
166	545	cloneItem.addActionListener(this);
167		- if (Globals.ADVANCED)
	546	+ //if (Globals.ADVANCED)
168	547	{
169	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
170	549	cloneSupportItem.addActionListener(this);
171	550	}
	551	+ oe.jTree.popup.addSeparator();
172	552	menu.add("-");
173		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
174	554	cutItem.addActionListener(this);
175		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
176	556	copyItem.addActionListener(this);
177	557	pasteItem = menu.add(new MenuItem("Paste"));
178	558	pasteItem.addActionListener(this);
179		- menu.add("-");
180	559
181		- menu.add("-");
182		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	560	+ oe.jTree.popup.addSeparator();
	561	+ //menu.add("-");
	562	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
183	563	pasteIntoItem.addActionListener(this);
184		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
185	565	pasteLinkItem.addActionListener(this);
186		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
187	567	pasteCloneItem.addActionListener(this);
188		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
189	569	// pasteExpandItem.addActionListener(this);
190		- menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
	572	+
	573	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	574	+ deleteItem.addActionListener(this);
193	575
194	576	if (Globals.ADVANCED)
195	577	{
..	..	@@ -203,23 +585,23 @@
203	585	//zBufferItem.addActionListener(this);
204	586	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	587	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	588	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	589	+ restoreCameraItem.addActionListener(this);
208	590
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
	591	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	592	+// toggleFullScreenItem.addItemListener(this);
	593	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	594	+// cameraMenu.add("-");
	595	+//
	596	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	597	+// toggleTextureItem.addItemListener(this);
	598	+// toggleTextureItem.setState(CameraPane.textureon);
	599	+//
	600	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	601	+// toggleSwitchItem.addItemListener(this);
	602	+// toggleSwitchItem.setState(CameraPane.SWITCH);
213	603
214		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
215		- toggleTextureItem.addItemListener(this);
216		- toggleTextureItem.setState(CameraPane.textureon);
217		-
218		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
219		- toggleSwitchItem.addItemListener(this);
220		- toggleSwitchItem.setState(CameraPane.SWITCH);
221		-
222		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	604	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	605	toggleHandleItem.addItemListener(this);
224	606	toggleHandleItem.setState(CameraPane.HANDLES);
225	607
..	..	@@ -246,7 +628,7 @@
246	628
247	629	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	630	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	631	+ toggleDebugItem.setState(Globals.DEBUG);
250	632
251	633	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	634	toggleFrustumItem.addItemListener(this);
..	..	@@ -274,15 +656,13 @@
274	656	{
275	657	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	658	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
278		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	659	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279	660	oe.cameraMenu.add("-");
280	661	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
281	662	openWindowItem.addActionListener(this);
282		- editLeafItem.addActionListener(this);
283	663	lookAtItem.addActionListener(this);
284	664	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	665	+ //switchViewItem.addActionListener(this);
286	666	}
287	667
288	668	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,21 +707,29 @@
327	707	}
328	708
329	709	oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	710	+// grabItem = menu.add(new MenuItem("Grab"));
	711	+// grabItem.addActionListener(this);
332	712	backItem = menu.add(new MenuItem("Back"));
333	713	backItem.addActionListener(this);
334	714	frontItem = menu.add(new MenuItem("Front"));
335	715	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	716	+// compositeItem = menu.add(new MenuItem("Composite"));
	717	+// compositeItem.addActionListener(this);
	718	+
	719	+ if (Globals.ADVANCED)
	720	+ {
338	721	hideItem = menu.add(new MenuItem("Hidden Group"));
339	722	hideItem.addActionListener(this);
340		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	723	+ }
	724	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
341	725	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- randomItem.addActionListener(this);
	726	+
	727	+// menu.add("-");
	728	+//
	729	+// switchItem = menu.add(new MenuItem("Switch node"));
	730	+// switchItem.addActionListener(this);
	731	+ if (Globals.ADVANCED)
	732	+ {
345	733	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	734	switchGeoItem.addActionListener(this);
347	735	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +737,6 @@
349	737	morphItem = menu.add(new MenuItem("Morph Group"));
350	738	morphItem.addActionListener(this);
351	739
352		- if (Globals.ADVANCED)
353		- {
354	740	menu.add("-");
355	741	physicsItem = menu.add(new MenuItem("Physics"));
356	742	physicsItem.addActionListener(this);
..	..	@@ -358,30 +744,29 @@
358	744	frameselectorItem.addActionListener(this);
359	745	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	746	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	747	}
364	748
365	749	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	750	+// textureItem = menu.add(new MenuItem("Texture"));
	751	+// textureItem.addActionListener(this);
368	752	billboardItem = menu.add(new MenuItem("Billboard"));
369	753	billboardItem.addActionListener(this);
370	754	csgItem = menu.add(new MenuItem("CSG"));
371	755	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	756	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	757	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	758	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	759	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	760	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	761	shadowZItem.addActionListener(this);
	762	+ attributeItem = menu.add(new MenuItem("Attribute"));
	763	+ attributeItem.addActionListener(this);
	764	+
378	765	if (Globals.ADVANCED)
379	766	{
380	767	menu.add("-");
381	768	linkerItem = menu.add(new MenuItem("Linker"));
382	769	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	770	templateItem = menu.add(new MenuItem("Template"));
386	771	templateItem.addActionListener(this);
387	772	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -410,7 +795,7 @@
410	795	genNormalsMESHItem.addActionListener(this);
411	796	if (Globals.ADVANCED)
412	797	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	798	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	799	genNormalsMINEItem.addActionListener(this);
415	800	}
416	801	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -470,6 +855,14 @@
470	855	markleavesItem.addActionListener(this);
471	856	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
472	857	unmarkleavesItem.addActionListener(this);
	858	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	859	+ rewindleavesItem.addActionListener(this);
	860	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	861	+ unrewindleavesItem.addActionListener(this);
	862	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	863	+ randomleavesItem.addActionListener(this);
	864	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	865	+ unrandomleavesItem.addActionListener(this);
473	866	menu.add("-");
474	867	flipVItem = menu.add(new MenuItem("Flip V"));
475	868	flipVItem.addActionListener(this);
..	..	@@ -495,10 +888,15 @@
495	888	attachBumpItem.addActionListener(this);
496	889	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
497	890	pigmentBumpItem.addActionListener(this);
	891	+ //embedTexturesItem
498	892	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
499	893	detachPigmentItem.addActionListener(this);
500	894	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
501	895	detachBumpItem.addActionListener(this);
	896	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	897	+ embedTexturesItem.addActionListener(this);
	898	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	899	+ deEmbedTexturesItem.addActionListener(this);
502	900	menu.add("-");
503	901	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
504	902	sortbysizeItem.addActionListener(this);
..	..	@@ -509,6 +907,9 @@
509	907	shareGeometriesItem.addActionListener(this);
510	908	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
511	909	mergeGeometriesItem.addActionListener(this);
	910	+ menu.add("-");
	911	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	912	+ editLeafItem.addActionListener(this);
512	913	if (Globals.ADVANCED)
513	914	{
514	915	// Pretty much the same as duplicate and clone.
..	..	@@ -525,16 +926,92 @@
525	926	buildToolsMenu(menu);
526	927	}
527	928
	929	+ JTabbedPane resourcecontainer;
	930	+ cGridBag currenttab;
	931	+ //boolean added; // patch for jar
	932	+
	933	+ int tabcount = 0;
	934	+ int colcount = 0;
	935	+ int rowcount = 0;
	936	+ int texturecount = 0;
	937	+
	938	+ int columns = 5;
	939	+ int rows = 7;
	940	+
	941	+ public void ResourceCallBack(String[] path)
	942	+ {
	943	+// for (int i = 0; i < path.length; i++)
	944	+// System.out.print(path[i] + "/");
	945	+// System.out.println();
	946	+
	947	+ if (//rowcount == 0 \|\|
	948	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	949	+ {
	950	+ currenttab = new cGridBag();
	951	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	952	+ currenttab.setName(tabname);
	953	+ //added = false;
	954	+ resourcecontainer.add(currenttab);
	955	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	956	+ rowcount = 1;
	957	+ colcount = 0;
	958	+ texturecount = 0;
	959	+ }
	960	+
	961	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	962	+ {
	963	+ //if (!added)
	964	+ {
	965	+ //added = true;
	966	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	967	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	968	+ }
	969	+
	970	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	971	+
	972	+ if (++colcount >= columns)
	973	+ {
	974	+ colcount = 0;
	975	+ currenttab.Return();
	976	+
	977	+ if (rowcount++ >= rows)
	978	+ {
	979	+ rowcount = 0;
	980	+ }
	981	+ }
	982	+ }
	983	+ else
	984	+ {
	985	+// if (!path[path.length-1].equals("icons"))
	986	+// resourcecontainer.Return();
	987	+ }
	988	+ }
	989	+
	990	+ void CreateTexturePanel(cGridBag container)
	991	+ {
	992	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	993	+ container.add(resourcecontainer);
	994	+
	995	+ Grafreed.ParseResources("textures", this);
	996	+ }
	997	+
528	998	void SetupUI2(ObjEditor oe)
529	999	{
	1000	+ // June 2019
	1001	+ if (oe == null)
	1002	+ {
	1003	+ //super.SetupUI2(this);
	1004	+ //return;
	1005	+ }
	1006	+
	1007	+ if (copy != group)
	1008	+ {
	1009	+ //super.SetupUI2(this);
	1010	+ }
	1011	+
530	1012	//new Exception().printStackTrace();
531	1013
532	1014	oe.radioPanel = new JPanel(new GridBagLayout());
533		- oe.aConstraints.weightx = 1;
534		- oe.aConstraints.weighty = 0;
535		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
536		- oe.aConstraints.gridwidth = 100;
537		- oe.aConstraints.gridheight = 1;
538	1015	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
539	1016
540	1017	oe.buttonGroup = new ButtonGroup();
..	..	@@ -555,39 +1032,122 @@
555	1032	oe.radioPanel.add(dummyButton);
556	1033	oe.buttonGroup.add(dummyButton);
557	1034	*/
	1035	+ cGridBag copyOptionsPanel = new cGridBag();
	1036	+
	1037	+ copyOptionsPanel.preferredHeight = 2;
	1038	+
558	1039	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
559	1040
560		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- undoButton.setToolTipText("Undo changes");
562		- undoButton.addActionListener(this);
	1041	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+ //minButton.setToolTipText("Minimize window");
	1043	+ //minButton.addActionListener(this);
563	1044
564		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- redoButton.setToolTipText("Redo changes");
566		- redoButton.addActionListener(this);
	1045	+ if (Globals.ADVANCED)
	1046	+ {
	1047	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+// maxButton.setToolTipText("Maximize window");
	1049	+// maxButton.addActionListener(this);
	1050	+ }
567	1051
568		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569		- saveButton.setToolTipText("Save changes");
570		- saveButton.addActionListener(this);
	1052	+ cButton gcButton;
571	1053
572		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
573		- liveCB.setToolTipText("Enable animation");
574		- liveCB.addItemListener(this);
	1054	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+// gcButton.setToolTipText("Garbage collect");
	1056	+// gcButton.addActionListener(new ActionListener()
	1057	+// {
	1058	+// public void actionPerformed(ActionEvent e)
	1059	+// {
	1060	+// System.gc();
	1061	+// }
	1062	+// });
	1063	+
	1064	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+ collapseButton.setToolTipText("Collapse toolbar");
	1066	+ collapseButton.addActionListener(this);
	1067	+
	1068	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1070	+ maximize3DButton.addActionListener(this);
	1071	+
	1072	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ twoButton.setToolTipText("Show 3D view only");
	1074	+ twoButton.addActionListener(this);
	1075	+ this.fullscreenLayout = twoButton;
	1076	+
	1077	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1078	+ threeButton.setToolTipText("Show controls and 3D view");
	1079	+ threeButton.addActionListener(this);
	1080	+ if (Globals.ADVANCED)
	1081	+ {
	1082	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1083	+ sixButton.setToolTipText("Show 3D view and controls");
	1084	+ sixButton.addActionListener(this);
	1085	+ }
	1086	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+// sevenButton.setToolTipText("3-column layout");
	1088	+// sevenButton.addActionListener(this);
	1089	+ //
	1090	+
	1091	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1092	+ fullButton.setToolTipText("Full-screen window");
	1093	+ fullButton.addActionListener(this);
	1094	+
	1095	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1096	+ screenfitButton.setToolTipText("Screen fit");
	1097	+ screenfitButton.addActionListener(this);
575	1098
576		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1099	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1101	+ restoreCameraButton.addActionListener(this);
	1102	+
	1103	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ saveVersionButton.setToolTipText("Duplicate current version");
	1105	+ saveVersionButton.addActionListener(this);
	1106	+
	1107	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ deleteVersionButton.setToolTipText("Delete current version");
	1109	+ deleteVersionButton.addActionListener(this);
	1110	+
	1111	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ previousVersionButton.setToolTipText("Previous version");
	1113	+ previousVersionButton.addActionListener(this);
	1114	+ previousVersionButton.setEnabled(false);
	1115	+
	1116	+ cGridBag updown = new cGridBag().setVertical(true);
	1117	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ restoreButton.setToolTipText("Undo (restore current version)");
	1119	+ restoreButton.addActionListener(this);
	1120	+ //restoreButton.setEnabled(false);
	1121	+
	1122	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ replaceButton.setToolTipText("Save (replace current version)");
	1124	+ replaceButton.addActionListener(this);
	1125	+ //replaceButton.setEnabled(false);
	1126	+
	1127	+ copyOptionsPanel.add(updown);
	1128	+
	1129	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ nextVersionButton.setToolTipText("Next version");
	1131	+ nextVersionButton.addActionListener(this);
	1132	+ nextVersionButton.setEnabled(false);
	1133	+
	1134	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	1135	oneStepButton.setToolTipText("Animate one step forward");
578	1136	oneStepButton.addActionListener(this);
579	1137
580		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1138	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1139	+ liveCB.setToolTipText("Enable animation");
	1140	+ liveCB.addItemListener(this);
	1141	+
	1142	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
581	1143	fastCB.setToolTipText("Fast mode");
582	1144	fastCB.addItemListener(this);
583	1145
584		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
585		- trackCB.setToolTipText("Enable tracking");
586		- trackCB.addItemListener(this);
587		-
588		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589		- screenfitButton.setToolTipText("Screen fit");
590		- screenfitButton.addActionListener(this);
	1146	+ //oe.toolboxPanel.Return();
	1147	+
	1148	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1149	+// trackCB.setToolTipText("Enable tracking");
	1150	+// trackCB.addItemListener(this);
591	1151
592	1152	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
593	1153	// screenfitpointButton.addActionListener(this);
..	..	@@ -597,67 +1157,137 @@
597	1157	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598	1158	snapobjectButton.addActionListener(this);
599	1159	snapobjectButton.setToolTipText("Snap Object");
	1160	+
	1161	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1162	+ fourButton.addActionListener(this);
	1163	+ fourButton.setToolTipText("Show control panel only");
600	1164	}
601	1165
602		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- flashSelectionButton.setToolTipText("Show selection");
604		- flashSelectionButton.addActionListener(this);
	1166	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
605	1167
606		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
607		-
608		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609		- twoButton.setToolTipText("Show center view only");
610		- twoButton.addActionListener(this);
611		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612		- fourButton.addActionListener(this);
613		- fourButton.setToolTipText("Show left panel only");
614		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
615		- sixButton.setToolTipText("2-column layout left");
616		- sixButton.addActionListener(this);
617		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
618		- threeButton.setToolTipText("2-column layout right");
619		- threeButton.addActionListener(this);
620		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621		- sevenButton.setToolTipText("3-column layout");
622		- sevenButton.addActionListener(this);
623		- //
624	1168
625		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626		- rootButton.setToolTipText("Edit selection in new tab");
	1169	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1170	+ rootButton.setToolTipText("Open selection in new tab");
627	1171	rootButton.addActionListener(this);
628	1172
629		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1173	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630	1174	closeButton.setToolTipText("Close tab");
631	1175	closeButton.addActionListener(this);
632	1176	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
633	1177	//clearButton.addActionListener(this);
634		-
635		- cGridBag commandsPanel = new cGridBag();
	1178	+
	1179	+ cGridBag row1 = new cGridBag();
636	1180
637		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638		- editButton.setToolTipText("Edit selection");
	1181	+ // INSERT
	1182	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1183	+ gridButton.setToolTipText("Create ground");
	1184	+ gridButton.addActionListener(this);
	1185	+
	1186	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1187	+ boxButton.setToolTipText("Create box");
	1188	+ boxButton.addActionListener(this);
	1189	+
	1190	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ superButton.setToolTipText("Create superellipsoid");
	1192	+ superButton.addActionListener(this);
	1193	+
	1194	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ sphereButton.setToolTipText("Create sphere");
	1196	+ sphereButton.addActionListener(this);
	1197	+
	1198	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1199	+ coneButton.setToolTipText("Create cone");
	1200	+ coneButton.addActionListener(this);
	1201	+
	1202	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ torusButton.setToolTipText("Create torus");
	1204	+ torusButton.addActionListener(this);
	1205	+
	1206	+ if (Globals.ADVANCED)
	1207	+ {
	1208	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1209	+ kleinButton.setToolTipText("Create Klein bottle");
	1210	+ kleinButton.addActionListener(this);
	1211	+ }
	1212	+
	1213	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ particlesButton.setToolTipText("Create particle system");
	1215	+ particlesButton.addActionListener(this);
	1216	+
	1217	+ oe.toolboxPanel.add(row1);
	1218	+
	1219	+ cGridBag row2 = new cGridBag();
	1220	+
	1221	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1222	+ groupButton.setToolTipText("Create group");
	1223	+ groupButton.addActionListener(this);
	1224	+
	1225	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ compositeButton.setToolTipText("Create composite");
	1227	+ compositeButton.addActionListener(this);
	1228	+
	1229	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1230	+ switchButton.setToolTipText("Create item switcher");
	1231	+ switchButton.addActionListener(this);
	1232	+
	1233	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ loopButton.setToolTipText("Create loop");
	1235	+ loopButton.addActionListener(this);
	1236	+
	1237	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1238	+ textureButton.setToolTipText("Create texture");
	1239	+ textureButton.addActionListener(this);
	1240	+
	1241	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1242	+ overlayButton.setToolTipText("Create overlay");
	1243	+ overlayButton.addActionListener(this);
	1244	+
	1245	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ lightButton.setToolTipText("Create light");
	1247	+ lightButton.addActionListener(this);
	1248	+
	1249	+ oe.toolboxPanel.add(row2);
	1250	+
	1251	+ cGridBag textures = new cGridBag();
	1252	+
	1253	+ CreateTexturePanel(textures);
	1254	+
	1255	+ oe.toolboxPanel.add(textures);
	1256	+
	1257	+ textures.preferredHeight = 100;
	1258	+
	1259	+ CreateSkyboxPanel(oe.skyboxPanel);
	1260	+
	1261	+ // EDIT panel
	1262	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1263	+ editButton.setToolTipText("Pin selection controls");
639	1264	editButton.addActionListener(this);
640	1265
641		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642		- uneditButton.setToolTipText("Unedit selection");
	1266	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ uneditButton.setToolTipText("Unpin and remove selection controls");
643	1268	uneditButton.addActionListener(this);
644	1269
645		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
646		- allParamsButton.setToolTipText("Edit all params");
	1270	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1271	+ allParamsButton.setToolTipText("Show all controls");
647	1272	allParamsButton.addActionListener(this);
648	1273
649		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- clearPanelButton.setToolTipText("Clear edit panel");
	1274	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1275	+ clearPanelButton.setToolTipText("Clear all controls");
651	1276	clearPanelButton.addActionListener(this);
652	1277
653		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654		- unselectButton.setToolTipText("Unselect");
655		- unselectButton.addActionListener(this);
	1278	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ //unselectButton.setToolTipText("Unselect");
	1280	+ //unselectButton.addActionListener(this);
656	1281
657		- commandsPanel.preferredHeight = 1;
	1282	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ flashSelectionButton.setToolTipText("Highlight selection");
	1284	+ flashSelectionButton.addActionListener(this);
658	1285
659		- oe.treePanel.add(commandsPanel);
660		- oe.treePanel.Return();
	1286	+ editCommandsPanel.preferredHeight = 1;
	1287	+
	1288	+ SetPinStates(false);
	1289	+// oe.treePanel.add(commandsPanel);
	1290	+// oe.treePanel.Return();
661	1291
662	1292	// oe.aConstraints.gridx += 1;
663	1293	// oe.aConstraints.weighty = 0;
..	..	@@ -674,32 +1304,20 @@
674	1304
675	1305	JScrollPane jSP;
676	1306	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
677		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1307	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
678	1308	ResetModel();
679	1309
680	1310	oe.treePanel.add(jSPPanel);
681	1311	oe.treePanel.Return();
682	1312
683		- cGridBag copyOptionsPanel = new cGridBag();
684		-
685		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
686		- colorCB.setToolTipText("Copy color when dropped");
687		- colorCB.addItemListener(this);
688		-
689		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
690		- materialCB.setToolTipText("Copy material when dropped");
691		- materialCB.addItemListener(this);
692		-
693		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
694		- textureCB.setToolTipText("Copy texture when dropped");
695		- textureCB.addItemListener(this);
696		-
697		- copyOptionsPanel.preferredHeight = 1;
698	1313	oe.treePanel.add(copyOptionsPanel);
699	1314	oe.treePanel.Return();
	1315	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1316	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1317	+ sliderPane.preferredHeight = 1;
700	1318
701		-// mainPanel.setDividerLocation(0.5); //1.0);
702		-// mainPanel.setResizeWeight(0.5);
	1319	+// mainPanel.setDividerLocation(0.1); //1.0);
	1320	+ mainPanel.setResizeWeight(0.4);
703	1321
704	1322	//jList.addListSelectionListener(this);
705	1323	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -707,7 +1325,7 @@
707	1325	//jTree.setEditable(true);
708	1326	oe.jTree.setDragEnabled(true);
709	1327	//jTree.setPreferredSize(new Dimension(10,10));
710		- jSP.setPreferredSize(new Dimension(100,200));
	1328	+ //jSP.setPreferredSize(new Dimension(100,200));
711	1329
712	1330	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
713	1331
..	..	@@ -719,29 +1337,49 @@
719	1337	dgr.addDragGestureListener(this);
720	1338	}catch(Exception e) {}
721	1339	*/
722		- radio.layout = sevenButton;
	1340	+ radio.layout = threeButton; // sixButton;
723	1341	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
724	1342	}
725	1343
726	1344	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
727	1345	{
	1346	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1347	+ colorCB.setToolTipText("Copy color when dropped");
	1348	+ colorCB.addItemListener(this);
	1349	+
	1350	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1351	+ materialCB.setToolTipText("Copy material when dropped");
	1352	+ materialCB.addItemListener(this);
	1353	+
	1354	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1355	+ textureCB.setToolTipText("Copy texture when dropped");
	1356	+ textureCB.addItemListener(this);
	1357	+
	1358	+ panel.Return();
	1359	+
728	1360	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
729	1361	boxCB.setToolTipText("Display bounding boxes");
730	1362	boxCB.addItemListener(this);
731	1363
732	1364	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
733		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1365	+ zoomBoxCB.setToolTipText("Display only for wheel");
734	1366	zoomBoxCB.addItemListener(this);
735	1367
736	1368	if (true) // Globals.ADVANCED)
737	1369	{
738		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
739		- supportCB.setToolTipText("Enable rigging");
740		- supportCB.addItemListener(this);
	1370	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1371	+// supportCB.setToolTipText("Enable rigging");
	1372	+// supportCB.addItemListener(this);
	1373	+
	1374	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1375	+ freezeCB.setToolTipText("Fast moving camera");
	1376	+ freezeCB.addItemListener(this);
741	1377
742	1378	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
743	1379	// localCB.addItemListener(this);
744	1380
	1381	+ panel.Return();
	1382	+
745	1383	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
746	1384	crowdCB.setToolTipText("Used for crowds");
747	1385	crowdCB.addItemListener(this);
..	..	@@ -750,14 +1388,19 @@
750	1388	smoothCB.setToolTipText("Snapping delay");
751	1389	smoothCB.addItemListener(this);
752	1390
753		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
754		- slowCB.setToolTipText("Smooth interpolation");
755		- slowCB.addItemListener(this);
	1391	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1392	+// slowCB.setToolTipText("Smooth interpolation");
	1393	+// slowCB.addItemListener(this);
	1394	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1395	+ minshaderCB.setToolTipText("Minimal fast shader");
	1396	+ minshaderCB.addItemListener(this);
756	1397
757	1398	// constraints.gridy += 1;
758	1399	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
759	1400	// speakerMocapCB.addItemListener(this);
760	1401
	1402	+ panel.Return();
	1403	+
761	1404	if (false)
762	1405	{
763	1406	// handled in scripts
..	..	@@ -772,34 +1415,82 @@
772	1415	//constraints.gridy += 1;
773	1416	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
774	1417	smoothfocusCB.addItemListener(this);
	1418	+ panel.Return();
775	1419	}
776	1420
777	1421	//constraints.gridx += 1;
778	1422	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
779	1423	// debugCB.addItemListener(this);
780	1424
	1425	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1426	+ trackCB.setToolTipText("Enable tracking target");
	1427	+ trackCB.addItemListener(this);
	1428	+
781	1429	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1430	+ oeilCB.setToolTipText("Move camera when tracking");
782	1431	oeilCB.addItemListener(this);
783	1432
	1433	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1434	+ shadowCB.setToolTipText("When live compute shadows");
	1435	+ shadowCB.addItemListener(this);
	1436	+
	1437	+ panel.Return();
	1438	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1439	+ toggleTextureCB.setToolTipText("Load textures");
	1440	+ toggleTextureCB.addItemListener(this);
	1441	+
	1442	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1443	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1444	+ toggleSwitchCB.addItemListener(this);
	1445	+
	1446	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1447	+ autokeepCB.setToolTipText("On structure change");
	1448	+ autokeepCB.addItemListener(this);
	1449	+
	1450	+ panel.Return();
	1451	+ if (Globals.ADVANCED)
	1452	+ {
784	1453	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
785	1454	lookAtCB.setToolTipText("Look-at target");
786	1455	lookAtCB.addItemListener(this);
	1456	+ }
787	1457
788	1458	}
789	1459
790	1460	cGridBag fill = new cGridBag();
791		-
792	1461	fill.preferredHeight = 200;
	1462	+ cGridBag fill2 = new cGridBag();
	1463	+ fill2.preferredHeight = 200;
	1464	+ cGridBag fill3 = new cGridBag();
	1465	+ fill3.preferredHeight = 200;
793	1466
794	1467	panel.add(fill);
	1468	+ panel.add(fill2);
	1469	+ panel.add(fill3);
795	1470
796	1471	}
797	1472
798	1473	void EditObject(Object3D obj)
799	1474	{
	1475	+ assert(obj instanceof Composite);
	1476	+
	1477	+// if (obj.versionlist == null)
	1478	+// {
	1479	+// obj.versionlist = new Object3D[100];
	1480	+// obj.versionindex = -1;
	1481	+// }
	1482	+
800	1483	cRadio radioButton = new cRadio(obj.name);
	1484	+
	1485	+ // June 2019. Patch to avoid bug with transparency.
	1486	+ radioButton.hadMaterial = obj.material != null;
	1487	+ if (!radioButton.hadMaterial)
	1488	+ {
	1489	+ obj.material = new cMaterial();
	1490	+ }
	1491	+
801	1492	radioButton.SetObject(obj);
802		- radioButton.layout = sevenButton;
	1493	+ radioButton.layout = threeButton; // sixButton;
803	1494	radioButton.SetCamera(cameraView.renderCamera, false);
804	1495	radioButton.addActionListener(this);
805	1496	radioPanel.add(radioButton);
..	..	@@ -809,6 +1500,8 @@
809	1500
810	1501	void SetupViews(ObjEditor oe)
811	1502	{
	1503	+ theFrame = this;
	1504	+
812	1505	oe.SetupViews();
813	1506
814	1507	System.out.println("SetupViews");
..	..	@@ -817,23 +1510,30 @@
817	1510	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
818	1511	}
819	1512
820		- JCheckBox liveCB;
821		- JCheckBox supportCB;
822		- JCheckBox localCB;
823		- JCheckBox crowdCB;
824		- JCheckBox smoothCB;
825		- JCheckBox fastCB;
826		- JCheckBox slowCB;
827		- JCheckBox boxCB;
828		- JCheckBox zoomBoxCB;
829		- JCheckBox trackCB;
830		- JCheckBox smoothfocusCB;
	1513	+ cToggleButton liveCB;
	1514	+ cCheckBox supportCB;
	1515	+ cCheckBox localCB;
	1516	+ cCheckBox crowdCB;
	1517	+ cCheckBox smoothCB;
	1518	+ cCheckBox minshaderCB;
	1519	+
	1520	+ cToggleButton fastCB;
	1521	+ cCheckBox slowCB;
	1522	+ cCheckBox boxCB;
	1523	+ cCheckBox zoomBoxCB;
	1524	+ cCheckBox freezeCB;
	1525	+ //cToggleButton trackCB;
	1526	+ cCheckBox trackCB;
	1527	+ cCheckBox smoothfocusCB;
831	1528	// JCheckBox speakerMocapCB;
832		- JCheckBox speakerCameraCB;
833		- JCheckBox speakerFocusCB;
834		- JCheckBox debugCB;
835		- JCheckBox oeilCB;
836		- JCheckBox lookAtCB;
	1529	+ cCheckBox speakerCameraCB;
	1530	+ cCheckBox speakerFocusCB;
	1531	+ cCheckBox debugCB;
	1532	+
	1533	+ cCheckBox oeilCB;
	1534	+ cCheckBox shadowCB;
	1535	+ cCheckBox autokeepCB;
	1536	+ cCheckBox lookAtCB;
837	1537
838	1538	// static int COLOR = 1;
839	1539	// static int MATERIAL = 2;
..	..	@@ -841,9 +1541,9 @@
841	1541
842	1542	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
843	1543
844		- JCheckBox colorCB;
845		- JCheckBox materialCB;
846		- JCheckBox textureCB;
	1544	+ cCheckBox colorCB;
	1545	+ cCheckBox materialCB;
	1546	+ cCheckBox textureCB;
847	1547
848	1548	public void itemStateChanged(ItemEvent e)
849	1549	{
..	..	@@ -887,6 +1587,12 @@
887	1587	{
888	1588	cameraView.ToggleInertia();
889	1589	cameraView.repaint();
	1590	+ }
	1591	+ else if(e.getSource() == minshaderCB)
	1592	+ {
	1593	+ Globals.MINSHADER ^= true;
	1594	+ cameraView.programInitialized = false;
	1595	+ cameraView.repaint();
890	1596	}
891	1597	else if(e.getSource() == localCB)
892	1598	{
..	..	@@ -936,6 +1642,18 @@
936	1642	{
937	1643	cameraView.ToggleOeil();
938	1644	}
	1645	+ else if(e.getSource() == shadowCB)
	1646	+ {
	1647	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1648	+ }
	1649	+ else if(e.getSource() == freezeCB)
	1650	+ {
	1651	+ Globals.FREEZEONMOVE ^= true;
	1652	+ }
	1653	+ else if(e.getSource() == autokeepCB)
	1654	+ {
	1655	+ Globals.REPLACEONMAKE ^= true;
	1656	+ }
939	1657	else if(e.getSource() == lookAtCB)
940	1658	{
941	1659	cameraView.ToggleLookAt();
..	..	@@ -952,7 +1670,8 @@
952	1670
953	1671	/**/
954	1672	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
955		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1673	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1674	+ TreePath path = objEditor.jTree.getSelectionPath();
956	1675	if ((path == null) \|\| (path.getPathCount() <= 1)) {
957	1676	// We can't move the root node or an empty selection
958	1677	return;
..	..	@@ -1015,8 +1734,6 @@
1015	1734	}
1016	1735	}
1017	1736
1018		- String string = (String) object;
1019		-
1020	1737	System.out.println("Transfer = " + object + "; drop : " + target);
1021	1738	// if( object instanceof java.io.File[])
1022	1739	// {
..	..	@@ -1024,6 +1741,8 @@
1024	1741	// objEditor.DropFile((java.io.File[]) object, true);
1025	1742	// return;
1026	1743	// }
	1744	+
	1745	+ String string = object.toString();
1027	1746
1028	1747	// File path for Mac and Windows
1029	1748	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1069,23 +1788,33 @@
1069	1788
1070	1789	assert target == objEditor.jTree;
1071	1790	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1791	+ Object3D destinationLeaf;
1072	1792	try {
1073		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1793	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1074	1794	} catch (Exception e) {
1075	1795	System.out.println("destinationPath : " + destinationPath);
1076	1796	return;
1077	1797	}
1078	1798
1079		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1799	+ for (int i=group.selection.size(); --i>=0;)
1080	1800	{
	1801	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1802	+
	1803	+ // Cannot move into itself
	1804	+ if (child == destinationLeaf)
	1805	+ return;
	1806	+ }
	1807	+
	1808	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1809	+// {
1081	1810	loadClipboard(true);
1082	1811	objEditor.jTree.setSelectionPath(destinationPath);
1083	1812	pasteInto(false, false);
1084		- } else {
1085		- loadClipboard(false);
1086		- objEditor.jTree.setSelectionPath(destinationPath);
1087		- pasteInto(false, false); // true); // ???
1088		- }
	1813	+// } else {
	1814	+// loadClipboard(false);
	1815	+// objEditor.jTree.setSelectionPath(destinationPath);
	1816	+// pasteInto(false, false); // true); // ???
	1817	+// }
1089	1818	}
1090	1819	public void dropActionChanged(DropTargetDragEvent dtde)
1091	1820	// Called if the user has modified the current drop gesture
..	..	@@ -1141,7 +1870,12 @@
1141	1870	TreePath path;
1142	1871
1143	1872	public TransferableTreePath(TreePath tp) {
1144		- path = tp;
	1873	+ Object[] objs = new Object[tp.getPathCount()];
	1874	+ for (int i=0; i<objs.length; i++)
	1875	+ {
	1876	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1877	+ }
	1878	+ path = new TreePath(objs);
1145	1879	}
1146	1880
1147	1881	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1190,22 +1924,30 @@
1190	1924	{
1191	1925	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1192	1926	//heightFieldItem.addActionListener(this);
1193		- gridItem = menu.add(new MenuItem("Grid"));
1194		- gridItem.addActionListener(this);
1195		- rectoidItem = menu.add(new MenuItem("Box"));
1196		- rectoidItem.addActionListener(this);
1197		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1198		- ellipsoidItem.addActionListener(this);
1199		- coneItem = menu.add(new MenuItem("Cone"));
1200		- coneItem.addActionListener(this);
1201		- torusItem = menu.add(new MenuItem("Torus"));
1202		- torusItem.addActionListener(this);
1203		- superItem = menu.add(new MenuItem("Superellipsoid"));
1204		- superItem.addActionListener(this);
	1927	+// gridItem = menu.add(new MenuItem("Grid"));
	1928	+// gridItem.addActionListener(this);
	1929	+// rectoidItem = menu.add(new MenuItem("Box"));
	1930	+// rectoidItem.addActionListener(this);
	1931	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1932	+// ellipsoidItem.addActionListener(this);
	1933	+// coneItem = menu.add(new MenuItem("Cone"));
	1934	+// coneItem.addActionListener(this);
	1935	+// torusItem = menu.add(new MenuItem("Torus"));
	1936	+// torusItem.addActionListener(this);
	1937	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1938	+// superItem.addActionListener(this);
	1939	+
	1940	+ cameraItem = menu.add(new MenuItem("Camera"));
	1941	+ cameraItem.addActionListener(this);
	1942	+
	1943	+ if (!Globals.ADVANCED)
	1944	+ {
1205	1945	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1206	1946	kleinItem.addActionListener(this);
1207		- particleItem = menu.add(new MenuItem("Particle system"));
1208		- particleItem.addActionListener(this);
	1947	+ }
	1948	+
	1949	+// particleItem = menu.add(new MenuItem("Particle system"));
	1950	+// particleItem.addActionListener(this);
1209	1951	if (Globals.ADVANCED)
1210	1952	{
1211	1953	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1231,15 +1973,15 @@
1231	1973	}
1232	1974	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1233	1975	bezierItem.addActionListener(this);
1234		- overlayItem = menu.add(new MenuItem("Overlay"));
1235		- overlayItem.addActionListener(this);
1236		- lightItem = menu.add(new MenuItem("Light"));
1237		- lightItem.addActionListener(this);
	1976	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1977	+// overlayItem.addActionListener(this);
	1978	+// lightItem = menu.add(new MenuItem("Light"));
	1979	+// lightItem.addActionListener(this);
1238	1980	menu.add("-");
1239	1981	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1240	1982	//superLoopItem.addActionListener(this);
1241		- loopItem = menu.add(new MenuItem("Loop"));
1242		- loopItem.addActionListener(this);
	1983	+// loopItem = menu.add(new MenuItem("Loop"));
	1984	+// loopItem.addActionListener(this);
1243	1985	doubleItem = menu.add(new MenuItem("Fork"));
1244	1986	doubleItem.addActionListener(this);
1245	1987	if (Globals.ADVANCED)
..	..	@@ -1255,6 +1997,9 @@
1255	1997	animationItem.addItemListener(this);
1256	1998	animationItem.setState(Globals.ANIMATION);
1257	1999
	2000	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2001	+ archiveItem.addActionListener(this);
	2002	+
1258	2003	menu.add("-");
1259	2004	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1260	2005	parseverticesItem.addActionListener(this);
..	..	@@ -1267,6 +2012,8 @@
1267	2012	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1268	2013	reduce34MorphItem.addActionListener(this);
1269	2014	menu.add("-");
	2015	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2016	+ memoryItem.addActionListener(this);
1270	2017	menu.add(computeAOItem = new MenuItem("Compute AO"));
1271	2018	computeAOItem.addActionListener(this);
1272	2019
..	..	@@ -1275,8 +2022,6 @@
1275	2022	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1276	2023	mirrorItem.addActionListener(this);
1277	2024	menu.add("-");
1278		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1279		- memoryItem.addActionListener(this);
1280	2025	menu.add(analyzeItem = new MenuItem("Analyze"));
1281	2026	analyzeItem.addActionListener(this);
1282	2027	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1420,9 +2165,38 @@
1420	2165	shadow.material = new cMaterial(obj.material);
1421	2166	shadow.material.diffuse = 0.0001f;
1422	2167	shadow.material.specular = 0.0001f;
	2168	+ shadow.material.opacity = 0.75f;
	2169	+
	2170	+ AllocProjectedVertices(shadow);
	2171	+
	2172	+ shadow.projectedVertices[1].x = 300;
1423	2173
1424	2174	makeSomething(shadow);
1425	2175	}
	2176	+
	2177	+ private void ClearUnpinned()
	2178	+ {
	2179	+ //for (Object3D obj : listUI)
	2180	+ for (int i=listUI.size(); --i>=0;)
	2181	+ {
	2182	+ Object3D obj = listUI.elementAt(i);
	2183	+ if (!obj.pinned)
	2184	+ {
	2185	+ obj.CloseUI();
	2186	+ listUI.remove(i);
	2187	+ }
	2188	+ }
	2189	+ }
	2190	+
	2191	+ private void EditElement(Object3D elem, boolean newWindow)
	2192	+ {
	2193	+ // if (!(elem instanceof Composite))
	2194	+ // newWindow = false;
	2195	+ listUI.add(elem);
	2196	+ elem.openEditWindow(this, newWindow); //, false);
	2197	+ System.out.println("edit : " + elem);
	2198	+ elem.editWindow.refreshContents(true); // ? new
	2199	+ }
1426	2200
1427	2201	/**
1428	2202	* applyExample
..	..	@@ -1667,7 +2441,7 @@
1667	2441	{
1668	2442	ScreenFit();
1669	2443	} else
1670		- if (source == switchItem)
	2444	+ if (source == switchViewItem)
1671	2445	{
1672	2446	cVector v1 = new cVector();
1673	2447	cVector v2 = new cVector();
..	..	@@ -1676,11 +2450,11 @@
1676	2450	objEditor.cameraView.renderCamera.setAim(v2, v1);
1677	2451	objEditor.cameraView.repaint();
1678	2452	} else
1679		- if (source == rectoidItem)
	2453	+ if (source == rectoidItem \|\| source == boxButton)
1680	2454	{
1681	2455	makeSomething(new Box());
1682	2456	} else
1683		- if (source == particleItem)
	2457	+ if (source == particleItem \|\| source == particlesButton)
1684	2458	{
1685	2459	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1686	2460	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1759,27 +2533,27 @@
1759	2533
1760	2534	makeSomething(obj);
1761	2535	} else
1762		- if (source == gridItem)
	2536	+ if (source == gridItem \|\| source == gridButton)
1763	2537	{
1764	2538	makeSomething(new Grid());
1765	2539	} else
1766		- if (source == ellipsoidItem)
	2540	+ if (source == ellipsoidItem \|\| source == sphereButton)
1767	2541	{
1768	2542	makeSomething(new Sphere());
1769	2543	} else
1770		- if (source == coneItem)
	2544	+ if (source == coneItem \|\| source == coneButton)
1771	2545	{
1772	2546	makeSomething(new Cone());
1773	2547	} else
1774		- if (source == torusItem)
	2548	+ if (source == torusItem \|\| source == torusButton)
1775	2549	{
1776	2550	makeSomething(new Torus());
1777	2551	} else
1778		- if (source == superItem)
	2552	+ if (source == superItem \|\| source == superButton)
1779	2553	{
1780	2554	makeSomething(new Superellipsoid());
1781	2555	} else
1782		- if (source == kleinItem)
	2556	+ if (source == kleinItem \|\| source == kleinButton)
1783	2557	{
1784	2558	makeSomething(new Klein());
1785	2559	} else
..	..	@@ -1799,7 +2573,7 @@
1799	2573	{
1800	2574	makeSomething(new BezierSurface());
1801	2575	} else
1802		- if (source == overlayItem)
	2576	+ if (source == overlayItem \|\| source == overlayButton)
1803	2577	{
1804	2578	/*
1805	2579	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1847,10 +2621,27 @@
1847	2621	s.setup();
1848	2622	makeSomething(s);
1849	2623	} else
1850		- if (source == lightItem)
	2624	+ if (source == lightItem \|\| source == lightButton)
1851	2625	{
1852	2626	makeSomething(new Light());
1853	2627	} else
	2628	+// if (source == skybox1Button \|\|
	2629	+// source == skybox2Button \|\|
	2630	+// source == skybox3Button \|\|
	2631	+// source == skybox4Button \|\|
	2632	+// source == skybox5Button \|\|
	2633	+// source == skybox6Button \|\|
	2634	+// source == skybox7Button \|\|
	2635	+// source == skybox11Button \|\|
	2636	+// source == skybox12Button \|\|
	2637	+// source == skybox13Button \|\|
	2638	+// source == skybox14Button \|\|
	2639	+// source == skybox15Button \|\|
	2640	+// source == skybox16Button \|\|
	2641	+// source == skybox17Button)
	2642	+// {
	2643	+// ChangeSkybox(source);
	2644	+// } else
1854	2645	if (source == csgItem)
1855	2646	{
1856	2647	group(new CSG());
..	..	@@ -1897,30 +2688,38 @@
1897	2688
1898	2689	group(g);
1899	2690	} else
1900		- if (source == loopItem)
	2691	+ if (source == loopItem \|\| source == loopButton)
1901	2692	{
	2693	+ if (!group.selection.isEmpty())
	2694	+ {
1902	2695	Composite csg = new GroupLeaf();
1903	2696	csg.count = 5;
1904		- group(csg);
1905		- Composite child = new cGroup();
	2697	+ Composite child = new cGroup("Branch");
1906	2698	csg.addChild(child);
1907	2699	child.addChild(csg);
	2700	+ group(csg);
	2701	+ }
1908	2702	} else
1909	2703	if (source == doubleItem)
1910	2704	{
1911		- Composite csg = new GroupLeaf();
	2705	+ if (!group.selection.isEmpty())
	2706	+ {
	2707	+ Composite csg = new GroupLeaf("Fork");
1912	2708	csg.count = 5;
	2709	+ Composite child = new cGroup("Branch A");
	2710	+ csg.addChild(child);
	2711	+ child.addChild(csg);
	2712	+ child = new cGroup("Branch B");
	2713	+ csg.addChild(child);
	2714	+ child.addChild(csg);
1913	2715	group(csg);
1914		- Composite child = new cGroup();
1915		- csg.addChild(child);
1916		- child.addChild(csg);
1917		- child = new cGroup();
1918		- csg.addChild(child);
1919		- child.addChild(csg);
	2716	+ }
1920	2717	} else
1921	2718	if (source == tripleItem)
1922	2719	{
1923		- Composite csg = new GroupLeaf();
	2720	+ if (!group.selection.isEmpty())
	2721	+ {
	2722	+ Composite csg = new GroupLeaf("Trident");
1924	2723	csg.count = 4;
1925	2724	group(csg);
1926	2725	Composite child = new cGroup();
..	..	@@ -1932,11 +2731,12 @@
1932	2731	child = new cGroup();
1933	2732	csg.addChild(child);
1934	2733	child.addChild(csg);
	2734	+ }
1935	2735	} else
1936	2736	if (source == computeAOItem)
1937	2737	{
1938	2738	Globals.drawMode = CameraPane.OCCLUSION;
1939		- Globals.theRenderer.repaint();
	2739	+ cameraView.repaint();
1940	2740	} else
1941	2741	if (source == recompileItem)
1942	2742	{
..	..	@@ -1951,7 +2751,7 @@
1951	2751	if (source == invariantsItem)
1952	2752	{
1953	2753	System.out.println("Invariants:");
1954		- Grafreed.grafreeD.universe.invariants();
	2754	+ Grafreed.grafreed.universe.invariants();
1955	2755	} else
1956	2756	if (source == memoryItem)
1957	2757	{
..	..	@@ -1970,17 +2770,64 @@
1970	2770	{
1971	2771	DumpObject();
1972	2772	} else
1973		- if (source == undoButton)
	2773	+ if (source == minButton)
1974	2774	{
1975		- Undo();
	2775	+ Minimize();
1976	2776	} else
1977		- if (source == redoButton)
	2777	+ if (source == maxButton)
1978	2778	{
1979		- Redo();
	2779	+ Maximize();
1980	2780	} else
1981		- if (source == saveButton)
	2781	+ if (source == fullButton)
1982	2782	{
1983		- Save();
	2783	+ ToggleFullScreen();
	2784	+ } else
	2785	+ if (source == collapseButton)
	2786	+ {
	2787	+ this.expandedLayout = radio.layout;
	2788	+ CollapseToolbar();
	2789	+ } else
	2790	+ if (source == maximize3DButton)
	2791	+ {
	2792	+ this.expandedLayout = radio.layout;
	2793	+ radio.layout = twoButton;
	2794	+ Show3DView();
	2795	+ CollapseToolbar();
	2796	+ } else
	2797	+ if (source == previousVersionButton)
	2798	+ {
	2799	+ // Go to previous version
	2800	+ //if (!Undo())
	2801	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2802	+ PreviousVersion();
	2803	+ } else
	2804	+ if (source == restoreButton)
	2805	+ {
	2806	+ // Restore current version
	2807	+ Restore();
	2808	+ //restoreButton.setEnabled(false);
	2809	+ } else
	2810	+ if (source == replaceButton)
	2811	+ {
	2812	+ // Overwrite current version
	2813	+ Replace();
	2814	+ //replaceButton.setEnabled(false);
	2815	+ } else
	2816	+ if (source == nextVersionButton)
	2817	+ {
	2818	+ // Go to next version
	2819	+ NextVersion();
	2820	+ } else
	2821	+ if (source == saveVersionButton)
	2822	+ {
	2823	+ // Save a new version
	2824	+ if (!Save(true))
	2825	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2826	+ } else
	2827	+ if (source == deleteVersionButton)
	2828	+ {
	2829	+ // Delete a new version
	2830	+ DeleteVersion();
1984	2831	} else
1985	2832	if (source == oneStepButton)
1986	2833	{
..	..	@@ -1989,17 +2836,14 @@
1989	2836	} else
1990	2837	if (source == screenfitButton)
1991	2838	{
1992		- //Reload(lastConverter, lastFilename, true);
1993	2839	ScreenFit();
1994	2840	} else
1995	2841	if (source == screenfitpointButton)
1996	2842	{
1997		- //Reload(lastConverter, lastFilename, true);
1998	2843	ScreenFitPoint();
1999	2844	} else
2000	2845	if (source == snapobjectButton)
2001	2846	{
2002		- //Reload(lastConverter, lastFilename, true);
2003	2847	SnapObject();
2004	2848	} else
2005	2849	// if (event.getSource() == recompileButton)
..	..	@@ -2038,11 +2882,11 @@
2038	2882	} else
2039	2883	if (source == undoItem)
2040	2884	{
2041		- Undo();
	2885	+ PreviousVersion();
2042	2886	} else
2043	2887	if (source == redoItem)
2044	2888	{
2045		- Redo();
	2889	+ NextVersion();
2046	2890	} else
2047	2891	if (source == duplicateItem)
2048	2892	{
..	..	@@ -2363,7 +3207,7 @@
2363	3207	{
2364	3208	StepAll();
2365	3209	} else
2366		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3210	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2367	3211	{
2368	3212	//int indices[] = jList.getSelectedIndices();
2369	3213	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2375,9 +3219,9 @@
2375	3219	{
2376	3220	ClearSelection(true);
2377	3221	} else
2378		- if (source == grabItem)
	3222	+ if (source == grabItem \|\| source == groupButton)
2379	3223	{
2380		- group(new cGroup(), true);
	3224	+ group(new cGroup(), false); // true);
2381	3225	} else
2382	3226	if (source == hideItem)
2383	3227	{
..	..	@@ -2395,11 +3239,11 @@
2395	3239	{
2396	3240	makeSomething(new Camera());
2397	3241	} else
2398		- if (source == compositeItem)
	3242	+ if (source == compositeItem \|\| source == compositeButton)
2399	3243	{
2400	3244	group(new Composite());
2401	3245	} else
2402		- if (source == randomItem)
	3246	+ if (source == switchItem \|\| source == switchButton)
2403	3247	{
2404	3248	RandomNode random = new RandomNode();
2405	3249	group(random);
..	..	@@ -2501,7 +3345,7 @@
2501	3345	{
2502	3346	group(new cLinker());
2503	3347	} else
2504		- if (source == textureItem)
	3348	+ if (source == textureItem \|\| source == textureButton)
2505	3349	{
2506	3350	group(new TextureNode());
2507	3351	} else
..	..	@@ -2521,17 +3365,42 @@
2521	3365	{
2522	3366	CastShadow(2);
2523	3367	} else
2524		- if (source == ungroupItem)
	3368	+ if (source == ungroupItem \|\| source == ungroupButton)
2525	3369	{
2526		- //ungroup();
	3370	+ boolean canUngroup = true;
	3371	+
2527	3372	for (int i=0; i<group.selection.size(); i++)
2528	3373	{
2529		- Ungroup(group.selection.get(i));
	3374	+ Object3D selectedItem = group.selection.get(i);
	3375	+
	3376	+ if (selectedItem.Size() == 0)
	3377	+ {
	3378	+ // Cannot ungroup leaves
	3379	+ canUngroup = false;
	3380	+ break;
	3381	+ }
	3382	+
	3383	+ if (selectedItem == group)
	3384	+ {
	3385	+ // Cannot ungroup root
	3386	+ canUngroup = false;
	3387	+ break;
	3388	+ }
2530	3389	}
2531	3390
2532		- ClearSelection(false);
2533		-
2534		- refreshContents();
	3391	+ if (canUngroup)
	3392	+ {
	3393	+ for (int i=0; i<group.selection.size(); i++)
	3394	+ {
	3395	+ Object3D selectedItem = group.selection.get(i);
	3396	+
	3397	+ Ungroup(selectedItem);
	3398	+ }
	3399	+
	3400	+ ClearSelection(false);
	3401	+
	3402	+ refreshContents();
	3403	+ }
2535	3404	} else
2536	3405	if (source == genUVItem)
2537	3406	{
..	..	@@ -2608,6 +3477,22 @@
2608	3477	if (source == unmarkleavesItem)
2609	3478	{
2610	3479	MarkLeaves(false);
	3480	+ } else
	3481	+ if (source == rewindleavesItem)
	3482	+ {
	3483	+ RewindLeaves(true);
	3484	+ } else
	3485	+ if (source == unrewindleavesItem)
	3486	+ {
	3487	+ RewindLeaves(false);
	3488	+ } else
	3489	+ if (source == randomleavesItem)
	3490	+ {
	3491	+ RandomLeaves(true);
	3492	+ } else
	3493	+ if (source == unrandomleavesItem)
	3494	+ {
	3495	+ RandomLeaves(false);
2611	3496	} else
2612	3497	if (source == flipVItem)
2613	3498	{
..	..	@@ -2816,7 +3701,7 @@
2816	3701	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2817	3702	{
2818	3703	obj = (Object3D)e.nextElement();
2819		- obj.SetBumpTexture(null);
	3704	+ obj.ResetBumpTexture();
2820	3705	}
2821	3706
2822	3707	refreshContents();
..	..	@@ -2832,6 +3717,31 @@
2832	3717
2833	3718	refreshContents();
2834	3719	} else
	3720	+ if (source == embedTexturesItem)
	3721	+ {
	3722	+ Object3D obj;
	3723	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3724	+ {
	3725	+ obj = (Object3D)e.nextElement();
	3726	+ obj.EmbedTextures(true);
	3727	+ }
	3728	+
	3729	+ refreshContents();
	3730	+ } else
	3731	+ if (source == deEmbedTexturesItem)
	3732	+ {
	3733	+ Object3D obj;
	3734	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3735	+ {
	3736	+ obj = (Object3D)e.nextElement();
	3737	+ obj.EmbedTextures(false);
	3738	+ }
	3739	+
	3740	+ CameraPane.texturepigment.clear();
	3741	+ CameraPane.texturebump.clear();
	3742	+
	3743	+ refreshContents();
	3744	+ } else
2835	3745	if (source == flashSelectionButton)
2836	3746	{
2837	3747	CameraPane.flash = true;
..	..	@@ -2843,42 +3753,36 @@
2843	3753	if (source == twoButton)
2844	3754	{
2845	3755	radio.layout = twoButton;
2846		- // bug
2847		- //gridPanel.setDividerLocation(1.0);
2848		- //bigPanel.setDividerLocation(0.0);
2849		-// bigThree.remove(scenePanel);
2850		-// bigThree.remove(centralPanel);
2851		-// bigThree.remove(XYZPanel);
2852		-// aWindowConstraints.gridx = 0;
2853		-// aWindowConstraints.gridy = 0;
2854		-// aWindowConstraints.gridwidth = 1;
2855		-// // aConstraints.gridheight = 3;
2856		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2857		-// aWindowConstraints.weightx = 0;
2858		-// aWindowConstraints.weighty = 1;
2859		-// //bigThree.add(jtp, aWindowConstraints);
2860		-// aWindowConstraints.weightx = 1;
2861		-// aWindowConstraints.gridwidth = 3;
2862		-// // aConstraints.gridheight = 3;
2863		-// aWindowConstraints.gridx = 1;
2864		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2865		-// bigThree.add(centralPanel, aWindowConstraints);
2866		-// aWindowConstraints.weightx = 0;
2867		-// aWindowConstraints.gridx = 4;
2868		-// aWindowConstraints.gridwidth = 1;
2869		-// // aConstraints.gridheight = 3;
2870		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2871		-// //bigThree.add(XYZPanel, aWindowConstraints);
2872		-// scenePanel.setVisible(false);
2873		-// centralPanel.setVisible(true);
2874		-// XYZPanel.setVisible(false);
2875		- bigThree.ClearUI();
2876		- bigThree.add(centralPanel);
2877		- bigThree.FlushUI();
	3756	+
	3757	+ if (CameraPane.FULLSCREEN)
	3758	+ fullscreenLayout = radio.layout;
	3759	+
	3760	+ Show3DView();
	3761	+
	3762	+ cameraView.requestFocusInWindow();
	3763	+
	3764	+// refreshContents(true);
	3765	+//
	3766	+// try
	3767	+// {
	3768	+// java.awt.Robot bot = new java.awt.Robot();
	3769	+// int mask = InputEvent.BUTTON1_MASK;
	3770	+// bot.mouseMove(100, 100);
	3771	+// bot.mousePress(mask);
	3772	+// bot.mouseRelease(mask);
	3773	+// }
	3774	+// catch (Exception e)
	3775	+// {
	3776	+//
	3777	+// }
	3778	+
2878	3779	} else
2879	3780	if (source == threeButton)
2880	3781	{
2881	3782	radio.layout = threeButton;
	3783	+
	3784	+ if (CameraPane.FULLSCREEN)
	3785	+ fullscreenLayout = radio.layout;
2882	3786
2883	3787	// bigThree.remove(scenePanel);
2884	3788	// bigThree.remove(centralPanel);
..	..	@@ -2908,13 +3812,18 @@
2908	3812	// centralPanel.setVisible(true);
2909	3813	// XYZPanel.setVisible(true);
2910	3814	bigThree.ClearUI();
	3815	+ bigThree.add(scenePanel);
2911	3816	bigThree.add(centralPanel);
2912		- bigThree.add(XYZPanel);
2913	3817	bigThree.FlushUI();
	3818	+
	3819	+ cameraView.requestFocusInWindow();
2914	3820	} else
2915	3821	if (source == fourButton)
2916	3822	{
2917	3823	radio.layout = fourButton;
	3824	+
	3825	+ if (CameraPane.FULLSCREEN)
	3826	+ fullscreenLayout = radio.layout;
2918	3827
2919	3828	// bigThree.remove(scenePanel);
2920	3829	// bigThree.remove(centralPanel);
..	..	@@ -2946,10 +3855,15 @@
2946	3855	bigThree.ClearUI();
2947	3856	bigThree.add(scenePanel);
2948	3857	bigThree.FlushUI();
	3858	+
	3859	+ cameraView.requestFocusInWindow();
2949	3860	} else
2950	3861	if (source == sixButton)
2951	3862	{
2952	3863	radio.layout = sixButton;
	3864	+
	3865	+ if (CameraPane.FULLSCREEN)
	3866	+ fullscreenLayout = radio.layout;
2953	3867
2954	3868	// bigThree.remove(scenePanel);
2955	3869	// bigThree.remove(centralPanel);
..	..	@@ -2979,13 +3893,18 @@
2979	3893	// centralPanel.setVisible(true);
2980	3894	// XYZPanel.setVisible(false);
2981	3895	bigThree.ClearUI();
2982		- bigThree.add(scenePanel);
2983	3896	bigThree.add(centralPanel);
	3897	+ bigThree.add(scenePanel);
2984	3898	bigThree.FlushUI();
	3899	+
	3900	+ cameraView.requestFocusInWindow();
2985	3901	} else
2986	3902	if (source == sevenButton)
2987	3903	{
2988	3904	radio.layout = sevenButton;
	3905	+
	3906	+ if (CameraPane.FULLSCREEN)
	3907	+ fullscreenLayout = radio.layout;
2989	3908
2990	3909	// bigThree.remove(scenePanel);
2991	3910	// bigThree.remove(centralPanel);
..	..	@@ -3019,9 +3938,12 @@
3019	3938	bigThree.add(centralPanel);
3020	3939	bigThree.add(XYZPanel);
3021	3940	bigThree.FlushUI();
	3941	+
	3942	+ cameraView.requestFocusInWindow();
3022	3943	} else
3023	3944	if (source == rootButton)
3024	3945	{
	3946	+ Replace();
3025	3947	Object3D obj;
3026	3948	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3027	3949	{
..	..	@@ -3030,6 +3952,7 @@
3030	3952	EditObject(obj);
3031	3953	}
3032	3954
	3955	+ cameraView.requestFocusInWindow();
3033	3956	refreshContents(true);
3034	3957	} else
3035	3958	if (source == closeButton)
..	..	@@ -3039,22 +3962,37 @@
3039	3962	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3040	3963	{
3041	3964	ab = (cRadio)e.nextElement();
3042		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3965	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3043	3966	{
	3967	+ // Patch to avoid bug with transparency.
	3968	+ if (!ab.hadMaterial)
	3969	+ {
	3970	+ ab.object.material = null;
	3971	+ }
	3972	+
3044	3973	buttonGroup.remove(ab);
3045	3974	radioPanel.remove(ab);
3046	3975
3047		- ab.GetObject().editWindow = null;
	3976	+ //ab.GetObject().editWindow = null;
	3977	+ ab.GetObject().manipWindow = null;
3048	3978	// ab.GetObject().objectUI = null; // ?????????
3049	3979
3050	3980	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3051	3981	break;
3052	3982	}
3053	3983	}
	3984	+
	3985	+ cameraView.requestFocusInWindow();
3054	3986	refreshContents(true);
3055	3987	} else
3056	3988	if (source == editItem \|\| source == editButton)
3057	3989	{
	3990	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3991	+ {
	3992	+ Object3D child = (Object3D)e.nextElement();
	3993	+ child.pinned = true;
	3994	+ }
	3995	+
3058	3996	EditSelection(false);
3059	3997	} else
3060	3998	if (source == uneditButton)
..	..	@@ -3063,9 +4001,10 @@
3063	4001	{
3064	4002	Object3D child = (Object3D)e.nextElement();
3065	4003	if(child.editWindow != null)
3066		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4004	+ child.pinned = false;
3067	4005	child.CloseUI();
3068	4006	listUI.remove(child);
	4007	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3069	4008
3070	4009	//child.editWindow = null; // ???????????
3071	4010	}
..	..	@@ -3080,16 +4019,18 @@
3080	4019	//copy.ClearUI();
3081	4020	for (Object3D obj : listUI)
3082	4021	{
	4022	+ obj.pinned = false;
3083	4023	obj.CloseUI();
3084	4024	}
3085	4025	listUI.clear();
	4026	+ SetPinStates(group.selection.size() > 0);
3086	4027	refreshContents(true);
3087	4028	} else
3088	4029	if (source == allParamsButton)
3089	4030	{
3090	4031	assert(copy == group);
3091	4032
3092		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4033	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3093	4034
3094	4035	for (Object3D obj : listUI)
3095	4036	{
..	..	@@ -3138,6 +4079,7 @@
3138	4079	}
3139	4080
3140	4081	copy = group;
	4082	+
3141	4083	//Globals.theRenderer.object = group;
3142	4084	if(!useclient)
3143	4085	{
..	..	@@ -3155,7 +4097,8 @@
3155	4097	}
3156	4098
3157	4099	// fix "+" issue
3158		- group.editWindow = this;
	4100	+ //group.editWindow = this;
	4101	+ group.manipWindow = this;
3159	4102
3160	4103	/*
3161	4104	currentLayout = radio.layout;
..	..	@@ -3163,20 +4106,44 @@
3163	4106	currentLayout = sevenButton;
3164	4107	*/
3165	4108	radio.layout.doClick();
	4109	+
	4110	+ assert(copy instanceof Composite);
	4111	+
	4112	+ if (copy.versionlist == null)
	4113	+ {
	4114	+ copy.versionlist = new Object3D[100];
	4115	+ copy.versionindex = -1;
	4116	+
	4117	+ Save(true);
	4118	+ }
	4119	+
	4120	+ SetVersionStates();
	4121	+
	4122	+ ClearUnpinned();
	4123	+
	4124	+ //Grafreed.Assert(group != null);
	4125	+ //Grafreed.Assert(group.selection != null);
	4126	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4127	+ if (group.selection == null \|\| group.selection.size() == 1)
	4128	+ EditSelection(false);
3166	4129	keepparent = group.parent;
3167	4130	// PARENT = NULL or not???
3168	4131	//group.parent = null; // ROOT
3169	4132	//group.attributes = -1;
3170	4133	ResetModel();
	4134	+
	4135	+ cameraView.requestFocusInWindow();
3171	4136	refreshContents(true);
3172	4137	} else if (event.getSource() == editCameraItem)
3173	4138	{
3174	4139	cameraView.ProtectCamera();
	4140	+ cameraView.requestFocusInWindow();
3175	4141	cameraView.repaint();
3176	4142	return;
3177		- } else if (event.getSource() == revertCameraItem)
	4143	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3178	4144	{
3179	4145	cameraView.RevertCamera();
	4146	+ cameraView.requestFocusInWindow();
3180	4147	cameraView.repaint();
3181	4148	return;
3182	4149	// } else if (event.getSource() == textureButton)
..	..	@@ -3191,7 +4158,6 @@
3191	4158	}
3192	4159
3193	4160	boolean useclient = false;
3194		- cRadio radio;
3195	4161
3196	4162	void ToggleRoot()
3197	4163	{
..	..	@@ -3754,7 +4720,7 @@
3754	4720
3755	4721	try
3756	4722	{
3757		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4723	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3758	4724	}
3759	4725	catch (Exception e)
3760	4726	{
..	..	@@ -4146,6 +5112,18 @@
4146	5112	refreshContents();
4147	5113	}
4148	5114
	5115	+ void RewindLeaves(boolean hide)
	5116	+ {
	5117	+ group.selection.RewindLeaves(hide);
	5118	+ refreshContents();
	5119	+ }
	5120	+
	5121	+ void RandomLeaves(boolean hide)
	5122	+ {
	5123	+ group.selection.RandomLeaves(hide);
	5124	+ refreshContents();
	5125	+ }
	5126	+
4149	5127	void SetTexRes(int tr)
4150	5128	{
4151	5129	group.selection.SetTexRes(tr);
..	..	@@ -4217,28 +5195,25 @@
4217	5195	// }
4218	5196	// }
4219	5197
4220		- static boolean allparams = true;
4221		-
4222		- static Vector<Object3D> listUI = new Vector<Object3D>();
4223		-
4224	5198	void EditSelection(boolean newWindow)
4225	5199	{
	5200	+ if (group.selection == null)
	5201	+ {
	5202	+ EditElement(group, newWindow); // ? new
	5203	+ return;
	5204	+ }
	5205	+
4226	5206	// aConstraints.gridy = 0;
4227	5207	for (int i=0; i<group.selection.size(); i++)
4228	5208	{
4229	5209	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4230	5210	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4231		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5211	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4232	5212
4233	5213	Object3D elem = (Object3D)group.selection.elementAt(i);
4234	5214	if(elem != group \|\| !newWindow)
4235	5215	{
4236		- // if (!(elem instanceof Composite))
4237		- // newWindow = false;
4238		- listUI.add(elem);
4239		- elem.openEditWindow(this, newWindow); //, false);
4240		- System.out.println("edit : " + elem);
4241		- elem.editWindow.refreshContents(true); // ? new
	5216	+ EditElement(elem, newWindow); // ? new
4242	5217	}
4243	5218	}
4244	5219	}
..	..	@@ -4301,9 +5276,7 @@
4301	5276
4302	5277	freezemodel = false;
4303	5278	}
4304		-
4305		- boolean flashIt = true;
4306		-
	5279	+
4307	5280	public void valueChanged(TreeSelectionEvent e)
4308	5281	//public boolean handleEvent(Event event)
4309	5282	{
..	..	@@ -4313,7 +5286,8 @@
4313	5286	//new Exception().printStackTrace();
4314	5287
4315	5288	freezemodel = true;
4316		-
	5289	+ ClearUnpinned();
	5290	+
4317	5291	/**/
4318	5292	//switch (event.id)
4319	5293	{
..	..	@@ -4346,7 +5320,7 @@
4346	5320	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4347	5321	// a camera
4348	5322	{
4349		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5323	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4350	5324	{
4351	5325	CameraPane.camerachangeframe = 0; // don't refuse it
4352	5326	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4355,6 +5329,13 @@
4355	5329	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4356	5330	}
4357	5331
	5332	+ if (tps != null && tps.length == 1)
	5333	+ {
	5334	+ EditSelection(false);
	5335	+ }
	5336	+
	5337	+ SetPinStates(tps != null && tps.length > 0);
	5338	+
4358	5339	refreshContents();
4359	5340	//return true;
4360	5341	}
..	..	@@ -4364,9 +5345,34 @@
4364	5345	freezemodel = false;
4365	5346	}
4366	5347
	5348	+ void SetPinStates(boolean enabled)
	5349	+ {
	5350	+ editButton.setEnabled(enabled);
	5351	+ uneditButton.setEnabled(enabled);
	5352	+ //unselectButton.setEnabled(enabled);
	5353	+ flashSelectionButton.setEnabled(enabled);
	5354	+
	5355	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5356	+
	5357	+ boolean allComposites = true;
	5358	+
	5359	+ if (group.selection != null)
	5360	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5361	+ {
	5362	+ if (!(e.nextElement() instanceof Composite))
	5363	+ {
	5364	+ allComposites = false;
	5365	+ break;
	5366	+ }
	5367	+ }
	5368	+
	5369	+ rootButton.setEnabled(allComposites);
	5370	+ }
	5371	+
4367	5372	void refreshContents(boolean cp)
4368	5373	{
4369		- if (!Globals.MOUSEDRAGGED)
	5374	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5375	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4370	5376	{
4371	5377	objEditor.ClearInfo(); // .GetMaterial());
4372	5378
..	..	@@ -4375,7 +5381,7 @@
4375	5381	Object3D child = (Object3D) group.selection.get(i);
4376	5382
4377	5383	objEditor.AddInfo(child, this, true);
4378		- System.err.println("info : " + child.GetPath());
	5384	+// System.err.println("info : " + child.GetPath());
4379	5385	}
4380	5386
4381	5387	objEditor.SetText(); // jan 2014
..	..	@@ -4465,7 +5471,8 @@
4465	5471
4466	5472	if (cut)
4467	5473	{
4468		- Save();
	5474	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5475	+// Save();
4469	5476	//int indices[] = jList.getSelectedIndices();
4470	5477	//for (int i = indices.length - 1; i >= 0; i--)
4471	5478	//jList.remove(indices[i]);
..	..	@@ -4568,6 +5575,10 @@
4568	5575
4569	5576	void paste(boolean expand)
4570	5577	{
	5578	+ if (Globals.REPLACEONMAKE)
	5579	+ Save();
	5580	+ boolean keep = Globals.REPLACEONMAKE;
	5581	+ Globals.REPLACEONMAKE = false;
4571	5582	// if (GrafreeD.clipboard == null)
4572	5583	// return;
4573	5584	boolean first = true;
..	..	@@ -4627,6 +5638,7 @@
4627	5638	Grafreed.clipboard.get(0).parent = keepparent;
4628	5639	}
4629	5640
	5641	+ Globals.REPLACEONMAKE = keep;
4630	5642	ResetModel();
4631	5643	refreshContents();
4632	5644	}
..	..	@@ -4762,6 +5774,10 @@
4762	5774
4763	5775	void group(Object3D csg, boolean grab)
4764	5776	{
	5777	+ if (Globals.REPLACEONMAKE)
	5778	+ Save();
	5779	+ boolean keep = Globals.REPLACEONMAKE;
	5780	+ Globals.REPLACEONMAKE = false;
4765	5781	if (//false) // why??
4766	5782	!group.selection.isEmpty())
4767	5783	{
..	..	@@ -4875,10 +5891,15 @@
4875	5891	//node.add(csg);
4876	5892	//makeSomething(node);
4877	5893	makeSomething(csg);
	5894	+ Globals.REPLACEONMAKE = keep;
4878	5895	}
4879	5896
4880	5897	void Ungroup(Object3D g)
4881	5898	{
	5899	+ if (Globals.REPLACEONMAKE)
	5900	+ Save();
	5901	+ boolean keep = Globals.REPLACEONMAKE;
	5902	+ Globals.REPLACEONMAKE = false;
4882	5903	if (g instanceof HiddenObject)
4883	5904	{
4884	5905	HiddenObject h = (HiddenObject) g;
..	..	@@ -4895,6 +5916,7 @@
4895	5916	objEditor.makeSomething(g.get(i), false);
4896	5917	}
4897	5918	}
	5919	+ Globals.REPLACEONMAKE = keep;
4898	5920	}
4899	5921
4900	5922	void ungroup()
..	..	@@ -5183,10 +6205,43 @@
5183	6205	cButton clearpanelButton;
5184	6206	cButton unselectButton;
5185	6207
5186		- cButton saveButton;
5187		- cButton undoButton;
5188		- cButton redoButton;
	6208	+ cButton restoreCameraButton;
	6209	+
5189	6210	cButton oneStepButton;
	6211	+
	6212	+ cButton groupButton;
	6213	+ cButton ungroupButton;
	6214	+ cButton compositeButton;
	6215	+ cButton switchButton;
	6216	+ cButton loopButton;
	6217	+ cButton textureButton;
	6218	+
	6219	+ cButton skybox1Button;
	6220	+ cButton skybox2Button;
	6221	+ cButton skybox3Button;
	6222	+ cButton skybox4Button;
	6223	+ cButton skybox5Button;
	6224	+ cButton skybox6Button;
	6225	+ cButton skybox7Button;
	6226	+
	6227	+ cButton skybox11Button;
	6228	+ cButton skybox12Button;
	6229	+ cButton skybox13Button;
	6230	+ cButton skybox14Button;
	6231	+ cButton skybox15Button;
	6232	+ cButton skybox16Button;
	6233	+ cButton skybox17Button;
	6234	+
	6235	+ cButton gridButton;
	6236	+ cButton boxButton;
	6237	+ cButton sphereButton;
	6238	+ cButton coneButton;
	6239	+ cButton torusButton;
	6240	+ cButton superButton;
	6241	+ cButton kleinButton;
	6242	+ cButton particlesButton;
	6243	+ cButton overlayButton;
	6244	+ cButton lightButton;
5190	6245
5191	6246	cButton screenfitButton;
5192	6247	cButton screenfitpointButton;
..	..	@@ -5199,14 +6254,6 @@
5199	6254
5200	6255	cButton setsupportButton;
5201	6256
5202		- cButton twoButton;
5203		- cButton sixButton;
5204		- cButton threeButton;
5205		- cButton sevenButton;
5206		- cButton fourButton; // full panel
5207		- cButton oneButton; // full XYZ
5208		- //cButton currentLayout;
5209		-
5210	6257	//
5211	6258	//Composite
5212	6259	Object3D // to do !!
..	..	@@ -5216,12 +6263,12 @@
5216	6263	//JTree jTree;
5217	6264	private MenuItem lookAtItem;
5218	6265	private MenuItem lookFromItem;
5219		- private MenuItem switchItem;
5220		- private MenuItem cutItem;
	6266	+ private MenuItem switchViewItem;
	6267	+ private JMenuItem cutItem;
5221	6268	private MenuItem undoItem;
5222	6269	private MenuItem redoItem;
5223		- private MenuItem duplicateItem;
5224		- private MenuItem cloneItem;
	6270	+ private JMenuItem duplicateItem;
	6271	+ private JMenuItem cloneItem;
5225	6272	private MenuItem cloneSupportItem;
5226	6273	private MenuItem overwriteGeoItem;
5227	6274	private MenuItem overwriteMatItem;
..	..	@@ -5242,13 +6289,13 @@
5242	6289	private MenuItem cloneGeometriesItem;
5243	6290	private MenuItem shareGeometriesItem;
5244	6291	private MenuItem mergeGeometriesItem;
5245		- private MenuItem copyItem;
	6292	+ private JMenuItem copyItem;
5246	6293	private MenuItem pasteItem;
5247		- private MenuItem pasteIntoItem;
5248		- private MenuItem pasteLinkItem;
5249		- private MenuItem pasteCloneItem;
5250		- private MenuItem pasteExpandItem;
5251		- private MenuItem clearItem;
	6294	+ private JMenuItem pasteIntoItem;
	6295	+ private JMenuItem pasteLinkItem;
	6296	+ private JMenuItem pasteCloneItem;
	6297	+ private JMenuItem pasteExpandItem;
	6298	+ private JMenuItem deleteItem;
5252	6299	private MenuItem clearAllItem;
5253	6300	private MenuItem genUVItem;
5254	6301	private MenuItem genNormalsMESHItem;
..	..	@@ -5283,6 +6330,10 @@
5283	6330	private MenuItem showleavesItem;
5284	6331	private MenuItem markleavesItem;
5285	6332	private MenuItem unmarkleavesItem;
	6333	+ private MenuItem rewindleavesItem;
	6334	+ private MenuItem unrewindleavesItem;
	6335	+ private MenuItem randomleavesItem;
	6336	+ private MenuItem unrandomleavesItem;
5286	6337
5287	6338	private MenuItem flipVItem;
5288	6339	private MenuItem unflipVItem;
..	..	@@ -5304,7 +6355,7 @@
5304	6355	private MenuItem frontItem;
5305	6356	private MenuItem cameraItem;
5306	6357	private MenuItem compositeItem;
5307		- private MenuItem randomItem;
	6358	+ private MenuItem switchItem;
5308	6359	private MenuItem physicsItem;
5309	6360	private MenuItem frameselectorItem;
5310	6361	private MenuItem scriptNodeItem;
..	..	@@ -5312,7 +6363,7 @@
5312	6363	private MenuItem switchTransfoItem;
5313	6364	private MenuItem morphItem;
5314	6365	private MenuItem linkerItem;
5315		- private MenuItem ungroupItem;
	6366	+ private JMenuItem ungroupItem;
5316	6367	private MenuItem editItem;
5317	6368	private MenuItem openWindowItem;
5318	6369	private MenuItem editLeafItem;
..	..	@@ -5328,6 +6379,8 @@
5328	6379	private MenuItem attachBumpItem;
5329	6380	private MenuItem detachBumpItem;
5330	6381	private MenuItem pigmentBumpItem;
	6382	+ private MenuItem embedTexturesItem;
	6383	+ private MenuItem deEmbedTexturesItem;
5331	6384
5332	6385	private MenuItem particleItem;
5333	6386	private MenuItem ragdollItem;
..	..	@@ -5378,5 +6431,5 @@
5378	6431
5379	6432	Menu cameraMenu;
5380	6433	MenuItem editCameraItem;
5381		- MenuItem revertCameraItem;
	6434	+ MenuItem restoreCameraItem;
5382	6435	}