~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,360 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane();
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
26	381	//ObjEditor objEditor;
27	382	public void closeUI2()
28	383	{
..	..	@@ -60,6 +415,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
..	..	@@ -246,7 +627,7 @@
246	627
247	628	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	629	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	630	+ toggleDebugItem.setState(Globals.DEBUG);
250	631
251	632	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	633	toggleFrustumItem.addItemListener(this);
..	..	@@ -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"));
..	..	@@ -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,16 +932,92 @@
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	{
	1006	+ // June 2019
	1007	+ if (oe == null)
	1008	+ {
	1009	+ //super.SetupUI2(this);
	1010	+ //return;
	1011	+ }
	1012	+
	1013	+ if (copy != group)
	1014	+ {
	1015	+ //super.SetupUI2(this);
	1016	+ }
	1017	+
538	1018	//new Exception().printStackTrace();
539	1019
540	1020	oe.radioPanel = new JPanel(new GridBagLayout());
541		- oe.aConstraints.weightx = 1;
542		- oe.aConstraints.weighty = 0;
543		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
544		- oe.aConstraints.gridwidth = 100;
545		- oe.aConstraints.gridheight = 1;
546	1021	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
547	1022
548	1023	oe.buttonGroup = new ButtonGroup();
..	..	@@ -563,39 +1038,123 @@
563	1038	oe.radioPanel.add(dummyButton);
564	1039	oe.buttonGroup.add(dummyButton);
565	1040	*/
	1041	+ cGridBag copyOptionsPanel = new cGridBag();
	1042	+
	1043	+ copyOptionsPanel.preferredHeight = 2;
	1044	+
566	1045	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
567	1046
568		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569		- undoButton.setToolTipText("Undo changes");
570		- undoButton.addActionListener(this);
	1047	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+ //minButton.setToolTipText("Minimize window");
	1049	+ //minButton.addActionListener(this);
571	1050
572		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573		- redoButton.setToolTipText("Redo changes");
574		- redoButton.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	+ }
575	1057
576		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577		- saveButton.setToolTipText("Save changes");
578		- saveButton.addActionListener(this);
	1058	+ cButton gcButton;
579	1059
580		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
581		- liveCB.setToolTipText("Enable animation");
582		- liveCB.addItemListener(this);
	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", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1071	+ collapseButton.setToolTipText("Collapse toolbar");
	1072	+ collapseButton.addActionListener(this);
	1073	+
	1074	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1076	+ maximize3DButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.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", !Grafreed.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", !Grafreed.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", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ fullButton.setToolTipText("Full-screen window");
	1099	+ fullButton.addActionListener(this);
	1100	+
	1101	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1102	+ screenfitButton.setToolTipText("Screen fit");
	1103	+ screenfitButton.addActionListener(this);
583	1104
584		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1105	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1107	+ restoreCameraButton.addActionListener(this);
	1108	+
	1109	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ saveVersionButton.setToolTipText("Duplicate current version");
	1111	+ saveVersionButton.addActionListener(this);
	1112	+
	1113	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ deleteVersionButton.setToolTipText("Delete current version");
	1115	+ deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
	1117	+
	1118	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.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", !Grafreed.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", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ replaceButton.setToolTipText("Save (replace current version)");
	1131	+ replaceButton.addActionListener(this);
	1132	+ replaceButton.setEnabled(false);
	1133	+
	1134	+ copyOptionsPanel.add(updown);
	1135	+
	1136	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.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", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585	1142	oneStepButton.setToolTipText("Animate one step forward");
586	1143	oneStepButton.addActionListener(this);
587	1144
588		- 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);
589	1150	fastCB.setToolTipText("Fast mode");
590	1151	fastCB.addItemListener(this);
591	1152
592		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
593		- trackCB.setToolTipText("Enable tracking");
594		- trackCB.addItemListener(this);
595		-
596		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- screenfitButton.setToolTipText("Screen fit");
598		- 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);
599	1158
600	1159	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
601	1160	// screenfitpointButton.addActionListener(this);
..	..	@@ -605,67 +1164,139 @@
605	1164	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606	1165	snapobjectButton.addActionListener(this);
607	1166	snapobjectButton.setToolTipText("Snap Object");
	1167	+
	1168	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1169	+ fourButton.addActionListener(this);
	1170	+ fourButton.setToolTipText("Show control panel only");
608	1171	}
609	1172
610		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611		- flashSelectionButton.setToolTipText("Show selection");
612		- flashSelectionButton.addActionListener(this);
	1173	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
613	1174
614		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
615		-
616		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617		- twoButton.setToolTipText("Show center view only");
618		- twoButton.addActionListener(this);
619		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- fourButton.addActionListener(this);
621		- fourButton.setToolTipText("Show left panel only");
622		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
623		- sixButton.setToolTipText("2-column layout left");
624		- sixButton.addActionListener(this);
625		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626		- threeButton.setToolTipText("2-column layout right");
627		- threeButton.addActionListener(this);
628		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- sevenButton.setToolTipText("3-column layout");
630		- sevenButton.addActionListener(this);
631		- //
632	1175
633		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- rootButton.setToolTipText("Edit selection in new tab");
	1176	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1177	+ rootButton.setToolTipText("Open selection in new tab");
635	1178	rootButton.addActionListener(this);
636	1179
637		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638	1181	closeButton.setToolTipText("Close tab");
639	1182	closeButton.addActionListener(this);
640	1183	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
641	1184	//clearButton.addActionListener(this);
642		-
643		- cGridBag commandsPanel = new cGridBag();
	1185	+
	1186	+ cGridBag row1 = new cGridBag();
644	1187
645		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
646		- editButton.setToolTipText("Edit selection");
	1188	+ // INSERT
	1189	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ gridButton.setToolTipText("Create ground");
	1191	+ gridButton.addActionListener(this);
	1192	+
	1193	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ boxButton.setToolTipText("Create box");
	1195	+ boxButton.addActionListener(this);
	1196	+
	1197	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ superButton.setToolTipText("Create superellipsoid");
	1199	+ superButton.addActionListener(this);
	1200	+
	1201	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ sphereButton.setToolTipText("Create sphere");
	1203	+ sphereButton.addActionListener(this);
	1204	+
	1205	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ coneButton.setToolTipText("Create cone");
	1207	+ coneButton.addActionListener(this);
	1208	+
	1209	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.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", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ kleinButton.setToolTipText("Create Klein bottle");
	1217	+ kleinButton.addActionListener(this);
	1218	+ }
	1219	+
	1220	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.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", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ groupButton.setToolTipText("Create group");
	1230	+ groupButton.addActionListener(this);
	1231	+
	1232	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ compositeButton.setToolTipText("Create composite");
	1234	+ compositeButton.addActionListener(this);
	1235	+
	1236	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ switchButton.setToolTipText("Create item switcher");
	1238	+ switchButton.addActionListener(this);
	1239	+
	1240	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ loopButton.setToolTipText("Create loop");
	1242	+ loopButton.addActionListener(this);
	1243	+
	1244	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ textureButton.setToolTipText("Create texture");
	1246	+ textureButton.addActionListener(this);
	1247	+
	1248	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ overlayButton.setToolTipText("Create overlay");
	1250	+ overlayButton.addActionListener(this);
	1251	+
	1252	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.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", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1272	+ editButton.setToolTipText("Pin selection controls");
647	1273	editButton.addActionListener(this);
648	1274
649		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- uneditButton.setToolTipText("Unedit selection");
	1275	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1276	+ uneditButton.setToolTipText("Unpin and remove selection controls");
651	1277	uneditButton.addActionListener(this);
652	1278
653		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
654		- allParamsButton.setToolTipText("Edit all params");
	1279	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1280	+ allParamsButton.setToolTipText("Show all controls");
655	1281	allParamsButton.addActionListener(this);
656	1282
657		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658		- clearPanelButton.setToolTipText("Clear edit panel");
	1283	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1284	+ clearPanelButton.setToolTipText("Clear all controls");
659	1285	clearPanelButton.addActionListener(this);
660	1286
661		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662		- unselectButton.setToolTipText("Unselect");
663		- unselectButton.addActionListener(this);
	1287	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1288	+ //unselectButton.setToolTipText("Unselect");
	1289	+ //unselectButton.addActionListener(this);
664	1290
665		- commandsPanel.preferredHeight = 1;
	1291	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ flashSelectionButton.setToolTipText("Highlight selection");
	1293	+ flashSelectionButton.addActionListener(this);
666	1294
667		- oe.treePanel.add(commandsPanel);
668		- oe.treePanel.Return();
	1295	+ editCommandsPanel.preferredHeight = 1;
	1296	+
	1297	+ SetPinStates(false);
	1298	+// oe.treePanel.add(commandsPanel);
	1299	+// oe.treePanel.Return();
669	1300
670	1301	// oe.aConstraints.gridx += 1;
671	1302	// oe.aConstraints.weighty = 0;
..	..	@@ -682,32 +1313,20 @@
682	1313
683	1314	JScrollPane jSP;
684	1315	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
685		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1316	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
686	1317	ResetModel();
687	1318
688	1319	oe.treePanel.add(jSPPanel);
689	1320	oe.treePanel.Return();
690	1321
691		- cGridBag copyOptionsPanel = new cGridBag();
692		-
693		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
694		- colorCB.setToolTipText("Copy color when dropped");
695		- colorCB.addItemListener(this);
696		-
697		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
698		- materialCB.setToolTipText("Copy material when dropped");
699		- materialCB.addItemListener(this);
700		-
701		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
702		- textureCB.setToolTipText("Copy texture when dropped");
703		- textureCB.addItemListener(this);
704		-
705		- copyOptionsPanel.preferredHeight = 1;
706	1322	oe.treePanel.add(copyOptionsPanel);
707	1323	oe.treePanel.Return();
	1324	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1325	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1326	+ sliderPane.preferredHeight = 1;
708	1327
709		-// mainPanel.setDividerLocation(0.5); //1.0);
710		-// mainPanel.setResizeWeight(0.5);
	1328	+// mainPanel.setDividerLocation(0.1); //1.0);
	1329	+ mainPanel.setResizeWeight(0.4);
711	1330
712	1331	//jList.addListSelectionListener(this);
713	1332	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -715,7 +1334,7 @@
715	1334	//jTree.setEditable(true);
716	1335	oe.jTree.setDragEnabled(true);
717	1336	//jTree.setPreferredSize(new Dimension(10,10));
718		- jSP.setPreferredSize(new Dimension(100,200));
	1337	+ //jSP.setPreferredSize(new Dimension(100,200));
719	1338
720	1339	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
721	1340
..	..	@@ -727,29 +1346,49 @@
727	1346	dgr.addDragGestureListener(this);
728	1347	}catch(Exception e) {}
729	1348	*/
730		- radio.layout = sevenButton;
	1349	+ radio.layout = threeButton; // sixButton;
731	1350	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
732	1351	}
733	1352
734	1353	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
735	1354	{
	1355	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1356	+ colorCB.setToolTipText("Copy color when dropped");
	1357	+ colorCB.addItemListener(this);
	1358	+
	1359	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1360	+ materialCB.setToolTipText("Copy material when dropped");
	1361	+ materialCB.addItemListener(this);
	1362	+
	1363	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1364	+ textureCB.setToolTipText("Copy texture when dropped");
	1365	+ textureCB.addItemListener(this);
	1366	+
	1367	+ panel.Return();
	1368	+
736	1369	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
737	1370	boxCB.setToolTipText("Display bounding boxes");
738	1371	boxCB.addItemListener(this);
739	1372
740	1373	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
741		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1374	+ zoomBoxCB.setToolTipText("Display only for wheel");
742	1375	zoomBoxCB.addItemListener(this);
743	1376
744	1377	if (true) // Globals.ADVANCED)
745	1378	{
746		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
747		- supportCB.setToolTipText("Enable rigging");
748		- supportCB.addItemListener(this);
	1379	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1380	+// supportCB.setToolTipText("Enable rigging");
	1381	+// supportCB.addItemListener(this);
	1382	+
	1383	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1384	+ freezeCB.setToolTipText("Fast moving camera");
	1385	+ freezeCB.addItemListener(this);
749	1386
750	1387	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
751	1388	// localCB.addItemListener(this);
752	1389
	1390	+ panel.Return();
	1391	+
753	1392	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
754	1393	crowdCB.setToolTipText("Used for crowds");
755	1394	crowdCB.addItemListener(this);
..	..	@@ -758,14 +1397,19 @@
758	1397	smoothCB.setToolTipText("Snapping delay");
759	1398	smoothCB.addItemListener(this);
760	1399
761		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
762		- slowCB.setToolTipText("Smooth interpolation");
763		- slowCB.addItemListener(this);
	1400	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1401	+// slowCB.setToolTipText("Smooth interpolation");
	1402	+// slowCB.addItemListener(this);
	1403	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1404	+ minshaderCB.setToolTipText("Minimal fast shader");
	1405	+ minshaderCB.addItemListener(this);
764	1406
765	1407	// constraints.gridy += 1;
766	1408	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
767	1409	// speakerMocapCB.addItemListener(this);
768	1410
	1411	+ panel.Return();
	1412	+
769	1413	if (false)
770	1414	{
771	1415	// handled in scripts
..	..	@@ -780,34 +1424,82 @@
780	1424	//constraints.gridy += 1;
781	1425	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
782	1426	smoothfocusCB.addItemListener(this);
	1427	+ panel.Return();
783	1428	}
784	1429
785	1430	//constraints.gridx += 1;
786	1431	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
787	1432	// debugCB.addItemListener(this);
788	1433
	1434	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1435	+ trackCB.setToolTipText("Enable tracking target");
	1436	+ trackCB.addItemListener(this);
	1437	+
789	1438	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1439	+ oeilCB.setToolTipText("Move camera when tracking");
790	1440	oeilCB.addItemListener(this);
791	1441
	1442	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1443	+ shadowCB.setToolTipText("When live compute shadows");
	1444	+ shadowCB.addItemListener(this);
	1445	+
	1446	+ panel.Return();
	1447	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1448	+ toggleTextureCB.setToolTipText("Load textures");
	1449	+ toggleTextureCB.addItemListener(this);
	1450	+
	1451	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1452	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1453	+ toggleSwitchCB.addItemListener(this);
	1454	+
	1455	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1456	+ autokeepCB.setToolTipText("On structure change");
	1457	+ autokeepCB.addItemListener(this);
	1458	+
	1459	+ panel.Return();
	1460	+ if (Globals.ADVANCED)
	1461	+ {
792	1462	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
793	1463	lookAtCB.setToolTipText("Look-at target");
794	1464	lookAtCB.addItemListener(this);
	1465	+ }
795	1466
796	1467	}
797	1468
798	1469	cGridBag fill = new cGridBag();
799		-
800	1470	fill.preferredHeight = 200;
	1471	+ cGridBag fill2 = new cGridBag();
	1472	+ fill2.preferredHeight = 200;
	1473	+ cGridBag fill3 = new cGridBag();
	1474	+ fill3.preferredHeight = 200;
801	1475
802	1476	panel.add(fill);
	1477	+ panel.add(fill2);
	1478	+ panel.add(fill3);
803	1479
804	1480	}
805	1481
806	1482	void EditObject(Object3D obj)
807	1483	{
	1484	+ assert(obj instanceof Composite);
	1485	+
	1486	+// if (obj.versionlist == null)
	1487	+// {
	1488	+// obj.versionlist = new Object3D[100];
	1489	+// obj.versionindex = -1;
	1490	+// }
	1491	+
808	1492	cRadio radioButton = new cRadio(obj.name);
	1493	+
	1494	+ // June 2019. Patch to avoid bug with transparency.
	1495	+ radioButton.hadMaterial = obj.material != null;
	1496	+ if (!radioButton.hadMaterial)
	1497	+ {
	1498	+ obj.material = new cMaterial();
	1499	+ }
	1500	+
809	1501	radioButton.SetObject(obj);
810		- radioButton.layout = sevenButton;
	1502	+ radioButton.layout = threeButton; // sixButton;
811	1503	radioButton.SetCamera(cameraView.renderCamera, false);
812	1504	radioButton.addActionListener(this);
813	1505	radioPanel.add(radioButton);
..	..	@@ -817,31 +1509,41 @@
817	1509
818	1510	void SetupViews(ObjEditor oe)
819	1511	{
	1512	+ theFrame = this;
	1513	+
820	1514	oe.SetupViews();
821	1515
	1516	+ if (Globals.DEBUG)
822	1517	System.out.println("SetupViews");
823	1518	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
824	1519	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
825	1520	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
826	1521	}
827	1522
828		- JCheckBox liveCB;
829		- JCheckBox supportCB;
830		- JCheckBox localCB;
831		- JCheckBox crowdCB;
832		- JCheckBox smoothCB;
833		- JCheckBox fastCB;
834		- JCheckBox slowCB;
835		- JCheckBox boxCB;
836		- JCheckBox zoomBoxCB;
837		- JCheckBox trackCB;
838		- JCheckBox smoothfocusCB;
	1523	+ cToggleButton liveCB;
	1524	+ cCheckBox supportCB;
	1525	+ cCheckBox localCB;
	1526	+ cCheckBox crowdCB;
	1527	+ cCheckBox smoothCB;
	1528	+ cCheckBox minshaderCB;
	1529	+
	1530	+ cToggleButton fastCB;
	1531	+ cCheckBox slowCB;
	1532	+ cCheckBox boxCB;
	1533	+ cCheckBox zoomBoxCB;
	1534	+ cCheckBox freezeCB;
	1535	+ //cToggleButton trackCB;
	1536	+ cCheckBox trackCB;
	1537	+ cCheckBox smoothfocusCB;
839	1538	// JCheckBox speakerMocapCB;
840		- JCheckBox speakerCameraCB;
841		- JCheckBox speakerFocusCB;
842		- JCheckBox debugCB;
843		- JCheckBox oeilCB;
844		- JCheckBox lookAtCB;
	1539	+ cCheckBox speakerCameraCB;
	1540	+ cCheckBox speakerFocusCB;
	1541	+ cCheckBox debugCB;
	1542	+
	1543	+ cCheckBox oeilCB;
	1544	+ cCheckBox shadowCB;
	1545	+ cCheckBox autokeepCB;
	1546	+ cCheckBox lookAtCB;
845	1547
846	1548	// static int COLOR = 1;
847	1549	// static int MATERIAL = 2;
..	..	@@ -849,9 +1551,9 @@
849	1551
850	1552	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
851	1553
852		- JCheckBox colorCB;
853		- JCheckBox materialCB;
854		- JCheckBox textureCB;
	1554	+ cCheckBox colorCB;
	1555	+ cCheckBox materialCB;
	1556	+ cCheckBox textureCB;
855	1557
856	1558	public void itemStateChanged(ItemEvent e)
857	1559	{
..	..	@@ -895,6 +1597,12 @@
895	1597	{
896	1598	cameraView.ToggleInertia();
897	1599	cameraView.repaint();
	1600	+ }
	1601	+ else if(e.getSource() == minshaderCB)
	1602	+ {
	1603	+ Globals.MINSHADER ^= true;
	1604	+ cameraView.programInitialized = false;
	1605	+ cameraView.repaint();
898	1606	}
899	1607	else if(e.getSource() == localCB)
900	1608	{
..	..	@@ -944,6 +1652,18 @@
944	1652	{
945	1653	cameraView.ToggleOeil();
946	1654	}
	1655	+ else if(e.getSource() == shadowCB)
	1656	+ {
	1657	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1658	+ }
	1659	+ else if(e.getSource() == freezeCB)
	1660	+ {
	1661	+ Globals.FREEZEONMOVE ^= true;
	1662	+ }
	1663	+ else if(e.getSource() == autokeepCB)
	1664	+ {
	1665	+ Globals.REPLACEONMAKE ^= true;
	1666	+ }
947	1667	else if(e.getSource() == lookAtCB)
948	1668	{
949	1669	cameraView.ToggleLookAt();
..	..	@@ -960,7 +1680,8 @@
960	1680
961	1681	/**/
962	1682	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
963		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1683	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1684	+ TreePath path = objEditor.jTree.getSelectionPath();
964	1685	if ((path == null) \|\| (path.getPathCount() <= 1)) {
965	1686	// We can't move the root node or an empty selection
966	1687	return;
..	..	@@ -1023,8 +1744,6 @@
1023	1744	}
1024	1745	}
1025	1746
1026		- String string = (String) object;
1027		-
1028	1747	System.out.println("Transfer = " + object + "; drop : " + target);
1029	1748	// if( object instanceof java.io.File[])
1030	1749	// {
..	..	@@ -1032,6 +1751,8 @@
1032	1751	// objEditor.DropFile((java.io.File[]) object, true);
1033	1752	// return;
1034	1753	// }
	1754	+
	1755	+ String string = object.toString();
1035	1756
1036	1757	// File path for Mac and Windows
1037	1758	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1077,23 +1798,33 @@
1077	1798
1078	1799	assert target == objEditor.jTree;
1079	1800	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1801	+ Object3D destinationLeaf;
1080	1802	try {
1081		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1803	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1082	1804	} catch (Exception e) {
1083	1805	System.out.println("destinationPath : " + destinationPath);
1084	1806	return;
1085	1807	}
1086	1808
1087		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1809	+ for (int i=group.selection.size(); --i>=0;)
1088	1810	{
	1811	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1812	+
	1813	+ // Cannot move into itself
	1814	+ if (child == destinationLeaf)
	1815	+ return;
	1816	+ }
	1817	+
	1818	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1819	+// {
1089	1820	loadClipboard(true);
1090	1821	objEditor.jTree.setSelectionPath(destinationPath);
1091	1822	pasteInto(false, false);
1092		- } else {
1093		- loadClipboard(false);
1094		- objEditor.jTree.setSelectionPath(destinationPath);
1095		- pasteInto(false, false); // true); // ???
1096		- }
	1823	+// } else {
	1824	+// loadClipboard(false);
	1825	+// objEditor.jTree.setSelectionPath(destinationPath);
	1826	+// pasteInto(false, false); // true); // ???
	1827	+// }
1097	1828	}
1098	1829	public void dropActionChanged(DropTargetDragEvent dtde)
1099	1830	// Called if the user has modified the current drop gesture
..	..	@@ -1149,7 +1880,12 @@
1149	1880	TreePath path;
1150	1881
1151	1882	public TransferableTreePath(TreePath tp) {
1152		- path = tp;
	1883	+ Object[] objs = new Object[tp.getPathCount()];
	1884	+ for (int i=0; i<objs.length; i++)
	1885	+ {
	1886	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1887	+ }
	1888	+ path = new TreePath(objs);
1153	1889	}
1154	1890
1155	1891	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1198,22 +1934,30 @@
1198	1934	{
1199	1935	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1200	1936	//heightFieldItem.addActionListener(this);
1201		- gridItem = menu.add(new MenuItem("Grid"));
1202		- gridItem.addActionListener(this);
1203		- rectoidItem = menu.add(new MenuItem("Box"));
1204		- rectoidItem.addActionListener(this);
1205		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1206		- ellipsoidItem.addActionListener(this);
1207		- coneItem = menu.add(new MenuItem("Cone"));
1208		- coneItem.addActionListener(this);
1209		- torusItem = menu.add(new MenuItem("Torus"));
1210		- torusItem.addActionListener(this);
1211		- superItem = menu.add(new MenuItem("Superellipsoid"));
1212		- superItem.addActionListener(this);
	1937	+// gridItem = menu.add(new MenuItem("Grid"));
	1938	+// gridItem.addActionListener(this);
	1939	+// rectoidItem = menu.add(new MenuItem("Box"));
	1940	+// rectoidItem.addActionListener(this);
	1941	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1942	+// ellipsoidItem.addActionListener(this);
	1943	+// coneItem = menu.add(new MenuItem("Cone"));
	1944	+// coneItem.addActionListener(this);
	1945	+// torusItem = menu.add(new MenuItem("Torus"));
	1946	+// torusItem.addActionListener(this);
	1947	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1948	+// superItem.addActionListener(this);
	1949	+
	1950	+ cameraItem = menu.add(new MenuItem("Camera"));
	1951	+ cameraItem.addActionListener(this);
	1952	+
	1953	+ if (!Globals.ADVANCED)
	1954	+ {
1213	1955	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1214	1956	kleinItem.addActionListener(this);
1215		- particleItem = menu.add(new MenuItem("Particle system"));
1216		- particleItem.addActionListener(this);
	1957	+ }
	1958	+
	1959	+// particleItem = menu.add(new MenuItem("Particle system"));
	1960	+// particleItem.addActionListener(this);
1217	1961	if (Globals.ADVANCED)
1218	1962	{
1219	1963	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1239,15 +1983,15 @@
1239	1983	}
1240	1984	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1241	1985	bezierItem.addActionListener(this);
1242		- overlayItem = menu.add(new MenuItem("Overlay"));
1243		- overlayItem.addActionListener(this);
1244		- lightItem = menu.add(new MenuItem("Light"));
1245		- lightItem.addActionListener(this);
	1986	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1987	+// overlayItem.addActionListener(this);
	1988	+// lightItem = menu.add(new MenuItem("Light"));
	1989	+// lightItem.addActionListener(this);
1246	1990	menu.add("-");
1247	1991	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1248	1992	//superLoopItem.addActionListener(this);
1249		- loopItem = menu.add(new MenuItem("Loop"));
1250		- loopItem.addActionListener(this);
	1993	+// loopItem = menu.add(new MenuItem("Loop"));
	1994	+// loopItem.addActionListener(this);
1251	1995	doubleItem = menu.add(new MenuItem("Fork"));
1252	1996	doubleItem.addActionListener(this);
1253	1997	if (Globals.ADVANCED)
..	..	@@ -1263,6 +2007,9 @@
1263	2007	animationItem.addItemListener(this);
1264	2008	animationItem.setState(Globals.ANIMATION);
1265	2009
	2010	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2011	+ archiveItem.addActionListener(this);
	2012	+
1266	2013	menu.add("-");
1267	2014	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1268	2015	parseverticesItem.addActionListener(this);
..	..	@@ -1275,6 +2022,8 @@
1275	2022	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1276	2023	reduce34MorphItem.addActionListener(this);
1277	2024	menu.add("-");
	2025	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2026	+ memoryItem.addActionListener(this);
1278	2027	menu.add(computeAOItem = new MenuItem("Compute AO"));
1279	2028	computeAOItem.addActionListener(this);
1280	2029
..	..	@@ -1283,8 +2032,6 @@
1283	2032	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1284	2033	mirrorItem.addActionListener(this);
1285	2034	menu.add("-");
1286		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1287		- memoryItem.addActionListener(this);
1288	2035	menu.add(analyzeItem = new MenuItem("Analyze"));
1289	2036	analyzeItem.addActionListener(this);
1290	2037	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1428,9 +2175,38 @@
1428	2175	shadow.material = new cMaterial(obj.material);
1429	2176	shadow.material.diffuse = 0.0001f;
1430	2177	shadow.material.specular = 0.0001f;
	2178	+ shadow.material.opacity = 0.75f;
	2179	+
	2180	+ AllocProjectedVertices(shadow);
	2181	+
	2182	+ shadow.projectedVertices[1].x = 300;
1431	2183
1432	2184	makeSomething(shadow);
1433	2185	}
	2186	+
	2187	+ private void ClearUnpinned()
	2188	+ {
	2189	+ //for (Object3D obj : listUI)
	2190	+ for (int i=listUI.size(); --i>=0;)
	2191	+ {
	2192	+ Object3D obj = listUI.elementAt(i);
	2193	+ if (!obj.pinned)
	2194	+ {
	2195	+ obj.CloseUI();
	2196	+ listUI.remove(i);
	2197	+ }
	2198	+ }
	2199	+ }
	2200	+
	2201	+ private void EditElement(Object3D elem, boolean newWindow)
	2202	+ {
	2203	+ // if (!(elem instanceof Composite))
	2204	+ // newWindow = false;
	2205	+ listUI.add(elem);
	2206	+ elem.openEditWindow(this, newWindow); //, false);
	2207	+ System.out.println("edit : " + elem);
	2208	+ elem.editWindow.refreshContents(true); // ? new
	2209	+ }
1434	2210
1435	2211	/**
1436	2212	* applyExample
..	..	@@ -1675,7 +2451,7 @@
1675	2451	{
1676	2452	ScreenFit();
1677	2453	} else
1678		- if (source == switchItem)
	2454	+ if (source == switchViewItem)
1679	2455	{
1680	2456	cVector v1 = new cVector();
1681	2457	cVector v2 = new cVector();
..	..	@@ -1684,11 +2460,11 @@
1684	2460	objEditor.cameraView.renderCamera.setAim(v2, v1);
1685	2461	objEditor.cameraView.repaint();
1686	2462	} else
1687		- if (source == rectoidItem)
	2463	+ if (source == rectoidItem \|\| source == boxButton)
1688	2464	{
1689	2465	makeSomething(new Box());
1690	2466	} else
1691		- if (source == particleItem)
	2467	+ if (source == particleItem \|\| source == particlesButton)
1692	2468	{
1693	2469	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1694	2470	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1767,27 +2543,27 @@
1767	2543
1768	2544	makeSomething(obj);
1769	2545	} else
1770		- if (source == gridItem)
	2546	+ if (source == gridItem \|\| source == gridButton)
1771	2547	{
1772	2548	makeSomething(new Grid());
1773	2549	} else
1774		- if (source == ellipsoidItem)
	2550	+ if (source == ellipsoidItem \|\| source == sphereButton)
1775	2551	{
1776	2552	makeSomething(new Sphere());
1777	2553	} else
1778		- if (source == coneItem)
	2554	+ if (source == coneItem \|\| source == coneButton)
1779	2555	{
1780	2556	makeSomething(new Cone());
1781	2557	} else
1782		- if (source == torusItem)
	2558	+ if (source == torusItem \|\| source == torusButton)
1783	2559	{
1784	2560	makeSomething(new Torus());
1785	2561	} else
1786		- if (source == superItem)
	2562	+ if (source == superItem \|\| source == superButton)
1787	2563	{
1788	2564	makeSomething(new Superellipsoid());
1789	2565	} else
1790		- if (source == kleinItem)
	2566	+ if (source == kleinItem \|\| source == kleinButton)
1791	2567	{
1792	2568	makeSomething(new Klein());
1793	2569	} else
..	..	@@ -1807,7 +2583,7 @@
1807	2583	{
1808	2584	makeSomething(new BezierSurface());
1809	2585	} else
1810		- if (source == overlayItem)
	2586	+ if (source == overlayItem \|\| source == overlayButton)
1811	2587	{
1812	2588	/*
1813	2589	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1855,10 +2631,27 @@
1855	2631	s.setup();
1856	2632	makeSomething(s);
1857	2633	} else
1858		- if (source == lightItem)
	2634	+ if (source == lightItem \|\| source == lightButton)
1859	2635	{
1860	2636	makeSomething(new Light());
1861	2637	} else
	2638	+// if (source == skybox1Button \|\|
	2639	+// source == skybox2Button \|\|
	2640	+// source == skybox3Button \|\|
	2641	+// source == skybox4Button \|\|
	2642	+// source == skybox5Button \|\|
	2643	+// source == skybox6Button \|\|
	2644	+// source == skybox7Button \|\|
	2645	+// source == skybox11Button \|\|
	2646	+// source == skybox12Button \|\|
	2647	+// source == skybox13Button \|\|
	2648	+// source == skybox14Button \|\|
	2649	+// source == skybox15Button \|\|
	2650	+// source == skybox16Button \|\|
	2651	+// source == skybox17Button)
	2652	+// {
	2653	+// ChangeSkybox(source);
	2654	+// } else
1862	2655	if (source == csgItem)
1863	2656	{
1864	2657	group(new CSG());
..	..	@@ -1905,30 +2698,38 @@
1905	2698
1906	2699	group(g);
1907	2700	} else
1908		- if (source == loopItem)
	2701	+ if (source == loopItem \|\| source == loopButton)
1909	2702	{
	2703	+ if (!group.selection.isEmpty())
	2704	+ {
1910	2705	Composite csg = new GroupLeaf();
1911	2706	csg.count = 5;
1912		- group(csg);
1913		- Composite child = new cGroup();
	2707	+ Composite child = new cGroup("Branch");
1914	2708	csg.addChild(child);
1915	2709	child.addChild(csg);
	2710	+ group(csg);
	2711	+ }
1916	2712	} else
1917	2713	if (source == doubleItem)
1918	2714	{
1919		- Composite csg = new GroupLeaf();
	2715	+ if (!group.selection.isEmpty())
	2716	+ {
	2717	+ Composite csg = new GroupLeaf("Fork");
1920	2718	csg.count = 5;
	2719	+ Composite child = new cGroup("Branch A");
	2720	+ csg.addChild(child);
	2721	+ child.addChild(csg);
	2722	+ child = new cGroup("Branch B");
	2723	+ csg.addChild(child);
	2724	+ child.addChild(csg);
1921	2725	group(csg);
1922		- Composite child = new cGroup();
1923		- csg.addChild(child);
1924		- child.addChild(csg);
1925		- child = new cGroup();
1926		- csg.addChild(child);
1927		- child.addChild(csg);
	2726	+ }
1928	2727	} else
1929	2728	if (source == tripleItem)
1930	2729	{
1931		- Composite csg = new GroupLeaf();
	2730	+ if (!group.selection.isEmpty())
	2731	+ {
	2732	+ Composite csg = new GroupLeaf("Trident");
1932	2733	csg.count = 4;
1933	2734	group(csg);
1934	2735	Composite child = new cGroup();
..	..	@@ -1940,11 +2741,12 @@
1940	2741	child = new cGroup();
1941	2742	csg.addChild(child);
1942	2743	child.addChild(csg);
	2744	+ }
1943	2745	} else
1944	2746	if (source == computeAOItem)
1945	2747	{
1946	2748	Globals.drawMode = CameraPane.OCCLUSION;
1947		- Globals.theRenderer.repaint();
	2749	+ cameraView.repaint();
1948	2750	} else
1949	2751	if (source == recompileItem)
1950	2752	{
..	..	@@ -1959,7 +2761,7 @@
1959	2761	if (source == invariantsItem)
1960	2762	{
1961	2763	System.out.println("Invariants:");
1962		- Grafreed.grafreeD.universe.invariants();
	2764	+ Grafreed.grafreed.universe.invariants();
1963	2765	} else
1964	2766	if (source == memoryItem)
1965	2767	{
..	..	@@ -1978,17 +2780,64 @@
1978	2780	{
1979	2781	DumpObject();
1980	2782	} else
1981		- if (source == undoButton)
	2783	+ if (source == minButton)
1982	2784	{
1983		- Undo();
	2785	+ Minimize();
1984	2786	} else
1985		- if (source == redoButton)
	2787	+ if (source == maxButton)
1986	2788	{
1987		- Redo();
	2789	+ Maximize();
1988	2790	} else
1989		- if (source == saveButton)
	2791	+ if (source == fullButton)
1990	2792	{
1991		- Save();
	2793	+ ToggleFullScreen();
	2794	+ } else
	2795	+ if (source == collapseButton)
	2796	+ {
	2797	+ this.expandedLayout = radio.layout;
	2798	+ CollapseToolbar();
	2799	+ } else
	2800	+ if (source == maximize3DButton)
	2801	+ {
	2802	+ this.expandedLayout = radio.layout;
	2803	+ radio.layout = twoButton;
	2804	+ Show3DView();
	2805	+ CollapseToolbar();
	2806	+ } else
	2807	+ if (source == previousVersionButton)
	2808	+ {
	2809	+ // Go to previous version
	2810	+ //if (!Undo())
	2811	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2812	+ PreviousVersion();
	2813	+ } else
	2814	+ if (source == restoreButton)
	2815	+ {
	2816	+ // Restore current version
	2817	+ Restore();
	2818	+ //restoreButton.setEnabled(false);
	2819	+ } else
	2820	+ if (source == replaceButton)
	2821	+ {
	2822	+ // Overwrite current version
	2823	+ Replace();
	2824	+ //replaceButton.setEnabled(false);
	2825	+ } else
	2826	+ if (source == nextVersionButton)
	2827	+ {
	2828	+ // Go to next version
	2829	+ NextVersion();
	2830	+ } else
	2831	+ if (source == saveVersionButton)
	2832	+ {
	2833	+ // Save a new version
	2834	+ if (!Save(true))
	2835	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2836	+ } else
	2837	+ if (source == deleteVersionButton)
	2838	+ {
	2839	+ // Delete a new version
	2840	+ DeleteVersion();
1992	2841	} else
1993	2842	if (source == oneStepButton)
1994	2843	{
..	..	@@ -1997,17 +2846,14 @@
1997	2846	} else
1998	2847	if (source == screenfitButton)
1999	2848	{
2000		- //Reload(lastConverter, lastFilename, true);
2001	2849	ScreenFit();
2002	2850	} else
2003	2851	if (source == screenfitpointButton)
2004	2852	{
2005		- //Reload(lastConverter, lastFilename, true);
2006	2853	ScreenFitPoint();
2007	2854	} else
2008	2855	if (source == snapobjectButton)
2009	2856	{
2010		- //Reload(lastConverter, lastFilename, true);
2011	2857	SnapObject();
2012	2858	} else
2013	2859	// if (event.getSource() == recompileButton)
..	..	@@ -2046,11 +2892,11 @@
2046	2892	} else
2047	2893	if (source == undoItem)
2048	2894	{
2049		- Undo();
	2895	+ PreviousVersion();
2050	2896	} else
2051	2897	if (source == redoItem)
2052	2898	{
2053		- Redo();
	2899	+ NextVersion();
2054	2900	} else
2055	2901	if (source == duplicateItem)
2056	2902	{
..	..	@@ -2371,7 +3217,7 @@
2371	3217	{
2372	3218	StepAll();
2373	3219	} else
2374		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3220	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2375	3221	{
2376	3222	//int indices[] = jList.getSelectedIndices();
2377	3223	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2383,9 +3229,9 @@
2383	3229	{
2384	3230	ClearSelection(true);
2385	3231	} else
2386		- if (source == grabItem)
	3232	+ if (source == grabItem \|\| source == groupButton)
2387	3233	{
2388		- group(new cGroup(), true);
	3234	+ group(new cGroup(), false); // true);
2389	3235	} else
2390	3236	if (source == hideItem)
2391	3237	{
..	..	@@ -2403,11 +3249,11 @@
2403	3249	{
2404	3250	makeSomething(new Camera());
2405	3251	} else
2406		- if (source == compositeItem)
	3252	+ if (source == compositeItem \|\| source == compositeButton)
2407	3253	{
2408	3254	group(new Composite());
2409	3255	} else
2410		- if (source == randomItem)
	3256	+ if (source == switchItem \|\| source == switchButton)
2411	3257	{
2412	3258	RandomNode random = new RandomNode();
2413	3259	group(random);
..	..	@@ -2509,7 +3355,7 @@
2509	3355	{
2510	3356	group(new cLinker());
2511	3357	} else
2512		- if (source == textureItem)
	3358	+ if (source == textureItem \|\| source == textureButton)
2513	3359	{
2514	3360	group(new TextureNode());
2515	3361	} else
..	..	@@ -2529,17 +3375,42 @@
2529	3375	{
2530	3376	CastShadow(2);
2531	3377	} else
2532		- if (source == ungroupItem)
	3378	+ if (source == ungroupItem \|\| source == ungroupButton)
2533	3379	{
2534		- //ungroup();
	3380	+ boolean canUngroup = true;
	3381	+
2535	3382	for (int i=0; i<group.selection.size(); i++)
2536	3383	{
2537		- Ungroup(group.selection.get(i));
	3384	+ Object3D selectedItem = group.selection.get(i);
	3385	+
	3386	+ if (selectedItem.Size() == 0)
	3387	+ {
	3388	+ // Cannot ungroup leaves
	3389	+ canUngroup = false;
	3390	+ break;
	3391	+ }
	3392	+
	3393	+ if (selectedItem == group)
	3394	+ {
	3395	+ // Cannot ungroup root
	3396	+ canUngroup = false;
	3397	+ break;
	3398	+ }
2538	3399	}
2539	3400
2540		- ClearSelection(false);
2541		-
2542		- refreshContents();
	3401	+ if (canUngroup)
	3402	+ {
	3403	+ for (int i=0; i<group.selection.size(); i++)
	3404	+ {
	3405	+ Object3D selectedItem = group.selection.get(i);
	3406	+
	3407	+ Ungroup(selectedItem);
	3408	+ }
	3409	+
	3410	+ ClearSelection(false);
	3411	+
	3412	+ refreshContents();
	3413	+ }
2543	3414	} else
2544	3415	if (source == genUVItem)
2545	3416	{
..	..	@@ -2840,7 +3711,7 @@
2840	3711	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2841	3712	{
2842	3713	obj = (Object3D)e.nextElement();
2843		- obj.SetBumpTexture(null);
	3714	+ obj.ResetBumpTexture();
2844	3715	}
2845	3716
2846	3717	refreshContents();
..	..	@@ -2856,6 +3727,31 @@
2856	3727
2857	3728	refreshContents();
2858	3729	} else
	3730	+ if (source == embedTexturesItem)
	3731	+ {
	3732	+ Object3D obj;
	3733	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3734	+ {
	3735	+ obj = (Object3D)e.nextElement();
	3736	+ obj.EmbedTextures(true);
	3737	+ }
	3738	+
	3739	+ refreshContents();
	3740	+ } else
	3741	+ if (source == deEmbedTexturesItem)
	3742	+ {
	3743	+ Object3D obj;
	3744	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3745	+ {
	3746	+ obj = (Object3D)e.nextElement();
	3747	+ obj.EmbedTextures(false);
	3748	+ }
	3749	+
	3750	+ CameraPane.texturepigment.clear();
	3751	+ CameraPane.texturebump.clear();
	3752	+
	3753	+ refreshContents();
	3754	+ } else
2859	3755	if (source == flashSelectionButton)
2860	3756	{
2861	3757	CameraPane.flash = true;
..	..	@@ -2867,42 +3763,36 @@
2867	3763	if (source == twoButton)
2868	3764	{
2869	3765	radio.layout = twoButton;
2870		- // bug
2871		- //gridPanel.setDividerLocation(1.0);
2872		- //bigPanel.setDividerLocation(0.0);
2873		-// bigThree.remove(scenePanel);
2874		-// bigThree.remove(centralPanel);
2875		-// bigThree.remove(XYZPanel);
2876		-// aWindowConstraints.gridx = 0;
2877		-// aWindowConstraints.gridy = 0;
2878		-// aWindowConstraints.gridwidth = 1;
2879		-// // aConstraints.gridheight = 3;
2880		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2881		-// aWindowConstraints.weightx = 0;
2882		-// aWindowConstraints.weighty = 1;
2883		-// //bigThree.add(jtp, aWindowConstraints);
2884		-// aWindowConstraints.weightx = 1;
2885		-// aWindowConstraints.gridwidth = 3;
2886		-// // aConstraints.gridheight = 3;
2887		-// aWindowConstraints.gridx = 1;
2888		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2889		-// bigThree.add(centralPanel, aWindowConstraints);
2890		-// aWindowConstraints.weightx = 0;
2891		-// aWindowConstraints.gridx = 4;
2892		-// aWindowConstraints.gridwidth = 1;
2893		-// // aConstraints.gridheight = 3;
2894		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2895		-// //bigThree.add(XYZPanel, aWindowConstraints);
2896		-// scenePanel.setVisible(false);
2897		-// centralPanel.setVisible(true);
2898		-// XYZPanel.setVisible(false);
2899		- bigThree.ClearUI();
2900		- bigThree.add(centralPanel);
2901		- bigThree.FlushUI();
	3766	+
	3767	+ if (CameraPane.FULLSCREEN)
	3768	+ fullscreenLayout = radio.layout;
	3769	+
	3770	+ Show3DView();
	3771	+
	3772	+ cameraView.requestFocusInWindow();
	3773	+
	3774	+// refreshContents(true);
	3775	+//
	3776	+// try
	3777	+// {
	3778	+// java.awt.Robot bot = new java.awt.Robot();
	3779	+// int mask = InputEvent.BUTTON1_MASK;
	3780	+// bot.mouseMove(100, 100);
	3781	+// bot.mousePress(mask);
	3782	+// bot.mouseRelease(mask);
	3783	+// }
	3784	+// catch (Exception e)
	3785	+// {
	3786	+//
	3787	+// }
	3788	+
2902	3789	} else
2903	3790	if (source == threeButton)
2904	3791	{
2905	3792	radio.layout = threeButton;
	3793	+
	3794	+ if (CameraPane.FULLSCREEN)
	3795	+ fullscreenLayout = radio.layout;
2906	3796
2907	3797	// bigThree.remove(scenePanel);
2908	3798	// bigThree.remove(centralPanel);
..	..	@@ -2932,13 +3822,18 @@
2932	3822	// centralPanel.setVisible(true);
2933	3823	// XYZPanel.setVisible(true);
2934	3824	bigThree.ClearUI();
	3825	+ bigThree.add(scenePanel);
2935	3826	bigThree.add(centralPanel);
2936		- bigThree.add(XYZPanel);
2937	3827	bigThree.FlushUI();
	3828	+
	3829	+ cameraView.requestFocusInWindow();
2938	3830	} else
2939	3831	if (source == fourButton)
2940	3832	{
2941	3833	radio.layout = fourButton;
	3834	+
	3835	+ if (CameraPane.FULLSCREEN)
	3836	+ fullscreenLayout = radio.layout;
2942	3837
2943	3838	// bigThree.remove(scenePanel);
2944	3839	// bigThree.remove(centralPanel);
..	..	@@ -2970,10 +3865,15 @@
2970	3865	bigThree.ClearUI();
2971	3866	bigThree.add(scenePanel);
2972	3867	bigThree.FlushUI();
	3868	+
	3869	+ cameraView.requestFocusInWindow();
2973	3870	} else
2974	3871	if (source == sixButton)
2975	3872	{
2976	3873	radio.layout = sixButton;
	3874	+
	3875	+ if (CameraPane.FULLSCREEN)
	3876	+ fullscreenLayout = radio.layout;
2977	3877
2978	3878	// bigThree.remove(scenePanel);
2979	3879	// bigThree.remove(centralPanel);
..	..	@@ -3003,13 +3903,18 @@
3003	3903	// centralPanel.setVisible(true);
3004	3904	// XYZPanel.setVisible(false);
3005	3905	bigThree.ClearUI();
3006		- bigThree.add(scenePanel);
3007	3906	bigThree.add(centralPanel);
	3907	+ bigThree.add(scenePanel);
3008	3908	bigThree.FlushUI();
	3909	+
	3910	+ cameraView.requestFocusInWindow();
3009	3911	} else
3010	3912	if (source == sevenButton)
3011	3913	{
3012	3914	radio.layout = sevenButton;
	3915	+
	3916	+ if (CameraPane.FULLSCREEN)
	3917	+ fullscreenLayout = radio.layout;
3013	3918
3014	3919	// bigThree.remove(scenePanel);
3015	3920	// bigThree.remove(centralPanel);
..	..	@@ -3043,9 +3948,12 @@
3043	3948	bigThree.add(centralPanel);
3044	3949	bigThree.add(XYZPanel);
3045	3950	bigThree.FlushUI();
	3951	+
	3952	+ cameraView.requestFocusInWindow();
3046	3953	} else
3047	3954	if (source == rootButton)
3048	3955	{
	3956	+ Replace();
3049	3957	Object3D obj;
3050	3958	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3051	3959	{
..	..	@@ -3054,6 +3962,7 @@
3054	3962	EditObject(obj);
3055	3963	}
3056	3964
	3965	+ cameraView.requestFocusInWindow();
3057	3966	refreshContents(true);
3058	3967	} else
3059	3968	if (source == closeButton)
..	..	@@ -3063,22 +3972,37 @@
3063	3972	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3064	3973	{
3065	3974	ab = (cRadio)e.nextElement();
3066		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3975	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3067	3976	{
	3977	+ // Patch to avoid bug with transparency.
	3978	+ if (!ab.hadMaterial)
	3979	+ {
	3980	+ ab.object.material = null;
	3981	+ }
	3982	+
3068	3983	buttonGroup.remove(ab);
3069	3984	radioPanel.remove(ab);
3070	3985
3071		- ab.GetObject().editWindow = null;
	3986	+ //ab.GetObject().editWindow = null;
	3987	+ ab.GetObject().manipWindow = null;
3072	3988	// ab.GetObject().objectUI = null; // ?????????
3073	3989
3074	3990	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3075	3991	break;
3076	3992	}
3077	3993	}
	3994	+
	3995	+ cameraView.requestFocusInWindow();
3078	3996	refreshContents(true);
3079	3997	} else
3080	3998	if (source == editItem \|\| source == editButton)
3081	3999	{
	4000	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4001	+ {
	4002	+ Object3D child = (Object3D)e.nextElement();
	4003	+ child.pinned = true;
	4004	+ }
	4005	+
3082	4006	EditSelection(false);
3083	4007	} else
3084	4008	if (source == uneditButton)
..	..	@@ -3087,9 +4011,10 @@
3087	4011	{
3088	4012	Object3D child = (Object3D)e.nextElement();
3089	4013	if(child.editWindow != null)
3090		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4014	+ child.pinned = false;
3091	4015	child.CloseUI();
3092	4016	listUI.remove(child);
	4017	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3093	4018
3094	4019	//child.editWindow = null; // ???????????
3095	4020	}
..	..	@@ -3104,16 +4029,18 @@
3104	4029	//copy.ClearUI();
3105	4030	for (Object3D obj : listUI)
3106	4031	{
	4032	+ obj.pinned = false;
3107	4033	obj.CloseUI();
3108	4034	}
3109	4035	listUI.clear();
	4036	+ SetPinStates(group.selection.size() > 0);
3110	4037	refreshContents(true);
3111	4038	} else
3112	4039	if (source == allParamsButton)
3113	4040	{
3114	4041	assert(copy == group);
3115	4042
3116		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4043	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3117	4044
3118	4045	for (Object3D obj : listUI)
3119	4046	{
..	..	@@ -3162,6 +4089,7 @@
3162	4089	}
3163	4090
3164	4091	copy = group;
	4092	+
3165	4093	//Globals.theRenderer.object = group;
3166	4094	if(!useclient)
3167	4095	{
..	..	@@ -3179,7 +4107,8 @@
3179	4107	}
3180	4108
3181	4109	// fix "+" issue
3182		- group.editWindow = this;
	4110	+ //group.editWindow = this;
	4111	+ group.manipWindow = this;
3183	4112
3184	4113	/*
3185	4114	currentLayout = radio.layout;
..	..	@@ -3187,20 +4116,47 @@
3187	4116	currentLayout = sevenButton;
3188	4117	*/
3189	4118	radio.layout.doClick();
	4119	+
	4120	+ assert(copy instanceof Composite);
	4121	+
	4122	+ if (copy.versionlist == null)
	4123	+ {
	4124	+ copy.versionlist = new Object3D[100];
	4125	+ copy.versionindex = -1;
	4126	+
	4127	+ // Cannot work with loops
	4128	+ // To fix this issue, first mark all nodes above the root,
	4129	+ // and check if any of these nodes are reachable below the root.
	4130	+ //Save(true);
	4131	+ }
	4132	+
	4133	+ SetVersionStates();
	4134	+
	4135	+ ClearUnpinned();
	4136	+
	4137	+ //Grafreed.Assert(group != null);
	4138	+ //Grafreed.Assert(group.selection != null);
	4139	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4140	+ if (group.selection == null \|\| group.selection.size() == 1)
	4141	+ EditSelection(false);
3190	4142	keepparent = group.parent;
3191	4143	// PARENT = NULL or not???
3192	4144	//group.parent = null; // ROOT
3193	4145	//group.attributes = -1;
3194	4146	ResetModel();
	4147	+
	4148	+ cameraView.requestFocusInWindow();
3195	4149	refreshContents(true);
3196	4150	} else if (event.getSource() == editCameraItem)
3197	4151	{
3198	4152	cameraView.ProtectCamera();
	4153	+ cameraView.requestFocusInWindow();
3199	4154	cameraView.repaint();
3200	4155	return;
3201		- } else if (event.getSource() == revertCameraItem)
	4156	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3202	4157	{
3203	4158	cameraView.RevertCamera();
	4159	+ cameraView.requestFocusInWindow();
3204	4160	cameraView.repaint();
3205	4161	return;
3206	4162	// } else if (event.getSource() == textureButton)
..	..	@@ -3215,7 +4171,6 @@
3215	4171	}
3216	4172
3217	4173	boolean useclient = false;
3218		- cRadio radio;
3219	4174
3220	4175	void ToggleRoot()
3221	4176	{
..	..	@@ -3778,7 +4733,7 @@
3778	4733
3779	4734	try
3780	4735	{
3781		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4736	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3782	4737	}
3783	4738	catch (Exception e)
3784	4739	{
..	..	@@ -4253,28 +5208,25 @@
4253	5208	// }
4254	5209	// }
4255	5210
4256		- static boolean allparams = true;
4257		-
4258		- static Vector<Object3D> listUI = new Vector<Object3D>();
4259		-
4260	5211	void EditSelection(boolean newWindow)
4261	5212	{
	5213	+ if (group.selection == null)
	5214	+ {
	5215	+ EditElement(group, newWindow); // ? new
	5216	+ return;
	5217	+ }
	5218	+
4262	5219	// aConstraints.gridy = 0;
4263	5220	for (int i=0; i<group.selection.size(); i++)
4264	5221	{
4265	5222	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4266	5223	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4267		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5224	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4268	5225
4269	5226	Object3D elem = (Object3D)group.selection.elementAt(i);
4270	5227	if(elem != group \|\| !newWindow)
4271	5228	{
4272		- // if (!(elem instanceof Composite))
4273		- // newWindow = false;
4274		- listUI.add(elem);
4275		- elem.openEditWindow(this, newWindow); //, false);
4276		- System.out.println("edit : " + elem);
4277		- elem.editWindow.refreshContents(true); // ? new
	5229	+ EditElement(elem, newWindow); // ? new
4278	5230	}
4279	5231	}
4280	5232	}
..	..	@@ -4337,9 +5289,7 @@
4337	5289
4338	5290	freezemodel = false;
4339	5291	}
4340		-
4341		- boolean flashIt = true;
4342		-
	5292	+
4343	5293	public void valueChanged(TreeSelectionEvent e)
4344	5294	//public boolean handleEvent(Event event)
4345	5295	{
..	..	@@ -4349,7 +5299,8 @@
4349	5299	//new Exception().printStackTrace();
4350	5300
4351	5301	freezemodel = true;
4352		-
	5302	+ ClearUnpinned();
	5303	+
4353	5304	/**/
4354	5305	//switch (event.id)
4355	5306	{
..	..	@@ -4382,7 +5333,7 @@
4382	5333	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4383	5334	// a camera
4384	5335	{
4385		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5336	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4386	5337	{
4387	5338	CameraPane.camerachangeframe = 0; // don't refuse it
4388	5339	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4391,6 +5342,13 @@
4391	5342	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4392	5343	}
4393	5344
	5345	+ if (tps != null && tps.length == 1)
	5346	+ {
	5347	+ EditSelection(false);
	5348	+ }
	5349	+
	5350	+ SetPinStates(tps != null && tps.length > 0);
	5351	+
4394	5352	refreshContents();
4395	5353	//return true;
4396	5354	}
..	..	@@ -4400,9 +5358,35 @@
4400	5358	freezemodel = false;
4401	5359	}
4402	5360
	5361	+ void SetPinStates(boolean enabled)
	5362	+ {
	5363	+ editButton.setEnabled(enabled);
	5364	+ uneditButton.setEnabled(enabled);
	5365	+ //unselectButton.setEnabled(enabled);
	5366	+ flashSelectionButton.setEnabled(enabled);
	5367	+
	5368	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5369	+
	5370	+ boolean allComposites = true;
	5371	+
	5372	+ if (group.selection != null)
	5373	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5374	+ {
	5375	+ Object next = e.nextElement();
	5376	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5377	+ {
	5378	+ allComposites = false;
	5379	+ break;
	5380	+ }
	5381	+ }
	5382	+
	5383	+ rootButton.setEnabled(allComposites);
	5384	+ }
	5385	+
4403	5386	void refreshContents(boolean cp)
4404	5387	{
4405		- if (!Globals.MOUSEDRAGGED)
	5388	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5389	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4406	5390	{
4407	5391	objEditor.ClearInfo(); // .GetMaterial());
4408	5392
..	..	@@ -4411,7 +5395,7 @@
4411	5395	Object3D child = (Object3D) group.selection.get(i);
4412	5396
4413	5397	objEditor.AddInfo(child, this, true);
4414		- System.err.println("info : " + child.GetPath());
	5398	+// System.err.println("info : " + child.GetPath());
4415	5399	}
4416	5400
4417	5401	objEditor.SetText(); // jan 2014
..	..	@@ -4501,7 +5485,8 @@
4501	5485
4502	5486	if (cut)
4503	5487	{
4504		- Save();
	5488	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5489	+// Save();
4505	5490	//int indices[] = jList.getSelectedIndices();
4506	5491	//for (int i = indices.length - 1; i >= 0; i--)
4507	5492	//jList.remove(indices[i]);
..	..	@@ -4604,6 +5589,10 @@
4604	5589
4605	5590	void paste(boolean expand)
4606	5591	{
	5592	+ if (Globals.REPLACEONMAKE)
	5593	+ Save();
	5594	+ boolean keep = Globals.REPLACEONMAKE;
	5595	+ Globals.REPLACEONMAKE = false;
4607	5596	// if (GrafreeD.clipboard == null)
4608	5597	// return;
4609	5598	boolean first = true;
..	..	@@ -4663,6 +5652,7 @@
4663	5652	Grafreed.clipboard.get(0).parent = keepparent;
4664	5653	}
4665	5654
	5655	+ Globals.REPLACEONMAKE = keep;
4666	5656	ResetModel();
4667	5657	refreshContents();
4668	5658	}
..	..	@@ -4798,6 +5788,10 @@
4798	5788
4799	5789	void group(Object3D csg, boolean grab)
4800	5790	{
	5791	+ if (Globals.REPLACEONMAKE)
	5792	+ Save();
	5793	+ boolean keep = Globals.REPLACEONMAKE;
	5794	+ Globals.REPLACEONMAKE = false;
4801	5795	if (//false) // why??
4802	5796	!group.selection.isEmpty())
4803	5797	{
..	..	@@ -4911,10 +5905,15 @@
4911	5905	//node.add(csg);
4912	5906	//makeSomething(node);
4913	5907	makeSomething(csg);
	5908	+ Globals.REPLACEONMAKE = keep;
4914	5909	}
4915	5910
4916	5911	void Ungroup(Object3D g)
4917	5912	{
	5913	+ if (Globals.REPLACEONMAKE)
	5914	+ Save();
	5915	+ boolean keep = Globals.REPLACEONMAKE;
	5916	+ Globals.REPLACEONMAKE = false;
4918	5917	if (g instanceof HiddenObject)
4919	5918	{
4920	5919	HiddenObject h = (HiddenObject) g;
..	..	@@ -4931,6 +5930,7 @@
4931	5930	objEditor.makeSomething(g.get(i), false);
4932	5931	}
4933	5932	}
	5933	+ Globals.REPLACEONMAKE = keep;
4934	5934	}
4935	5935
4936	5936	void ungroup()
..	..	@@ -5219,10 +6219,43 @@
5219	6219	cButton clearpanelButton;
5220	6220	cButton unselectButton;
5221	6221
5222		- cButton saveButton;
5223		- cButton undoButton;
5224		- cButton redoButton;
	6222	+ cButton restoreCameraButton;
	6223	+
5225	6224	cButton oneStepButton;
	6225	+
	6226	+ cButton groupButton;
	6227	+ cButton ungroupButton;
	6228	+ cButton compositeButton;
	6229	+ cButton switchButton;
	6230	+ cButton loopButton;
	6231	+ cButton textureButton;
	6232	+
	6233	+ cButton skybox1Button;
	6234	+ cButton skybox2Button;
	6235	+ cButton skybox3Button;
	6236	+ cButton skybox4Button;
	6237	+ cButton skybox5Button;
	6238	+ cButton skybox6Button;
	6239	+ cButton skybox7Button;
	6240	+
	6241	+ cButton skybox11Button;
	6242	+ cButton skybox12Button;
	6243	+ cButton skybox13Button;
	6244	+ cButton skybox14Button;
	6245	+ cButton skybox15Button;
	6246	+ cButton skybox16Button;
	6247	+ cButton skybox17Button;
	6248	+
	6249	+ cButton gridButton;
	6250	+ cButton boxButton;
	6251	+ cButton sphereButton;
	6252	+ cButton coneButton;
	6253	+ cButton torusButton;
	6254	+ cButton superButton;
	6255	+ cButton kleinButton;
	6256	+ cButton particlesButton;
	6257	+ cButton overlayButton;
	6258	+ cButton lightButton;
5226	6259
5227	6260	cButton screenfitButton;
5228	6261	cButton screenfitpointButton;
..	..	@@ -5235,14 +6268,6 @@
5235	6268
5236	6269	cButton setsupportButton;
5237	6270
5238		- cButton twoButton;
5239		- cButton sixButton;
5240		- cButton threeButton;
5241		- cButton sevenButton;
5242		- cButton fourButton; // full panel
5243		- cButton oneButton; // full XYZ
5244		- //cButton currentLayout;
5245		-
5246	6271	//
5247	6272	//Composite
5248	6273	Object3D // to do !!
..	..	@@ -5252,12 +6277,12 @@
5252	6277	//JTree jTree;
5253	6278	private MenuItem lookAtItem;
5254	6279	private MenuItem lookFromItem;
5255		- private MenuItem switchItem;
5256		- private MenuItem cutItem;
	6280	+ private MenuItem switchViewItem;
	6281	+ private JMenuItem cutItem;
5257	6282	private MenuItem undoItem;
5258	6283	private MenuItem redoItem;
5259		- private MenuItem duplicateItem;
5260		- private MenuItem cloneItem;
	6284	+ private JMenuItem duplicateItem;
	6285	+ private JMenuItem cloneItem;
5261	6286	private MenuItem cloneSupportItem;
5262	6287	private MenuItem overwriteGeoItem;
5263	6288	private MenuItem overwriteMatItem;
..	..	@@ -5278,13 +6303,13 @@
5278	6303	private MenuItem cloneGeometriesItem;
5279	6304	private MenuItem shareGeometriesItem;
5280	6305	private MenuItem mergeGeometriesItem;
5281		- private MenuItem copyItem;
	6306	+ private JMenuItem copyItem;
5282	6307	private MenuItem pasteItem;
5283		- private MenuItem pasteIntoItem;
5284		- private MenuItem pasteLinkItem;
5285		- private MenuItem pasteCloneItem;
5286		- private MenuItem pasteExpandItem;
5287		- private MenuItem clearItem;
	6308	+ private JMenuItem pasteIntoItem;
	6309	+ private JMenuItem pasteLinkItem;
	6310	+ private JMenuItem pasteCloneItem;
	6311	+ private JMenuItem pasteExpandItem;
	6312	+ private JMenuItem deleteItem;
5288	6313	private MenuItem clearAllItem;
5289	6314	private MenuItem genUVItem;
5290	6315	private MenuItem genNormalsMESHItem;
..	..	@@ -5339,12 +6364,12 @@
5339	6364	private MenuItem transformGeometryItem;
5340	6365	private MenuItem transformChildrenItem;
5341	6366	private MenuItem hideItem;
5342		- private MenuItem grabItem;
	6367	+ private JMenuItem grabItem;
5343	6368	private MenuItem backItem;
5344	6369	private MenuItem frontItem;
5345	6370	private MenuItem cameraItem;
5346	6371	private MenuItem compositeItem;
5347		- private MenuItem randomItem;
	6372	+ private MenuItem switchItem;
5348	6373	private MenuItem physicsItem;
5349	6374	private MenuItem frameselectorItem;
5350	6375	private MenuItem scriptNodeItem;
..	..	@@ -5352,7 +6377,7 @@
5352	6377	private MenuItem switchTransfoItem;
5353	6378	private MenuItem morphItem;
5354	6379	private MenuItem linkerItem;
5355		- private MenuItem ungroupItem;
	6380	+ private JMenuItem ungroupItem;
5356	6381	private MenuItem editItem;
5357	6382	private MenuItem openWindowItem;
5358	6383	private MenuItem editLeafItem;
..	..	@@ -5368,6 +6393,8 @@
5368	6393	private MenuItem attachBumpItem;
5369	6394	private MenuItem detachBumpItem;
5370	6395	private MenuItem pigmentBumpItem;
	6396	+ private MenuItem embedTexturesItem;
	6397	+ private MenuItem deEmbedTexturesItem;
5371	6398
5372	6399	private MenuItem particleItem;
5373	6400	private MenuItem ragdollItem;
..	..	@@ -5418,5 +6445,5 @@
5418	6445
5419	6446	Menu cameraMenu;
5420	6447	MenuItem editCameraItem;
5421		- MenuItem revertCameraItem;
	6448	+ MenuItem restoreCameraItem;
5422	6449	}