~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,11 +526,19 @@
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"));
156	534	//editItem.addActionListener(this);
157		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	535	+
	536	+// undoItem = menu.add(new MenuItem("Undo"));
	537	+// undoItem.addActionListener(this);
	538	+// redoItem = menu.add(new MenuItem("Redo"));
	539	+// redoItem.addActionListener(this);
	540	+// menu.add("-");
	541	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
158	542	duplicateItem.addActionListener(this);
159	543	cloneItem = menu.add(new MenuItem("Clone"));
160	544	cloneItem.addActionListener(this);
..	..	@@ -170,7 +554,6 @@
170	554	copyItem.addActionListener(this);
171	555	pasteItem = menu.add(new MenuItem("Paste"));
172	556	pasteItem.addActionListener(this);
173		- menu.add("-");
174	557
175	558	menu.add("-");
176	559	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -182,8 +565,8 @@
182	565	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
183	566	// pasteExpandItem.addActionListener(this);
184	567	menu.add("-");
185		- clearItem = menu.add(new MenuItem("Clear"));
186		- clearItem.addActionListener(this);
	568	+ deleteItem = menu.add(new MenuItem("Delete"));
	569	+ deleteItem.addActionListener(this);
187	570
188	571	if (Globals.ADVANCED)
189	572	{
..	..	@@ -197,23 +580,23 @@
197	580	//zBufferItem.addActionListener(this);
198	581	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
199	582	//normalLensItem.addActionListener(this);
200		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
201		- revertCameraItem.addActionListener(this);
	583	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	584	+ restoreCameraItem.addActionListener(this);
202	585
203		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
204		- toggleFullScreenItem.addItemListener(this);
205		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
206		- cameraMenu.add("-");
	586	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	587	+// toggleFullScreenItem.addItemListener(this);
	588	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	589	+// cameraMenu.add("-");
	590	+//
	591	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	592	+// toggleTextureItem.addItemListener(this);
	593	+// toggleTextureItem.setState(CameraPane.textureon);
	594	+//
	595	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	596	+// toggleSwitchItem.addItemListener(this);
	597	+// toggleSwitchItem.setState(CameraPane.SWITCH);
207	598
208		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
209		- toggleTextureItem.addItemListener(this);
210		- toggleTextureItem.setState(CameraPane.textureon);
211		-
212		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
213		- toggleSwitchItem.addItemListener(this);
214		- toggleSwitchItem.setState(CameraPane.SWITCH);
215		-
216		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	599	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
217	600	toggleHandleItem.addItemListener(this);
218	601	toggleHandleItem.setState(CameraPane.HANDLES);
219	602
..	..	@@ -240,7 +623,7 @@
240	623
241	624	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
242	625	toggleDebugItem.addItemListener(this);
243		- toggleDebugItem.setState(CameraPane.DEBUG);
	626	+ toggleDebugItem.setState(Globals.DEBUG);
244	627
245	628	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
246	629	toggleFrustumItem.addItemListener(this);
..	..	@@ -261,22 +644,20 @@
261	644	// animationItem.addItemListener(this);
262	645	// animationItem.setState(CameraPane.ANIMATION);
263	646	cameraMenu.add("-");
264		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
	647	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
265	648	editCameraItem.addActionListener(this);
266	649
267	650	if (Globals.ADVANCED)
268	651	{
269	652	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
270	653	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
271		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
272		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	654	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
273	655	oe.cameraMenu.add("-");
274	656	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
275	657	openWindowItem.addActionListener(this);
276		- editLeafItem.addActionListener(this);
277	658	lookAtItem.addActionListener(this);
278	659	//lookFromItem.addActinoListener(this);
279		- //switchItem.addActionListener(this);
	660	+ //switchViewItem.addActionListener(this);
280	661	}
281	662
282	663	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -321,21 +702,29 @@
321	702	}
322	703
323	704	oe.menuBar.add(menu = new Menu("Group"));
324		- grabItem = menu.add(new MenuItem("Grab"));
325		- grabItem.addActionListener(this);
	705	+// grabItem = menu.add(new MenuItem("Grab"));
	706	+// grabItem.addActionListener(this);
326	707	backItem = menu.add(new MenuItem("Back"));
327	708	backItem.addActionListener(this);
328	709	frontItem = menu.add(new MenuItem("Front"));
329	710	frontItem.addActionListener(this);
330		- compositeItem = menu.add(new MenuItem("Composite"));
331		- compositeItem.addActionListener(this);
	711	+// compositeItem = menu.add(new MenuItem("Composite"));
	712	+// compositeItem.addActionListener(this);
	713	+
	714	+ if (Globals.ADVANCED)
	715	+ {
332	716	hideItem = menu.add(new MenuItem("Hidden Group"));
333	717	hideItem.addActionListener(this);
	718	+ }
334	719	ungroupItem = menu.add(new MenuItem("Ungroup"));
335	720	ungroupItem.addActionListener(this);
336		- menu.add("-");
337		- randomItem = menu.add(new MenuItem("Switch node"));
338		- randomItem.addActionListener(this);
	721	+
	722	+// menu.add("-");
	723	+//
	724	+// switchItem = menu.add(new MenuItem("Switch node"));
	725	+// switchItem.addActionListener(this);
	726	+ if (Globals.ADVANCED)
	727	+ {
339	728	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
340	729	switchGeoItem.addActionListener(this);
341	730	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -343,8 +732,6 @@
343	732	morphItem = menu.add(new MenuItem("Morph Group"));
344	733	morphItem.addActionListener(this);
345	734
346		- if (Globals.ADVANCED)
347		- {
348	735	menu.add("-");
349	736	physicsItem = menu.add(new MenuItem("Physics"));
350	737	physicsItem.addActionListener(this);
..	..	@@ -352,30 +739,29 @@
352	739	frameselectorItem.addActionListener(this);
353	740	scriptNodeItem = menu.add(new MenuItem("Script Node"));
354	741	scriptNodeItem.addActionListener(this);
355		- cameraItem = menu.add(new MenuItem("Camera"));
356		- cameraItem.addActionListener(this);
357	742	}
358	743
359	744	oe.menuBar.add(menu = new Menu("Object"));
360		- textureItem = menu.add(new MenuItem("Texture"));
361		- textureItem.addActionListener(this);
	745	+// textureItem = menu.add(new MenuItem("Texture"));
	746	+// textureItem.addActionListener(this);
362	747	billboardItem = menu.add(new MenuItem("Billboard"));
363	748	billboardItem.addActionListener(this);
364	749	csgItem = menu.add(new MenuItem("CSG"));
365	750	csgItem.addActionListener(this);
366		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	751	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
367	752	shadowXItem.addActionListener(this);
368		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	753	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
369	754	shadowYItem.addActionListener(this);
370		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	755	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
371	756	shadowZItem.addActionListener(this);
	757	+ attributeItem = menu.add(new MenuItem("Attribute"));
	758	+ attributeItem.addActionListener(this);
	759	+
372	760	if (Globals.ADVANCED)
373	761	{
374	762	menu.add("-");
375	763	linkerItem = menu.add(new MenuItem("Linker"));
376	764	linkerItem.addActionListener(this);
377		- attributeItem = menu.add(new MenuItem("Attribute"));
378		- attributeItem.addActionListener(this);
379	765	templateItem = menu.add(new MenuItem("Template"));
380	766	templateItem.addActionListener(this);
381	767	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -404,7 +790,7 @@
404	790	genNormalsMESHItem.addActionListener(this);
405	791	if (Globals.ADVANCED)
406	792	{
407		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	793	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
408	794	genNormalsMINEItem.addActionListener(this);
409	795	}
410	796	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -464,6 +850,14 @@
464	850	markleavesItem.addActionListener(this);
465	851	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
466	852	unmarkleavesItem.addActionListener(this);
	853	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	854	+ rewindleavesItem.addActionListener(this);
	855	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	856	+ unrewindleavesItem.addActionListener(this);
	857	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	858	+ randomleavesItem.addActionListener(this);
	859	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	860	+ unrandomleavesItem.addActionListener(this);
467	861	menu.add("-");
468	862	flipVItem = menu.add(new MenuItem("Flip V"));
469	863	flipVItem.addActionListener(this);
..	..	@@ -489,10 +883,15 @@
489	883	attachBumpItem.addActionListener(this);
490	884	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
491	885	pigmentBumpItem.addActionListener(this);
	886	+ //embedTexturesItem
492	887	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
493	888	detachPigmentItem.addActionListener(this);
494	889	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
495	890	detachBumpItem.addActionListener(this);
	891	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	892	+ embedTexturesItem.addActionListener(this);
	893	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	894	+ deEmbedTexturesItem.addActionListener(this);
496	895	menu.add("-");
497	896	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
498	897	sortbysizeItem.addActionListener(this);
..	..	@@ -503,6 +902,9 @@
503	902	shareGeometriesItem.addActionListener(this);
504	903	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
505	904	mergeGeometriesItem.addActionListener(this);
	905	+ menu.add("-");
	906	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	907	+ editLeafItem.addActionListener(this);
506	908	if (Globals.ADVANCED)
507	909	{
508	910	// Pretty much the same as duplicate and clone.
..	..	@@ -519,16 +921,91 @@
519	921	buildToolsMenu(menu);
520	922	}
521	923
	924	+ JTabbedPane resourcecontainer;
	925	+ cGridBag currenttab;
	926	+ boolean added; // patch for jar
	927	+
	928	+ int tabcount = 0;
	929	+ int colcount = 0;
	930	+ int rowcount = 0;
	931	+ int texturecount = 0;
	932	+
	933	+ int columns = 5;
	934	+ int rows = 7;
	935	+
	936	+ public void ResourceCallBack(String[] path)
	937	+ {
	938	+// for (int i = 0; i < path.length; i++)
	939	+// System.out.print(path[i] + "/");
	940	+// System.out.println();
	941	+
	942	+ if (//rowcount == 0 \|\|
	943	+ path.length == 1)
	944	+ {
	945	+ currenttab = new cGridBag();
	946	+ added = false;
	947	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	948	+ currenttab.setName(tabname);
	949	+ rowcount = 1;
	950	+ colcount = 0;
	951	+ texturecount = 0;
	952	+ }
	953	+
	954	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	955	+ {
	956	+ if (!added)
	957	+ {
	958	+ added = true;
	959	+ resourcecontainer.add(currenttab);
	960	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ }
	963	+
	964	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	965	+
	966	+ if (++colcount >= columns)
	967	+ {
	968	+ colcount = 0;
	969	+ currenttab.Return();
	970	+
	971	+ if (rowcount++ >= rows)
	972	+ {
	973	+ rowcount = 0;
	974	+ }
	975	+ }
	976	+ }
	977	+ else
	978	+ {
	979	+// if (!path[path.length-1].equals("icons"))
	980	+// resourcecontainer.Return();
	981	+ }
	982	+ }
	983	+
	984	+ void CreateTexturePanel(cGridBag container)
	985	+ {
	986	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	987	+ container.add(resourcecontainer);
	988	+
	989	+ Grafreed.ParseResources("textures", this);
	990	+ }
	991	+
522	992	void SetupUI2(ObjEditor oe)
523	993	{
	994	+ // June 2019
	995	+ if (oe == null)
	996	+ {
	997	+ //super.SetupUI2(this);
	998	+ //return;
	999	+ }
	1000	+
	1001	+ if (copy != group)
	1002	+ {
	1003	+ //super.SetupUI2(this);
	1004	+ }
	1005	+
524	1006	//new Exception().printStackTrace();
525	1007
526	1008	oe.radioPanel = new JPanel(new GridBagLayout());
527		- oe.aConstraints.weightx = 1;
528		- oe.aConstraints.weighty = 0;
529		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
530		- oe.aConstraints.gridwidth = 100;
531		- oe.aConstraints.gridheight = 1;
532	1009	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
533	1010
534	1011	oe.buttonGroup = new ButtonGroup();
..	..	@@ -549,27 +1026,122 @@
549	1026	oe.radioPanel.add(dummyButton);
550	1027	oe.buttonGroup.add(dummyButton);
551	1028	*/
	1029	+ cGridBag copyOptionsPanel = new cGridBag();
	1030	+
	1031	+ copyOptionsPanel.preferredHeight = 2;
	1032	+
552	1033	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
553	1034
554		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
555		- liveCB.setToolTipText("Enable animation");
556		- liveCB.addItemListener(this);
	1035	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1036	+ //minButton.setToolTipText("Minimize window");
	1037	+ //minButton.addActionListener(this);
	1038	+
	1039	+ if (Globals.ADVANCED)
	1040	+ {
	1041	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+// maxButton.setToolTipText("Maximize window");
	1043	+// maxButton.addActionListener(this);
	1044	+ }
	1045	+
	1046	+ cButton gcButton;
	1047	+
	1048	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1049	+// gcButton.setToolTipText("Garbage collect");
	1050	+// gcButton.addActionListener(new ActionListener()
	1051	+// {
	1052	+// public void actionPerformed(ActionEvent e)
	1053	+// {
	1054	+// System.gc();
	1055	+// }
	1056	+// });
	1057	+
	1058	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+ collapseButton.setToolTipText("Collapse toolbar");
	1060	+ collapseButton.addActionListener(this);
	1061	+
	1062	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1064	+ maximize3DButton.addActionListener(this);
	1065	+
	1066	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1067	+ twoButton.setToolTipText("Show 3D view only");
	1068	+ twoButton.addActionListener(this);
	1069	+ this.fullscreenLayout = twoButton;
	1070	+
	1071	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ threeButton.setToolTipText("Show controls and 3D view");
	1073	+ threeButton.addActionListener(this);
	1074	+ if (Globals.ADVANCED)
	1075	+ {
	1076	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ sixButton.setToolTipText("Show 3D view and controls");
	1078	+ sixButton.addActionListener(this);
	1079	+ }
	1080	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+// sevenButton.setToolTipText("3-column layout");
	1082	+// sevenButton.addActionListener(this);
	1083	+ //
	1084	+
	1085	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1086	+ fullButton.setToolTipText("Full-screen window");
	1087	+ fullButton.addActionListener(this);
	1088	+
	1089	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1090	+ screenfitButton.setToolTipText("Screen fit");
	1091	+ screenfitButton.addActionListener(this);
557	1092
558		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1094	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1095	+ restoreCameraButton.addActionListener(this);
	1096	+
	1097	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ saveVersionButton.setToolTipText("Duplicate current version");
	1099	+ saveVersionButton.addActionListener(this);
	1100	+
	1101	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ deleteVersionButton.setToolTipText("Delete current version");
	1103	+ deleteVersionButton.addActionListener(this);
	1104	+
	1105	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ previousVersionButton.setToolTipText("Previous version");
	1107	+ previousVersionButton.addActionListener(this);
	1108	+ previousVersionButton.setEnabled(false);
	1109	+
	1110	+ cGridBag updown = new cGridBag().setVertical(true);
	1111	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ restoreButton.setToolTipText("Undo (restore current version)");
	1113	+ restoreButton.addActionListener(this);
	1114	+ //restoreButton.setEnabled(false);
	1115	+
	1116	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ replaceButton.setToolTipText("Save (replace current version)");
	1118	+ replaceButton.addActionListener(this);
	1119	+ //replaceButton.setEnabled(false);
	1120	+
	1121	+ copyOptionsPanel.add(updown);
	1122	+
	1123	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ nextVersionButton.setToolTipText("Next version");
	1125	+ nextVersionButton.addActionListener(this);
	1126	+ nextVersionButton.setEnabled(false);
	1127	+
	1128	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
559	1129	oneStepButton.setToolTipText("Animate one step forward");
560	1130	oneStepButton.addActionListener(this);
561	1131
562		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1132	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1133	+ liveCB.setToolTipText("Enable animation");
	1134	+ liveCB.addItemListener(this);
	1135	+
	1136	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
563	1137	fastCB.setToolTipText("Fast mode");
564	1138	fastCB.addItemListener(this);
565	1139
566		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
567		- trackCB.setToolTipText("Enable tracking");
568		- trackCB.addItemListener(this);
569		-
570		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
571		- screenfitButton.setToolTipText("Screen fit");
572		- screenfitButton.addActionListener(this);
	1140	+ //oe.toolboxPanel.Return();
	1141	+
	1142	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1143	+// trackCB.setToolTipText("Enable tracking");
	1144	+// trackCB.addItemListener(this);
573	1145
574	1146	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
575	1147	// screenfitpointButton.addActionListener(this);
..	..	@@ -579,67 +1151,137 @@
579	1151	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
580	1152	snapobjectButton.addActionListener(this);
581	1153	snapobjectButton.setToolTipText("Snap Object");
	1154	+
	1155	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1156	+ fourButton.addActionListener(this);
	1157	+ fourButton.setToolTipText("Show control panel only");
582	1158	}
583	1159
584		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585		- flashSelectionButton.setToolTipText("Show selection");
586		- flashSelectionButton.addActionListener(this);
	1160	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
587	1161
588		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
589		-
590		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
591		- twoButton.setToolTipText("Show center view only");
592		- twoButton.addActionListener(this);
593		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- fourButton.addActionListener(this);
595		- fourButton.setToolTipText("Show left panel only");
596		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- sixButton.setToolTipText("2-column layout left");
598		- sixButton.addActionListener(this);
599		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- threeButton.setToolTipText("2-column layout right");
601		- threeButton.addActionListener(this);
602		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- sevenButton.setToolTipText("3-column layout");
604		- sevenButton.addActionListener(this);
605		- //
606	1162
607		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608		- rootButton.setToolTipText("Edit selection in new tab");
	1163	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1164	+ rootButton.setToolTipText("Open selection in new tab");
609	1165	rootButton.addActionListener(this);
610	1166
611		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1167	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612	1168	closeButton.setToolTipText("Close tab");
613	1169	closeButton.addActionListener(this);
614	1170	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
615	1171	//clearButton.addActionListener(this);
616		-
617		- cGridBag commandsPanel = new cGridBag();
	1172	+
	1173	+ cGridBag row1 = new cGridBag();
618	1174
619		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- editButton.setToolTipText("Edit selection");
	1175	+ // INSERT
	1176	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ gridButton.setToolTipText("Create ground");
	1178	+ gridButton.addActionListener(this);
	1179	+
	1180	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1181	+ boxButton.setToolTipText("Create box");
	1182	+ boxButton.addActionListener(this);
	1183	+
	1184	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1185	+ sphereButton.setToolTipText("Create sphere");
	1186	+ sphereButton.addActionListener(this);
	1187	+
	1188	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1189	+ coneButton.setToolTipText("Create cone");
	1190	+ coneButton.addActionListener(this);
	1191	+
	1192	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1193	+ torusButton.setToolTipText("Create torus");
	1194	+ torusButton.addActionListener(this);
	1195	+
	1196	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ superButton.setToolTipText("Create superellipsoid");
	1198	+ superButton.addActionListener(this);
	1199	+
	1200	+ if (Globals.ADVANCED)
	1201	+ {
	1202	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1203	+ kleinButton.setToolTipText("Create Klein bottle");
	1204	+ kleinButton.addActionListener(this);
	1205	+ }
	1206	+
	1207	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1208	+ particlesButton.setToolTipText("Create particle system");
	1209	+ particlesButton.addActionListener(this);
	1210	+
	1211	+ oe.toolboxPanel.add(row1);
	1212	+
	1213	+ cGridBag row2 = new cGridBag();
	1214	+
	1215	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ groupButton.setToolTipText("Create group");
	1217	+ groupButton.addActionListener(this);
	1218	+
	1219	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ compositeButton.setToolTipText("Create composite");
	1221	+ compositeButton.addActionListener(this);
	1222	+
	1223	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ switchButton.setToolTipText("Create item switcher");
	1225	+ switchButton.addActionListener(this);
	1226	+
	1227	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ loopButton.setToolTipText("Create loop");
	1229	+ loopButton.addActionListener(this);
	1230	+
	1231	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ textureButton.setToolTipText("Create texture");
	1233	+ textureButton.addActionListener(this);
	1234	+
	1235	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1236	+ overlayButton.setToolTipText("Create overlay");
	1237	+ overlayButton.addActionListener(this);
	1238	+
	1239	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1240	+ lightButton.setToolTipText("Create light");
	1241	+ lightButton.addActionListener(this);
	1242	+
	1243	+ oe.toolboxPanel.add(row2);
	1244	+
	1245	+ cGridBag textures = new cGridBag();
	1246	+
	1247	+ CreateTexturePanel(textures);
	1248	+
	1249	+ oe.toolboxPanel.add(textures);
	1250	+
	1251	+ textures.preferredHeight = 100;
	1252	+
	1253	+ CreateSkyboxPanel(oe.skyboxPanel);
	1254	+
	1255	+ // EDIT panel
	1256	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1257	+ editButton.setToolTipText("Pin selection controls");
621	1258	editButton.addActionListener(this);
622	1259
623		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- uneditButton.setToolTipText("Unedit selection");
	1260	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1261	+ uneditButton.setToolTipText("Unpin and remove selection controls");
625	1262	uneditButton.addActionListener(this);
626	1263
627		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
628		- allParamsButton.setToolTipText("Edit all params");
	1264	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1265	+ allParamsButton.setToolTipText("Show all controls");
629	1266	allParamsButton.addActionListener(this);
630	1267
631		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632		- clearPanelButton.setToolTipText("Clear edit panel");
	1268	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1269	+ clearPanelButton.setToolTipText("Clear all controls");
633	1270	clearPanelButton.addActionListener(this);
634	1271
635		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
636		- unselectButton.setToolTipText("Unselect");
637		- unselectButton.addActionListener(this);
	1272	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1273	+ //unselectButton.setToolTipText("Unselect");
	1274	+ //unselectButton.addActionListener(this);
638	1275
639		- commandsPanel.preferredHeight = 1;
	1276	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1277	+ flashSelectionButton.setToolTipText("Highlight selection");
	1278	+ flashSelectionButton.addActionListener(this);
640	1279
641		- oe.treePanel.add(commandsPanel);
642		- oe.treePanel.Return();
	1280	+ editCommandsPanel.preferredHeight = 1;
	1281	+
	1282	+ SetPinStates(false);
	1283	+// oe.treePanel.add(commandsPanel);
	1284	+// oe.treePanel.Return();
643	1285
644	1286	// oe.aConstraints.gridx += 1;
645	1287	// oe.aConstraints.weighty = 0;
..	..	@@ -656,32 +1298,20 @@
656	1298
657	1299	JScrollPane jSP;
658	1300	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
659		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1301	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
660	1302	ResetModel();
661	1303
662	1304	oe.treePanel.add(jSPPanel);
663	1305	oe.treePanel.Return();
664	1306
665		- cGridBag copyOptionsPanel = new cGridBag();
666		-
667		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
668		- colorCB.setToolTipText("Copy color when dropped");
669		- colorCB.addItemListener(this);
670		-
671		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
672		- materialCB.setToolTipText("Copy material when dropped");
673		- materialCB.addItemListener(this);
674		-
675		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
676		- textureCB.setToolTipText("Copy texture when dropped");
677		- textureCB.addItemListener(this);
678		-
679		- copyOptionsPanel.preferredHeight = 1;
680	1307	oe.treePanel.add(copyOptionsPanel);
681	1308	oe.treePanel.Return();
	1309	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1310	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1311	+ sliderPane.preferredHeight = 1;
682	1312
683		-// mainPanel.setDividerLocation(0.5); //1.0);
684		-// mainPanel.setResizeWeight(0.5);
	1313	+// mainPanel.setDividerLocation(0.1); //1.0);
	1314	+ mainPanel.setResizeWeight(0.4);
685	1315
686	1316	//jList.addListSelectionListener(this);
687	1317	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -689,7 +1319,7 @@
689	1319	//jTree.setEditable(true);
690	1320	oe.jTree.setDragEnabled(true);
691	1321	//jTree.setPreferredSize(new Dimension(10,10));
692		- jSP.setPreferredSize(new Dimension(100,200));
	1322	+ //jSP.setPreferredSize(new Dimension(100,200));
693	1323
694	1324	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
695	1325
..	..	@@ -701,29 +1331,49 @@
701	1331	dgr.addDragGestureListener(this);
702	1332	}catch(Exception e) {}
703	1333	*/
704		- radio.layout = sevenButton;
	1334	+ radio.layout = threeButton; // sixButton;
705	1335	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
706	1336	}
707	1337
708	1338	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
709	1339	{
	1340	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1341	+ colorCB.setToolTipText("Copy color when dropped");
	1342	+ colorCB.addItemListener(this);
	1343	+
	1344	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1345	+ materialCB.setToolTipText("Copy material when dropped");
	1346	+ materialCB.addItemListener(this);
	1347	+
	1348	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1349	+ textureCB.setToolTipText("Copy texture when dropped");
	1350	+ textureCB.addItemListener(this);
	1351	+
	1352	+ panel.Return();
	1353	+
710	1354	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
711	1355	boxCB.setToolTipText("Display bounding boxes");
712	1356	boxCB.addItemListener(this);
713	1357
714	1358	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
715		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1359	+ zoomBoxCB.setToolTipText("Display only for wheel");
716	1360	zoomBoxCB.addItemListener(this);
717	1361
718	1362	if (true) // Globals.ADVANCED)
719	1363	{
720		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
721		- supportCB.setToolTipText("Enable rigging");
722		- supportCB.addItemListener(this);
	1364	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1365	+// supportCB.setToolTipText("Enable rigging");
	1366	+// supportCB.addItemListener(this);
	1367	+
	1368	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1369	+ freezeCB.setToolTipText("Fast moving camera");
	1370	+ freezeCB.addItemListener(this);
723	1371
724	1372	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
725	1373	// localCB.addItemListener(this);
726	1374
	1375	+ panel.Return();
	1376	+
727	1377	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
728	1378	crowdCB.setToolTipText("Used for crowds");
729	1379	crowdCB.addItemListener(this);
..	..	@@ -732,14 +1382,19 @@
732	1382	smoothCB.setToolTipText("Snapping delay");
733	1383	smoothCB.addItemListener(this);
734	1384
735		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
736		- slowCB.setToolTipText("Smooth interpolation");
737		- slowCB.addItemListener(this);
	1385	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1386	+// slowCB.setToolTipText("Smooth interpolation");
	1387	+// slowCB.addItemListener(this);
	1388	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1389	+ minshaderCB.setToolTipText("Minimal fast shader");
	1390	+ minshaderCB.addItemListener(this);
738	1391
739	1392	// constraints.gridy += 1;
740	1393	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
741	1394	// speakerMocapCB.addItemListener(this);
742	1395
	1396	+ panel.Return();
	1397	+
743	1398	if (false)
744	1399	{
745	1400	// handled in scripts
..	..	@@ -754,34 +1409,82 @@
754	1409	//constraints.gridy += 1;
755	1410	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
756	1411	smoothfocusCB.addItemListener(this);
	1412	+ panel.Return();
757	1413	}
758	1414
759	1415	//constraints.gridx += 1;
760	1416	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
761	1417	// debugCB.addItemListener(this);
762	1418
	1419	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1420	+ trackCB.setToolTipText("Enable tracking target");
	1421	+ trackCB.addItemListener(this);
	1422	+
763	1423	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1424	+ oeilCB.setToolTipText("Move camera when tracking");
764	1425	oeilCB.addItemListener(this);
765	1426
	1427	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1428	+ shadowCB.setToolTipText("When live compute shadows");
	1429	+ shadowCB.addItemListener(this);
	1430	+
	1431	+ panel.Return();
	1432	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1433	+ toggleTextureCB.setToolTipText("Load textures");
	1434	+ toggleTextureCB.addItemListener(this);
	1435	+
	1436	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1437	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1438	+ toggleSwitchCB.addItemListener(this);
	1439	+
	1440	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1441	+ autokeepCB.setToolTipText("On structure change");
	1442	+ autokeepCB.addItemListener(this);
	1443	+
	1444	+ panel.Return();
	1445	+ if (Globals.ADVANCED)
	1446	+ {
766	1447	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
767	1448	lookAtCB.setToolTipText("Look-at target");
768	1449	lookAtCB.addItemListener(this);
	1450	+ }
769	1451
770	1452	}
771	1453
772	1454	cGridBag fill = new cGridBag();
773		-
774	1455	fill.preferredHeight = 200;
	1456	+ cGridBag fill2 = new cGridBag();
	1457	+ fill2.preferredHeight = 200;
	1458	+ cGridBag fill3 = new cGridBag();
	1459	+ fill3.preferredHeight = 200;
775	1460
776	1461	panel.add(fill);
	1462	+ panel.add(fill2);
	1463	+ panel.add(fill3);
777	1464
778	1465	}
779	1466
780	1467	void EditObject(Object3D obj)
781	1468	{
	1469	+ assert(obj instanceof Composite);
	1470	+
	1471	+// if (obj.versionlist == null)
	1472	+// {
	1473	+// obj.versionlist = new Object3D[100];
	1474	+// obj.versionindex = -1;
	1475	+// }
	1476	+
782	1477	cRadio radioButton = new cRadio(obj.name);
	1478	+
	1479	+ // June 2019. Patch to avoid bug with transparency.
	1480	+ radioButton.hadMaterial = obj.material != null;
	1481	+ if (!radioButton.hadMaterial)
	1482	+ {
	1483	+ obj.material = new cMaterial();
	1484	+ }
	1485	+
783	1486	radioButton.SetObject(obj);
784		- radioButton.layout = sevenButton;
	1487	+ radioButton.layout = threeButton; // sixButton;
785	1488	radioButton.SetCamera(cameraView.renderCamera, false);
786	1489	radioButton.addActionListener(this);
787	1490	radioPanel.add(radioButton);
..	..	@@ -791,6 +1494,8 @@
791	1494
792	1495	void SetupViews(ObjEditor oe)
793	1496	{
	1497	+ theFrame = this;
	1498	+
794	1499	oe.SetupViews();
795	1500
796	1501	System.out.println("SetupViews");
..	..	@@ -799,23 +1504,30 @@
799	1504	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
800	1505	}
801	1506
802		- JCheckBox liveCB;
803		- JCheckBox supportCB;
804		- JCheckBox localCB;
805		- JCheckBox crowdCB;
806		- JCheckBox smoothCB;
807		- JCheckBox fastCB;
808		- JCheckBox slowCB;
809		- JCheckBox boxCB;
810		- JCheckBox zoomBoxCB;
811		- JCheckBox trackCB;
812		- JCheckBox smoothfocusCB;
	1507	+ cToggleButton liveCB;
	1508	+ cCheckBox supportCB;
	1509	+ cCheckBox localCB;
	1510	+ cCheckBox crowdCB;
	1511	+ cCheckBox smoothCB;
	1512	+ cCheckBox minshaderCB;
	1513	+
	1514	+ cToggleButton fastCB;
	1515	+ cCheckBox slowCB;
	1516	+ cCheckBox boxCB;
	1517	+ cCheckBox zoomBoxCB;
	1518	+ cCheckBox freezeCB;
	1519	+ //cToggleButton trackCB;
	1520	+ cCheckBox trackCB;
	1521	+ cCheckBox smoothfocusCB;
813	1522	// JCheckBox speakerMocapCB;
814		- JCheckBox speakerCameraCB;
815		- JCheckBox speakerFocusCB;
816		- JCheckBox debugCB;
817		- JCheckBox oeilCB;
818		- JCheckBox lookAtCB;
	1523	+ cCheckBox speakerCameraCB;
	1524	+ cCheckBox speakerFocusCB;
	1525	+ cCheckBox debugCB;
	1526	+
	1527	+ cCheckBox oeilCB;
	1528	+ cCheckBox shadowCB;
	1529	+ cCheckBox autokeepCB;
	1530	+ cCheckBox lookAtCB;
819	1531
820	1532	// static int COLOR = 1;
821	1533	// static int MATERIAL = 2;
..	..	@@ -823,9 +1535,9 @@
823	1535
824	1536	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
825	1537
826		- JCheckBox colorCB;
827		- JCheckBox materialCB;
828		- JCheckBox textureCB;
	1538	+ cCheckBox colorCB;
	1539	+ cCheckBox materialCB;
	1540	+ cCheckBox textureCB;
829	1541
830	1542	public void itemStateChanged(ItemEvent e)
831	1543	{
..	..	@@ -853,6 +1565,7 @@
853	1565	} else if(e.getSource() == liveCB)
854	1566	{
855	1567	cameraView.ToggleLive();
	1568	+ refreshContents(false);
856	1569	}
857	1570	else if(e.getSource() == supportCB)
858	1571	{
..	..	@@ -868,6 +1581,12 @@
868	1581	{
869	1582	cameraView.ToggleInertia();
870	1583	cameraView.repaint();
	1584	+ }
	1585	+ else if(e.getSource() == minshaderCB)
	1586	+ {
	1587	+ Globals.MINSHADER ^= true;
	1588	+ cameraView.programInitialized = false;
	1589	+ cameraView.repaint();
871	1590	}
872	1591	else if(e.getSource() == localCB)
873	1592	{
..	..	@@ -917,6 +1636,18 @@
917	1636	{
918	1637	cameraView.ToggleOeil();
919	1638	}
	1639	+ else if(e.getSource() == shadowCB)
	1640	+ {
	1641	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1642	+ }
	1643	+ else if(e.getSource() == freezeCB)
	1644	+ {
	1645	+ Globals.FREEZEONMOVE ^= true;
	1646	+ }
	1647	+ else if(e.getSource() == autokeepCB)
	1648	+ {
	1649	+ Globals.REPLACEONMAKE ^= true;
	1650	+ }
920	1651	else if(e.getSource() == lookAtCB)
921	1652	{
922	1653	cameraView.ToggleLookAt();
..	..	@@ -933,7 +1664,8 @@
933	1664
934	1665	/**/
935	1666	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
936		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1667	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1668	+ TreePath path = objEditor.jTree.getSelectionPath();
937	1669	if ((path == null) \|\| (path.getPathCount() <= 1)) {
938	1670	// We can't move the root node or an empty selection
939	1671	return;
..	..	@@ -996,8 +1728,6 @@
996	1728	}
997	1729	}
998	1730
999		- String string = (String) object;
1000		-
1001	1731	System.out.println("Transfer = " + object + "; drop : " + target);
1002	1732	// if( object instanceof java.io.File[])
1003	1733	// {
..	..	@@ -1005,6 +1735,8 @@
1005	1735	// objEditor.DropFile((java.io.File[]) object, true);
1006	1736	// return;
1007	1737	// }
	1738	+
	1739	+ String string = object.toString();
1008	1740
1009	1741	// File path for Mac and Windows
1010	1742	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1050,23 +1782,33 @@
1050	1782
1051	1783	assert target == objEditor.jTree;
1052	1784	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1785	+ Object3D destinationLeaf;
1053	1786	try {
1054		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1787	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1055	1788	} catch (Exception e) {
1056	1789	System.out.println("destinationPath : " + destinationPath);
1057	1790	return;
1058	1791	}
1059	1792
1060		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1793	+ for (int i=group.selection.size(); --i>=0;)
1061	1794	{
	1795	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1796	+
	1797	+ // Cannot move into itself
	1798	+ if (child == destinationLeaf)
	1799	+ return;
	1800	+ }
	1801	+
	1802	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1803	+// {
1062	1804	loadClipboard(true);
1063	1805	objEditor.jTree.setSelectionPath(destinationPath);
1064	1806	pasteInto(false, false);
1065		- } else {
1066		- loadClipboard(false);
1067		- objEditor.jTree.setSelectionPath(destinationPath);
1068		- pasteInto(false, false); // true); // ???
1069		- }
	1807	+// } else {
	1808	+// loadClipboard(false);
	1809	+// objEditor.jTree.setSelectionPath(destinationPath);
	1810	+// pasteInto(false, false); // true); // ???
	1811	+// }
1070	1812	}
1071	1813	public void dropActionChanged(DropTargetDragEvent dtde)
1072	1814	// Called if the user has modified the current drop gesture
..	..	@@ -1122,7 +1864,12 @@
1122	1864	TreePath path;
1123	1865
1124	1866	public TransferableTreePath(TreePath tp) {
1125		- path = tp;
	1867	+ Object[] objs = new Object[tp.getPathCount()];
	1868	+ for (int i=0; i<objs.length; i++)
	1869	+ {
	1870	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1871	+ }
	1872	+ path = new TreePath(objs);
1126	1873	}
1127	1874
1128	1875	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1171,22 +1918,30 @@
1171	1918	{
1172	1919	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1173	1920	//heightFieldItem.addActionListener(this);
1174		- gridItem = menu.add(new MenuItem("Grid"));
1175		- gridItem.addActionListener(this);
1176		- rectoidItem = menu.add(new MenuItem("Box"));
1177		- rectoidItem.addActionListener(this);
1178		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1179		- ellipsoidItem.addActionListener(this);
1180		- coneItem = menu.add(new MenuItem("Cone"));
1181		- coneItem.addActionListener(this);
1182		- torusItem = menu.add(new MenuItem("Torus"));
1183		- torusItem.addActionListener(this);
1184		- superItem = menu.add(new MenuItem("Superellipsoid"));
1185		- superItem.addActionListener(this);
	1921	+// gridItem = menu.add(new MenuItem("Grid"));
	1922	+// gridItem.addActionListener(this);
	1923	+// rectoidItem = menu.add(new MenuItem("Box"));
	1924	+// rectoidItem.addActionListener(this);
	1925	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1926	+// ellipsoidItem.addActionListener(this);
	1927	+// coneItem = menu.add(new MenuItem("Cone"));
	1928	+// coneItem.addActionListener(this);
	1929	+// torusItem = menu.add(new MenuItem("Torus"));
	1930	+// torusItem.addActionListener(this);
	1931	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1932	+// superItem.addActionListener(this);
	1933	+
	1934	+ cameraItem = menu.add(new MenuItem("Camera"));
	1935	+ cameraItem.addActionListener(this);
	1936	+
	1937	+ if (!Globals.ADVANCED)
	1938	+ {
1186	1939	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1187	1940	kleinItem.addActionListener(this);
1188		- particleItem = menu.add(new MenuItem("Particle system"));
1189		- particleItem.addActionListener(this);
	1941	+ }
	1942	+
	1943	+// particleItem = menu.add(new MenuItem("Particle system"));
	1944	+// particleItem.addActionListener(this);
1190	1945	if (Globals.ADVANCED)
1191	1946	{
1192	1947	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1212,15 +1967,15 @@
1212	1967	}
1213	1968	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1214	1969	bezierItem.addActionListener(this);
1215		- overlayItem = menu.add(new MenuItem("Overlay"));
1216		- overlayItem.addActionListener(this);
1217		- lightItem = menu.add(new MenuItem("Light"));
1218		- lightItem.addActionListener(this);
	1970	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1971	+// overlayItem.addActionListener(this);
	1972	+// lightItem = menu.add(new MenuItem("Light"));
	1973	+// lightItem.addActionListener(this);
1219	1974	menu.add("-");
1220	1975	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1221	1976	//superLoopItem.addActionListener(this);
1222		- loopItem = menu.add(new MenuItem("Loop"));
1223		- loopItem.addActionListener(this);
	1977	+// loopItem = menu.add(new MenuItem("Loop"));
	1978	+// loopItem.addActionListener(this);
1224	1979	doubleItem = menu.add(new MenuItem("Fork"));
1225	1980	doubleItem.addActionListener(this);
1226	1981	if (Globals.ADVANCED)
..	..	@@ -1236,6 +1991,9 @@
1236	1991	animationItem.addItemListener(this);
1237	1992	animationItem.setState(Globals.ANIMATION);
1238	1993
	1994	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1995	+ archiveItem.addActionListener(this);
	1996	+
1239	1997	menu.add("-");
1240	1998	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1241	1999	parseverticesItem.addActionListener(this);
..	..	@@ -1248,6 +2006,8 @@
1248	2006	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1249	2007	reduce34MorphItem.addActionListener(this);
1250	2008	menu.add("-");
	2009	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2010	+ memoryItem.addActionListener(this);
1251	2011	menu.add(computeAOItem = new MenuItem("Compute AO"));
1252	2012	computeAOItem.addActionListener(this);
1253	2013
..	..	@@ -1256,11 +2016,9 @@
1256	2016	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1257	2017	mirrorItem.addActionListener(this);
1258	2018	menu.add("-");
1259		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1260		- memoryItem.addActionListener(this);
1261	2019	menu.add(analyzeItem = new MenuItem("Analyze"));
1262	2020	analyzeItem.addActionListener(this);
1263		- menu.add(dumpItem = new MenuItem("Dump"));
	2021	+ menu.add(dumpItem = new MenuItem("Print"));
1264	2022	dumpItem.addActionListener(this);
1265	2023	// menu.add(pathItem = new MenuItem("From-to path"));
1266	2024	// pathItem.addActionListener(this);
..	..	@@ -1401,9 +2159,34 @@
1401	2159	shadow.material = new cMaterial(obj.material);
1402	2160	shadow.material.diffuse = 0.0001f;
1403	2161	shadow.material.specular = 0.0001f;
	2162	+ //shadow.projectedVertices[1].x = 300;
1404	2163
1405	2164	makeSomething(shadow);
1406	2165	}
	2166	+
	2167	+ private void ClearUnpinned()
	2168	+ {
	2169	+ //for (Object3D obj : listUI)
	2170	+ for (int i=listUI.size(); --i>=0;)
	2171	+ {
	2172	+ Object3D obj = listUI.elementAt(i);
	2173	+ if (!obj.pinned)
	2174	+ {
	2175	+ obj.CloseUI();
	2176	+ listUI.remove(i);
	2177	+ }
	2178	+ }
	2179	+ }
	2180	+
	2181	+ private void EditElement(Object3D elem, boolean newWindow)
	2182	+ {
	2183	+ // if (!(elem instanceof Composite))
	2184	+ // newWindow = false;
	2185	+ listUI.add(elem);
	2186	+ elem.openEditWindow(this, newWindow); //, false);
	2187	+ System.out.println("edit : " + elem);
	2188	+ elem.editWindow.refreshContents(true); // ? new
	2189	+ }
1407	2190
1408	2191	/**
1409	2192	* applyExample
..	..	@@ -1648,7 +2431,7 @@
1648	2431	{
1649	2432	ScreenFit();
1650	2433	} else
1651		- if (source == switchItem)
	2434	+ if (source == switchViewItem)
1652	2435	{
1653	2436	cVector v1 = new cVector();
1654	2437	cVector v2 = new cVector();
..	..	@@ -1657,11 +2440,11 @@
1657	2440	objEditor.cameraView.renderCamera.setAim(v2, v1);
1658	2441	objEditor.cameraView.repaint();
1659	2442	} else
1660		- if (source == rectoidItem)
	2443	+ if (source == rectoidItem \|\| source == boxButton)
1661	2444	{
1662	2445	makeSomething(new Box());
1663	2446	} else
1664		- if (source == particleItem)
	2447	+ if (source == particleItem \|\| source == particlesButton)
1665	2448	{
1666	2449	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1667	2450	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1740,27 +2523,27 @@
1740	2523
1741	2524	makeSomething(obj);
1742	2525	} else
1743		- if (source == gridItem)
	2526	+ if (source == gridItem \|\| source == gridButton)
1744	2527	{
1745	2528	makeSomething(new Grid());
1746	2529	} else
1747		- if (source == ellipsoidItem)
	2530	+ if (source == ellipsoidItem \|\| source == sphereButton)
1748	2531	{
1749	2532	makeSomething(new Sphere());
1750	2533	} else
1751		- if (source == coneItem)
	2534	+ if (source == coneItem \|\| source == coneButton)
1752	2535	{
1753	2536	makeSomething(new Cone());
1754	2537	} else
1755		- if (source == torusItem)
	2538	+ if (source == torusItem \|\| source == torusButton)
1756	2539	{
1757	2540	makeSomething(new Torus());
1758	2541	} else
1759		- if (source == superItem)
	2542	+ if (source == superItem \|\| source == superButton)
1760	2543	{
1761	2544	makeSomething(new Superellipsoid());
1762	2545	} else
1763		- if (source == kleinItem)
	2546	+ if (source == kleinItem \|\| source == kleinButton)
1764	2547	{
1765	2548	makeSomething(new Klein());
1766	2549	} else
..	..	@@ -1780,7 +2563,7 @@
1780	2563	{
1781	2564	makeSomething(new BezierSurface());
1782	2565	} else
1783		- if (source == overlayItem)
	2566	+ if (source == overlayItem \|\| source == overlayButton)
1784	2567	{
1785	2568	/*
1786	2569	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1828,10 +2611,27 @@
1828	2611	s.setup();
1829	2612	makeSomething(s);
1830	2613	} else
1831		- if (source == lightItem)
	2614	+ if (source == lightItem \|\| source == lightButton)
1832	2615	{
1833	2616	makeSomething(new Light());
1834	2617	} else
	2618	+// if (source == skybox1Button \|\|
	2619	+// source == skybox2Button \|\|
	2620	+// source == skybox3Button \|\|
	2621	+// source == skybox4Button \|\|
	2622	+// source == skybox5Button \|\|
	2623	+// source == skybox6Button \|\|
	2624	+// source == skybox7Button \|\|
	2625	+// source == skybox11Button \|\|
	2626	+// source == skybox12Button \|\|
	2627	+// source == skybox13Button \|\|
	2628	+// source == skybox14Button \|\|
	2629	+// source == skybox15Button \|\|
	2630	+// source == skybox16Button \|\|
	2631	+// source == skybox17Button)
	2632	+// {
	2633	+// ChangeSkybox(source);
	2634	+// } else
1835	2635	if (source == csgItem)
1836	2636	{
1837	2637	group(new CSG());
..	..	@@ -1878,30 +2678,30 @@
1878	2678
1879	2679	group(g);
1880	2680	} else
1881		- if (source == loopItem)
	2681	+ if (source == loopItem \|\| source == loopButton)
1882	2682	{
1883	2683	Composite csg = new GroupLeaf();
1884	2684	csg.count = 5;
1885	2685	group(csg);
1886		- Composite child = new cGroup();
	2686	+ Composite child = new cGroup("Branch");
1887	2687	csg.addChild(child);
1888	2688	child.addChild(csg);
1889	2689	} else
1890	2690	if (source == doubleItem)
1891	2691	{
1892		- Composite csg = new GroupLeaf();
	2692	+ Composite csg = new GroupLeaf("Fork");
1893	2693	csg.count = 5;
1894	2694	group(csg);
1895		- Composite child = new cGroup();
	2695	+ Composite child = new cGroup("Branch A");
1896	2696	csg.addChild(child);
1897	2697	child.addChild(csg);
1898		- child = new cGroup();
	2698	+ child = new cGroup("Branch B");
1899	2699	csg.addChild(child);
1900	2700	child.addChild(csg);
1901	2701	} else
1902	2702	if (source == tripleItem)
1903	2703	{
1904		- Composite csg = new GroupLeaf();
	2704	+ Composite csg = new GroupLeaf("Trident");
1905	2705	csg.count = 4;
1906	2706	group(csg);
1907	2707	Composite child = new cGroup();
..	..	@@ -1917,7 +2717,7 @@
1917	2717	if (source == computeAOItem)
1918	2718	{
1919	2719	Globals.drawMode = CameraPane.OCCLUSION;
1920		- Globals.theRenderer.repaint();
	2720	+ cameraView.repaint();
1921	2721	} else
1922	2722	if (source == recompileItem)
1923	2723	{
..	..	@@ -1932,7 +2732,7 @@
1932	2732	if (source == invariantsItem)
1933	2733	{
1934	2734	System.out.println("Invariants:");
1935		- Grafreed.grafreeD.universe.invariants();
	2735	+ Grafreed.grafreed.universe.invariants();
1936	2736	} else
1937	2737	if (source == memoryItem)
1938	2738	{
..	..	@@ -1951,6 +2751,65 @@
1951	2751	{
1952	2752	DumpObject();
1953	2753	} else
	2754	+ if (source == minButton)
	2755	+ {
	2756	+ Minimize();
	2757	+ } else
	2758	+ if (source == maxButton)
	2759	+ {
	2760	+ Maximize();
	2761	+ } else
	2762	+ if (source == fullButton)
	2763	+ {
	2764	+ ToggleFullScreen();
	2765	+ } else
	2766	+ if (source == collapseButton)
	2767	+ {
	2768	+ this.expandedLayout = radio.layout;
	2769	+ CollapseToolbar();
	2770	+ } else
	2771	+ if (source == maximize3DButton)
	2772	+ {
	2773	+ this.expandedLayout = radio.layout;
	2774	+ radio.layout = twoButton;
	2775	+ Show3DView();
	2776	+ CollapseToolbar();
	2777	+ } else
	2778	+ if (source == previousVersionButton)
	2779	+ {
	2780	+ // Go to previous version
	2781	+ //if (!Undo())
	2782	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2783	+ PreviousVersion();
	2784	+ } else
	2785	+ if (source == restoreButton)
	2786	+ {
	2787	+ // Restore current version
	2788	+ Restore();
	2789	+ //restoreButton.setEnabled(false);
	2790	+ } else
	2791	+ if (source == replaceButton)
	2792	+ {
	2793	+ // Overwrite current version
	2794	+ Replace();
	2795	+ //replaceButton.setEnabled(false);
	2796	+ } else
	2797	+ if (source == nextVersionButton)
	2798	+ {
	2799	+ // Go to next version
	2800	+ NextVersion();
	2801	+ } else
	2802	+ if (source == saveVersionButton)
	2803	+ {
	2804	+ // Save a new version
	2805	+ if (!Save(true))
	2806	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2807	+ } else
	2808	+ if (source == deleteVersionButton)
	2809	+ {
	2810	+ // Delete a new version
	2811	+ DeleteVersion();
	2812	+ } else
1954	2813	if (source == oneStepButton)
1955	2814	{
1956	2815	Globals.ONESTEP = true;
..	..	@@ -1958,17 +2817,14 @@
1958	2817	} else
1959	2818	if (source == screenfitButton)
1960	2819	{
1961		- //Reload(lastConverter, lastFilename, true);
1962	2820	ScreenFit();
1963	2821	} else
1964	2822	if (source == screenfitpointButton)
1965	2823	{
1966		- //Reload(lastConverter, lastFilename, true);
1967	2824	ScreenFitPoint();
1968	2825	} else
1969	2826	if (source == snapobjectButton)
1970	2827	{
1971		- //Reload(lastConverter, lastFilename, true);
1972	2828	SnapObject();
1973	2829	} else
1974	2830	// if (event.getSource() == recompileButton)
..	..	@@ -2004,6 +2860,14 @@
2004	2860	if (source == cutItem \|\| source == clearButton)
2005	2861	{
2006	2862	loadClipboard(true);
	2863	+ } else
	2864	+ if (source == undoItem)
	2865	+ {
	2866	+ PreviousVersion();
	2867	+ } else
	2868	+ if (source == redoItem)
	2869	+ {
	2870	+ NextVersion();
2007	2871	} else
2008	2872	if (source == duplicateItem)
2009	2873	{
..	..	@@ -2324,7 +3188,7 @@
2324	3188	{
2325	3189	StepAll();
2326	3190	} else
2327		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3191	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2328	3192	{
2329	3193	//int indices[] = jList.getSelectedIndices();
2330	3194	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2336,9 +3200,9 @@
2336	3200	{
2337	3201	ClearSelection(true);
2338	3202	} else
2339		- if (source == grabItem)
	3203	+ if (source == grabItem \|\| source == groupButton)
2340	3204	{
2341		- group(new cGroup(), true);
	3205	+ group(new cGroup(), false); // true);
2342	3206	} else
2343	3207	if (source == hideItem)
2344	3208	{
..	..	@@ -2356,11 +3220,11 @@
2356	3220	{
2357	3221	makeSomething(new Camera());
2358	3222	} else
2359		- if (source == compositeItem)
	3223	+ if (source == compositeItem \|\| source == compositeButton)
2360	3224	{
2361	3225	group(new Composite());
2362	3226	} else
2363		- if (source == randomItem)
	3227	+ if (source == switchItem \|\| source == switchButton)
2364	3228	{
2365	3229	RandomNode random = new RandomNode();
2366	3230	group(random);
..	..	@@ -2462,7 +3326,7 @@
2462	3326	{
2463	3327	group(new cLinker());
2464	3328	} else
2465		- if (source == textureItem)
	3329	+ if (source == textureItem \|\| source == textureButton)
2466	3330	{
2467	3331	group(new TextureNode());
2468	3332	} else
..	..	@@ -2482,17 +3346,30 @@
2482	3346	{
2483	3347	CastShadow(2);
2484	3348	} else
2485		- if (source == ungroupItem)
	3349	+ if (source == ungroupItem \|\| source == ungroupButton)
2486	3350	{
2487		- //ungroup();
	3351	+ boolean hasRoot = false;
	3352	+
2488	3353	for (int i=0; i<group.selection.size(); i++)
2489	3354	{
2490		- Ungroup(group.selection.get(i));
	3355	+ if (group.selection.get(i) == group)
	3356	+ {
	3357	+ hasRoot = true;
	3358	+ break;
	3359	+ }
2491	3360	}
2492	3361
2493		- ClearSelection(false);
2494		-
2495		- refreshContents();
	3362	+ if (!hasRoot)
	3363	+ {
	3364	+ for (int i=0; i<group.selection.size(); i++)
	3365	+ {
	3366	+ Ungroup(group.selection.get(i));
	3367	+ }
	3368	+
	3369	+ ClearSelection(false);
	3370	+
	3371	+ refreshContents();
	3372	+ }
2496	3373	} else
2497	3374	if (source == genUVItem)
2498	3375	{
..	..	@@ -2504,7 +3381,7 @@
2504	3381	} else
2505	3382	if (source == genNormalsMESHItem)
2506	3383	{
2507		- GenNormals(true); // TODO
	3384	+ GenNormalsMESH();
2508	3385	} else
2509	3386	if (source == genNormalsORGANItem)
2510	3387	{
..	..	@@ -2569,6 +3446,22 @@
2569	3446	if (source == unmarkleavesItem)
2570	3447	{
2571	3448	MarkLeaves(false);
	3449	+ } else
	3450	+ if (source == rewindleavesItem)
	3451	+ {
	3452	+ RewindLeaves(true);
	3453	+ } else
	3454	+ if (source == unrewindleavesItem)
	3455	+ {
	3456	+ RewindLeaves(false);
	3457	+ } else
	3458	+ if (source == randomleavesItem)
	3459	+ {
	3460	+ RandomLeaves(true);
	3461	+ } else
	3462	+ if (source == unrandomleavesItem)
	3463	+ {
	3464	+ RandomLeaves(false);
2572	3465	} else
2573	3466	if (source == flipVItem)
2574	3467	{
..	..	@@ -2777,7 +3670,7 @@
2777	3670	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2778	3671	{
2779	3672	obj = (Object3D)e.nextElement();
2780		- obj.SetBumpTexture(null);
	3673	+ obj.ResetBumpTexture();
2781	3674	}
2782	3675
2783	3676	refreshContents();
..	..	@@ -2793,6 +3686,31 @@
2793	3686
2794	3687	refreshContents();
2795	3688	} else
	3689	+ if (source == embedTexturesItem)
	3690	+ {
	3691	+ Object3D obj;
	3692	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3693	+ {
	3694	+ obj = (Object3D)e.nextElement();
	3695	+ obj.EmbedTextures(true);
	3696	+ }
	3697	+
	3698	+ refreshContents();
	3699	+ } else
	3700	+ if (source == deEmbedTexturesItem)
	3701	+ {
	3702	+ Object3D obj;
	3703	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3704	+ {
	3705	+ obj = (Object3D)e.nextElement();
	3706	+ obj.EmbedTextures(false);
	3707	+ }
	3708	+
	3709	+ CameraPane.texturepigment.clear();
	3710	+ CameraPane.texturebump.clear();
	3711	+
	3712	+ refreshContents();
	3713	+ } else
2796	3714	if (source == flashSelectionButton)
2797	3715	{
2798	3716	CameraPane.flash = true;
..	..	@@ -2804,42 +3722,36 @@
2804	3722	if (source == twoButton)
2805	3723	{
2806	3724	radio.layout = twoButton;
2807		- // bug
2808		- //gridPanel.setDividerLocation(1.0);
2809		- //bigPanel.setDividerLocation(0.0);
2810		-// bigThree.remove(scenePanel);
2811		-// bigThree.remove(centralPanel);
2812		-// bigThree.remove(XYZPanel);
2813		-// aWindowConstraints.gridx = 0;
2814		-// aWindowConstraints.gridy = 0;
2815		-// aWindowConstraints.gridwidth = 1;
2816		-// // aConstraints.gridheight = 3;
2817		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2818		-// aWindowConstraints.weightx = 0;
2819		-// aWindowConstraints.weighty = 1;
2820		-// //bigThree.add(jtp, aWindowConstraints);
2821		-// aWindowConstraints.weightx = 1;
2822		-// aWindowConstraints.gridwidth = 3;
2823		-// // aConstraints.gridheight = 3;
2824		-// aWindowConstraints.gridx = 1;
2825		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2826		-// bigThree.add(centralPanel, aWindowConstraints);
2827		-// aWindowConstraints.weightx = 0;
2828		-// aWindowConstraints.gridx = 4;
2829		-// aWindowConstraints.gridwidth = 1;
2830		-// // aConstraints.gridheight = 3;
2831		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2832		-// //bigThree.add(XYZPanel, aWindowConstraints);
2833		-// scenePanel.setVisible(false);
2834		-// centralPanel.setVisible(true);
2835		-// XYZPanel.setVisible(false);
2836		- bigThree.ClearUI();
2837		- bigThree.add(centralPanel);
2838		- bigThree.FlushUI();
	3725	+
	3726	+ if (CameraPane.FULLSCREEN)
	3727	+ fullscreenLayout = radio.layout;
	3728	+
	3729	+ Show3DView();
	3730	+
	3731	+ cameraView.requestFocusInWindow();
	3732	+
	3733	+// refreshContents(true);
	3734	+//
	3735	+// try
	3736	+// {
	3737	+// java.awt.Robot bot = new java.awt.Robot();
	3738	+// int mask = InputEvent.BUTTON1_MASK;
	3739	+// bot.mouseMove(100, 100);
	3740	+// bot.mousePress(mask);
	3741	+// bot.mouseRelease(mask);
	3742	+// }
	3743	+// catch (Exception e)
	3744	+// {
	3745	+//
	3746	+// }
	3747	+
2839	3748	} else
2840	3749	if (source == threeButton)
2841	3750	{
2842	3751	radio.layout = threeButton;
	3752	+
	3753	+ if (CameraPane.FULLSCREEN)
	3754	+ fullscreenLayout = radio.layout;
2843	3755
2844	3756	// bigThree.remove(scenePanel);
2845	3757	// bigThree.remove(centralPanel);
..	..	@@ -2869,13 +3781,18 @@
2869	3781	// centralPanel.setVisible(true);
2870	3782	// XYZPanel.setVisible(true);
2871	3783	bigThree.ClearUI();
	3784	+ bigThree.add(scenePanel);
2872	3785	bigThree.add(centralPanel);
2873		- bigThree.add(XYZPanel);
2874	3786	bigThree.FlushUI();
	3787	+
	3788	+ cameraView.requestFocusInWindow();
2875	3789	} else
2876	3790	if (source == fourButton)
2877	3791	{
2878	3792	radio.layout = fourButton;
	3793	+
	3794	+ if (CameraPane.FULLSCREEN)
	3795	+ fullscreenLayout = radio.layout;
2879	3796
2880	3797	// bigThree.remove(scenePanel);
2881	3798	// bigThree.remove(centralPanel);
..	..	@@ -2907,10 +3824,15 @@
2907	3824	bigThree.ClearUI();
2908	3825	bigThree.add(scenePanel);
2909	3826	bigThree.FlushUI();
	3827	+
	3828	+ cameraView.requestFocusInWindow();
2910	3829	} else
2911	3830	if (source == sixButton)
2912	3831	{
2913	3832	radio.layout = sixButton;
	3833	+
	3834	+ if (CameraPane.FULLSCREEN)
	3835	+ fullscreenLayout = radio.layout;
2914	3836
2915	3837	// bigThree.remove(scenePanel);
2916	3838	// bigThree.remove(centralPanel);
..	..	@@ -2940,13 +3862,18 @@
2940	3862	// centralPanel.setVisible(true);
2941	3863	// XYZPanel.setVisible(false);
2942	3864	bigThree.ClearUI();
2943		- bigThree.add(scenePanel);
2944	3865	bigThree.add(centralPanel);
	3866	+ bigThree.add(scenePanel);
2945	3867	bigThree.FlushUI();
	3868	+
	3869	+ cameraView.requestFocusInWindow();
2946	3870	} else
2947	3871	if (source == sevenButton)
2948	3872	{
2949	3873	radio.layout = sevenButton;
	3874	+
	3875	+ if (CameraPane.FULLSCREEN)
	3876	+ fullscreenLayout = radio.layout;
2950	3877
2951	3878	// bigThree.remove(scenePanel);
2952	3879	// bigThree.remove(centralPanel);
..	..	@@ -2980,9 +3907,12 @@
2980	3907	bigThree.add(centralPanel);
2981	3908	bigThree.add(XYZPanel);
2982	3909	bigThree.FlushUI();
	3910	+
	3911	+ cameraView.requestFocusInWindow();
2983	3912	} else
2984	3913	if (source == rootButton)
2985	3914	{
	3915	+ Replace();
2986	3916	Object3D obj;
2987	3917	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2988	3918	{
..	..	@@ -2991,6 +3921,7 @@
2991	3921	EditObject(obj);
2992	3922	}
2993	3923
	3924	+ cameraView.requestFocusInWindow();
2994	3925	refreshContents(true);
2995	3926	} else
2996	3927	if (source == closeButton)
..	..	@@ -3000,22 +3931,37 @@
3000	3931	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3001	3932	{
3002	3933	ab = (cRadio)e.nextElement();
3003		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3934	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3004	3935	{
	3936	+ // Patch to avoid bug with transparency.
	3937	+ if (!ab.hadMaterial)
	3938	+ {
	3939	+ ab.object.material = null;
	3940	+ }
	3941	+
3005	3942	buttonGroup.remove(ab);
3006	3943	radioPanel.remove(ab);
3007	3944
3008		- ab.GetObject().editWindow = null;
	3945	+ //ab.GetObject().editWindow = null;
	3946	+ ab.GetObject().manipWindow = null;
3009	3947	// ab.GetObject().objectUI = null; // ?????????
3010	3948
3011	3949	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3012	3950	break;
3013	3951	}
3014	3952	}
	3953	+
	3954	+ cameraView.requestFocusInWindow();
3015	3955	refreshContents(true);
3016	3956	} else
3017	3957	if (source == editItem \|\| source == editButton)
3018	3958	{
	3959	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3960	+ {
	3961	+ Object3D child = (Object3D)e.nextElement();
	3962	+ child.pinned = true;
	3963	+ }
	3964	+
3019	3965	EditSelection(false);
3020	3966	} else
3021	3967	if (source == uneditButton)
..	..	@@ -3024,11 +3970,12 @@
3024	3970	{
3025	3971	Object3D child = (Object3D)e.nextElement();
3026	3972	if(child.editWindow != null)
3027		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3973	+ child.pinned = false;
3028	3974	child.CloseUI();
3029	3975	listUI.remove(child);
	3976	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3030	3977
3031		- child.editWindow = null; // ???????????
	3978	+ //child.editWindow = null; // ???????????
3032	3979	}
3033	3980	objEditor.ctrlPanel.FlushUI();
3034	3981	//objEditor.jTree.clearSelection();
..	..	@@ -3041,16 +3988,18 @@
3041	3988	//copy.ClearUI();
3042	3989	for (Object3D obj : listUI)
3043	3990	{
	3991	+ obj.pinned = false;
3044	3992	obj.CloseUI();
3045	3993	}
3046	3994	listUI.clear();
	3995	+ SetPinStates(group.selection.size() > 0);
3047	3996	refreshContents(true);
3048	3997	} else
3049	3998	if (source == allParamsButton)
3050	3999	{
3051	4000	assert(copy == group);
3052	4001
3053		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4002	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3054	4003
3055	4004	for (Object3D obj : listUI)
3056	4005	{
..	..	@@ -3099,6 +4048,7 @@
3099	4048	}
3100	4049
3101	4050	copy = group;
	4051	+
3102	4052	//Globals.theRenderer.object = group;
3103	4053	if(!useclient)
3104	4054	{
..	..	@@ -3115,7 +4065,9 @@
3115	4065	sideView.object = group;
3116	4066	}
3117	4067
3118		-// fix "+" issue group.editWindow = this;
	4068	+// fix "+" issue
	4069	+ //group.editWindow = this;
	4070	+ group.manipWindow = this;
3119	4071
3120	4072	/*
3121	4073	currentLayout = radio.layout;
..	..	@@ -3123,20 +4075,44 @@
3123	4075	currentLayout = sevenButton;
3124	4076	*/
3125	4077	radio.layout.doClick();
	4078	+
	4079	+ assert(copy instanceof Composite);
	4080	+
	4081	+ if (copy.versionlist == null)
	4082	+ {
	4083	+ copy.versionlist = new Object3D[100];
	4084	+ copy.versionindex = -1;
	4085	+
	4086	+ Save(true);
	4087	+ }
	4088	+
	4089	+ SetVersionStates();
	4090	+
	4091	+ ClearUnpinned();
	4092	+
	4093	+ //Grafreed.Assert(group != null);
	4094	+ //Grafreed.Assert(group.selection != null);
	4095	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4096	+ if (group.selection == null \|\| group.selection.size() == 1)
	4097	+ EditSelection(false);
3126	4098	keepparent = group.parent;
3127	4099	// PARENT = NULL or not???
3128	4100	//group.parent = null; // ROOT
3129	4101	//group.attributes = -1;
3130	4102	ResetModel();
	4103	+
	4104	+ cameraView.requestFocusInWindow();
3131	4105	refreshContents(true);
3132	4106	} else if (event.getSource() == editCameraItem)
3133	4107	{
3134	4108	cameraView.ProtectCamera();
	4109	+ cameraView.requestFocusInWindow();
3135	4110	cameraView.repaint();
3136	4111	return;
3137		- } else if (event.getSource() == revertCameraItem)
	4112	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3138	4113	{
3139	4114	cameraView.RevertCamera();
	4115	+ cameraView.requestFocusInWindow();
3140	4116	cameraView.repaint();
3141	4117	return;
3142	4118	// } else if (event.getSource() == textureButton)
..	..	@@ -3151,7 +4127,6 @@
3151	4127	}
3152	4128
3153	4129	boolean useclient = false;
3154		- cRadio radio;
3155	4130
3156	4131	void ToggleRoot()
3157	4132	{
..	..	@@ -3390,7 +4365,8 @@
3390	4365
3391	4366	int size = obj.MemorySize();
3392	4367
3393		- System.err.println((size/1024) + " KB is the size of " + obj);
	4368	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4369	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3394	4370	}
3395	4371	}
3396	4372	catch (Exception e)
..	..	@@ -3471,6 +4447,13 @@
3471	4447	void GenNormals(boolean crease)
3472	4448	{
3473	4449	group.GenNormalsS(crease);
	4450	+
	4451	+ refreshContents();
	4452	+ }
	4453	+
	4454	+ void GenNormalsMESH()
	4455	+ {
	4456	+ group.GenNormalsMeshS();
3474	4457
3475	4458	refreshContents();
3476	4459	}
..	..	@@ -3706,7 +4689,7 @@
3706	4689
3707	4690	try
3708	4691	{
3709		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4692	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3710	4693	}
3711	4694	catch (Exception e)
3712	4695	{
..	..	@@ -4098,6 +5081,18 @@
4098	5081	refreshContents();
4099	5082	}
4100	5083
	5084	+ void RewindLeaves(boolean hide)
	5085	+ {
	5086	+ group.selection.RewindLeaves(hide);
	5087	+ refreshContents();
	5088	+ }
	5089	+
	5090	+ void RandomLeaves(boolean hide)
	5091	+ {
	5092	+ group.selection.RandomLeaves(hide);
	5093	+ refreshContents();
	5094	+ }
	5095	+
4101	5096	void SetTexRes(int tr)
4102	5097	{
4103	5098	group.selection.SetTexRes(tr);
..	..	@@ -4169,28 +5164,25 @@
4169	5164	// }
4170	5165	// }
4171	5166
4172		- static boolean allparams = true;
4173		-
4174		- static Vector<Object3D> listUI = new Vector<Object3D>();
4175		-
4176	5167	void EditSelection(boolean newWindow)
4177	5168	{
	5169	+ if (group.selection == null)
	5170	+ {
	5171	+ EditElement(group, newWindow); // ? new
	5172	+ return;
	5173	+ }
	5174	+
4178	5175	// aConstraints.gridy = 0;
4179	5176	for (int i=0; i<group.selection.size(); i++)
4180	5177	{
4181	5178	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4182	5179	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5180	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4184	5181
4185	5182	Object3D elem = (Object3D)group.selection.elementAt(i);
4186	5183	if(elem != group \|\| !newWindow)
4187	5184	{
4188		- // if (!(elem instanceof Composite))
4189		- // newWindow = false;
4190		- listUI.add(elem);
4191		- elem.openEditWindow(this, newWindow); //, false);
4192		- System.out.println("edit : " + elem);
4193		- elem.editWindow.refreshContents(true); // ? new
	5185	+ EditElement(elem, newWindow); // ? new
4194	5186	}
4195	5187	}
4196	5188	}
..	..	@@ -4253,9 +5245,7 @@
4253	5245
4254	5246	freezemodel = false;
4255	5247	}
4256		-
4257		- boolean flashIt = true;
4258		-
	5248	+
4259	5249	public void valueChanged(TreeSelectionEvent e)
4260	5250	//public boolean handleEvent(Event event)
4261	5251	{
..	..	@@ -4265,7 +5255,8 @@
4265	5255	//new Exception().printStackTrace();
4266	5256
4267	5257	freezemodel = true;
4268		-
	5258	+ ClearUnpinned();
	5259	+
4269	5260	/**/
4270	5261	//switch (event.id)
4271	5262	{
..	..	@@ -4273,7 +5264,6 @@
4273	5264	//case 702: // Event.LIST_DESELECT
4274	5265	group.deselectAll();
4275	5266	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4276		- objEditor.ClearInfo(); // .GetMaterial());
4277	5267	if (tps != null)
4278	5268	{
4279	5269	for (int i=0; i < tps.length; i++)
..	..	@@ -4282,10 +5272,8 @@
4282	5272
4283	5273	//if (child.parent != null)
4284	5274	//child.parent.addSelectee(child);
	5275	+ objEditor.SetMaterial(child);
4285	5276	group.addSelectee(child);
4286		- objEditor.SetMaterial(child); // .GetMaterial());
4287		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4288		- System.err.println("info : " + child.GetPath());
4289	5277	}
4290	5278	}
4291	5279	// else
..	..	@@ -4295,20 +5283,28 @@
4295	5283	// System.err.println("info : " + group.GetPath());
4296	5284	// }
4297	5285
4298		- objEditor.SetText(); // jan 2014
4299		-
4300		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5286	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4301	5287	CameraPane.flash = true;
4302	5288
4303		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5289	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4304	5290	// a camera
4305	5291	{
4306		- CameraPane.camerachangeframe = 0; // don't refuse it
4307		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5292	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5293	+ {
	5294	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5295	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5296	+ }
4308	5297	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4309	5298	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4310	5299	}
4311	5300
	5301	+ if (tps != null && tps.length == 1)
	5302	+ {
	5303	+ EditSelection(false);
	5304	+ }
	5305	+
	5306	+ SetPinStates(tps != null && tps.length > 0);
	5307	+
4312	5308	refreshContents();
4313	5309	//return true;
4314	5310	}
..	..	@@ -4317,6 +5313,51 @@
4317	5313
4318	5314	freezemodel = false;
4319	5315	}
	5316	+
	5317	+ void SetPinStates(boolean enabled)
	5318	+ {
	5319	+ editButton.setEnabled(enabled);
	5320	+ uneditButton.setEnabled(enabled);
	5321	+ //unselectButton.setEnabled(enabled);
	5322	+ flashSelectionButton.setEnabled(enabled);
	5323	+
	5324	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5325	+
	5326	+ boolean allComposites = true;
	5327	+
	5328	+ if (group.selection != null)
	5329	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5330	+ {
	5331	+ if (!(e.nextElement() instanceof Composite))
	5332	+ {
	5333	+ allComposites = false;
	5334	+ break;
	5335	+ }
	5336	+ }
	5337	+
	5338	+ rootButton.setEnabled(allComposites);
	5339	+ }
	5340	+
	5341	+ void refreshContents(boolean cp)
	5342	+ {
	5343	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5344	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5345	+ {
	5346	+ objEditor.ClearInfo(); // .GetMaterial());
	5347	+
	5348	+ for (int i=0; i < group.selection.Size(); i++)
	5349	+ {
	5350	+ Object3D child = (Object3D) group.selection.get(i);
	5351	+
	5352	+ objEditor.AddInfo(child, this, true);
	5353	+// System.err.println("info : " + child.GetPath());
	5354	+ }
	5355	+
	5356	+ objEditor.SetText(); // jan 2014
	5357	+ }
	5358	+
	5359	+ super.refreshContents(cp);
	5360	+ }
4320	5361
4321	5362	void linkSomething(Object3D thing)
4322	5363	{
..	..	@@ -4388,6 +5429,7 @@
4388	5429	{
4389	5430	if (group.selection.isEmpty())
4390	5431	return;
	5432	+
4391	5433	Grafreed.clipboardIsTempGroup = false;
4392	5434	Composite tGroup = null;
4393	5435	if (group.selection.size() > 0) // 1)
..	..	@@ -4398,6 +5440,8 @@
4398	5440
4399	5441	if (cut)
4400	5442	{
	5443	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5444	+// Save();
4401	5445	//int indices[] = jList.getSelectedIndices();
4402	5446	//for (int i = indices.length - 1; i >= 0; i--)
4403	5447	//jList.remove(indices[i]);
..	..	@@ -4487,8 +5531,10 @@
4487	5531	}
4488	5532
4489	5533	}
	5534	+
4490	5535	if (Grafreed.clipboardIsTempGroup)
4491	5536	Grafreed.clipboard = tGroup;
	5537	+
4492	5538	if (cut)
4493	5539	{
4494	5540	ResetModel();
..	..	@@ -4498,6 +5544,10 @@
4498	5544
4499	5545	void paste(boolean expand)
4500	5546	{
	5547	+ if (Globals.REPLACEONMAKE)
	5548	+ Save();
	5549	+ boolean keep = Globals.REPLACEONMAKE;
	5550	+ Globals.REPLACEONMAKE = false;
4501	5551	// if (GrafreeD.clipboard == null)
4502	5552	// return;
4503	5553	boolean first = true;
..	..	@@ -4557,6 +5607,7 @@
4557	5607	Grafreed.clipboard.get(0).parent = keepparent;
4558	5608	}
4559	5609
	5610	+ Globals.REPLACEONMAKE = keep;
4560	5611	ResetModel();
4561	5612	refreshContents();
4562	5613	}
..	..	@@ -4692,6 +5743,10 @@
4692	5743
4693	5744	void group(Object3D csg, boolean grab)
4694	5745	{
	5746	+ if (Globals.REPLACEONMAKE)
	5747	+ Save();
	5748	+ boolean keep = Globals.REPLACEONMAKE;
	5749	+ Globals.REPLACEONMAKE = false;
4695	5750	if (//false) // why??
4696	5751	!group.selection.isEmpty())
4697	5752	{
..	..	@@ -4805,10 +5860,15 @@
4805	5860	//node.add(csg);
4806	5861	//makeSomething(node);
4807	5862	makeSomething(csg);
	5863	+ Globals.REPLACEONMAKE = keep;
4808	5864	}
4809	5865
4810	5866	void Ungroup(Object3D g)
4811	5867	{
	5868	+ if (Globals.REPLACEONMAKE)
	5869	+ Save();
	5870	+ boolean keep = Globals.REPLACEONMAKE;
	5871	+ Globals.REPLACEONMAKE = false;
4812	5872	if (g instanceof HiddenObject)
4813	5873	{
4814	5874	HiddenObject h = (HiddenObject) g;
..	..	@@ -4825,6 +5885,7 @@
4825	5885	objEditor.makeSomething(g.get(i), false);
4826	5886	}
4827	5887	}
	5888	+ Globals.REPLACEONMAKE = keep;
4828	5889	}
4829	5890
4830	5891	void ungroup()
..	..	@@ -5113,7 +6174,43 @@
5113	6174	cButton clearpanelButton;
5114	6175	cButton unselectButton;
5115	6176
	6177	+ cButton restoreCameraButton;
	6178	+
5116	6179	cButton oneStepButton;
	6180	+
	6181	+ cButton groupButton;
	6182	+ cButton ungroupButton;
	6183	+ cButton compositeButton;
	6184	+ cButton switchButton;
	6185	+ cButton loopButton;
	6186	+ cButton textureButton;
	6187	+
	6188	+ cButton skybox1Button;
	6189	+ cButton skybox2Button;
	6190	+ cButton skybox3Button;
	6191	+ cButton skybox4Button;
	6192	+ cButton skybox5Button;
	6193	+ cButton skybox6Button;
	6194	+ cButton skybox7Button;
	6195	+
	6196	+ cButton skybox11Button;
	6197	+ cButton skybox12Button;
	6198	+ cButton skybox13Button;
	6199	+ cButton skybox14Button;
	6200	+ cButton skybox15Button;
	6201	+ cButton skybox16Button;
	6202	+ cButton skybox17Button;
	6203	+
	6204	+ cButton gridButton;
	6205	+ cButton boxButton;
	6206	+ cButton sphereButton;
	6207	+ cButton coneButton;
	6208	+ cButton torusButton;
	6209	+ cButton superButton;
	6210	+ cButton kleinButton;
	6211	+ cButton particlesButton;
	6212	+ cButton overlayButton;
	6213	+ cButton lightButton;
5117	6214
5118	6215	cButton screenfitButton;
5119	6216	cButton screenfitpointButton;
..	..	@@ -5126,14 +6223,6 @@
5126	6223
5127	6224	cButton setsupportButton;
5128	6225
5129		- cButton twoButton;
5130		- cButton sixButton;
5131		- cButton threeButton;
5132		- cButton sevenButton;
5133		- cButton fourButton; // full panel
5134		- cButton oneButton; // full XYZ
5135		- //cButton currentLayout;
5136		-
5137	6226	//
5138	6227	//Composite
5139	6228	Object3D // to do !!
..	..	@@ -5143,9 +6232,11 @@
5143	6232	//JTree jTree;
5144	6233	private MenuItem lookAtItem;
5145	6234	private MenuItem lookFromItem;
5146		- private MenuItem switchItem;
	6235	+ private MenuItem switchViewItem;
5147	6236	private MenuItem cutItem;
5148		- private MenuItem duplicateItem;
	6237	+ private MenuItem undoItem;
	6238	+ private MenuItem redoItem;
	6239	+ private JMenuItem duplicateItem;
5149	6240	private MenuItem cloneItem;
5150	6241	private MenuItem cloneSupportItem;
5151	6242	private MenuItem overwriteGeoItem;
..	..	@@ -5173,7 +6264,7 @@
5173	6264	private MenuItem pasteLinkItem;
5174	6265	private MenuItem pasteCloneItem;
5175	6266	private MenuItem pasteExpandItem;
5176		- private MenuItem clearItem;
	6267	+ private MenuItem deleteItem;
5177	6268	private MenuItem clearAllItem;
5178	6269	private MenuItem genUVItem;
5179	6270	private MenuItem genNormalsMESHItem;
..	..	@@ -5208,6 +6299,10 @@
5208	6299	private MenuItem showleavesItem;
5209	6300	private MenuItem markleavesItem;
5210	6301	private MenuItem unmarkleavesItem;
	6302	+ private MenuItem rewindleavesItem;
	6303	+ private MenuItem unrewindleavesItem;
	6304	+ private MenuItem randomleavesItem;
	6305	+ private MenuItem unrandomleavesItem;
5211	6306
5212	6307	private MenuItem flipVItem;
5213	6308	private MenuItem unflipVItem;
..	..	@@ -5229,7 +6324,7 @@
5229	6324	private MenuItem frontItem;
5230	6325	private MenuItem cameraItem;
5231	6326	private MenuItem compositeItem;
5232		- private MenuItem randomItem;
	6327	+ private MenuItem switchItem;
5233	6328	private MenuItem physicsItem;
5234	6329	private MenuItem frameselectorItem;
5235	6330	private MenuItem scriptNodeItem;
..	..	@@ -5253,6 +6348,8 @@
5253	6348	private MenuItem attachBumpItem;
5254	6349	private MenuItem detachBumpItem;
5255	6350	private MenuItem pigmentBumpItem;
	6351	+ private MenuItem embedTexturesItem;
	6352	+ private MenuItem deEmbedTexturesItem;
5256	6353
5257	6354	private MenuItem particleItem;
5258	6355	private MenuItem ragdollItem;
..	..	@@ -5303,5 +6400,5 @@
5303	6400
5304	6401	Menu cameraMenu;
5305	6402	MenuItem editCameraItem;
5306		- MenuItem revertCameraItem;
	6403	+ MenuItem restoreCameraItem;
5307	6404	}