~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,91 @@
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)
	949	+ {
	950	+ currenttab = new cGridBag();
	951	+ added = false;
	952	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	953	+ currenttab.setName(tabname);
	954	+ rowcount = 1;
	955	+ colcount = 0;
	956	+ texturecount = 0;
	957	+ }
	958	+
	959	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	960	+ {
	961	+ if (!added)
	962	+ {
	963	+ added = true;
	964	+ resourcecontainer.add(currenttab);
	965	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	966	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	967	+ }
	968	+
	969	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	970	+
	971	+ if (++colcount >= columns)
	972	+ {
	973	+ colcount = 0;
	974	+ currenttab.Return();
	975	+
	976	+ if (rowcount++ >= rows)
	977	+ {
	978	+ rowcount = 0;
	979	+ }
	980	+ }
	981	+ }
	982	+ else
	983	+ {
	984	+// if (!path[path.length-1].equals("icons"))
	985	+// resourcecontainer.Return();
	986	+ }
	987	+ }
	988	+
	989	+ void CreateTexturePanel(cGridBag container)
	990	+ {
	991	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	992	+ container.add(resourcecontainer);
	993	+
	994	+ Grafreed.ParseResources("textures", this);
	995	+ }
	996	+
528	997	void SetupUI2(ObjEditor oe)
529	998	{
	999	+ // June 2019
	1000	+ if (oe == null)
	1001	+ {
	1002	+ //super.SetupUI2(this);
	1003	+ //return;
	1004	+ }
	1005	+
	1006	+ if (copy != group)
	1007	+ {
	1008	+ //super.SetupUI2(this);
	1009	+ }
	1010	+
530	1011	//new Exception().printStackTrace();
531	1012
532	1013	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	1014	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
539	1015
540	1016	oe.buttonGroup = new ButtonGroup();
..	..	@@ -555,39 +1031,122 @@
555	1031	oe.radioPanel.add(dummyButton);
556	1032	oe.buttonGroup.add(dummyButton);
557	1033	*/
	1034	+ cGridBag copyOptionsPanel = new cGridBag();
	1035	+
	1036	+ copyOptionsPanel.preferredHeight = 2;
	1037	+
558	1038	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
559	1039
560		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- undoButton.setToolTipText("Undo changes");
562		- undoButton.addActionListener(this);
	1040	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1041	+ //minButton.setToolTipText("Minimize window");
	1042	+ //minButton.addActionListener(this);
563	1043
564		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- redoButton.setToolTipText("Redo changes");
566		- redoButton.addActionListener(this);
	1044	+ if (Globals.ADVANCED)
	1045	+ {
	1046	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1047	+// maxButton.setToolTipText("Maximize window");
	1048	+// maxButton.addActionListener(this);
	1049	+ }
567	1050
568		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569		- saveButton.setToolTipText("Save changes");
570		- saveButton.addActionListener(this);
	1051	+ cButton gcButton;
571	1052
572		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
573		- liveCB.setToolTipText("Enable animation");
574		- liveCB.addItemListener(this);
	1053	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// gcButton.setToolTipText("Garbage collect");
	1055	+// gcButton.addActionListener(new ActionListener()
	1056	+// {
	1057	+// public void actionPerformed(ActionEvent e)
	1058	+// {
	1059	+// System.gc();
	1060	+// }
	1061	+// });
	1062	+
	1063	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ collapseButton.setToolTipText("Collapse toolbar");
	1065	+ collapseButton.addActionListener(this);
	1066	+
	1067	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1069	+ maximize3DButton.addActionListener(this);
	1070	+
	1071	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ twoButton.setToolTipText("Show 3D view only");
	1073	+ twoButton.addActionListener(this);
	1074	+ this.fullscreenLayout = twoButton;
	1075	+
	1076	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ threeButton.setToolTipText("Show controls and 3D view");
	1078	+ threeButton.addActionListener(this);
	1079	+ if (Globals.ADVANCED)
	1080	+ {
	1081	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ sixButton.setToolTipText("Show 3D view and controls");
	1083	+ sixButton.addActionListener(this);
	1084	+ }
	1085	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1086	+// sevenButton.setToolTipText("3-column layout");
	1087	+// sevenButton.addActionListener(this);
	1088	+ //
	1089	+
	1090	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1091	+ fullButton.setToolTipText("Full-screen window");
	1092	+ fullButton.addActionListener(this);
	1093	+
	1094	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1095	+ screenfitButton.setToolTipText("Screen fit");
	1096	+ screenfitButton.addActionListener(this);
575	1097
576		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1099	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1100	+ restoreCameraButton.addActionListener(this);
	1101	+
	1102	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ saveVersionButton.setToolTipText("Duplicate current version");
	1104	+ saveVersionButton.addActionListener(this);
	1105	+
	1106	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+ deleteVersionButton.setToolTipText("Delete current version");
	1108	+ deleteVersionButton.addActionListener(this);
	1109	+
	1110	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1111	+ previousVersionButton.setToolTipText("Previous version");
	1112	+ previousVersionButton.addActionListener(this);
	1113	+ previousVersionButton.setEnabled(false);
	1114	+
	1115	+ cGridBag updown = new cGridBag().setVertical(true);
	1116	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ restoreButton.setToolTipText("Undo (restore current version)");
	1118	+ restoreButton.addActionListener(this);
	1119	+ //restoreButton.setEnabled(false);
	1120	+
	1121	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1122	+ replaceButton.setToolTipText("Save (replace current version)");
	1123	+ replaceButton.addActionListener(this);
	1124	+ //replaceButton.setEnabled(false);
	1125	+
	1126	+ copyOptionsPanel.add(updown);
	1127	+
	1128	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ nextVersionButton.setToolTipText("Next version");
	1130	+ nextVersionButton.addActionListener(this);
	1131	+ nextVersionButton.setEnabled(false);
	1132	+
	1133	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	1134	oneStepButton.setToolTipText("Animate one step forward");
578	1135	oneStepButton.addActionListener(this);
579	1136
580		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1137	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1138	+ liveCB.setToolTipText("Enable animation");
	1139	+ liveCB.addItemListener(this);
	1140	+
	1141	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
581	1142	fastCB.setToolTipText("Fast mode");
582	1143	fastCB.addItemListener(this);
583	1144
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);
	1145	+ //oe.toolboxPanel.Return();
	1146	+
	1147	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1148	+// trackCB.setToolTipText("Enable tracking");
	1149	+// trackCB.addItemListener(this);
591	1150
592	1151	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
593	1152	// screenfitpointButton.addActionListener(this);
..	..	@@ -597,67 +1156,137 @@
597	1156	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598	1157	snapobjectButton.addActionListener(this);
599	1158	snapobjectButton.setToolTipText("Snap Object");
	1159	+
	1160	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1161	+ fourButton.addActionListener(this);
	1162	+ fourButton.setToolTipText("Show control panel only");
600	1163	}
601	1164
602		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- flashSelectionButton.setToolTipText("Show selection");
604		- flashSelectionButton.addActionListener(this);
	1165	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
605	1166
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	1167
625		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626		- rootButton.setToolTipText("Edit selection in new tab");
	1168	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ rootButton.setToolTipText("Open selection in new tab");
627	1170	rootButton.addActionListener(this);
628	1171
629		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1172	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630	1173	closeButton.setToolTipText("Close tab");
631	1174	closeButton.addActionListener(this);
632	1175	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
633	1176	//clearButton.addActionListener(this);
634		-
635		- cGridBag commandsPanel = new cGridBag();
	1177	+
	1178	+ cGridBag row1 = new cGridBag();
636	1179
637		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638		- editButton.setToolTipText("Edit selection");
	1180	+ // INSERT
	1181	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ gridButton.setToolTipText("Create ground");
	1183	+ gridButton.addActionListener(this);
	1184	+
	1185	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1186	+ boxButton.setToolTipText("Create box");
	1187	+ boxButton.addActionListener(this);
	1188	+
	1189	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ sphereButton.setToolTipText("Create sphere");
	1191	+ sphereButton.addActionListener(this);
	1192	+
	1193	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ coneButton.setToolTipText("Create cone");
	1195	+ coneButton.addActionListener(this);
	1196	+
	1197	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ torusButton.setToolTipText("Create torus");
	1199	+ torusButton.addActionListener(this);
	1200	+
	1201	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ superButton.setToolTipText("Create superellipsoid");
	1203	+ superButton.addActionListener(this);
	1204	+
	1205	+ if (Globals.ADVANCED)
	1206	+ {
	1207	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1208	+ kleinButton.setToolTipText("Create Klein bottle");
	1209	+ kleinButton.addActionListener(this);
	1210	+ }
	1211	+
	1212	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1213	+ particlesButton.setToolTipText("Create particle system");
	1214	+ particlesButton.addActionListener(this);
	1215	+
	1216	+ oe.toolboxPanel.add(row1);
	1217	+
	1218	+ cGridBag row2 = new cGridBag();
	1219	+
	1220	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1221	+ groupButton.setToolTipText("Create group");
	1222	+ groupButton.addActionListener(this);
	1223	+
	1224	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1225	+ compositeButton.setToolTipText("Create composite");
	1226	+ compositeButton.addActionListener(this);
	1227	+
	1228	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ switchButton.setToolTipText("Create item switcher");
	1230	+ switchButton.addActionListener(this);
	1231	+
	1232	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ loopButton.setToolTipText("Create loop");
	1234	+ loopButton.addActionListener(this);
	1235	+
	1236	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ textureButton.setToolTipText("Create texture");
	1238	+ textureButton.addActionListener(this);
	1239	+
	1240	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ overlayButton.setToolTipText("Create overlay");
	1242	+ overlayButton.addActionListener(this);
	1243	+
	1244	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ lightButton.setToolTipText("Create light");
	1246	+ lightButton.addActionListener(this);
	1247	+
	1248	+ oe.toolboxPanel.add(row2);
	1249	+
	1250	+ cGridBag textures = new cGridBag();
	1251	+
	1252	+ CreateTexturePanel(textures);
	1253	+
	1254	+ oe.toolboxPanel.add(textures);
	1255	+
	1256	+ textures.preferredHeight = 100;
	1257	+
	1258	+ CreateSkyboxPanel(oe.skyboxPanel);
	1259	+
	1260	+ // EDIT panel
	1261	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1262	+ editButton.setToolTipText("Pin selection controls");
639	1263	editButton.addActionListener(this);
640	1264
641		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642		- uneditButton.setToolTipText("Unedit selection");
	1265	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ uneditButton.setToolTipText("Unpin and remove selection controls");
643	1267	uneditButton.addActionListener(this);
644	1268
645		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
646		- allParamsButton.setToolTipText("Edit all params");
	1269	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1270	+ allParamsButton.setToolTipText("Show all controls");
647	1271	allParamsButton.addActionListener(this);
648	1272
649		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- clearPanelButton.setToolTipText("Clear edit panel");
	1273	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1274	+ clearPanelButton.setToolTipText("Clear all controls");
651	1275	clearPanelButton.addActionListener(this);
652	1276
653		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654		- unselectButton.setToolTipText("Unselect");
655		- unselectButton.addActionListener(this);
	1277	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1278	+ //unselectButton.setToolTipText("Unselect");
	1279	+ //unselectButton.addActionListener(this);
656	1280
657		- commandsPanel.preferredHeight = 1;
	1281	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1282	+ flashSelectionButton.setToolTipText("Highlight selection");
	1283	+ flashSelectionButton.addActionListener(this);
658	1284
659		- oe.treePanel.add(commandsPanel);
660		- oe.treePanel.Return();
	1285	+ editCommandsPanel.preferredHeight = 1;
	1286	+
	1287	+ SetPinStates(false);
	1288	+// oe.treePanel.add(commandsPanel);
	1289	+// oe.treePanel.Return();
661	1290
662	1291	// oe.aConstraints.gridx += 1;
663	1292	// oe.aConstraints.weighty = 0;
..	..	@@ -674,32 +1303,20 @@
674	1303
675	1304	JScrollPane jSP;
676	1305	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
677		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1306	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
678	1307	ResetModel();
679	1308
680	1309	oe.treePanel.add(jSPPanel);
681	1310	oe.treePanel.Return();
682	1311
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	1312	oe.treePanel.add(copyOptionsPanel);
699	1313	oe.treePanel.Return();
	1314	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1315	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1316	+ sliderPane.preferredHeight = 1;
700	1317
701		-// mainPanel.setDividerLocation(0.5); //1.0);
702		-// mainPanel.setResizeWeight(0.5);
	1318	+// mainPanel.setDividerLocation(0.1); //1.0);
	1319	+ mainPanel.setResizeWeight(0.4);
703	1320
704	1321	//jList.addListSelectionListener(this);
705	1322	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -707,7 +1324,7 @@
707	1324	//jTree.setEditable(true);
708	1325	oe.jTree.setDragEnabled(true);
709	1326	//jTree.setPreferredSize(new Dimension(10,10));
710		- jSP.setPreferredSize(new Dimension(100,200));
	1327	+ //jSP.setPreferredSize(new Dimension(100,200));
711	1328
712	1329	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
713	1330
..	..	@@ -719,29 +1336,49 @@
719	1336	dgr.addDragGestureListener(this);
720	1337	}catch(Exception e) {}
721	1338	*/
722		- radio.layout = sevenButton;
	1339	+ radio.layout = threeButton; // sixButton;
723	1340	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
724	1341	}
725	1342
726	1343	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
727	1344	{
	1345	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1346	+ colorCB.setToolTipText("Copy color when dropped");
	1347	+ colorCB.addItemListener(this);
	1348	+
	1349	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1350	+ materialCB.setToolTipText("Copy material when dropped");
	1351	+ materialCB.addItemListener(this);
	1352	+
	1353	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1354	+ textureCB.setToolTipText("Copy texture when dropped");
	1355	+ textureCB.addItemListener(this);
	1356	+
	1357	+ panel.Return();
	1358	+
728	1359	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
729	1360	boxCB.setToolTipText("Display bounding boxes");
730	1361	boxCB.addItemListener(this);
731	1362
732	1363	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
733		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1364	+ zoomBoxCB.setToolTipText("Display only for wheel");
734	1365	zoomBoxCB.addItemListener(this);
735	1366
736	1367	if (true) // Globals.ADVANCED)
737	1368	{
738		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
739		- supportCB.setToolTipText("Enable rigging");
740		- supportCB.addItemListener(this);
	1369	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1370	+// supportCB.setToolTipText("Enable rigging");
	1371	+// supportCB.addItemListener(this);
	1372	+
	1373	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1374	+ freezeCB.setToolTipText("Fast moving camera");
	1375	+ freezeCB.addItemListener(this);
741	1376
742	1377	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
743	1378	// localCB.addItemListener(this);
744	1379
	1380	+ panel.Return();
	1381	+
745	1382	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
746	1383	crowdCB.setToolTipText("Used for crowds");
747	1384	crowdCB.addItemListener(this);
..	..	@@ -750,14 +1387,19 @@
750	1387	smoothCB.setToolTipText("Snapping delay");
751	1388	smoothCB.addItemListener(this);
752	1389
753		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
754		- slowCB.setToolTipText("Smooth interpolation");
755		- slowCB.addItemListener(this);
	1390	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1391	+// slowCB.setToolTipText("Smooth interpolation");
	1392	+// slowCB.addItemListener(this);
	1393	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1394	+ minshaderCB.setToolTipText("Minimal fast shader");
	1395	+ minshaderCB.addItemListener(this);
756	1396
757	1397	// constraints.gridy += 1;
758	1398	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
759	1399	// speakerMocapCB.addItemListener(this);
760	1400
	1401	+ panel.Return();
	1402	+
761	1403	if (false)
762	1404	{
763	1405	// handled in scripts
..	..	@@ -772,34 +1414,82 @@
772	1414	//constraints.gridy += 1;
773	1415	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
774	1416	smoothfocusCB.addItemListener(this);
	1417	+ panel.Return();
775	1418	}
776	1419
777	1420	//constraints.gridx += 1;
778	1421	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
779	1422	// debugCB.addItemListener(this);
780	1423
	1424	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1425	+ trackCB.setToolTipText("Enable tracking target");
	1426	+ trackCB.addItemListener(this);
	1427	+
781	1428	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1429	+ oeilCB.setToolTipText("Move camera when tracking");
782	1430	oeilCB.addItemListener(this);
783	1431
	1432	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1433	+ shadowCB.setToolTipText("When live compute shadows");
	1434	+ shadowCB.addItemListener(this);
	1435	+
	1436	+ panel.Return();
	1437	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1438	+ toggleTextureCB.setToolTipText("Load textures");
	1439	+ toggleTextureCB.addItemListener(this);
	1440	+
	1441	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1442	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1443	+ toggleSwitchCB.addItemListener(this);
	1444	+
	1445	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1446	+ autokeepCB.setToolTipText("On structure change");
	1447	+ autokeepCB.addItemListener(this);
	1448	+
	1449	+ panel.Return();
	1450	+ if (Globals.ADVANCED)
	1451	+ {
784	1452	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
785	1453	lookAtCB.setToolTipText("Look-at target");
786	1454	lookAtCB.addItemListener(this);
	1455	+ }
787	1456
788	1457	}
789	1458
790	1459	cGridBag fill = new cGridBag();
791		-
792	1460	fill.preferredHeight = 200;
	1461	+ cGridBag fill2 = new cGridBag();
	1462	+ fill2.preferredHeight = 200;
	1463	+ cGridBag fill3 = new cGridBag();
	1464	+ fill3.preferredHeight = 200;
793	1465
794	1466	panel.add(fill);
	1467	+ panel.add(fill2);
	1468	+ panel.add(fill3);
795	1469
796	1470	}
797	1471
798	1472	void EditObject(Object3D obj)
799	1473	{
	1474	+ assert(obj instanceof Composite);
	1475	+
	1476	+// if (obj.versionlist == null)
	1477	+// {
	1478	+// obj.versionlist = new Object3D[100];
	1479	+// obj.versionindex = -1;
	1480	+// }
	1481	+
800	1482	cRadio radioButton = new cRadio(obj.name);
	1483	+
	1484	+ // June 2019. Patch to avoid bug with transparency.
	1485	+ radioButton.hadMaterial = obj.material != null;
	1486	+ if (!radioButton.hadMaterial)
	1487	+ {
	1488	+ obj.material = new cMaterial();
	1489	+ }
	1490	+
801	1491	radioButton.SetObject(obj);
802		- radioButton.layout = sevenButton;
	1492	+ radioButton.layout = threeButton; // sixButton;
803	1493	radioButton.SetCamera(cameraView.renderCamera, false);
804	1494	radioButton.addActionListener(this);
805	1495	radioPanel.add(radioButton);
..	..	@@ -809,6 +1499,8 @@
809	1499
810	1500	void SetupViews(ObjEditor oe)
811	1501	{
	1502	+ theFrame = this;
	1503	+
812	1504	oe.SetupViews();
813	1505
814	1506	System.out.println("SetupViews");
..	..	@@ -817,23 +1509,30 @@
817	1509	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
818	1510	}
819	1511
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;
	1512	+ cToggleButton liveCB;
	1513	+ cCheckBox supportCB;
	1514	+ cCheckBox localCB;
	1515	+ cCheckBox crowdCB;
	1516	+ cCheckBox smoothCB;
	1517	+ cCheckBox minshaderCB;
	1518	+
	1519	+ cToggleButton fastCB;
	1520	+ cCheckBox slowCB;
	1521	+ cCheckBox boxCB;
	1522	+ cCheckBox zoomBoxCB;
	1523	+ cCheckBox freezeCB;
	1524	+ //cToggleButton trackCB;
	1525	+ cCheckBox trackCB;
	1526	+ cCheckBox smoothfocusCB;
831	1527	// JCheckBox speakerMocapCB;
832		- JCheckBox speakerCameraCB;
833		- JCheckBox speakerFocusCB;
834		- JCheckBox debugCB;
835		- JCheckBox oeilCB;
836		- JCheckBox lookAtCB;
	1528	+ cCheckBox speakerCameraCB;
	1529	+ cCheckBox speakerFocusCB;
	1530	+ cCheckBox debugCB;
	1531	+
	1532	+ cCheckBox oeilCB;
	1533	+ cCheckBox shadowCB;
	1534	+ cCheckBox autokeepCB;
	1535	+ cCheckBox lookAtCB;
837	1536
838	1537	// static int COLOR = 1;
839	1538	// static int MATERIAL = 2;
..	..	@@ -841,9 +1540,9 @@
841	1540
842	1541	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
843	1542
844		- JCheckBox colorCB;
845		- JCheckBox materialCB;
846		- JCheckBox textureCB;
	1543	+ cCheckBox colorCB;
	1544	+ cCheckBox materialCB;
	1545	+ cCheckBox textureCB;
847	1546
848	1547	public void itemStateChanged(ItemEvent e)
849	1548	{
..	..	@@ -887,6 +1586,12 @@
887	1586	{
888	1587	cameraView.ToggleInertia();
889	1588	cameraView.repaint();
	1589	+ }
	1590	+ else if(e.getSource() == minshaderCB)
	1591	+ {
	1592	+ Globals.MINSHADER ^= true;
	1593	+ cameraView.programInitialized = false;
	1594	+ cameraView.repaint();
890	1595	}
891	1596	else if(e.getSource() == localCB)
892	1597	{
..	..	@@ -936,6 +1641,18 @@
936	1641	{
937	1642	cameraView.ToggleOeil();
938	1643	}
	1644	+ else if(e.getSource() == shadowCB)
	1645	+ {
	1646	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1647	+ }
	1648	+ else if(e.getSource() == freezeCB)
	1649	+ {
	1650	+ Globals.FREEZEONMOVE ^= true;
	1651	+ }
	1652	+ else if(e.getSource() == autokeepCB)
	1653	+ {
	1654	+ Globals.REPLACEONMAKE ^= true;
	1655	+ }
939	1656	else if(e.getSource() == lookAtCB)
940	1657	{
941	1658	cameraView.ToggleLookAt();
..	..	@@ -952,7 +1669,8 @@
952	1669
953	1670	/**/
954	1671	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
955		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1672	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1673	+ TreePath path = objEditor.jTree.getSelectionPath();
956	1674	if ((path == null) \|\| (path.getPathCount() <= 1)) {
957	1675	// We can't move the root node or an empty selection
958	1676	return;
..	..	@@ -1015,8 +1733,6 @@
1015	1733	}
1016	1734	}
1017	1735
1018		- String string = (String) object;
1019		-
1020	1736	System.out.println("Transfer = " + object + "; drop : " + target);
1021	1737	// if( object instanceof java.io.File[])
1022	1738	// {
..	..	@@ -1024,6 +1740,8 @@
1024	1740	// objEditor.DropFile((java.io.File[]) object, true);
1025	1741	// return;
1026	1742	// }
	1743	+
	1744	+ String string = object.toString();
1027	1745
1028	1746	// File path for Mac and Windows
1029	1747	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1069,23 +1787,33 @@
1069	1787
1070	1788	assert target == objEditor.jTree;
1071	1789	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1790	+ Object3D destinationLeaf;
1072	1791	try {
1073		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1792	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1074	1793	} catch (Exception e) {
1075	1794	System.out.println("destinationPath : " + destinationPath);
1076	1795	return;
1077	1796	}
1078	1797
1079		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1798	+ for (int i=group.selection.size(); --i>=0;)
1080	1799	{
	1800	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1801	+
	1802	+ // Cannot move into itself
	1803	+ if (child == destinationLeaf)
	1804	+ return;
	1805	+ }
	1806	+
	1807	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1808	+// {
1081	1809	loadClipboard(true);
1082	1810	objEditor.jTree.setSelectionPath(destinationPath);
1083	1811	pasteInto(false, false);
1084		- } else {
1085		- loadClipboard(false);
1086		- objEditor.jTree.setSelectionPath(destinationPath);
1087		- pasteInto(false, false); // true); // ???
1088		- }
	1812	+// } else {
	1813	+// loadClipboard(false);
	1814	+// objEditor.jTree.setSelectionPath(destinationPath);
	1815	+// pasteInto(false, false); // true); // ???
	1816	+// }
1089	1817	}
1090	1818	public void dropActionChanged(DropTargetDragEvent dtde)
1091	1819	// Called if the user has modified the current drop gesture
..	..	@@ -1141,7 +1869,12 @@
1141	1869	TreePath path;
1142	1870
1143	1871	public TransferableTreePath(TreePath tp) {
1144		- path = tp;
	1872	+ Object[] objs = new Object[tp.getPathCount()];
	1873	+ for (int i=0; i<objs.length; i++)
	1874	+ {
	1875	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1876	+ }
	1877	+ path = new TreePath(objs);
1145	1878	}
1146	1879
1147	1880	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1190,22 +1923,30 @@
1190	1923	{
1191	1924	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1192	1925	//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);
	1926	+// gridItem = menu.add(new MenuItem("Grid"));
	1927	+// gridItem.addActionListener(this);
	1928	+// rectoidItem = menu.add(new MenuItem("Box"));
	1929	+// rectoidItem.addActionListener(this);
	1930	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1931	+// ellipsoidItem.addActionListener(this);
	1932	+// coneItem = menu.add(new MenuItem("Cone"));
	1933	+// coneItem.addActionListener(this);
	1934	+// torusItem = menu.add(new MenuItem("Torus"));
	1935	+// torusItem.addActionListener(this);
	1936	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1937	+// superItem.addActionListener(this);
	1938	+
	1939	+ cameraItem = menu.add(new MenuItem("Camera"));
	1940	+ cameraItem.addActionListener(this);
	1941	+
	1942	+ if (!Globals.ADVANCED)
	1943	+ {
1205	1944	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1206	1945	kleinItem.addActionListener(this);
1207		- particleItem = menu.add(new MenuItem("Particle system"));
1208		- particleItem.addActionListener(this);
	1946	+ }
	1947	+
	1948	+// particleItem = menu.add(new MenuItem("Particle system"));
	1949	+// particleItem.addActionListener(this);
1209	1950	if (Globals.ADVANCED)
1210	1951	{
1211	1952	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1231,15 +1972,15 @@
1231	1972	}
1232	1973	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1233	1974	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);
	1975	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1976	+// overlayItem.addActionListener(this);
	1977	+// lightItem = menu.add(new MenuItem("Light"));
	1978	+// lightItem.addActionListener(this);
1238	1979	menu.add("-");
1239	1980	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1240	1981	//superLoopItem.addActionListener(this);
1241		- loopItem = menu.add(new MenuItem("Loop"));
1242		- loopItem.addActionListener(this);
	1982	+// loopItem = menu.add(new MenuItem("Loop"));
	1983	+// loopItem.addActionListener(this);
1243	1984	doubleItem = menu.add(new MenuItem("Fork"));
1244	1985	doubleItem.addActionListener(this);
1245	1986	if (Globals.ADVANCED)
..	..	@@ -1255,6 +1996,9 @@
1255	1996	animationItem.addItemListener(this);
1256	1997	animationItem.setState(Globals.ANIMATION);
1257	1998
	1999	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2000	+ archiveItem.addActionListener(this);
	2001	+
1258	2002	menu.add("-");
1259	2003	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1260	2004	parseverticesItem.addActionListener(this);
..	..	@@ -1267,6 +2011,8 @@
1267	2011	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1268	2012	reduce34MorphItem.addActionListener(this);
1269	2013	menu.add("-");
	2014	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2015	+ memoryItem.addActionListener(this);
1270	2016	menu.add(computeAOItem = new MenuItem("Compute AO"));
1271	2017	computeAOItem.addActionListener(this);
1272	2018
..	..	@@ -1275,8 +2021,6 @@
1275	2021	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1276	2022	mirrorItem.addActionListener(this);
1277	2023	menu.add("-");
1278		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1279		- memoryItem.addActionListener(this);
1280	2024	menu.add(analyzeItem = new MenuItem("Analyze"));
1281	2025	analyzeItem.addActionListener(this);
1282	2026	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1420,9 +2164,34 @@
1420	2164	shadow.material = new cMaterial(obj.material);
1421	2165	shadow.material.diffuse = 0.0001f;
1422	2166	shadow.material.specular = 0.0001f;
	2167	+ //shadow.projectedVertices[1].x = 300;
1423	2168
1424	2169	makeSomething(shadow);
1425	2170	}
	2171	+
	2172	+ private void ClearUnpinned()
	2173	+ {
	2174	+ //for (Object3D obj : listUI)
	2175	+ for (int i=listUI.size(); --i>=0;)
	2176	+ {
	2177	+ Object3D obj = listUI.elementAt(i);
	2178	+ if (!obj.pinned)
	2179	+ {
	2180	+ obj.CloseUI();
	2181	+ listUI.remove(i);
	2182	+ }
	2183	+ }
	2184	+ }
	2185	+
	2186	+ private void EditElement(Object3D elem, boolean newWindow)
	2187	+ {
	2188	+ // if (!(elem instanceof Composite))
	2189	+ // newWindow = false;
	2190	+ listUI.add(elem);
	2191	+ elem.openEditWindow(this, newWindow); //, false);
	2192	+ System.out.println("edit : " + elem);
	2193	+ elem.editWindow.refreshContents(true); // ? new
	2194	+ }
1426	2195
1427	2196	/**
1428	2197	* applyExample
..	..	@@ -1667,7 +2436,7 @@
1667	2436	{
1668	2437	ScreenFit();
1669	2438	} else
1670		- if (source == switchItem)
	2439	+ if (source == switchViewItem)
1671	2440	{
1672	2441	cVector v1 = new cVector();
1673	2442	cVector v2 = new cVector();
..	..	@@ -1676,11 +2445,11 @@
1676	2445	objEditor.cameraView.renderCamera.setAim(v2, v1);
1677	2446	objEditor.cameraView.repaint();
1678	2447	} else
1679		- if (source == rectoidItem)
	2448	+ if (source == rectoidItem \|\| source == boxButton)
1680	2449	{
1681	2450	makeSomething(new Box());
1682	2451	} else
1683		- if (source == particleItem)
	2452	+ if (source == particleItem \|\| source == particlesButton)
1684	2453	{
1685	2454	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1686	2455	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1759,27 +2528,27 @@
1759	2528
1760	2529	makeSomething(obj);
1761	2530	} else
1762		- if (source == gridItem)
	2531	+ if (source == gridItem \|\| source == gridButton)
1763	2532	{
1764	2533	makeSomething(new Grid());
1765	2534	} else
1766		- if (source == ellipsoidItem)
	2535	+ if (source == ellipsoidItem \|\| source == sphereButton)
1767	2536	{
1768	2537	makeSomething(new Sphere());
1769	2538	} else
1770		- if (source == coneItem)
	2539	+ if (source == coneItem \|\| source == coneButton)
1771	2540	{
1772	2541	makeSomething(new Cone());
1773	2542	} else
1774		- if (source == torusItem)
	2543	+ if (source == torusItem \|\| source == torusButton)
1775	2544	{
1776	2545	makeSomething(new Torus());
1777	2546	} else
1778		- if (source == superItem)
	2547	+ if (source == superItem \|\| source == superButton)
1779	2548	{
1780	2549	makeSomething(new Superellipsoid());
1781	2550	} else
1782		- if (source == kleinItem)
	2551	+ if (source == kleinItem \|\| source == kleinButton)
1783	2552	{
1784	2553	makeSomething(new Klein());
1785	2554	} else
..	..	@@ -1799,7 +2568,7 @@
1799	2568	{
1800	2569	makeSomething(new BezierSurface());
1801	2570	} else
1802		- if (source == overlayItem)
	2571	+ if (source == overlayItem \|\| source == overlayButton)
1803	2572	{
1804	2573	/*
1805	2574	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1847,10 +2616,27 @@
1847	2616	s.setup();
1848	2617	makeSomething(s);
1849	2618	} else
1850		- if (source == lightItem)
	2619	+ if (source == lightItem \|\| source == lightButton)
1851	2620	{
1852	2621	makeSomething(new Light());
1853	2622	} else
	2623	+// if (source == skybox1Button \|\|
	2624	+// source == skybox2Button \|\|
	2625	+// source == skybox3Button \|\|
	2626	+// source == skybox4Button \|\|
	2627	+// source == skybox5Button \|\|
	2628	+// source == skybox6Button \|\|
	2629	+// source == skybox7Button \|\|
	2630	+// source == skybox11Button \|\|
	2631	+// source == skybox12Button \|\|
	2632	+// source == skybox13Button \|\|
	2633	+// source == skybox14Button \|\|
	2634	+// source == skybox15Button \|\|
	2635	+// source == skybox16Button \|\|
	2636	+// source == skybox17Button)
	2637	+// {
	2638	+// ChangeSkybox(source);
	2639	+// } else
1854	2640	if (source == csgItem)
1855	2641	{
1856	2642	group(new CSG());
..	..	@@ -1897,30 +2683,38 @@
1897	2683
1898	2684	group(g);
1899	2685	} else
1900		- if (source == loopItem)
	2686	+ if (source == loopItem \|\| source == loopButton)
1901	2687	{
	2688	+ if (!group.selection.isEmpty())
	2689	+ {
1902	2690	Composite csg = new GroupLeaf();
1903	2691	csg.count = 5;
1904		- group(csg);
1905		- Composite child = new cGroup();
	2692	+ Composite child = new cGroup("Branch");
1906	2693	csg.addChild(child);
1907	2694	child.addChild(csg);
	2695	+ group(csg);
	2696	+ }
1908	2697	} else
1909	2698	if (source == doubleItem)
1910	2699	{
1911		- Composite csg = new GroupLeaf();
	2700	+ if (!group.selection.isEmpty())
	2701	+ {
	2702	+ Composite csg = new GroupLeaf("Fork");
1912	2703	csg.count = 5;
	2704	+ Composite child = new cGroup("Branch A");
	2705	+ csg.addChild(child);
	2706	+ child.addChild(csg);
	2707	+ child = new cGroup("Branch B");
	2708	+ csg.addChild(child);
	2709	+ child.addChild(csg);
1913	2710	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);
	2711	+ }
1920	2712	} else
1921	2713	if (source == tripleItem)
1922	2714	{
1923		- Composite csg = new GroupLeaf();
	2715	+ if (!group.selection.isEmpty())
	2716	+ {
	2717	+ Composite csg = new GroupLeaf("Trident");
1924	2718	csg.count = 4;
1925	2719	group(csg);
1926	2720	Composite child = new cGroup();
..	..	@@ -1932,11 +2726,12 @@
1932	2726	child = new cGroup();
1933	2727	csg.addChild(child);
1934	2728	child.addChild(csg);
	2729	+ }
1935	2730	} else
1936	2731	if (source == computeAOItem)
1937	2732	{
1938	2733	Globals.drawMode = CameraPane.OCCLUSION;
1939		- Globals.theRenderer.repaint();
	2734	+ cameraView.repaint();
1940	2735	} else
1941	2736	if (source == recompileItem)
1942	2737	{
..	..	@@ -1951,7 +2746,7 @@
1951	2746	if (source == invariantsItem)
1952	2747	{
1953	2748	System.out.println("Invariants:");
1954		- Grafreed.grafreeD.universe.invariants();
	2749	+ Grafreed.grafreed.universe.invariants();
1955	2750	} else
1956	2751	if (source == memoryItem)
1957	2752	{
..	..	@@ -1970,17 +2765,64 @@
1970	2765	{
1971	2766	DumpObject();
1972	2767	} else
1973		- if (source == undoButton)
	2768	+ if (source == minButton)
1974	2769	{
1975		- Undo();
	2770	+ Minimize();
1976	2771	} else
1977		- if (source == redoButton)
	2772	+ if (source == maxButton)
1978	2773	{
1979		- Redo();
	2774	+ Maximize();
1980	2775	} else
1981		- if (source == saveButton)
	2776	+ if (source == fullButton)
1982	2777	{
1983		- Save();
	2778	+ ToggleFullScreen();
	2779	+ } else
	2780	+ if (source == collapseButton)
	2781	+ {
	2782	+ this.expandedLayout = radio.layout;
	2783	+ CollapseToolbar();
	2784	+ } else
	2785	+ if (source == maximize3DButton)
	2786	+ {
	2787	+ this.expandedLayout = radio.layout;
	2788	+ radio.layout = twoButton;
	2789	+ Show3DView();
	2790	+ CollapseToolbar();
	2791	+ } else
	2792	+ if (source == previousVersionButton)
	2793	+ {
	2794	+ // Go to previous version
	2795	+ //if (!Undo())
	2796	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2797	+ PreviousVersion();
	2798	+ } else
	2799	+ if (source == restoreButton)
	2800	+ {
	2801	+ // Restore current version
	2802	+ Restore();
	2803	+ //restoreButton.setEnabled(false);
	2804	+ } else
	2805	+ if (source == replaceButton)
	2806	+ {
	2807	+ // Overwrite current version
	2808	+ Replace();
	2809	+ //replaceButton.setEnabled(false);
	2810	+ } else
	2811	+ if (source == nextVersionButton)
	2812	+ {
	2813	+ // Go to next version
	2814	+ NextVersion();
	2815	+ } else
	2816	+ if (source == saveVersionButton)
	2817	+ {
	2818	+ // Save a new version
	2819	+ if (!Save(true))
	2820	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2821	+ } else
	2822	+ if (source == deleteVersionButton)
	2823	+ {
	2824	+ // Delete a new version
	2825	+ DeleteVersion();
1984	2826	} else
1985	2827	if (source == oneStepButton)
1986	2828	{
..	..	@@ -1989,17 +2831,14 @@
1989	2831	} else
1990	2832	if (source == screenfitButton)
1991	2833	{
1992		- //Reload(lastConverter, lastFilename, true);
1993	2834	ScreenFit();
1994	2835	} else
1995	2836	if (source == screenfitpointButton)
1996	2837	{
1997		- //Reload(lastConverter, lastFilename, true);
1998	2838	ScreenFitPoint();
1999	2839	} else
2000	2840	if (source == snapobjectButton)
2001	2841	{
2002		- //Reload(lastConverter, lastFilename, true);
2003	2842	SnapObject();
2004	2843	} else
2005	2844	// if (event.getSource() == recompileButton)
..	..	@@ -2038,11 +2877,11 @@
2038	2877	} else
2039	2878	if (source == undoItem)
2040	2879	{
2041		- Undo();
	2880	+ PreviousVersion();
2042	2881	} else
2043	2882	if (source == redoItem)
2044	2883	{
2045		- Redo();
	2884	+ NextVersion();
2046	2885	} else
2047	2886	if (source == duplicateItem)
2048	2887	{
..	..	@@ -2363,7 +3202,7 @@
2363	3202	{
2364	3203	StepAll();
2365	3204	} else
2366		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3205	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2367	3206	{
2368	3207	//int indices[] = jList.getSelectedIndices();
2369	3208	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2375,9 +3214,9 @@
2375	3214	{
2376	3215	ClearSelection(true);
2377	3216	} else
2378		- if (source == grabItem)
	3217	+ if (source == grabItem \|\| source == groupButton)
2379	3218	{
2380		- group(new cGroup(), true);
	3219	+ group(new cGroup(), false); // true);
2381	3220	} else
2382	3221	if (source == hideItem)
2383	3222	{
..	..	@@ -2395,11 +3234,11 @@
2395	3234	{
2396	3235	makeSomething(new Camera());
2397	3236	} else
2398		- if (source == compositeItem)
	3237	+ if (source == compositeItem \|\| source == compositeButton)
2399	3238	{
2400	3239	group(new Composite());
2401	3240	} else
2402		- if (source == randomItem)
	3241	+ if (source == switchItem \|\| source == switchButton)
2403	3242	{
2404	3243	RandomNode random = new RandomNode();
2405	3244	group(random);
..	..	@@ -2501,7 +3340,7 @@
2501	3340	{
2502	3341	group(new cLinker());
2503	3342	} else
2504		- if (source == textureItem)
	3343	+ if (source == textureItem \|\| source == textureButton)
2505	3344	{
2506	3345	group(new TextureNode());
2507	3346	} else
..	..	@@ -2521,17 +3360,42 @@
2521	3360	{
2522	3361	CastShadow(2);
2523	3362	} else
2524		- if (source == ungroupItem)
	3363	+ if (source == ungroupItem \|\| source == ungroupButton)
2525	3364	{
2526		- //ungroup();
	3365	+ boolean canUngroup = true;
	3366	+
2527	3367	for (int i=0; i<group.selection.size(); i++)
2528	3368	{
2529		- Ungroup(group.selection.get(i));
	3369	+ Object3D selectedItem = group.selection.get(i);
	3370	+
	3371	+ if (selectedItem.Size() == 0)
	3372	+ {
	3373	+ // Cannot ungroup leaves
	3374	+ canUngroup = false;
	3375	+ break;
	3376	+ }
	3377	+
	3378	+ if (selectedItem == group)
	3379	+ {
	3380	+ // Cannot ungroup root
	3381	+ canUngroup = false;
	3382	+ break;
	3383	+ }
2530	3384	}
2531	3385
2532		- ClearSelection(false);
2533		-
2534		- refreshContents();
	3386	+ if (canUngroup)
	3387	+ {
	3388	+ for (int i=0; i<group.selection.size(); i++)
	3389	+ {
	3390	+ Object3D selectedItem = group.selection.get(i);
	3391	+
	3392	+ Ungroup(selectedItem);
	3393	+ }
	3394	+
	3395	+ ClearSelection(false);
	3396	+
	3397	+ refreshContents();
	3398	+ }
2535	3399	} else
2536	3400	if (source == genUVItem)
2537	3401	{
..	..	@@ -2608,6 +3472,22 @@
2608	3472	if (source == unmarkleavesItem)
2609	3473	{
2610	3474	MarkLeaves(false);
	3475	+ } else
	3476	+ if (source == rewindleavesItem)
	3477	+ {
	3478	+ RewindLeaves(true);
	3479	+ } else
	3480	+ if (source == unrewindleavesItem)
	3481	+ {
	3482	+ RewindLeaves(false);
	3483	+ } else
	3484	+ if (source == randomleavesItem)
	3485	+ {
	3486	+ RandomLeaves(true);
	3487	+ } else
	3488	+ if (source == unrandomleavesItem)
	3489	+ {
	3490	+ RandomLeaves(false);
2611	3491	} else
2612	3492	if (source == flipVItem)
2613	3493	{
..	..	@@ -2816,7 +3696,7 @@
2816	3696	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2817	3697	{
2818	3698	obj = (Object3D)e.nextElement();
2819		- obj.SetBumpTexture(null);
	3699	+ obj.ResetBumpTexture();
2820	3700	}
2821	3701
2822	3702	refreshContents();
..	..	@@ -2832,6 +3712,31 @@
2832	3712
2833	3713	refreshContents();
2834	3714	} else
	3715	+ if (source == embedTexturesItem)
	3716	+ {
	3717	+ Object3D obj;
	3718	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3719	+ {
	3720	+ obj = (Object3D)e.nextElement();
	3721	+ obj.EmbedTextures(true);
	3722	+ }
	3723	+
	3724	+ refreshContents();
	3725	+ } else
	3726	+ if (source == deEmbedTexturesItem)
	3727	+ {
	3728	+ Object3D obj;
	3729	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3730	+ {
	3731	+ obj = (Object3D)e.nextElement();
	3732	+ obj.EmbedTextures(false);
	3733	+ }
	3734	+
	3735	+ CameraPane.texturepigment.clear();
	3736	+ CameraPane.texturebump.clear();
	3737	+
	3738	+ refreshContents();
	3739	+ } else
2835	3740	if (source == flashSelectionButton)
2836	3741	{
2837	3742	CameraPane.flash = true;
..	..	@@ -2843,42 +3748,36 @@
2843	3748	if (source == twoButton)
2844	3749	{
2845	3750	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();
	3751	+
	3752	+ if (CameraPane.FULLSCREEN)
	3753	+ fullscreenLayout = radio.layout;
	3754	+
	3755	+ Show3DView();
	3756	+
	3757	+ cameraView.requestFocusInWindow();
	3758	+
	3759	+// refreshContents(true);
	3760	+//
	3761	+// try
	3762	+// {
	3763	+// java.awt.Robot bot = new java.awt.Robot();
	3764	+// int mask = InputEvent.BUTTON1_MASK;
	3765	+// bot.mouseMove(100, 100);
	3766	+// bot.mousePress(mask);
	3767	+// bot.mouseRelease(mask);
	3768	+// }
	3769	+// catch (Exception e)
	3770	+// {
	3771	+//
	3772	+// }
	3773	+
2878	3774	} else
2879	3775	if (source == threeButton)
2880	3776	{
2881	3777	radio.layout = threeButton;
	3778	+
	3779	+ if (CameraPane.FULLSCREEN)
	3780	+ fullscreenLayout = radio.layout;
2882	3781
2883	3782	// bigThree.remove(scenePanel);
2884	3783	// bigThree.remove(centralPanel);
..	..	@@ -2908,13 +3807,18 @@
2908	3807	// centralPanel.setVisible(true);
2909	3808	// XYZPanel.setVisible(true);
2910	3809	bigThree.ClearUI();
	3810	+ bigThree.add(scenePanel);
2911	3811	bigThree.add(centralPanel);
2912		- bigThree.add(XYZPanel);
2913	3812	bigThree.FlushUI();
	3813	+
	3814	+ cameraView.requestFocusInWindow();
2914	3815	} else
2915	3816	if (source == fourButton)
2916	3817	{
2917	3818	radio.layout = fourButton;
	3819	+
	3820	+ if (CameraPane.FULLSCREEN)
	3821	+ fullscreenLayout = radio.layout;
2918	3822
2919	3823	// bigThree.remove(scenePanel);
2920	3824	// bigThree.remove(centralPanel);
..	..	@@ -2946,10 +3850,15 @@
2946	3850	bigThree.ClearUI();
2947	3851	bigThree.add(scenePanel);
2948	3852	bigThree.FlushUI();
	3853	+
	3854	+ cameraView.requestFocusInWindow();
2949	3855	} else
2950	3856	if (source == sixButton)
2951	3857	{
2952	3858	radio.layout = sixButton;
	3859	+
	3860	+ if (CameraPane.FULLSCREEN)
	3861	+ fullscreenLayout = radio.layout;
2953	3862
2954	3863	// bigThree.remove(scenePanel);
2955	3864	// bigThree.remove(centralPanel);
..	..	@@ -2979,13 +3888,18 @@
2979	3888	// centralPanel.setVisible(true);
2980	3889	// XYZPanel.setVisible(false);
2981	3890	bigThree.ClearUI();
2982		- bigThree.add(scenePanel);
2983	3891	bigThree.add(centralPanel);
	3892	+ bigThree.add(scenePanel);
2984	3893	bigThree.FlushUI();
	3894	+
	3895	+ cameraView.requestFocusInWindow();
2985	3896	} else
2986	3897	if (source == sevenButton)
2987	3898	{
2988	3899	radio.layout = sevenButton;
	3900	+
	3901	+ if (CameraPane.FULLSCREEN)
	3902	+ fullscreenLayout = radio.layout;
2989	3903
2990	3904	// bigThree.remove(scenePanel);
2991	3905	// bigThree.remove(centralPanel);
..	..	@@ -3019,9 +3933,12 @@
3019	3933	bigThree.add(centralPanel);
3020	3934	bigThree.add(XYZPanel);
3021	3935	bigThree.FlushUI();
	3936	+
	3937	+ cameraView.requestFocusInWindow();
3022	3938	} else
3023	3939	if (source == rootButton)
3024	3940	{
	3941	+ Replace();
3025	3942	Object3D obj;
3026	3943	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3027	3944	{
..	..	@@ -3030,6 +3947,7 @@
3030	3947	EditObject(obj);
3031	3948	}
3032	3949
	3950	+ cameraView.requestFocusInWindow();
3033	3951	refreshContents(true);
3034	3952	} else
3035	3953	if (source == closeButton)
..	..	@@ -3039,22 +3957,37 @@
3039	3957	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3040	3958	{
3041	3959	ab = (cRadio)e.nextElement();
3042		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3960	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3043	3961	{
	3962	+ // Patch to avoid bug with transparency.
	3963	+ if (!ab.hadMaterial)
	3964	+ {
	3965	+ ab.object.material = null;
	3966	+ }
	3967	+
3044	3968	buttonGroup.remove(ab);
3045	3969	radioPanel.remove(ab);
3046	3970
3047		- ab.GetObject().editWindow = null;
	3971	+ //ab.GetObject().editWindow = null;
	3972	+ ab.GetObject().manipWindow = null;
3048	3973	// ab.GetObject().objectUI = null; // ?????????
3049	3974
3050	3975	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3051	3976	break;
3052	3977	}
3053	3978	}
	3979	+
	3980	+ cameraView.requestFocusInWindow();
3054	3981	refreshContents(true);
3055	3982	} else
3056	3983	if (source == editItem \|\| source == editButton)
3057	3984	{
	3985	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3986	+ {
	3987	+ Object3D child = (Object3D)e.nextElement();
	3988	+ child.pinned = true;
	3989	+ }
	3990	+
3058	3991	EditSelection(false);
3059	3992	} else
3060	3993	if (source == uneditButton)
..	..	@@ -3063,9 +3996,10 @@
3063	3996	{
3064	3997	Object3D child = (Object3D)e.nextElement();
3065	3998	if(child.editWindow != null)
3066		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3999	+ child.pinned = false;
3067	4000	child.CloseUI();
3068	4001	listUI.remove(child);
	4002	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3069	4003
3070	4004	//child.editWindow = null; // ???????????
3071	4005	}
..	..	@@ -3080,16 +4014,18 @@
3080	4014	//copy.ClearUI();
3081	4015	for (Object3D obj : listUI)
3082	4016	{
	4017	+ obj.pinned = false;
3083	4018	obj.CloseUI();
3084	4019	}
3085	4020	listUI.clear();
	4021	+ SetPinStates(group.selection.size() > 0);
3086	4022	refreshContents(true);
3087	4023	} else
3088	4024	if (source == allParamsButton)
3089	4025	{
3090	4026	assert(copy == group);
3091	4027
3092		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4028	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3093	4029
3094	4030	for (Object3D obj : listUI)
3095	4031	{
..	..	@@ -3138,6 +4074,7 @@
3138	4074	}
3139	4075
3140	4076	copy = group;
	4077	+
3141	4078	//Globals.theRenderer.object = group;
3142	4079	if(!useclient)
3143	4080	{
..	..	@@ -3155,7 +4092,8 @@
3155	4092	}
3156	4093
3157	4094	// fix "+" issue
3158		- group.editWindow = this;
	4095	+ //group.editWindow = this;
	4096	+ group.manipWindow = this;
3159	4097
3160	4098	/*
3161	4099	currentLayout = radio.layout;
..	..	@@ -3163,20 +4101,44 @@
3163	4101	currentLayout = sevenButton;
3164	4102	*/
3165	4103	radio.layout.doClick();
	4104	+
	4105	+ assert(copy instanceof Composite);
	4106	+
	4107	+ if (copy.versionlist == null)
	4108	+ {
	4109	+ copy.versionlist = new Object3D[100];
	4110	+ copy.versionindex = -1;
	4111	+
	4112	+ Save(true);
	4113	+ }
	4114	+
	4115	+ SetVersionStates();
	4116	+
	4117	+ ClearUnpinned();
	4118	+
	4119	+ //Grafreed.Assert(group != null);
	4120	+ //Grafreed.Assert(group.selection != null);
	4121	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4122	+ if (group.selection == null \|\| group.selection.size() == 1)
	4123	+ EditSelection(false);
3166	4124	keepparent = group.parent;
3167	4125	// PARENT = NULL or not???
3168	4126	//group.parent = null; // ROOT
3169	4127	//group.attributes = -1;
3170	4128	ResetModel();
	4129	+
	4130	+ cameraView.requestFocusInWindow();
3171	4131	refreshContents(true);
3172	4132	} else if (event.getSource() == editCameraItem)
3173	4133	{
3174	4134	cameraView.ProtectCamera();
	4135	+ cameraView.requestFocusInWindow();
3175	4136	cameraView.repaint();
3176	4137	return;
3177		- } else if (event.getSource() == revertCameraItem)
	4138	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3178	4139	{
3179	4140	cameraView.RevertCamera();
	4141	+ cameraView.requestFocusInWindow();
3180	4142	cameraView.repaint();
3181	4143	return;
3182	4144	// } else if (event.getSource() == textureButton)
..	..	@@ -3191,7 +4153,6 @@
3191	4153	}
3192	4154
3193	4155	boolean useclient = false;
3194		- cRadio radio;
3195	4156
3196	4157	void ToggleRoot()
3197	4158	{
..	..	@@ -3754,7 +4715,7 @@
3754	4715
3755	4716	try
3756	4717	{
3757		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4718	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3758	4719	}
3759	4720	catch (Exception e)
3760	4721	{
..	..	@@ -4146,6 +5107,18 @@
4146	5107	refreshContents();
4147	5108	}
4148	5109
	5110	+ void RewindLeaves(boolean hide)
	5111	+ {
	5112	+ group.selection.RewindLeaves(hide);
	5113	+ refreshContents();
	5114	+ }
	5115	+
	5116	+ void RandomLeaves(boolean hide)
	5117	+ {
	5118	+ group.selection.RandomLeaves(hide);
	5119	+ refreshContents();
	5120	+ }
	5121	+
4149	5122	void SetTexRes(int tr)
4150	5123	{
4151	5124	group.selection.SetTexRes(tr);
..	..	@@ -4217,28 +5190,25 @@
4217	5190	// }
4218	5191	// }
4219	5192
4220		- static boolean allparams = true;
4221		-
4222		- static Vector<Object3D> listUI = new Vector<Object3D>();
4223		-
4224	5193	void EditSelection(boolean newWindow)
4225	5194	{
	5195	+ if (group.selection == null)
	5196	+ {
	5197	+ EditElement(group, newWindow); // ? new
	5198	+ return;
	5199	+ }
	5200	+
4226	5201	// aConstraints.gridy = 0;
4227	5202	for (int i=0; i<group.selection.size(); i++)
4228	5203	{
4229	5204	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4230	5205	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4231		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5206	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4232	5207
4233	5208	Object3D elem = (Object3D)group.selection.elementAt(i);
4234	5209	if(elem != group \|\| !newWindow)
4235	5210	{
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
	5211	+ EditElement(elem, newWindow); // ? new
4242	5212	}
4243	5213	}
4244	5214	}
..	..	@@ -4301,9 +5271,7 @@
4301	5271
4302	5272	freezemodel = false;
4303	5273	}
4304		-
4305		- boolean flashIt = true;
4306		-
	5274	+
4307	5275	public void valueChanged(TreeSelectionEvent e)
4308	5276	//public boolean handleEvent(Event event)
4309	5277	{
..	..	@@ -4313,7 +5281,8 @@
4313	5281	//new Exception().printStackTrace();
4314	5282
4315	5283	freezemodel = true;
4316		-
	5284	+ ClearUnpinned();
	5285	+
4317	5286	/**/
4318	5287	//switch (event.id)
4319	5288	{
..	..	@@ -4329,6 +5298,7 @@
4329	5298
4330	5299	//if (child.parent != null)
4331	5300	//child.parent.addSelectee(child);
	5301	+ objEditor.SetMaterial(child);
4332	5302	group.addSelectee(child);
4333	5303	}
4334	5304	}
..	..	@@ -4345,7 +5315,7 @@
4345	5315	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4346	5316	// a camera
4347	5317	{
4348		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5318	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4349	5319	{
4350	5320	CameraPane.camerachangeframe = 0; // don't refuse it
4351	5321	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4354,6 +5324,13 @@
4354	5324	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4355	5325	}
4356	5326
	5327	+ if (tps != null && tps.length == 1)
	5328	+ {
	5329	+ EditSelection(false);
	5330	+ }
	5331	+
	5332	+ SetPinStates(tps != null && tps.length > 0);
	5333	+
4357	5334	refreshContents();
4358	5335	//return true;
4359	5336	}
..	..	@@ -4363,21 +5340,43 @@
4363	5340	freezemodel = false;
4364	5341	}
4365	5342
	5343	+ void SetPinStates(boolean enabled)
	5344	+ {
	5345	+ editButton.setEnabled(enabled);
	5346	+ uneditButton.setEnabled(enabled);
	5347	+ //unselectButton.setEnabled(enabled);
	5348	+ flashSelectionButton.setEnabled(enabled);
	5349	+
	5350	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5351	+
	5352	+ boolean allComposites = true;
	5353	+
	5354	+ if (group.selection != null)
	5355	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5356	+ {
	5357	+ if (!(e.nextElement() instanceof Composite))
	5358	+ {
	5359	+ allComposites = false;
	5360	+ break;
	5361	+ }
	5362	+ }
	5363	+
	5364	+ rootButton.setEnabled(allComposites);
	5365	+ }
	5366	+
4366	5367	void refreshContents(boolean cp)
4367	5368	{
4368		- if (!Globals.MOUSEDRAGGED)
	5369	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5370	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4369	5371	{
4370	5372	objEditor.ClearInfo(); // .GetMaterial());
4371	5373
4372		- for (int i=0; i < group.selection.size(); i++)
	5374	+ for (int i=0; i < group.selection.Size(); i++)
4373	5375	{
4374		- Object3D child = (Object3D) group.selection.reserve(i);
	5376	+ Object3D child = (Object3D) group.selection.get(i);
4375	5377
4376		- objEditor.SetMaterial(child);
4377	5378	objEditor.AddInfo(child, this, true);
4378		- System.err.println("info : " + child.GetPath());
4379		-
4380		- group.selection.release(i);
	5379	+// System.err.println("info : " + child.GetPath());
4381	5380	}
4382	5381
4383	5382	objEditor.SetText(); // jan 2014
..	..	@@ -4467,7 +5466,8 @@
4467	5466
4468	5467	if (cut)
4469	5468	{
4470		- Save();
	5469	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5470	+// Save();
4471	5471	//int indices[] = jList.getSelectedIndices();
4472	5472	//for (int i = indices.length - 1; i >= 0; i--)
4473	5473	//jList.remove(indices[i]);
..	..	@@ -4570,6 +5570,10 @@
4570	5570
4571	5571	void paste(boolean expand)
4572	5572	{
	5573	+ if (Globals.REPLACEONMAKE)
	5574	+ Save();
	5575	+ boolean keep = Globals.REPLACEONMAKE;
	5576	+ Globals.REPLACEONMAKE = false;
4573	5577	// if (GrafreeD.clipboard == null)
4574	5578	// return;
4575	5579	boolean first = true;
..	..	@@ -4629,6 +5633,7 @@
4629	5633	Grafreed.clipboard.get(0).parent = keepparent;
4630	5634	}
4631	5635
	5636	+ Globals.REPLACEONMAKE = keep;
4632	5637	ResetModel();
4633	5638	refreshContents();
4634	5639	}
..	..	@@ -4764,6 +5769,10 @@
4764	5769
4765	5770	void group(Object3D csg, boolean grab)
4766	5771	{
	5772	+ if (Globals.REPLACEONMAKE)
	5773	+ Save();
	5774	+ boolean keep = Globals.REPLACEONMAKE;
	5775	+ Globals.REPLACEONMAKE = false;
4767	5776	if (//false) // why??
4768	5777	!group.selection.isEmpty())
4769	5778	{
..	..	@@ -4877,10 +5886,15 @@
4877	5886	//node.add(csg);
4878	5887	//makeSomething(node);
4879	5888	makeSomething(csg);
	5889	+ Globals.REPLACEONMAKE = keep;
4880	5890	}
4881	5891
4882	5892	void Ungroup(Object3D g)
4883	5893	{
	5894	+ if (Globals.REPLACEONMAKE)
	5895	+ Save();
	5896	+ boolean keep = Globals.REPLACEONMAKE;
	5897	+ Globals.REPLACEONMAKE = false;
4884	5898	if (g instanceof HiddenObject)
4885	5899	{
4886	5900	HiddenObject h = (HiddenObject) g;
..	..	@@ -4897,6 +5911,7 @@
4897	5911	objEditor.makeSomething(g.get(i), false);
4898	5912	}
4899	5913	}
	5914	+ Globals.REPLACEONMAKE = keep;
4900	5915	}
4901	5916
4902	5917	void ungroup()
..	..	@@ -5185,10 +6200,43 @@
5185	6200	cButton clearpanelButton;
5186	6201	cButton unselectButton;
5187	6202
5188		- cButton saveButton;
5189		- cButton undoButton;
5190		- cButton redoButton;
	6203	+ cButton restoreCameraButton;
	6204	+
5191	6205	cButton oneStepButton;
	6206	+
	6207	+ cButton groupButton;
	6208	+ cButton ungroupButton;
	6209	+ cButton compositeButton;
	6210	+ cButton switchButton;
	6211	+ cButton loopButton;
	6212	+ cButton textureButton;
	6213	+
	6214	+ cButton skybox1Button;
	6215	+ cButton skybox2Button;
	6216	+ cButton skybox3Button;
	6217	+ cButton skybox4Button;
	6218	+ cButton skybox5Button;
	6219	+ cButton skybox6Button;
	6220	+ cButton skybox7Button;
	6221	+
	6222	+ cButton skybox11Button;
	6223	+ cButton skybox12Button;
	6224	+ cButton skybox13Button;
	6225	+ cButton skybox14Button;
	6226	+ cButton skybox15Button;
	6227	+ cButton skybox16Button;
	6228	+ cButton skybox17Button;
	6229	+
	6230	+ cButton gridButton;
	6231	+ cButton boxButton;
	6232	+ cButton sphereButton;
	6233	+ cButton coneButton;
	6234	+ cButton torusButton;
	6235	+ cButton superButton;
	6236	+ cButton kleinButton;
	6237	+ cButton particlesButton;
	6238	+ cButton overlayButton;
	6239	+ cButton lightButton;
5192	6240
5193	6241	cButton screenfitButton;
5194	6242	cButton screenfitpointButton;
..	..	@@ -5201,14 +6249,6 @@
5201	6249
5202	6250	cButton setsupportButton;
5203	6251
5204		- cButton twoButton;
5205		- cButton sixButton;
5206		- cButton threeButton;
5207		- cButton sevenButton;
5208		- cButton fourButton; // full panel
5209		- cButton oneButton; // full XYZ
5210		- //cButton currentLayout;
5211		-
5212	6252	//
5213	6253	//Composite
5214	6254	Object3D // to do !!
..	..	@@ -5218,12 +6258,12 @@
5218	6258	//JTree jTree;
5219	6259	private MenuItem lookAtItem;
5220	6260	private MenuItem lookFromItem;
5221		- private MenuItem switchItem;
5222		- private MenuItem cutItem;
	6261	+ private MenuItem switchViewItem;
	6262	+ private JMenuItem cutItem;
5223	6263	private MenuItem undoItem;
5224	6264	private MenuItem redoItem;
5225		- private MenuItem duplicateItem;
5226		- private MenuItem cloneItem;
	6265	+ private JMenuItem duplicateItem;
	6266	+ private JMenuItem cloneItem;
5227	6267	private MenuItem cloneSupportItem;
5228	6268	private MenuItem overwriteGeoItem;
5229	6269	private MenuItem overwriteMatItem;
..	..	@@ -5244,13 +6284,13 @@
5244	6284	private MenuItem cloneGeometriesItem;
5245	6285	private MenuItem shareGeometriesItem;
5246	6286	private MenuItem mergeGeometriesItem;
5247		- private MenuItem copyItem;
	6287	+ private JMenuItem copyItem;
5248	6288	private MenuItem pasteItem;
5249		- private MenuItem pasteIntoItem;
5250		- private MenuItem pasteLinkItem;
5251		- private MenuItem pasteCloneItem;
5252		- private MenuItem pasteExpandItem;
5253		- private MenuItem clearItem;
	6289	+ private JMenuItem pasteIntoItem;
	6290	+ private JMenuItem pasteLinkItem;
	6291	+ private JMenuItem pasteCloneItem;
	6292	+ private JMenuItem pasteExpandItem;
	6293	+ private JMenuItem deleteItem;
5254	6294	private MenuItem clearAllItem;
5255	6295	private MenuItem genUVItem;
5256	6296	private MenuItem genNormalsMESHItem;
..	..	@@ -5285,6 +6325,10 @@
5285	6325	private MenuItem showleavesItem;
5286	6326	private MenuItem markleavesItem;
5287	6327	private MenuItem unmarkleavesItem;
	6328	+ private MenuItem rewindleavesItem;
	6329	+ private MenuItem unrewindleavesItem;
	6330	+ private MenuItem randomleavesItem;
	6331	+ private MenuItem unrandomleavesItem;
5288	6332
5289	6333	private MenuItem flipVItem;
5290	6334	private MenuItem unflipVItem;
..	..	@@ -5306,7 +6350,7 @@
5306	6350	private MenuItem frontItem;
5307	6351	private MenuItem cameraItem;
5308	6352	private MenuItem compositeItem;
5309		- private MenuItem randomItem;
	6353	+ private MenuItem switchItem;
5310	6354	private MenuItem physicsItem;
5311	6355	private MenuItem frameselectorItem;
5312	6356	private MenuItem scriptNodeItem;
..	..	@@ -5314,7 +6358,7 @@
5314	6358	private MenuItem switchTransfoItem;
5315	6359	private MenuItem morphItem;
5316	6360	private MenuItem linkerItem;
5317		- private MenuItem ungroupItem;
	6361	+ private JMenuItem ungroupItem;
5318	6362	private MenuItem editItem;
5319	6363	private MenuItem openWindowItem;
5320	6364	private MenuItem editLeafItem;
..	..	@@ -5330,6 +6374,8 @@
5330	6374	private MenuItem attachBumpItem;
5331	6375	private MenuItem detachBumpItem;
5332	6376	private MenuItem pigmentBumpItem;
	6377	+ private MenuItem embedTexturesItem;
	6378	+ private MenuItem deEmbedTexturesItem;
5333	6379
5334	6380	private MenuItem particleItem;
5335	6381	private MenuItem ragdollItem;
..	..	@@ -5380,5 +6426,5 @@
5380	6426
5381	6427	Menu cameraMenu;
5382	6428	MenuItem editCameraItem;
5383		- MenuItem revertCameraItem;
	6429	+ MenuItem restoreCameraItem;
5384	6430	}