~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,360 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane();
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,16 @@
60	415	this.copy = this.group = group;
61	416	//selectees = this.group.selectees;
62	417
	418	+ assert(false);
	419	+
	420	+ if (copy.versionlist == null)
	421	+ {
	422	+ copy.versionlist = new Object3D[100];
	423	+ copy.versionindex = -1;
	424	+
	425	+ //Save(true);
	426	+ }
	427	+
63	428	if(ui)
64	429	SetupUI(objEditor);
65	430	}
..	..	@@ -80,10 +445,22 @@
80	445	SetupViews(objEditor);
81	446
82	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	448	+
	449	+ if (copy.versionlist == null)
	450	+ {
	451	+ copy.versionlist = new Object3D[100];
	452	+ copy.versionindex = -1;
	453	+
	454	+ //Save(true);
	455	+ }
83	456	}
84	457
85	458	void CloneSelection(boolean supports)
86	459	{
	460	+ if (Globals.REPLACEONMAKE)
	461	+ Save();
	462	+ boolean keep = Globals.REPLACEONMAKE;
	463	+ Globals.REPLACEONMAKE = false;
87	464	// Object3D keep = GrafreeD.clipboard;
88	465	//Object3D obj;
89	466	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +471,7 @@
94	471
95	472	makeSomething(clone, i==group.selection.size()-1);
96	473	}
	474	+ Globals.REPLACEONMAKE = keep;
97	475	}
98	476
99	477	void CloneClipboard(boolean supports)
..	..	@@ -150,6 +528,8 @@
150	528
151	529	void SetupMenu2(GroupEditor oe)
152	530	{
	531	+ oe.jTree = new cTree();
	532	+
153	533	Menu menu;
154	534	oe.menuBar.add(menu = new Menu("Edit"));
155	535	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,36 +540,37 @@
160	540	// redoItem = menu.add(new MenuItem("Redo"));
161	541	// redoItem.addActionListener(this);
162	542	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	543	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	544	duplicateItem.addActionListener(this);
165		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
166	547	cloneItem.addActionListener(this);
167		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
168	549	{
169	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
170	551	cloneSupportItem.addActionListener(this);
171	552	}
	553	+ oe.jTree.popup.addSeparator();
172	554	menu.add("-");
173		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
174	556	cutItem.addActionListener(this);
175		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
176	558	copyItem.addActionListener(this);
177	559	pasteItem = menu.add(new MenuItem("Paste"));
178	560	pasteItem.addActionListener(this);
179		- menu.add("-");
180	561
181		- menu.add("-");
182		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
183	565	pasteIntoItem.addActionListener(this);
184		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
185	567	pasteLinkItem.addActionListener(this);
186		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
187	569	pasteCloneItem.addActionListener(this);
188		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
189	571	// pasteExpandItem.addActionListener(this);
190		- menu.add("-");
191		- clearItem = menu.add(new MenuItem("Clear"));
192		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
193	574
194	575	if (Globals.ADVANCED)
195	576	{
..	..	@@ -203,23 +584,23 @@
203	584	//zBufferItem.addActionListener(this);
204	585	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	586	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	587	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	588	+ restoreCameraItem.addActionListener(this);
208	589
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
	590	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	591	+// toggleFullScreenItem.addItemListener(this);
	592	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	593	+// cameraMenu.add("-");
	594	+//
	595	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	596	+// toggleTextureItem.addItemListener(this);
	597	+// toggleTextureItem.setState(CameraPane.textureon);
	598	+//
	599	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	600	+// toggleSwitchItem.addItemListener(this);
	601	+// toggleSwitchItem.setState(CameraPane.SWITCH);
213	602
214		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
215		- toggleTextureItem.addItemListener(this);
216		- toggleTextureItem.setState(CameraPane.textureon);
217		-
218		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
219		- toggleSwitchItem.addItemListener(this);
220		- toggleSwitchItem.setState(CameraPane.SWITCH);
221		-
222		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	603	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	604	toggleHandleItem.addItemListener(this);
224	605	toggleHandleItem.setState(CameraPane.HANDLES);
225	606
..	..	@@ -274,15 +655,13 @@
274	655	{
275	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
278		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	658	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279	659	oe.cameraMenu.add("-");
280	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
281	661	openWindowItem.addActionListener(this);
282		- editLeafItem.addActionListener(this);
283	662	lookAtItem.addActionListener(this);
284	663	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	664	+ //switchViewItem.addActionListener(this);
286	665	}
287	666
288	667	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,22 +705,37 @@
326	705	setMasterItem.addActionListener(this);
327	706	}
328	707
329		- oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
332	710	backItem = menu.add(new MenuItem("Back"));
333	711	backItem.addActionListener(this);
334	712	frontItem = menu.add(new MenuItem("Front"));
335	713	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	714	+// compositeItem = menu.add(new MenuItem("Composite"));
	715	+// compositeItem.addActionListener(this);
	716	+
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
	720	+ if (Globals.ADVANCED)
	721	+ {
338	722	hideItem = menu.add(new MenuItem("Hidden Group"));
339	723	hideItem.addActionListener(this);
340		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ }
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
341	726	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- randomItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
	732	+
	733	+// menu.add("-");
	734	+//
	735	+// switchItem = menu.add(new MenuItem("Switch node"));
	736	+// switchItem.addActionListener(this);
	737	+ if (Globals.ADVANCED)
	738	+ {
345	739	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	740	switchGeoItem.addActionListener(this);
347	741	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +743,6 @@
349	743	morphItem = menu.add(new MenuItem("Morph Group"));
350	744	morphItem.addActionListener(this);
351	745
352		- if (Globals.ADVANCED)
353		- {
354	746	menu.add("-");
355	747	physicsItem = menu.add(new MenuItem("Physics"));
356	748	physicsItem.addActionListener(this);
..	..	@@ -358,30 +750,29 @@
358	750	frameselectorItem.addActionListener(this);
359	751	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	752	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	753	}
364	754
365	755	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	756	+// textureItem = menu.add(new MenuItem("Texture"));
	757	+// textureItem.addActionListener(this);
368	758	billboardItem = menu.add(new MenuItem("Billboard"));
369	759	billboardItem.addActionListener(this);
370	760	csgItem = menu.add(new MenuItem("CSG"));
371	761	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	762	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	763	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	764	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	765	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	766	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	767	shadowZItem.addActionListener(this);
	768	+ attributeItem = menu.add(new MenuItem("Attribute"));
	769	+ attributeItem.addActionListener(this);
	770	+
378	771	if (Globals.ADVANCED)
379	772	{
380	773	menu.add("-");
381	774	linkerItem = menu.add(new MenuItem("Linker"));
382	775	linkerItem.addActionListener(this);
383		- attributeItem = menu.add(new MenuItem("Attribute"));
384		- attributeItem.addActionListener(this);
385	776	templateItem = menu.add(new MenuItem("Template"));
386	777	templateItem.addActionListener(this);
387	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -410,7 +801,7 @@
410	801	genNormalsMESHItem.addActionListener(this);
411	802	if (Globals.ADVANCED)
412	803	{
413		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	804	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
414	805	genNormalsMINEItem.addActionListener(this);
415	806	}
416	807	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -466,9 +857,9 @@
466	857	hideleavesItem.addActionListener(this);
467	858	showleavesItem = menu.add(new MenuItem("Show Leaves"));
468	859	showleavesItem.addActionListener(this);
469		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	860	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
470	861	markleavesItem.addActionListener(this);
471		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	862	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
472	863	unmarkleavesItem.addActionListener(this);
473	864	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
474	865	rewindleavesItem.addActionListener(this);
..	..	@@ -503,10 +894,15 @@
503	894	attachBumpItem.addActionListener(this);
504	895	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
505	896	pigmentBumpItem.addActionListener(this);
	897	+ //embedTexturesItem
506	898	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
507	899	detachPigmentItem.addActionListener(this);
508	900	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
509	901	detachBumpItem.addActionListener(this);
	902	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	903	+ embedTexturesItem.addActionListener(this);
	904	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	905	+ deEmbedTexturesItem.addActionListener(this);
510	906	menu.add("-");
511	907	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
512	908	sortbysizeItem.addActionListener(this);
..	..	@@ -517,6 +913,9 @@
517	913	shareGeometriesItem.addActionListener(this);
518	914	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
519	915	mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
520	919	if (Globals.ADVANCED)
521	920	{
522	921	// Pretty much the same as duplicate and clone.
..	..	@@ -533,6 +932,75 @@
533	932	buildToolsMenu(menu);
534	933	}
535	934
	935	+ JTabbedPane resourcecontainer;
	936	+ cGridBag currenttab;
	937	+ //boolean added; // patch for jar
	938	+
	939	+ int tabcount = 0;
	940	+ int colcount = 0;
	941	+ int rowcount = 0;
	942	+ int texturecount = 0;
	943	+
	944	+ int columns = 5;
	945	+ int rows = 7;
	946	+
	947	+ public void ResourceCallBack(String[] path)
	948	+ {
	949	+// for (int i = 0; i < path.length; i++)
	950	+// System.out.print(path[i] + "/");
	951	+// System.out.println();
	952	+
	953	+ if (//rowcount == 0 \|\|
	954	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	955	+ {
	956	+ currenttab = new cGridBag();
	957	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	958	+ currenttab.setName(tabname);
	959	+ //added = false;
	960	+ resourcecontainer.add(currenttab);
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	962	+ rowcount = 1;
	963	+ colcount = 0;
	964	+ texturecount = 0;
	965	+ }
	966	+
	967	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	968	+ {
	969	+ //if (!added)
	970	+ {
	971	+ //added = true;
	972	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	973	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	974	+ }
	975	+
	976	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	977	+
	978	+ if (++colcount >= columns)
	979	+ {
	980	+ colcount = 0;
	981	+ currenttab.Return();
	982	+
	983	+ if (rowcount++ >= rows)
	984	+ {
	985	+ rowcount = 0;
	986	+ }
	987	+ }
	988	+ }
	989	+ else
	990	+ {
	991	+// if (!path[path.length-1].equals("icons"))
	992	+// resourcecontainer.Return();
	993	+ }
	994	+ }
	995	+
	996	+ void CreateTexturePanel(cGridBag container)
	997	+ {
	998	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	999	+ container.add(resourcecontainer);
	1000	+
	1001	+ Grafreed.ParseResources("textures", this);
	1002	+ }
	1003	+
536	1004	void SetupUI2(ObjEditor oe)
537	1005	{
538	1006	// June 2019
..	..	@@ -550,11 +1018,6 @@
550	1018	//new Exception().printStackTrace();
551	1019
552	1020	oe.radioPanel = new JPanel(new GridBagLayout());
553		- oe.aConstraints.weightx = 1;
554		- oe.aConstraints.weighty = 0;
555		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
556		- oe.aConstraints.gridwidth = 100;
557		- oe.aConstraints.gridheight = 1;
558	1021	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
559	1022
560	1023	oe.buttonGroup = new ButtonGroup();
..	..	@@ -575,121 +1038,265 @@
575	1038	oe.radioPanel.add(dummyButton);
576	1039	oe.buttonGroup.add(dummyButton);
577	1040	*/
	1041	+ cGridBag versionManagerPanel = new cGridBag();
	1042	+
	1043	+ versionManagerPanel.preferredHeight = 4;
	1044	+
578	1045	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
579	1046
580	1047	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
581	1048	//minButton.setToolTipText("Minimize window");
582	1049	//minButton.addActionListener(this);
583	1050
584		- oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585		- maxButton.setToolTipText("Maximize window");
586		- maxButton.addActionListener(this);
	1051	+ if (Globals.ADVANCED)
	1052	+ {
	1053	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// maxButton.setToolTipText("Maximize window");
	1055	+// maxButton.addActionListener(this);
	1056	+ }
587	1057
588		- oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+ cButton gcButton;
	1059	+
	1060	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+// gcButton.setToolTipText("Garbage collect");
	1062	+// gcButton.addActionListener(new ActionListener()
	1063	+// {
	1064	+// public void actionPerformed(ActionEvent e)
	1065	+// {
	1066	+// System.gc();
	1067	+// }
	1068	+// });
	1069	+
	1070	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1071	+ collapseButton.setToolTipText("Collapse toolbar");
	1072	+ collapseButton.addActionListener(this);
	1073	+
	1074	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1076	+ maximize3DButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ twoButton.setToolTipText("Show 3D view only");
	1080	+ twoButton.addActionListener(this);
	1081	+ this.fullscreenLayout = twoButton;
	1082	+
	1083	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ threeButton.setToolTipText("Show controls and 3D view");
	1085	+ threeButton.addActionListener(this);
	1086	+ if (Globals.ADVANCED)
	1087	+ {
	1088	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ sixButton.setToolTipText("Show 3D view and controls");
	1090	+ sixButton.addActionListener(this);
	1091	+ }
	1092	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+// sevenButton.setToolTipText("3-column layout");
	1094	+// sevenButton.addActionListener(this);
	1095	+ //
	1096	+
	1097	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
589	1098	fullButton.setToolTipText("Full-screen window");
590	1099	fullButton.addActionListener(this);
591	1100
592		- oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
593		- undoButton.setToolTipText("Undo changes");
594		- undoButton.addActionListener(this);
595		-
596		- oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- redoButton.setToolTipText("Redo changes");
598		- redoButton.addActionListener(this);
599		-
600		- oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
601		- saveButton.setToolTipText("Save changes");
602		- saveButton.addActionListener(this);
603		-
604		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
605		- liveCB.setToolTipText("Enable animation");
606		- liveCB.addItemListener(this);
	1101	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ screenfitButton.setToolTipText("Screen fit");
	1103	+ screenfitButton.addActionListener(this);
607	1104
608		- oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1105	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1107	+ restoreCameraButton.addActionListener(this);
	1108	+
	1109	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ saveVersionButton.setToolTipText("Duplicate current version");
	1111	+ saveVersionButton.addActionListener(this);
	1112	+
	1113	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ deleteVersionButton.setToolTipText("Delete current version");
	1115	+ deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
	1117	+
	1118	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ previousVersionButton.setToolTipText("Previous version");
	1120	+ previousVersionButton.addActionListener(this);
	1121	+ previousVersionButton.setEnabled(false);
	1122	+
	1123	+ cGridBag updown = new cGridBag().setVertical(true);
	1124	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1125	+ restoreButton.setToolTipText("Undo (restore current version)");
	1126	+ restoreButton.addActionListener(this);
	1127	+ restoreButton.setEnabled(false);
	1128	+
	1129	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ replaceButton.setToolTipText("Save (replace current version)");
	1131	+ replaceButton.addActionListener(this);
	1132	+ replaceButton.setEnabled(false);
	1133	+
	1134	+ versionManagerPanel.add(updown);
	1135	+
	1136	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ nextVersionButton.setToolTipText("Next version");
	1138	+ nextVersionButton.addActionListener(this);
	1139	+ nextVersionButton.setEnabled(false);
	1140	+
	1141	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
609	1142	oneStepButton.setToolTipText("Animate one step forward");
610	1143	oneStepButton.addActionListener(this);
611	1144
612		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1145	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1146	+ liveCB.setToolTipText("Enable animation");
	1147	+ liveCB.addItemListener(this);
	1148	+
	1149	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
613	1150	fastCB.setToolTipText("Fast mode");
614	1151	fastCB.addItemListener(this);
615	1152
616		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
617		- trackCB.setToolTipText("Enable tracking");
618		- trackCB.addItemListener(this);
619		-
620		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621		- screenfitButton.setToolTipText("Screen fit");
622		- screenfitButton.addActionListener(this);
	1153	+ //oe.toolboxPanel.Return();
	1154	+
	1155	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1156	+// trackCB.setToolTipText("Enable tracking");
	1157	+// trackCB.addItemListener(this);
623	1158
624	1159	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
625	1160	// screenfitpointButton.addActionListener(this);
626	1161
627	1162	if (Globals.ADVANCED)
628	1163	{
629		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1164	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
630	1165	snapobjectButton.addActionListener(this);
631	1166	snapobjectButton.setToolTipText("Snap Object");
	1167	+
	1168	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ fourButton.addActionListener(this);
	1170	+ fourButton.setToolTipText("Show control panel only");
632	1171	}
633	1172
634		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
635		- flashSelectionButton.setToolTipText("Show selection");
636		- flashSelectionButton.addActionListener(this);
	1173	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
637	1174
638		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
639		-
640		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641		- twoButton.setToolTipText("Show center view only");
642		- twoButton.addActionListener(this);
643		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644		- fourButton.addActionListener(this);
645		- fourButton.setToolTipText("Show left panel only");
646		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
647		- sixButton.setToolTipText("2-column layout left");
648		- sixButton.addActionListener(this);
649		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- threeButton.setToolTipText("2-column layout right");
651		- threeButton.addActionListener(this);
652		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
653		- sevenButton.setToolTipText("3-column layout");
654		- sevenButton.addActionListener(this);
655		- //
656	1175
657		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- rootButton.setToolTipText("Edit selection in new tab");
	1176	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ rootButton.setToolTipText("Open selection in new tab");
659	1178	rootButton.addActionListener(this);
660	1179
661		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
662	1181	closeButton.setToolTipText("Close tab");
663	1182	closeButton.addActionListener(this);
664	1183	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
665	1184	//clearButton.addActionListener(this);
666		-
667		- cGridBag commandsPanel = new cGridBag();
	1185	+
	1186	+ cGridBag row1 = new cGridBag();
668	1187
669		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
670		- editButton.setToolTipText("Edit selection");
	1188	+ // INSERT
	1189	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ gridButton.setToolTipText("Create ground");
	1191	+ gridButton.addActionListener(this);
	1192	+
	1193	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ boxButton.setToolTipText("Create box");
	1195	+ boxButton.addActionListener(this);
	1196	+
	1197	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ superButton.setToolTipText("Create superellipsoid");
	1199	+ superButton.addActionListener(this);
	1200	+
	1201	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ sphereButton.setToolTipText("Create sphere");
	1203	+ sphereButton.addActionListener(this);
	1204	+
	1205	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ coneButton.setToolTipText("Create cone");
	1207	+ coneButton.addActionListener(this);
	1208	+
	1209	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ torusButton.setToolTipText("Create torus");
	1211	+ torusButton.addActionListener(this);
	1212	+
	1213	+ if (Globals.ADVANCED)
	1214	+ {
	1215	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ kleinButton.setToolTipText("Create Klein bottle");
	1217	+ kleinButton.addActionListener(this);
	1218	+ }
	1219	+
	1220	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1221	+ particlesButton.setToolTipText("Create particle system");
	1222	+ particlesButton.addActionListener(this);
	1223	+
	1224	+ oe.toolboxPanel.add(row1);
	1225	+
	1226	+ cGridBag row2 = new cGridBag();
	1227	+
	1228	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ groupButton.setToolTipText("Create group");
	1230	+ groupButton.addActionListener(this);
	1231	+
	1232	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ compositeButton.setToolTipText("Create composite");
	1234	+ compositeButton.addActionListener(this);
	1235	+
	1236	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ switchButton.setToolTipText("Create item switcher");
	1238	+ switchButton.addActionListener(this);
	1239	+
	1240	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ loopButton.setToolTipText("Create loop");
	1242	+ loopButton.addActionListener(this);
	1243	+
	1244	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ textureButton.setToolTipText("Create texture");
	1246	+ textureButton.addActionListener(this);
	1247	+
	1248	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ overlayButton.setToolTipText("Create overlay");
	1250	+ overlayButton.addActionListener(this);
	1251	+
	1252	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1253	+ lightButton.setToolTipText("Create light");
	1254	+ lightButton.addActionListener(this);
	1255	+
	1256	+ oe.toolboxPanel.add(row2);
	1257	+
	1258	+ cGridBag textures = new cGridBag();
	1259	+
	1260	+ CreateTexturePanel(textures);
	1261	+
	1262	+ resourcecontainer.setSelectedIndex((int)(Math.random() * resourcecontainer.getTabCount()));
	1263	+
	1264	+ oe.toolboxPanel.add(textures);
	1265	+
	1266	+ textures.preferredHeight = 100;
	1267	+
	1268	+ CreateSkyboxPanel(oe.skyboxPanel);
	1269	+
	1270	+ // EDIT panel
	1271	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1272	+ editButton.setToolTipText("Pin selection controls");
671	1273	editButton.addActionListener(this);
672	1274
673		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674		- uneditButton.setToolTipText("Unedit selection");
	1275	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1276	+ uneditButton.setToolTipText("Unpin and remove selection controls");
675	1277	uneditButton.addActionListener(this);
676	1278
677		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
678		- allParamsButton.setToolTipText("Edit all params");
	1279	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1280	+ allParamsButton.setToolTipText("Show all controls");
679	1281	allParamsButton.addActionListener(this);
680	1282
681		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682		- clearPanelButton.setToolTipText("Clear edit panel");
	1283	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1284	+ clearPanelButton.setToolTipText("Clear all controls");
683	1285	clearPanelButton.addActionListener(this);
684	1286
685		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686		- unselectButton.setToolTipText("Unselect");
687		- unselectButton.addActionListener(this);
	1287	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1288	+ //unselectButton.setToolTipText("Unselect");
	1289	+ //unselectButton.addActionListener(this);
688	1290
689		- commandsPanel.preferredHeight = 1;
	1291	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ flashSelectionButton.setToolTipText("Highlight selection");
	1293	+ flashSelectionButton.addActionListener(this);
690	1294
691		- oe.treePanel.add(commandsPanel);
692		- oe.treePanel.Return();
	1295	+ editCommandsPanel.preferredHeight = 1;
	1296	+
	1297	+ SetPinStates(false);
	1298	+// oe.treePanel.add(commandsPanel);
	1299	+// oe.treePanel.Return();
693	1300
694	1301	// oe.aConstraints.gridx += 1;
695	1302	// oe.aConstraints.weighty = 0;
..	..	@@ -704,34 +1311,24 @@
704	1311
705	1312	cGridBag jSPPanel = new cGridBag();
706	1313
	1314	+ jSPPanel.preferredHeight = 20;
	1315	+
707	1316	JScrollPane jSP;
708	1317	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
709		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1318	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
710	1319	ResetModel();
711	1320
712	1321	oe.treePanel.add(jSPPanel);
713	1322	oe.treePanel.Return();
714	1323
715		- cGridBag copyOptionsPanel = new cGridBag();
716		-
717		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
718		- colorCB.setToolTipText("Copy color when dropped");
719		- colorCB.addItemListener(this);
720		-
721		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
722		- materialCB.setToolTipText("Copy material when dropped");
723		- materialCB.addItemListener(this);
724		-
725		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
726		- textureCB.setToolTipText("Copy texture when dropped");
727		- textureCB.addItemListener(this);
728		-
729		- copyOptionsPanel.preferredHeight = 1;
730		- oe.treePanel.add(copyOptionsPanel);
	1324	+ oe.treePanel.add(versionManagerPanel);
731	1325	oe.treePanel.Return();
	1326	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1327	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1328	+ versionSliderPane.preferredHeight = 3;
732	1329
733		-// mainPanel.setDividerLocation(0.5); //1.0);
734		-// mainPanel.setResizeWeight(0.5);
	1330	+// mainPanel.setDividerLocation(0.1); //1.0);
	1331	+ mainPanel.setResizeWeight(0.4);
735	1332
736	1333	//jList.addListSelectionListener(this);
737	1334	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -739,7 +1336,7 @@
739	1336	//jTree.setEditable(true);
740	1337	oe.jTree.setDragEnabled(true);
741	1338	//jTree.setPreferredSize(new Dimension(10,10));
742		- jSP.setPreferredSize(new Dimension(100,200));
	1339	+ //jSP.setPreferredSize(new Dimension(100,200));
743	1340
744	1341	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
745	1342
..	..	@@ -751,29 +1348,49 @@
751	1348	dgr.addDragGestureListener(this);
752	1349	}catch(Exception e) {}
753	1350	*/
754		- radio.layout = sevenButton;
	1351	+ radio.layout = threeButton; // sixButton;
755	1352	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
756	1353	}
757	1354
758	1355	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
759	1356	{
	1357	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1358	+ colorCB.setToolTipText("Copy color when dropped");
	1359	+ colorCB.addItemListener(this);
	1360	+
	1361	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1362	+ materialCB.setToolTipText("Copy material when dropped");
	1363	+ materialCB.addItemListener(this);
	1364	+
	1365	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1366	+ textureCB.setToolTipText("Copy texture when dropped");
	1367	+ textureCB.addItemListener(this);
	1368	+
	1369	+ panel.Return();
	1370	+
760	1371	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
761	1372	boxCB.setToolTipText("Display bounding boxes");
762	1373	boxCB.addItemListener(this);
763	1374
764	1375	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
765		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1376	+ zoomBoxCB.setToolTipText("Display only for wheel");
766	1377	zoomBoxCB.addItemListener(this);
767	1378
768	1379	if (true) // Globals.ADVANCED)
769	1380	{
770		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
771		- supportCB.setToolTipText("Enable rigging");
772		- supportCB.addItemListener(this);
	1381	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1382	+// supportCB.setToolTipText("Enable rigging");
	1383	+// supportCB.addItemListener(this);
	1384	+
	1385	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1386	+ freezeCB.setToolTipText("Fast moving camera");
	1387	+ freezeCB.addItemListener(this);
773	1388
774	1389	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
775	1390	// localCB.addItemListener(this);
776	1391
	1392	+ panel.Return();
	1393	+
777	1394	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
778	1395	crowdCB.setToolTipText("Used for crowds");
779	1396	crowdCB.addItemListener(this);
..	..	@@ -782,14 +1399,19 @@
782	1399	smoothCB.setToolTipText("Snapping delay");
783	1400	smoothCB.addItemListener(this);
784	1401
785		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
786		- slowCB.setToolTipText("Smooth interpolation");
787		- slowCB.addItemListener(this);
	1402	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1403	+// slowCB.setToolTipText("Smooth interpolation");
	1404	+// slowCB.addItemListener(this);
	1405	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1406	+ minshaderCB.setToolTipText("Minimal fast shader");
	1407	+ minshaderCB.addItemListener(this);
788	1408
789	1409	// constraints.gridy += 1;
790	1410	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
791	1411	// speakerMocapCB.addItemListener(this);
792	1412
	1413	+ panel.Return();
	1414	+
793	1415	if (false)
794	1416	{
795	1417	// handled in scripts
..	..	@@ -804,34 +1426,82 @@
804	1426	//constraints.gridy += 1;
805	1427	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
806	1428	smoothfocusCB.addItemListener(this);
	1429	+ panel.Return();
807	1430	}
808	1431
809	1432	//constraints.gridx += 1;
810	1433	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
811	1434	// debugCB.addItemListener(this);
812	1435
	1436	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1437	+ trackCB.setToolTipText("Enable tracking target");
	1438	+ trackCB.addItemListener(this);
	1439	+
813	1440	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1441	+ oeilCB.setToolTipText("Move camera when tracking");
814	1442	oeilCB.addItemListener(this);
815	1443
	1444	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1445	+ shadowCB.setToolTipText("When live compute shadows");
	1446	+ shadowCB.addItemListener(this);
	1447	+
	1448	+ panel.Return();
	1449	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1450	+ toggleTextureCB.setToolTipText("Load textures");
	1451	+ toggleTextureCB.addItemListener(this);
	1452	+
	1453	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1454	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1455	+ toggleSwitchCB.addItemListener(this);
	1456	+
	1457	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1458	+ autokeepCB.setToolTipText("On structure change");
	1459	+ autokeepCB.addItemListener(this);
	1460	+
	1461	+ panel.Return();
	1462	+ if (Globals.ADVANCED)
	1463	+ {
816	1464	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
817	1465	lookAtCB.setToolTipText("Look-at target");
818	1466	lookAtCB.addItemListener(this);
	1467	+ }
819	1468
820	1469	}
821	1470
822	1471	cGridBag fill = new cGridBag();
823		-
824	1472	fill.preferredHeight = 200;
	1473	+ cGridBag fill2 = new cGridBag();
	1474	+ fill2.preferredHeight = 200;
	1475	+ cGridBag fill3 = new cGridBag();
	1476	+ fill3.preferredHeight = 200;
825	1477
826	1478	panel.add(fill);
	1479	+ panel.add(fill2);
	1480	+ panel.add(fill3);
827	1481
828	1482	}
829	1483
830	1484	void EditObject(Object3D obj)
831	1485	{
	1486	+ assert(obj instanceof Composite);
	1487	+
	1488	+// if (obj.versionlist == null)
	1489	+// {
	1490	+// obj.versionlist = new Object3D[100];
	1491	+// obj.versionindex = -1;
	1492	+// }
	1493	+
832	1494	cRadio radioButton = new cRadio(obj.name);
	1495	+
	1496	+ // June 2019. Patch to avoid bug with transparency.
	1497	+ radioButton.hadMaterial = obj.material != null;
	1498	+ if (!radioButton.hadMaterial)
	1499	+ {
	1500	+ obj.material = new cMaterial();
	1501	+ }
	1502	+
833	1503	radioButton.SetObject(obj);
834		- radioButton.layout = sevenButton;
	1504	+ radioButton.layout = threeButton; // sixButton;
835	1505	radioButton.SetCamera(cameraView.renderCamera, false);
836	1506	radioButton.addActionListener(this);
837	1507	radioPanel.add(radioButton);
..	..	@@ -845,29 +1515,37 @@
845	1515
846	1516	oe.SetupViews();
847	1517
	1518	+ if (Globals.DEBUG)
848	1519	System.out.println("SetupViews");
849	1520	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
850	1521	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
851	1522	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
852	1523	}
853	1524
854		- JCheckBox liveCB;
855		- JCheckBox supportCB;
856		- JCheckBox localCB;
857		- JCheckBox crowdCB;
858		- JCheckBox smoothCB;
859		- JCheckBox fastCB;
860		- JCheckBox slowCB;
861		- JCheckBox boxCB;
862		- JCheckBox zoomBoxCB;
863		- JCheckBox trackCB;
864		- JCheckBox smoothfocusCB;
	1525	+ cToggleButton liveCB;
	1526	+ cCheckBox supportCB;
	1527	+ cCheckBox localCB;
	1528	+ cCheckBox crowdCB;
	1529	+ cCheckBox smoothCB;
	1530	+ cCheckBox minshaderCB;
	1531	+
	1532	+ cToggleButton fastCB;
	1533	+ cCheckBox slowCB;
	1534	+ cCheckBox boxCB;
	1535	+ cCheckBox zoomBoxCB;
	1536	+ cCheckBox freezeCB;
	1537	+ //cToggleButton trackCB;
	1538	+ cCheckBox trackCB;
	1539	+ cCheckBox smoothfocusCB;
865	1540	// JCheckBox speakerMocapCB;
866		- JCheckBox speakerCameraCB;
867		- JCheckBox speakerFocusCB;
868		- JCheckBox debugCB;
869		- JCheckBox oeilCB;
870		- JCheckBox lookAtCB;
	1541	+ cCheckBox speakerCameraCB;
	1542	+ cCheckBox speakerFocusCB;
	1543	+ cCheckBox debugCB;
	1544	+
	1545	+ cCheckBox oeilCB;
	1546	+ cCheckBox shadowCB;
	1547	+ cCheckBox autokeepCB;
	1548	+ cCheckBox lookAtCB;
871	1549
872	1550	// static int COLOR = 1;
873	1551	// static int MATERIAL = 2;
..	..	@@ -875,9 +1553,9 @@
875	1553
876	1554	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
877	1555
878		- JCheckBox colorCB;
879		- JCheckBox materialCB;
880		- JCheckBox textureCB;
	1556	+ cCheckBox colorCB;
	1557	+ cCheckBox materialCB;
	1558	+ cCheckBox textureCB;
881	1559
882	1560	public void itemStateChanged(ItemEvent e)
883	1561	{
..	..	@@ -921,6 +1599,12 @@
921	1599	{
922	1600	cameraView.ToggleInertia();
923	1601	cameraView.repaint();
	1602	+ }
	1603	+ else if(e.getSource() == minshaderCB)
	1604	+ {
	1605	+ Globals.MINSHADER ^= true;
	1606	+ cameraView.programInitialized = false;
	1607	+ cameraView.repaint();
924	1608	}
925	1609	else if(e.getSource() == localCB)
926	1610	{
..	..	@@ -970,6 +1654,18 @@
970	1654	{
971	1655	cameraView.ToggleOeil();
972	1656	}
	1657	+ else if(e.getSource() == shadowCB)
	1658	+ {
	1659	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1660	+ }
	1661	+ else if(e.getSource() == freezeCB)
	1662	+ {
	1663	+ Globals.FREEZEONMOVE ^= true;
	1664	+ }
	1665	+ else if(e.getSource() == autokeepCB)
	1666	+ {
	1667	+ Globals.REPLACEONMAKE ^= true;
	1668	+ }
973	1669	else if(e.getSource() == lookAtCB)
974	1670	{
975	1671	cameraView.ToggleLookAt();
..	..	@@ -986,7 +1682,8 @@
986	1682
987	1683	/**/
988	1684	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
989		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1685	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1686	+ TreePath path = objEditor.jTree.getSelectionPath();
990	1687	if ((path == null) \|\| (path.getPathCount() <= 1)) {
991	1688	// We can't move the root node or an empty selection
992	1689	return;
..	..	@@ -1049,8 +1746,6 @@
1049	1746	}
1050	1747	}
1051	1748
1052		- String string = (String) object;
1053		-
1054	1749	System.out.println("Transfer = " + object + "; drop : " + target);
1055	1750	// if( object instanceof java.io.File[])
1056	1751	// {
..	..	@@ -1058,6 +1753,8 @@
1058	1753	// objEditor.DropFile((java.io.File[]) object, true);
1059	1754	// return;
1060	1755	// }
	1756	+
	1757	+ String string = object.toString();
1061	1758
1062	1759	// File path for Mac and Windows
1063	1760	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1103,23 +1800,33 @@
1103	1800
1104	1801	assert target == objEditor.jTree;
1105	1802	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1803	+ Object3D destinationLeaf;
1106	1804	try {
1107		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1805	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1108	1806	} catch (Exception e) {
1109	1807	System.out.println("destinationPath : " + destinationPath);
1110	1808	return;
1111	1809	}
1112	1810
1113		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1811	+ for (int i=group.selection.size(); --i>=0;)
1114	1812	{
	1813	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1814	+
	1815	+ // Cannot move into itself
	1816	+ if (child == destinationLeaf)
	1817	+ return;
	1818	+ }
	1819	+
	1820	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1821	+// {
1115	1822	loadClipboard(true);
1116	1823	objEditor.jTree.setSelectionPath(destinationPath);
1117	1824	pasteInto(false, false);
1118		- } else {
1119		- loadClipboard(false);
1120		- objEditor.jTree.setSelectionPath(destinationPath);
1121		- pasteInto(false, false); // true); // ???
1122		- }
	1825	+// } else {
	1826	+// loadClipboard(false);
	1827	+// objEditor.jTree.setSelectionPath(destinationPath);
	1828	+// pasteInto(false, false); // true); // ???
	1829	+// }
1123	1830	}
1124	1831	public void dropActionChanged(DropTargetDragEvent dtde)
1125	1832	// Called if the user has modified the current drop gesture
..	..	@@ -1175,7 +1882,12 @@
1175	1882	TreePath path;
1176	1883
1177	1884	public TransferableTreePath(TreePath tp) {
1178		- path = tp;
	1885	+ Object[] objs = new Object[tp.getPathCount()];
	1886	+ for (int i=0; i<objs.length; i++)
	1887	+ {
	1888	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1889	+ }
	1890	+ path = new TreePath(objs);
1179	1891	}
1180	1892
1181	1893	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1224,22 +1936,30 @@
1224	1936	{
1225	1937	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1226	1938	//heightFieldItem.addActionListener(this);
1227		- gridItem = menu.add(new MenuItem("Grid"));
1228		- gridItem.addActionListener(this);
1229		- rectoidItem = menu.add(new MenuItem("Box"));
1230		- rectoidItem.addActionListener(this);
1231		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1232		- ellipsoidItem.addActionListener(this);
1233		- coneItem = menu.add(new MenuItem("Cone"));
1234		- coneItem.addActionListener(this);
1235		- torusItem = menu.add(new MenuItem("Torus"));
1236		- torusItem.addActionListener(this);
1237		- superItem = menu.add(new MenuItem("Superellipsoid"));
1238		- superItem.addActionListener(this);
	1939	+// gridItem = menu.add(new MenuItem("Grid"));
	1940	+// gridItem.addActionListener(this);
	1941	+// rectoidItem = menu.add(new MenuItem("Box"));
	1942	+// rectoidItem.addActionListener(this);
	1943	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1944	+// ellipsoidItem.addActionListener(this);
	1945	+// coneItem = menu.add(new MenuItem("Cone"));
	1946	+// coneItem.addActionListener(this);
	1947	+// torusItem = menu.add(new MenuItem("Torus"));
	1948	+// torusItem.addActionListener(this);
	1949	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1950	+// superItem.addActionListener(this);
	1951	+
	1952	+ cameraItem = menu.add(new MenuItem("Camera"));
	1953	+ cameraItem.addActionListener(this);
	1954	+
	1955	+ if (!Globals.ADVANCED)
	1956	+ {
1239	1957	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1240	1958	kleinItem.addActionListener(this);
1241		- particleItem = menu.add(new MenuItem("Particle system"));
1242		- particleItem.addActionListener(this);
	1959	+ }
	1960	+
	1961	+// particleItem = menu.add(new MenuItem("Particle system"));
	1962	+// particleItem.addActionListener(this);
1243	1963	if (Globals.ADVANCED)
1244	1964	{
1245	1965	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1265,15 +1985,15 @@
1265	1985	}
1266	1986	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1267	1987	bezierItem.addActionListener(this);
1268		- overlayItem = menu.add(new MenuItem("Overlay"));
1269		- overlayItem.addActionListener(this);
1270		- lightItem = menu.add(new MenuItem("Light"));
1271		- lightItem.addActionListener(this);
	1988	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1989	+// overlayItem.addActionListener(this);
	1990	+// lightItem = menu.add(new MenuItem("Light"));
	1991	+// lightItem.addActionListener(this);
1272	1992	menu.add("-");
1273	1993	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1274	1994	//superLoopItem.addActionListener(this);
1275		- loopItem = menu.add(new MenuItem("Loop"));
1276		- loopItem.addActionListener(this);
	1995	+// loopItem = menu.add(new MenuItem("Loop"));
	1996	+// loopItem.addActionListener(this);
1277	1997	doubleItem = menu.add(new MenuItem("Fork"));
1278	1998	doubleItem.addActionListener(this);
1279	1999	if (Globals.ADVANCED)
..	..	@@ -1289,6 +2009,9 @@
1289	2009	animationItem.addItemListener(this);
1290	2010	animationItem.setState(Globals.ANIMATION);
1291	2011
	2012	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2013	+ archiveItem.addActionListener(this);
	2014	+
1292	2015	menu.add("-");
1293	2016	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1294	2017	parseverticesItem.addActionListener(this);
..	..	@@ -1301,6 +2024,8 @@
1301	2024	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1302	2025	reduce34MorphItem.addActionListener(this);
1303	2026	menu.add("-");
	2027	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2028	+ memoryItem.addActionListener(this);
1304	2029	menu.add(computeAOItem = new MenuItem("Compute AO"));
1305	2030	computeAOItem.addActionListener(this);
1306	2031
..	..	@@ -1309,8 +2034,6 @@
1309	2034	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1310	2035	mirrorItem.addActionListener(this);
1311	2036	menu.add("-");
1312		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1313		- memoryItem.addActionListener(this);
1314	2037	menu.add(analyzeItem = new MenuItem("Analyze"));
1315	2038	analyzeItem.addActionListener(this);
1316	2039	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1454,9 +2177,38 @@
1454	2177	shadow.material = new cMaterial(obj.material);
1455	2178	shadow.material.diffuse = 0.0001f;
1456	2179	shadow.material.specular = 0.0001f;
	2180	+ shadow.material.opacity = 0.75f;
	2181	+
	2182	+ AllocProjectedVertices(shadow);
	2183	+
	2184	+ shadow.projectedVertices[1].x = 300;
1457	2185
1458	2186	makeSomething(shadow);
1459	2187	}
	2188	+
	2189	+ private void ClearUnpinned()
	2190	+ {
	2191	+ //for (Object3D obj : listUI)
	2192	+ for (int i=listUI.size(); --i>=0;)
	2193	+ {
	2194	+ Object3D obj = listUI.elementAt(i);
	2195	+ if (!obj.pinned)
	2196	+ {
	2197	+ obj.CloseUI();
	2198	+ listUI.remove(i);
	2199	+ }
	2200	+ }
	2201	+ }
	2202	+
	2203	+ private void EditElement(Object3D elem, boolean newWindow)
	2204	+ {
	2205	+ // if (!(elem instanceof Composite))
	2206	+ // newWindow = false;
	2207	+ listUI.add(elem);
	2208	+ elem.openEditWindow(this, newWindow); //, false);
	2209	+ System.out.println("edit : " + elem);
	2210	+ elem.editWindow.refreshContents(true); // ? new
	2211	+ }
1460	2212
1461	2213	/**
1462	2214	* applyExample
..	..	@@ -1701,7 +2453,7 @@
1701	2453	{
1702	2454	ScreenFit();
1703	2455	} else
1704		- if (source == switchItem)
	2456	+ if (source == switchViewItem)
1705	2457	{
1706	2458	cVector v1 = new cVector();
1707	2459	cVector v2 = new cVector();
..	..	@@ -1710,11 +2462,11 @@
1710	2462	objEditor.cameraView.renderCamera.setAim(v2, v1);
1711	2463	objEditor.cameraView.repaint();
1712	2464	} else
1713		- if (source == rectoidItem)
	2465	+ if (source == rectoidItem \|\| source == boxButton)
1714	2466	{
1715	2467	makeSomething(new Box());
1716	2468	} else
1717		- if (source == particleItem)
	2469	+ if (source == particleItem \|\| source == particlesButton)
1718	2470	{
1719	2471	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1720	2472	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1793,27 +2545,27 @@
1793	2545
1794	2546	makeSomething(obj);
1795	2547	} else
1796		- if (source == gridItem)
	2548	+ if (source == gridItem \|\| source == gridButton)
1797	2549	{
1798	2550	makeSomething(new Grid());
1799	2551	} else
1800		- if (source == ellipsoidItem)
	2552	+ if (source == ellipsoidItem \|\| source == sphereButton)
1801	2553	{
1802	2554	makeSomething(new Sphere());
1803	2555	} else
1804		- if (source == coneItem)
	2556	+ if (source == coneItem \|\| source == coneButton)
1805	2557	{
1806	2558	makeSomething(new Cone());
1807	2559	} else
1808		- if (source == torusItem)
	2560	+ if (source == torusItem \|\| source == torusButton)
1809	2561	{
1810	2562	makeSomething(new Torus());
1811	2563	} else
1812		- if (source == superItem)
	2564	+ if (source == superItem \|\| source == superButton)
1813	2565	{
1814	2566	makeSomething(new Superellipsoid());
1815	2567	} else
1816		- if (source == kleinItem)
	2568	+ if (source == kleinItem \|\| source == kleinButton)
1817	2569	{
1818	2570	makeSomething(new Klein());
1819	2571	} else
..	..	@@ -1833,7 +2585,7 @@
1833	2585	{
1834	2586	makeSomething(new BezierSurface());
1835	2587	} else
1836		- if (source == overlayItem)
	2588	+ if (source == overlayItem \|\| source == overlayButton)
1837	2589	{
1838	2590	/*
1839	2591	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1881,10 +2633,27 @@
1881	2633	s.setup();
1882	2634	makeSomething(s);
1883	2635	} else
1884		- if (source == lightItem)
	2636	+ if (source == lightItem \|\| source == lightButton)
1885	2637	{
1886	2638	makeSomething(new Light());
1887	2639	} else
	2640	+// if (source == skybox1Button \|\|
	2641	+// source == skybox2Button \|\|
	2642	+// source == skybox3Button \|\|
	2643	+// source == skybox4Button \|\|
	2644	+// source == skybox5Button \|\|
	2645	+// source == skybox6Button \|\|
	2646	+// source == skybox7Button \|\|
	2647	+// source == skybox11Button \|\|
	2648	+// source == skybox12Button \|\|
	2649	+// source == skybox13Button \|\|
	2650	+// source == skybox14Button \|\|
	2651	+// source == skybox15Button \|\|
	2652	+// source == skybox16Button \|\|
	2653	+// source == skybox17Button)
	2654	+// {
	2655	+// ChangeSkybox(source);
	2656	+// } else
1888	2657	if (source == csgItem)
1889	2658	{
1890	2659	group(new CSG());
..	..	@@ -1931,30 +2700,38 @@
1931	2700
1932	2701	group(g);
1933	2702	} else
1934		- if (source == loopItem)
	2703	+ if (source == loopItem \|\| source == loopButton)
1935	2704	{
	2705	+ if (!group.selection.isEmpty())
	2706	+ {
1936	2707	Composite csg = new GroupLeaf();
1937	2708	csg.count = 5;
1938		- group(csg);
1939		- Composite child = new cGroup();
	2709	+ Composite child = new cGroup("Branch");
1940	2710	csg.addChild(child);
1941	2711	child.addChild(csg);
	2712	+ group(csg);
	2713	+ }
1942	2714	} else
1943	2715	if (source == doubleItem)
1944	2716	{
1945		- Composite csg = new GroupLeaf();
	2717	+ if (!group.selection.isEmpty())
	2718	+ {
	2719	+ Composite csg = new GroupLeaf("Fork");
1946	2720	csg.count = 5;
	2721	+ Composite child = new cGroup("Branch A");
	2722	+ csg.addChild(child);
	2723	+ child.addChild(csg);
	2724	+ child = new cGroup("Branch B");
	2725	+ csg.addChild(child);
	2726	+ child.addChild(csg);
1947	2727	group(csg);
1948		- Composite child = new cGroup();
1949		- csg.addChild(child);
1950		- child.addChild(csg);
1951		- child = new cGroup();
1952		- csg.addChild(child);
1953		- child.addChild(csg);
	2728	+ }
1954	2729	} else
1955	2730	if (source == tripleItem)
1956	2731	{
1957		- Composite csg = new GroupLeaf();
	2732	+ if (!group.selection.isEmpty())
	2733	+ {
	2734	+ Composite csg = new GroupLeaf("Trident");
1958	2735	csg.count = 4;
1959	2736	group(csg);
1960	2737	Composite child = new cGroup();
..	..	@@ -1966,11 +2743,12 @@
1966	2743	child = new cGroup();
1967	2744	csg.addChild(child);
1968	2745	child.addChild(csg);
	2746	+ }
1969	2747	} else
1970	2748	if (source == computeAOItem)
1971	2749	{
1972	2750	Globals.drawMode = CameraPane.OCCLUSION;
1973		- Globals.theRenderer.repaint();
	2751	+ cameraView.repaint();
1974	2752	} else
1975	2753	if (source == recompileItem)
1976	2754	{
..	..	@@ -1985,7 +2763,7 @@
1985	2763	if (source == invariantsItem)
1986	2764	{
1987	2765	System.out.println("Invariants:");
1988		- Grafreed.grafreeD.universe.invariants();
	2766	+ Grafreed.grafreed.universe.invariants();
1989	2767	} else
1990	2768	if (source == memoryItem)
1991	2769	{
..	..	@@ -2016,17 +2794,52 @@
2016	2794	{
2017	2795	ToggleFullScreen();
2018	2796	} else
2019		- if (source == undoButton)
	2797	+ if (source == collapseButton)
2020	2798	{
2021		- Undo();
	2799	+ this.expandedLayout = radio.layout;
	2800	+ CollapseToolbar();
2022	2801	} else
2023		- if (source == redoButton)
	2802	+ if (source == maximize3DButton)
2024	2803	{
2025		- Redo();
	2804	+ this.expandedLayout = radio.layout;
	2805	+ radio.layout = twoButton;
	2806	+ Show3DView();
	2807	+ CollapseToolbar();
2026	2808	} else
2027		- if (source == saveButton)
	2809	+ if (source == previousVersionButton)
2028	2810	{
2029		- Save();
	2811	+ // Go to previous version
	2812	+ //if (!Undo())
	2813	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2814	+ PreviousVersion();
	2815	+ } else
	2816	+ if (source == restoreButton)
	2817	+ {
	2818	+ // Restore current version
	2819	+ Restore();
	2820	+ //restoreButton.setEnabled(false);
	2821	+ } else
	2822	+ if (source == replaceButton)
	2823	+ {
	2824	+ // Overwrite current version
	2825	+ Replace();
	2826	+ //replaceButton.setEnabled(false);
	2827	+ } else
	2828	+ if (source == nextVersionButton)
	2829	+ {
	2830	+ // Go to next version
	2831	+ NextVersion();
	2832	+ } else
	2833	+ if (source == saveVersionButton)
	2834	+ {
	2835	+ // Save a new version
	2836	+ if (!Save(true))
	2837	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2838	+ } else
	2839	+ if (source == deleteVersionButton)
	2840	+ {
	2841	+ // Delete a new version
	2842	+ DeleteVersion();
2030	2843	} else
2031	2844	if (source == oneStepButton)
2032	2845	{
..	..	@@ -2035,17 +2848,14 @@
2035	2848	} else
2036	2849	if (source == screenfitButton)
2037	2850	{
2038		- //Reload(lastConverter, lastFilename, true);
2039	2851	ScreenFit();
2040	2852	} else
2041	2853	if (source == screenfitpointButton)
2042	2854	{
2043		- //Reload(lastConverter, lastFilename, true);
2044	2855	ScreenFitPoint();
2045	2856	} else
2046	2857	if (source == snapobjectButton)
2047	2858	{
2048		- //Reload(lastConverter, lastFilename, true);
2049	2859	SnapObject();
2050	2860	} else
2051	2861	// if (event.getSource() == recompileButton)
..	..	@@ -2084,11 +2894,11 @@
2084	2894	} else
2085	2895	if (source == undoItem)
2086	2896	{
2087		- Undo();
	2897	+ PreviousVersion();
2088	2898	} else
2089	2899	if (source == redoItem)
2090	2900	{
2091		- Redo();
	2901	+ NextVersion();
2092	2902	} else
2093	2903	if (source == duplicateItem)
2094	2904	{
..	..	@@ -2409,7 +3219,7 @@
2409	3219	{
2410	3220	StepAll();
2411	3221	} else
2412		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3222	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2413	3223	{
2414	3224	//int indices[] = jList.getSelectedIndices();
2415	3225	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2421,9 +3231,9 @@
2421	3231	{
2422	3232	ClearSelection(true);
2423	3233	} else
2424		- if (source == grabItem)
	3234	+ if (source == grabItem \|\| source == groupButton)
2425	3235	{
2426		- group(new cGroup(), true);
	3236	+ group(new cGroup(), false); // true);
2427	3237	} else
2428	3238	if (source == hideItem)
2429	3239	{
..	..	@@ -2441,11 +3251,11 @@
2441	3251	{
2442	3252	makeSomething(new Camera());
2443	3253	} else
2444		- if (source == compositeItem)
	3254	+ if (source == compositeItem \|\| source == compositeButton)
2445	3255	{
2446	3256	group(new Composite());
2447	3257	} else
2448		- if (source == randomItem)
	3258	+ if (source == switchItem \|\| source == switchButton)
2449	3259	{
2450	3260	RandomNode random = new RandomNode();
2451	3261	group(random);
..	..	@@ -2547,7 +3357,7 @@
2547	3357	{
2548	3358	group(new cLinker());
2549	3359	} else
2550		- if (source == textureItem)
	3360	+ if (source == textureItem \|\| source == textureButton)
2551	3361	{
2552	3362	group(new TextureNode());
2553	3363	} else
..	..	@@ -2567,17 +3377,42 @@
2567	3377	{
2568	3378	CastShadow(2);
2569	3379	} else
2570		- if (source == ungroupItem)
	3380	+ if (source == ungroupItem \|\| source == ungroupButton)
2571	3381	{
2572		- //ungroup();
	3382	+ boolean canUngroup = true;
	3383	+
2573	3384	for (int i=0; i<group.selection.size(); i++)
2574	3385	{
2575		- Ungroup(group.selection.get(i));
	3386	+ Object3D selectedItem = group.selection.get(i);
	3387	+
	3388	+ if (selectedItem.Size() == 0)
	3389	+ {
	3390	+ // Cannot ungroup leaves
	3391	+ canUngroup = false;
	3392	+ break;
	3393	+ }
	3394	+
	3395	+ if (selectedItem == group)
	3396	+ {
	3397	+ // Cannot ungroup root
	3398	+ canUngroup = false;
	3399	+ break;
	3400	+ }
2576	3401	}
2577	3402
2578		- ClearSelection(false);
2579		-
2580		- refreshContents();
	3403	+ if (canUngroup)
	3404	+ {
	3405	+ for (int i=0; i<group.selection.size(); i++)
	3406	+ {
	3407	+ Object3D selectedItem = group.selection.get(i);
	3408	+
	3409	+ Ungroup(selectedItem);
	3410	+ }
	3411	+
	3412	+ ClearSelection(false);
	3413	+
	3414	+ refreshContents();
	3415	+ }
2581	3416	} else
2582	3417	if (source == genUVItem)
2583	3418	{
..	..	@@ -2878,7 +3713,7 @@
2878	3713	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2879	3714	{
2880	3715	obj = (Object3D)e.nextElement();
2881		- obj.SetBumpTexture(null);
	3716	+ obj.ResetBumpTexture();
2882	3717	}
2883	3718
2884	3719	refreshContents();
..	..	@@ -2894,6 +3729,31 @@
2894	3729
2895	3730	refreshContents();
2896	3731	} else
	3732	+ if (source == embedTexturesItem)
	3733	+ {
	3734	+ Object3D obj;
	3735	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3736	+ {
	3737	+ obj = (Object3D)e.nextElement();
	3738	+ obj.EmbedTextures(true);
	3739	+ }
	3740	+
	3741	+ refreshContents();
	3742	+ } else
	3743	+ if (source == deEmbedTexturesItem)
	3744	+ {
	3745	+ Object3D obj;
	3746	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3747	+ {
	3748	+ obj = (Object3D)e.nextElement();
	3749	+ obj.EmbedTextures(false);
	3750	+ }
	3751	+
	3752	+ CameraPane.texturepigment.clear();
	3753	+ CameraPane.texturebump.clear();
	3754	+
	3755	+ refreshContents();
	3756	+ } else
2897	3757	if (source == flashSelectionButton)
2898	3758	{
2899	3759	CameraPane.flash = true;
..	..	@@ -2905,38 +3765,11 @@
2905	3765	if (source == twoButton)
2906	3766	{
2907	3767	radio.layout = twoButton;
2908		- // bug
2909		- //gridPanel.setDividerLocation(1.0);
2910		- //bigPanel.setDividerLocation(0.0);
2911		-// bigThree.remove(scenePanel);
2912		-// bigThree.remove(centralPanel);
2913		-// bigThree.remove(XYZPanel);
2914		-// aWindowConstraints.gridx = 0;
2915		-// aWindowConstraints.gridy = 0;
2916		-// aWindowConstraints.gridwidth = 1;
2917		-// // aConstraints.gridheight = 3;
2918		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2919		-// aWindowConstraints.weightx = 0;
2920		-// aWindowConstraints.weighty = 1;
2921		-// //bigThree.add(jtp, aWindowConstraints);
2922		-// aWindowConstraints.weightx = 1;
2923		-// aWindowConstraints.gridwidth = 3;
2924		-// // aConstraints.gridheight = 3;
2925		-// aWindowConstraints.gridx = 1;
2926		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2927		-// bigThree.add(centralPanel, aWindowConstraints);
2928		-// aWindowConstraints.weightx = 0;
2929		-// aWindowConstraints.gridx = 4;
2930		-// aWindowConstraints.gridwidth = 1;
2931		-// // aConstraints.gridheight = 3;
2932		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2933		-// //bigThree.add(XYZPanel, aWindowConstraints);
2934		-// scenePanel.setVisible(false);
2935		-// centralPanel.setVisible(true);
2936		-// XYZPanel.setVisible(false);
2937		- bigThree.ClearUI();
2938		- bigThree.add(centralPanel);
2939		- bigThree.FlushUI();
	3768	+
	3769	+ if (CameraPane.FULLSCREEN)
	3770	+ fullscreenLayout = radio.layout;
	3771	+
	3772	+ Show3DView();
2940	3773
2941	3774	cameraView.requestFocusInWindow();
2942	3775
..	..	@@ -2959,6 +3792,9 @@
2959	3792	if (source == threeButton)
2960	3793	{
2961	3794	radio.layout = threeButton;
	3795	+
	3796	+ if (CameraPane.FULLSCREEN)
	3797	+ fullscreenLayout = radio.layout;
2962	3798
2963	3799	// bigThree.remove(scenePanel);
2964	3800	// bigThree.remove(centralPanel);
..	..	@@ -2988,8 +3824,8 @@
2988	3824	// centralPanel.setVisible(true);
2989	3825	// XYZPanel.setVisible(true);
2990	3826	bigThree.ClearUI();
	3827	+ bigThree.add(scenePanel);
2991	3828	bigThree.add(centralPanel);
2992		- bigThree.add(XYZPanel);
2993	3829	bigThree.FlushUI();
2994	3830
2995	3831	cameraView.requestFocusInWindow();
..	..	@@ -2997,6 +3833,9 @@
2997	3833	if (source == fourButton)
2998	3834	{
2999	3835	radio.layout = fourButton;
	3836	+
	3837	+ if (CameraPane.FULLSCREEN)
	3838	+ fullscreenLayout = radio.layout;
3000	3839
3001	3840	// bigThree.remove(scenePanel);
3002	3841	// bigThree.remove(centralPanel);
..	..	@@ -3035,6 +3874,9 @@
3035	3874	{
3036	3875	radio.layout = sixButton;
3037	3876
	3877	+ if (CameraPane.FULLSCREEN)
	3878	+ fullscreenLayout = radio.layout;
	3879	+
3038	3880	// bigThree.remove(scenePanel);
3039	3881	// bigThree.remove(centralPanel);
3040	3882	// bigThree.remove(XYZPanel);
..	..	@@ -3063,8 +3905,8 @@
3063	3905	// centralPanel.setVisible(true);
3064	3906	// XYZPanel.setVisible(false);
3065	3907	bigThree.ClearUI();
3066		- bigThree.add(scenePanel);
3067	3908	bigThree.add(centralPanel);
	3909	+ bigThree.add(scenePanel);
3068	3910	bigThree.FlushUI();
3069	3911
3070	3912	cameraView.requestFocusInWindow();
..	..	@@ -3072,6 +3914,9 @@
3072	3914	if (source == sevenButton)
3073	3915	{
3074	3916	radio.layout = sevenButton;
	3917	+
	3918	+ if (CameraPane.FULLSCREEN)
	3919	+ fullscreenLayout = radio.layout;
3075	3920
3076	3921	// bigThree.remove(scenePanel);
3077	3922	// bigThree.remove(centralPanel);
..	..	@@ -3110,6 +3955,7 @@
3110	3955	} else
3111	3956	if (source == rootButton)
3112	3957	{
	3958	+ Replace();
3113	3959	Object3D obj;
3114	3960	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3115	3961	{
..	..	@@ -3124,16 +3970,25 @@
3124	3970	if (source == closeButton)
3125	3971	{
3126	3972	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3973	+ Replace();
	3974	+
3127	3975	cRadio ab;
3128	3976	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3129	3977	{
3130	3978	ab = (cRadio)e.nextElement();
3131		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3979	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3132	3980	{
	3981	+ // Patch to avoid bug with transparency.
	3982	+ if (!ab.hadMaterial)
	3983	+ {
	3984	+ ab.object.material = null;
	3985	+ }
	3986	+
3133	3987	buttonGroup.remove(ab);
3134	3988	radioPanel.remove(ab);
3135	3989
3136		- ab.GetObject().editWindow = null;
	3990	+ //ab.GetObject().editWindow = null;
	3991	+ ab.GetObject().manipWindow = null;
3137	3992	// ab.GetObject().objectUI = null; // ?????????
3138	3993
3139	3994	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
..	..	@@ -3146,6 +4001,12 @@
3146	4001	} else
3147	4002	if (source == editItem \|\| source == editButton)
3148	4003	{
	4004	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4005	+ {
	4006	+ Object3D child = (Object3D)e.nextElement();
	4007	+ child.pinned = true;
	4008	+ }
	4009	+
3149	4010	EditSelection(false);
3150	4011	} else
3151	4012	if (source == uneditButton)
..	..	@@ -3154,9 +4015,10 @@
3154	4015	{
3155	4016	Object3D child = (Object3D)e.nextElement();
3156	4017	if(child.editWindow != null)
3157		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4018	+ child.pinned = false;
3158	4019	child.CloseUI();
3159	4020	listUI.remove(child);
	4021	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3160	4022
3161	4023	//child.editWindow = null; // ???????????
3162	4024	}
..	..	@@ -3171,16 +4033,18 @@
3171	4033	//copy.ClearUI();
3172	4034	for (Object3D obj : listUI)
3173	4035	{
	4036	+ obj.pinned = false;
3174	4037	obj.CloseUI();
3175	4038	}
3176	4039	listUI.clear();
	4040	+ SetPinStates(group.selection.size() > 0);
3177	4041	refreshContents(true);
3178	4042	} else
3179	4043	if (source == allParamsButton)
3180	4044	{
3181	4045	assert(copy == group);
3182	4046
3183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4047	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3184	4048
3185	4049	for (Object3D obj : listUI)
3186	4050	{
..	..	@@ -3206,6 +4070,8 @@
3206	4070	} else
3207	4071	if(source instanceof cRadio)
3208	4072	{
	4073	+ Replace();
	4074	+
3209	4075	group.parent = keepparent;
3210	4076	group.attributes = 0;
3211	4077	//group.editWindow = null;
..	..	@@ -3229,6 +4095,7 @@
3229	4095	}
3230	4096
3231	4097	copy = group;
	4098	+
3232	4099	//Globals.theRenderer.object = group;
3233	4100	if(!useclient)
3234	4101	{
..	..	@@ -3247,6 +4114,7 @@
3247	4114
3248	4115	// fix "+" issue
3249	4116	//group.editWindow = this;
	4117	+ group.manipWindow = this;
3250	4118
3251	4119	/*
3252	4120	currentLayout = radio.layout;
..	..	@@ -3254,6 +4122,37 @@
3254	4122	currentLayout = sevenButton;
3255	4123	*/
3256	4124	radio.layout.doClick();
	4125	+
	4126	+ assert(copy instanceof Composite);
	4127	+
	4128	+ if (copy.versionlist == null)
	4129	+ {
	4130	+ copy.versionindex = -1;
	4131	+
	4132	+ // Cannot work with loops
	4133	+ // To fix this issue, we first mark all nodes above the root,
	4134	+ // and check if any of these nodes are reachable below the root.
	4135	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4136	+
	4137	+ if (!copy.HasTags())
	4138	+ {
	4139	+ copy.versionlist = new Object3D[100];
	4140	+
	4141	+ Save(true);
	4142	+ }
	4143	+
	4144	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4145	+ }
	4146	+
	4147	+ SetVersionStates();
	4148	+
	4149	+ ClearUnpinned();
	4150	+
	4151	+ //Grafreed.Assert(group != null);
	4152	+ //Grafreed.Assert(group.selection != null);
	4153	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4154	+ if (group.selection == null \|\| group.selection.size() == 1)
	4155	+ EditSelection(false);
3257	4156	keepparent = group.parent;
3258	4157	// PARENT = NULL or not???
3259	4158	//group.parent = null; // ROOT
..	..	@@ -3265,11 +4164,13 @@
3265	4164	} else if (event.getSource() == editCameraItem)
3266	4165	{
3267	4166	cameraView.ProtectCamera();
	4167	+ cameraView.requestFocusInWindow();
3268	4168	cameraView.repaint();
3269	4169	return;
3270		- } else if (event.getSource() == revertCameraItem)
	4170	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3271	4171	{
3272	4172	cameraView.RevertCamera();
	4173	+ cameraView.requestFocusInWindow();
3273	4174	cameraView.repaint();
3274	4175	return;
3275	4176	// } else if (event.getSource() == textureButton)
..	..	@@ -3388,7 +4289,7 @@
3388	4289	TouchTransform(obj);
3389	4290	continue;
3390	4291	}
3391		- if ((mask&2) != 0) // Scale
	4292	+ if ((mask&2) != 0) // Scale/rotation
3392	4293	{
3393	4294	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3394	4295	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -3396,10 +4297,6 @@
3396	4297	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3397	4298	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3398	4299	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3399		- }
3400		- if ((mask&4) != 0) // Rotation
3401		- {
3402		- // ?
3403	4300	}
3404	4301	if ((mask&1) != 0) // Translation
3405	4302	{
..	..	@@ -3846,7 +4743,7 @@
3846	4743
3847	4744	try
3848	4745	{
3849		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4746	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3850	4747	}
3851	4748	catch (Exception e)
3852	4749	{
..	..	@@ -4321,28 +5218,25 @@
4321	5218	// }
4322	5219	// }
4323	5220
4324		- static boolean allparams = true;
4325		-
4326		- static Vector<Object3D> listUI = new Vector<Object3D>();
4327		-
4328	5221	void EditSelection(boolean newWindow)
4329	5222	{
	5223	+ if (group.selection == null)
	5224	+ {
	5225	+ EditElement(group, newWindow); // ? new
	5226	+ return;
	5227	+ }
	5228	+
4330	5229	// aConstraints.gridy = 0;
4331	5230	for (int i=0; i<group.selection.size(); i++)
4332	5231	{
4333	5232	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4334	5233	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4335		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5234	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4336	5235
4337	5236	Object3D elem = (Object3D)group.selection.elementAt(i);
4338	5237	if(elem != group \|\| !newWindow)
4339	5238	{
4340		- // if (!(elem instanceof Composite))
4341		- // newWindow = false;
4342		- listUI.add(elem);
4343		- elem.openEditWindow(this, newWindow); //, false);
4344		- System.out.println("edit : " + elem);
4345		- elem.editWindow.refreshContents(true); // ? new
	5239	+ EditElement(elem, newWindow); // ? new
4346	5240	}
4347	5241	}
4348	5242	}
..	..	@@ -4405,9 +5299,7 @@
4405	5299
4406	5300	freezemodel = false;
4407	5301	}
4408		-
4409		- boolean flashIt = true;
4410		-
	5302	+
4411	5303	public void valueChanged(TreeSelectionEvent e)
4412	5304	//public boolean handleEvent(Event event)
4413	5305	{
..	..	@@ -4417,7 +5309,8 @@
4417	5309	//new Exception().printStackTrace();
4418	5310
4419	5311	freezemodel = true;
4420		-
	5312	+ ClearUnpinned();
	5313	+
4421	5314	/**/
4422	5315	//switch (event.id)
4423	5316	{
..	..	@@ -4450,7 +5343,7 @@
4450	5343	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4451	5344	// a camera
4452	5345	{
4453		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5346	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4454	5347	{
4455	5348	CameraPane.camerachangeframe = 0; // don't refuse it
4456	5349	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4459,6 +5352,13 @@
4459	5352	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4460	5353	}
4461	5354
	5355	+ if (tps != null && tps.length == 1)
	5356	+ {
	5357	+ EditSelection(false);
	5358	+ }
	5359	+
	5360	+ SetPinStates(tps != null && tps.length > 0);
	5361	+
4462	5362	refreshContents();
4463	5363	//return true;
4464	5364	}
..	..	@@ -4468,9 +5368,36 @@
4468	5368	freezemodel = false;
4469	5369	}
4470	5370
	5371	+ void SetPinStates(boolean enabled)
	5372	+ {
	5373	+ editButton.setEnabled(enabled);
	5374	+ uneditButton.setEnabled(enabled);
	5375	+ //unselectButton.setEnabled(enabled);
	5376	+ flashSelectionButton.setEnabled(enabled);
	5377	+
	5378	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5379	+
	5380	+ boolean allComposites = true;
	5381	+
	5382	+ if (group.selection != null)
	5383	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5384	+ {
	5385	+ Object next = e.nextElement();
	5386	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5387	+ {
	5388	+ allComposites = false;
	5389	+ break;
	5390	+ }
	5391	+ }
	5392	+
	5393	+ rootButton.setEnabled(allComposites);
	5394	+ }
	5395	+
4471	5396	void refreshContents(boolean cp)
4472	5397	{
4473		- if (!Globals.MOUSEDRAGGED)
	5398	+ if (Globals.ADVANCED)
	5399	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5400	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4474	5401	{
4475	5402	objEditor.ClearInfo(); // .GetMaterial());
4476	5403
..	..	@@ -4479,7 +5406,7 @@
4479	5406	Object3D child = (Object3D) group.selection.get(i);
4480	5407
4481	5408	objEditor.AddInfo(child, this, true);
4482		- System.err.println("info : " + child.GetPath());
	5409	+// System.err.println("info : " + child.GetPath());
4483	5410	}
4484	5411
4485	5412	objEditor.SetText(); // jan 2014
..	..	@@ -4569,7 +5496,8 @@
4569	5496
4570	5497	if (cut)
4571	5498	{
4572		- Save();
	5499	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5500	+// Save();
4573	5501	//int indices[] = jList.getSelectedIndices();
4574	5502	//for (int i = indices.length - 1; i >= 0; i--)
4575	5503	//jList.remove(indices[i]);
..	..	@@ -4672,6 +5600,10 @@
4672	5600
4673	5601	void paste(boolean expand)
4674	5602	{
	5603	+ if (Globals.REPLACEONMAKE)
	5604	+ Save();
	5605	+ boolean keep = Globals.REPLACEONMAKE;
	5606	+ Globals.REPLACEONMAKE = false;
4675	5607	// if (GrafreeD.clipboard == null)
4676	5608	// return;
4677	5609	boolean first = true;
..	..	@@ -4731,6 +5663,7 @@
4731	5663	Grafreed.clipboard.get(0).parent = keepparent;
4732	5664	}
4733	5665
	5666	+ Globals.REPLACEONMAKE = keep;
4734	5667	ResetModel();
4735	5668	refreshContents();
4736	5669	}
..	..	@@ -4866,6 +5799,10 @@
4866	5799
4867	5800	void group(Object3D csg, boolean grab)
4868	5801	{
	5802	+ if (Globals.REPLACEONMAKE)
	5803	+ Save();
	5804	+ boolean keep = Globals.REPLACEONMAKE;
	5805	+ Globals.REPLACEONMAKE = false;
4869	5806	if (//false) // why??
4870	5807	!group.selection.isEmpty())
4871	5808	{
..	..	@@ -4979,10 +5916,15 @@
4979	5916	//node.add(csg);
4980	5917	//makeSomething(node);
4981	5918	makeSomething(csg);
	5919	+ Globals.REPLACEONMAKE = keep;
4982	5920	}
4983	5921
4984	5922	void Ungroup(Object3D g)
4985	5923	{
	5924	+ if (Globals.REPLACEONMAKE)
	5925	+ Save();
	5926	+ boolean keep = Globals.REPLACEONMAKE;
	5927	+ Globals.REPLACEONMAKE = false;
4986	5928	if (g instanceof HiddenObject)
4987	5929	{
4988	5930	HiddenObject h = (HiddenObject) g;
..	..	@@ -4999,6 +5941,7 @@
4999	5941	objEditor.makeSomething(g.get(i), false);
5000	5942	}
5001	5943	}
	5944	+ Globals.REPLACEONMAKE = keep;
5002	5945	}
5003	5946
5004	5947	void ungroup()
..	..	@@ -5287,13 +6230,43 @@
5287	6230	cButton clearpanelButton;
5288	6231	cButton unselectButton;
5289	6232
5290		- cButton minButton;
5291		- cButton maxButton;
5292		- cButton fullButton;
5293		- cButton undoButton;
5294		- cButton redoButton;
5295		- cButton saveButton;
	6233	+ cButton restoreCameraButton;
	6234	+
5296	6235	cButton oneStepButton;
	6236	+
	6237	+ cButton groupButton;
	6238	+ cButton ungroupButton;
	6239	+ cButton compositeButton;
	6240	+ cButton switchButton;
	6241	+ cButton loopButton;
	6242	+ cButton textureButton;
	6243	+
	6244	+ cButton skybox1Button;
	6245	+ cButton skybox2Button;
	6246	+ cButton skybox3Button;
	6247	+ cButton skybox4Button;
	6248	+ cButton skybox5Button;
	6249	+ cButton skybox6Button;
	6250	+ cButton skybox7Button;
	6251	+
	6252	+ cButton skybox11Button;
	6253	+ cButton skybox12Button;
	6254	+ cButton skybox13Button;
	6255	+ cButton skybox14Button;
	6256	+ cButton skybox15Button;
	6257	+ cButton skybox16Button;
	6258	+ cButton skybox17Button;
	6259	+
	6260	+ cButton gridButton;
	6261	+ cButton boxButton;
	6262	+ cButton sphereButton;
	6263	+ cButton coneButton;
	6264	+ cButton torusButton;
	6265	+ cButton superButton;
	6266	+ cButton kleinButton;
	6267	+ cButton particlesButton;
	6268	+ cButton overlayButton;
	6269	+ cButton lightButton;
5297	6270
5298	6271	cButton screenfitButton;
5299	6272	cButton screenfitpointButton;
..	..	@@ -5315,12 +6288,12 @@
5315	6288	//JTree jTree;
5316	6289	private MenuItem lookAtItem;
5317	6290	private MenuItem lookFromItem;
5318		- private MenuItem switchItem;
5319		- private MenuItem cutItem;
	6291	+ private MenuItem switchViewItem;
	6292	+ private JMenuItem cutItem;
5320	6293	private MenuItem undoItem;
5321	6294	private MenuItem redoItem;
5322		- private MenuItem duplicateItem;
5323		- private MenuItem cloneItem;
	6295	+ private JMenuItem duplicateItem;
	6296	+ private JMenuItem cloneItem;
5324	6297	private MenuItem cloneSupportItem;
5325	6298	private MenuItem overwriteGeoItem;
5326	6299	private MenuItem overwriteMatItem;
..	..	@@ -5341,13 +6314,13 @@
5341	6314	private MenuItem cloneGeometriesItem;
5342	6315	private MenuItem shareGeometriesItem;
5343	6316	private MenuItem mergeGeometriesItem;
5344		- private MenuItem copyItem;
	6317	+ private JMenuItem copyItem;
5345	6318	private MenuItem pasteItem;
5346		- private MenuItem pasteIntoItem;
5347		- private MenuItem pasteLinkItem;
5348		- private MenuItem pasteCloneItem;
5349		- private MenuItem pasteExpandItem;
5350		- private MenuItem clearItem;
	6319	+ private JMenuItem pasteIntoItem;
	6320	+ private JMenuItem pasteLinkItem;
	6321	+ private JMenuItem pasteCloneItem;
	6322	+ private JMenuItem pasteExpandItem;
	6323	+ private JMenuItem deleteItem;
5351	6324	private MenuItem clearAllItem;
5352	6325	private MenuItem genUVItem;
5353	6326	private MenuItem genNormalsMESHItem;
..	..	@@ -5402,12 +6375,12 @@
5402	6375	private MenuItem transformGeometryItem;
5403	6376	private MenuItem transformChildrenItem;
5404	6377	private MenuItem hideItem;
5405		- private MenuItem grabItem;
	6378	+ private JMenuItem grabItem;
5406	6379	private MenuItem backItem;
5407	6380	private MenuItem frontItem;
5408	6381	private MenuItem cameraItem;
5409	6382	private MenuItem compositeItem;
5410		- private MenuItem randomItem;
	6383	+ private MenuItem switchItem;
5411	6384	private MenuItem physicsItem;
5412	6385	private MenuItem frameselectorItem;
5413	6386	private MenuItem scriptNodeItem;
..	..	@@ -5415,7 +6388,7 @@
5415	6388	private MenuItem switchTransfoItem;
5416	6389	private MenuItem morphItem;
5417	6390	private MenuItem linkerItem;
5418		- private MenuItem ungroupItem;
	6391	+ private JMenuItem ungroupItem;
5419	6392	private MenuItem editItem;
5420	6393	private MenuItem openWindowItem;
5421	6394	private MenuItem editLeafItem;
..	..	@@ -5431,6 +6404,8 @@
5431	6404	private MenuItem attachBumpItem;
5432	6405	private MenuItem detachBumpItem;
5433	6406	private MenuItem pigmentBumpItem;
	6407	+ private MenuItem embedTexturesItem;
	6408	+ private MenuItem deEmbedTexturesItem;
5434	6409
5435	6410	private MenuItem particleItem;
5436	6411	private MenuItem ragdollItem;
..	..	@@ -5481,5 +6456,5 @@
5481	6456
5482	6457	Menu cameraMenu;
5483	6458	MenuItem editCameraItem;
5484		- MenuItem revertCameraItem;
	6459	+ MenuItem restoreCameraItem;
5485	6460	}