~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,350 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
	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	+
26	371	//ObjEditor objEditor;
27	372	public void closeUI2()
28	373	{
..	..	@@ -60,6 +405,16 @@
60	405	this.copy = this.group = group;
61	406	//selectees = this.group.selectees;
62	407
	408	+ assert(false);
	409	+
	410	+// if (copy.versionlist == null)
	411	+// {
	412	+// copy.versionlist = new Object3D[100];
	413	+// copy.versionindex = -1;
	414	+//
	415	+// //Save(true);
	416	+// }
	417	+
63	418	if(ui)
64	419	SetupUI(objEditor);
65	420	}
..	..	@@ -74,16 +429,28 @@
74	429	this.copy = this.group = copy;
75	430	//selectees = this.group.selectees;
76	431
77		- SetupMenu2(objEditor);
	432	+ SetupMenu2(this); //objEditor);
78	433	SetupUI2(objEditor);
79	434	objEditor.SetupUI(true);
80	435	SetupViews(objEditor);
81	436
82	437	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	438	+
	439	+// if (copy.versionlist == null)
	440	+// {
	441	+// copy.versionlist = new Object3D[100];
	442	+// copy.versionindex = -1;
	443	+//
	444	+// //Save(true);
	445	+// }
83	446	}
84	447
85	448	void CloneSelection(boolean supports)
86	449	{
	450	+ if (Globals.REPLACEONMAKE)
	451	+ Save();
	452	+ boolean keep = Globals.REPLACEONMAKE;
	453	+ Globals.REPLACEONMAKE = false;
87	454	// Object3D keep = GrafreeD.clipboard;
88	455	//Object3D obj;
89	456	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +461,7 @@
94	461
95	462	makeSomething(clone, i==group.selection.size()-1);
96	463	}
	464	+ Globals.REPLACEONMAKE = keep;
97	465	}
98	466
99	467	void CloneClipboard(boolean supports)
..	..	@@ -148,57 +516,51 @@
148	516
149	517	//JTextField nameField;
150	518
151		- void SetupMenu2(ObjEditor oe)
	519	+ void SetupMenu2(GroupEditor oe)
152	520	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
	521	+ oe.jTree = new cTree();
	522	+
168	523	Menu menu;
169	524	oe.menuBar.add(menu = new Menu("Edit"));
170	525	//editItem = menu.add(new MenuItem("Edit"));
171	526	//editItem.addActionListener(this);
172		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	527	+
	528	+// undoItem = menu.add(new MenuItem("Undo"));
	529	+// undoItem.addActionListener(this);
	530	+// redoItem = menu.add(new MenuItem("Redo"));
	531	+// redoItem.addActionListener(this);
	532	+// menu.add("-");
	533	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
173	534	duplicateItem.addActionListener(this);
174		- cloneItem = menu.add(new MenuItem("Clone"));
	535	+
	536	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
175	537	cloneItem.addActionListener(this);
176		- if (Globals.ADVANCED)
	538	+ //if (Globals.ADVANCED)
177	539	{
178	540	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
179	541	cloneSupportItem.addActionListener(this);
180	542	}
	543	+ oe.jTree.popup.addSeparator();
181	544	menu.add("-");
182		- cutItem = menu.add(new MenuItem("Cut"));
	545	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
183	546	cutItem.addActionListener(this);
184		- copyItem = menu.add(new MenuItem("Copy"));
	547	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
185	548	copyItem.addActionListener(this);
186	549	pasteItem = menu.add(new MenuItem("Paste"));
187	550	pasteItem.addActionListener(this);
188		- menu.add("-");
189	551
190		- menu.add("-");
191		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	552	+ oe.jTree.popup.addSeparator();
	553	+ //menu.add("-");
	554	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
192	555	pasteIntoItem.addActionListener(this);
193		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	556	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
194	557	pasteLinkItem.addActionListener(this);
195		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	558	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
196	559	pasteCloneItem.addActionListener(this);
197		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	560	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
198	561	// pasteExpandItem.addActionListener(this);
199		- menu.add("-");
200		- clearItem = menu.add(new MenuItem("Clear"));
201		- clearItem.addActionListener(this);
	562	+ //menu.add("-");
	563	+ oe.jTree.popup.addSeparator();
202	564
203	565	if (Globals.ADVANCED)
204	566	{
..	..	@@ -206,7 +568,92 @@
206	568	clearAllItem = menu.add(new MenuItem("Clear All"));
207	569	clearAllItem.addActionListener(this);
208	570	}
	571	+
	572	+ menuBar.add(cameraMenu = new Menu("View"));
	573	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	574	+ //zBufferItem.addActionListener(this);
	575	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	576	+ //normalLensItem.addActionListener(this);
	577	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	578	+ restoreCameraItem.addActionListener(this);
	579	+
	580	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	581	+// toggleFullScreenItem.addItemListener(this);
	582	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	583	+// cameraMenu.add("-");
	584	+//
	585	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	586	+// toggleTextureItem.addItemListener(this);
	587	+// toggleTextureItem.setState(CameraPane.textureon);
	588	+//
	589	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	590	+// toggleSwitchItem.addItemListener(this);
	591	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	592	+
	593	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	594	+ toggleHandleItem.addItemListener(this);
	595	+ toggleHandleItem.setState(CameraPane.HANDLES);
	596	+
	597	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	598	+ togglePaintItem.addItemListener(this);
	599	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	600	+
	601	+ if (Globals.ADVANCED)
	602	+ {
	603	+ cameraMenu.add("-");
	604	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	605	+ toggleLiveItem.addItemListener(this);
	606	+ toggleLiveItem.setState(Globals.isLIVE());
209	607
	608	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	609	+ stepItem.addActionListener(this);
	610	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	611	+ // toggleDLItem.addItemListener(this);
	612	+ // toggleDLItem.setState(false);
	613	+
	614	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	615	+ toggleRenderItem.addItemListener(this);
	616	+ toggleRenderItem.setState(!CameraPane.frozen);
	617	+
	618	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	619	+ toggleDebugItem.addItemListener(this);
	620	+ toggleDebugItem.setState(Globals.DEBUG);
	621	+
	622	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	623	+ toggleFrustumItem.addItemListener(this);
	624	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	625	+
	626	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	627	+ toggleFootContactItem.addItemListener(this);
	628	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	629	+
	630	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	631	+ toggleTimelineItem.addItemListener(this);
	632	+ }
	633	+
	634	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	635	+// toggleRootItem.addItemListener(this);
	636	+// toggleRootItem.setState(false);
	637	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	638	+// animationItem.addItemListener(this);
	639	+// animationItem.setState(CameraPane.ANIMATION);
	640	+ cameraMenu.add("-");
	641	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	642	+ editCameraItem.addActionListener(this);
	643	+
	644	+ if (Globals.ADVANCED)
	645	+ {
	646	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	647	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	648	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	649	+ oe.cameraMenu.add("-");
	650	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	651	+ openWindowItem.addActionListener(this);
	652	+ lookAtItem.addActionListener(this);
	653	+ //lookFromItem.addActinoListener(this);
	654	+ //switchViewItem.addActionListener(this);
	655	+ }
	656	+
210	657	oe.menuBar.add(menu = new Menu("Setting"));
211	658	if (Globals.ADVANCED)
212	659	{
..	..	@@ -248,22 +695,37 @@
248	695	setMasterItem.addActionListener(this);
249	696	}
250	697
251		- oe.menuBar.add(menu = new Menu("Group"));
252		- grabItem = menu.add(new MenuItem("Grab"));
253		- grabItem.addActionListener(this);
	698	+ oe.menuBar.add(menu = new Menu("Order"));
	699	+
254	700	backItem = menu.add(new MenuItem("Back"));
255	701	backItem.addActionListener(this);
256	702	frontItem = menu.add(new MenuItem("Front"));
257	703	frontItem.addActionListener(this);
258		- compositeItem = menu.add(new MenuItem("Composite"));
259		- compositeItem.addActionListener(this);
	704	+// compositeItem = menu.add(new MenuItem("Composite"));
	705	+// compositeItem.addActionListener(this);
	706	+
	707	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	708	+ grabItem.addActionListener(this);
	709	+
	710	+ if (Globals.ADVANCED)
	711	+ {
260	712	hideItem = menu.add(new MenuItem("Hidden Group"));
261	713	hideItem.addActionListener(this);
262		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	714	+ }
	715	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
263	716	ungroupItem.addActionListener(this);
264		- menu.add("-");
265		- randomItem = menu.add(new MenuItem("Switch node"));
266		- randomItem.addActionListener(this);
	717	+
	718	+ oe.jTree.popup.addSeparator();
	719	+
	720	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	721	+ deleteItem.addActionListener(this);
	722	+
	723	+// menu.add("-");
	724	+//
	725	+// switchItem = menu.add(new MenuItem("Switch node"));
	726	+// switchItem.addActionListener(this);
	727	+ if (Globals.ADVANCED)
	728	+ {
267	729	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
268	730	switchGeoItem.addActionListener(this);
269	731	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -271,8 +733,6 @@
271	733	morphItem = menu.add(new MenuItem("Morph Group"));
272	734	morphItem.addActionListener(this);
273	735
274		- if (Globals.ADVANCED)
275		- {
276	736	menu.add("-");
277	737	physicsItem = menu.add(new MenuItem("Physics"));
278	738	physicsItem.addActionListener(this);
..	..	@@ -280,41 +740,47 @@
280	740	frameselectorItem.addActionListener(this);
281	741	scriptNodeItem = menu.add(new MenuItem("Script Node"));
282	742	scriptNodeItem.addActionListener(this);
283		- cameraItem = menu.add(new MenuItem("Camera"));
284		- cameraItem.addActionListener(this);
285	743	}
286	744
287	745	oe.menuBar.add(menu = new Menu("Object"));
288		- textureItem = menu.add(new MenuItem("Texture"));
289		- textureItem.addActionListener(this);
	746	+// textureItem = menu.add(new MenuItem("Texture"));
	747	+// textureItem.addActionListener(this);
290	748	billboardItem = menu.add(new MenuItem("Billboard"));
291	749	billboardItem.addActionListener(this);
292	750	csgItem = menu.add(new MenuItem("CSG"));
293	751	csgItem.addActionListener(this);
294		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	752	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
295	753	shadowXItem.addActionListener(this);
296		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	754	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
297	755	shadowYItem.addActionListener(this);
298		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	756	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
299	757	shadowZItem.addActionListener(this);
	758	+
	759	+ attributeItem = menu.add(new MenuItem("Attribute"));
	760	+ attributeItem.addActionListener(this);
300	761	if (Globals.ADVANCED)
301	762	{
302	763	menu.add("-");
303	764	linkerItem = menu.add(new MenuItem("Linker"));
304	765	linkerItem.addActionListener(this);
305		- attributeItem = menu.add(new MenuItem("Attribute"));
306		- attributeItem.addActionListener(this);
307	766	templateItem = menu.add(new MenuItem("Template"));
308	767	templateItem.addActionListener(this);
309	768	pointflowItem = menu.add(new MenuItem("Point Flow"));
310	769	pointflowItem.addActionListener(this);
311	770	}
312	771	menu.add("-");
	772	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	773	+ textureRatioRItem.addActionListener(this);
	774	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	775	+ textureRatioGItem.addActionListener(this);
	776	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	777	+ textureRatioBItem.addActionListener(this);
	778	+ menu.add("-");
313	779	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
314	780	resetTransformItem.addActionListener(this);
315	781	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
316	782	resetCentroidItem.addActionListener(this);
317		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	783	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
318	784	resetCentroidXZItem.addActionListener(this);
319	785	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
320	786	transformGeometryItem.addActionListener(this);
..	..	@@ -332,7 +798,7 @@
332	798	genNormalsMESHItem.addActionListener(this);
333	799	if (Globals.ADVANCED)
334	800	{
335		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	801	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
336	802	genNormalsMINEItem.addActionListener(this);
337	803	}
338	804	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -366,6 +832,8 @@
366	832	}
367	833
368	834	oe.menuBar.add(menu = new Menu("Attributes"));
	835	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	836	+ clearVersionsItem.addActionListener(this);
369	837	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	838	clearMaterialsItem.addActionListener(this);
371	839	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -388,10 +856,18 @@
388	856	hideleavesItem.addActionListener(this);
389	857	showleavesItem = menu.add(new MenuItem("Show Leaves"));
390	858	showleavesItem.addActionListener(this);
391		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	859	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
392	860	markleavesItem.addActionListener(this);
393		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	861	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
394	862	unmarkleavesItem.addActionListener(this);
	863	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	864	+ rewindleavesItem.addActionListener(this);
	865	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	866	+ unrewindleavesItem.addActionListener(this);
	867	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	868	+ randomleavesItem.addActionListener(this);
	869	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	870	+ unrandomleavesItem.addActionListener(this);
395	871	menu.add("-");
396	872	flipVItem = menu.add(new MenuItem("Flip V"));
397	873	flipVItem.addActionListener(this);
..	..	@@ -417,10 +893,15 @@
417	893	attachBumpItem.addActionListener(this);
418	894	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
419	895	pigmentBumpItem.addActionListener(this);
	896	+ //embedTexturesItem
420	897	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
421	898	detachPigmentItem.addActionListener(this);
422	899	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
423	900	detachBumpItem.addActionListener(this);
	901	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	902	+ embedTexturesItem.addActionListener(this);
	903	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	904	+ deEmbedTexturesItem.addActionListener(this);
424	905	menu.add("-");
425	906	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
426	907	sortbysizeItem.addActionListener(this);
..	..	@@ -431,6 +912,9 @@
431	912	shareGeometriesItem.addActionListener(this);
432	913	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
433	914	mergeGeometriesItem.addActionListener(this);
	915	+ menu.add("-");
	916	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	917	+ editLeafItem.addActionListener(this);
434	918	if (Globals.ADVANCED)
435	919	{
436	920	// Pretty much the same as duplicate and clone.
..	..	@@ -443,33 +927,101 @@
443	927	oe.menuBar.add(menu = new Menu("Insert"));
444	928	buildCreateMenu(menu);
445	929
446		- oe.menuBar.add(menu = new Menu("Include"));
447		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
448		- importOBJItem.addActionListener(this);
449		- menu.add("-");
450		- import3DSItem = menu.add(new MenuItem("3DS file..."));
451		- import3DSItem.addActionListener(this);
452		- menu.add("-");
453		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
454		- importVRMLX3DItem.addActionListener(this);
455		- menu.add("-");
456		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
457		- importGFDItem.addActionListener(this);
458		-
459	930	oe.menuBar.add(menu = new Menu("Tools"));
460	931	buildToolsMenu(menu);
461	932	}
462	933
	934	+ JTabbedPane resourcecontainer;
	935	+ cGridBag currenttab;
	936	+ //boolean added; // patch for jar
	937	+
	938	+ int totalcount = 0;
	939	+
	940	+ int tabcount = 0;
	941	+ int colcount = 0;
	942	+ int rowcount = 0;
	943	+ int texturecount = 0;
	944	+
	945	+ int columns = 5;
	946	+ int rows = 7;
	947	+
	948	+ public void ResourceCallBack(String[] path)
	949	+ {
	950	+// for (int i = 0; i < path.length; i++)
	951	+// System.out.print(path[i] + "/");
	952	+// System.out.println();
	953	+
	954	+ if (//rowcount == 0 \|\|
	955	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	956	+ {
	957	+ currenttab = new cGridBag();
	958	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	959	+ currenttab.setName(tabname);
	960	+ //added = false;
	961	+ resourcecontainer.add(currenttab);
	962	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	963	+ rowcount = 1;
	964	+ colcount = 0;
	965	+ texturecount = 0;
	966	+ }
	967	+
	968	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	969	+ {
	970	+ //if (!added)
	971	+ {
	972	+ //added = true;
	973	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	974	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	975	+ }
	976	+
	977	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	978	+ totalcount++;
	979	+
	980	+ if (++colcount >= columns)
	981	+ {
	982	+ colcount = 0;
	983	+ currenttab.Return();
	984	+
	985	+ if (rowcount++ >= rows)
	986	+ {
	987	+ rowcount = 0;
	988	+ }
	989	+ }
	990	+ }
	991	+ else
	992	+ {
	993	+// if (!path[path.length-1].equals("icons"))
	994	+// resourcecontainer.Return();
	995	+ }
	996	+ }
	997	+
	998	+ void CreateTexturePanel(cGridBag container)
	999	+ {
	1000	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1001	+ container.add(resourcecontainer);
	1002	+
	1003	+ Grafreed.ParseResources("textures", this);
	1004	+
	1005	+ // 935. System.out.println("Total = " + totalcount);
	1006	+ }
	1007	+
463	1008	void SetupUI2(ObjEditor oe)
464	1009	{
	1010	+ // June 2019
	1011	+ if (oe == null)
	1012	+ {
	1013	+ //super.SetupUI2(this);
	1014	+ //return;
	1015	+ }
	1016	+
	1017	+ if (copy != group)
	1018	+ {
	1019	+ //super.SetupUI2(this);
	1020	+ }
	1021	+
465	1022	//new Exception().printStackTrace();
466	1023
467	1024	oe.radioPanel = new JPanel(new GridBagLayout());
468		- oe.aConstraints.weightx = 1;
469		- oe.aConstraints.weighty = 0;
470		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
471		- oe.aConstraints.gridwidth = 100;
472		- oe.aConstraints.gridheight = 1;
473	1025	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
474	1026
475	1027	oe.buttonGroup = new ButtonGroup();
..	..	@@ -490,97 +1042,268 @@
490	1042	oe.radioPanel.add(dummyButton);
491	1043	oe.buttonGroup.add(dummyButton);
492	1044	*/
	1045	+ cGridBag versionManagerPanel = new cGridBag();
	1046	+
	1047	+ versionManagerPanel.preferredHeight = 4;
	1048	+
493	1049	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
494	1050
495		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496		- liveCB.setToolTipText("Enable animation");
497		- liveCB.addItemListener(this);
	1051	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1052	+ //minButton.setToolTipText("Minimize window");
	1053	+ //minButton.addActionListener(this);
	1054	+
	1055	+ if (Globals.ADVANCED)
	1056	+ {
	1057	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1058	+// maxButton.setToolTipText("Maximize window");
	1059	+// maxButton.addActionListener(this);
	1060	+ }
	1061	+
	1062	+ cButton gcButton;
	1063	+
	1064	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1065	+// gcButton.setToolTipText("Garbage collect");
	1066	+// gcButton.addActionListener(new ActionListener()
	1067	+// {
	1068	+// public void actionPerformed(ActionEvent e)
	1069	+// {
	1070	+// System.gc();
	1071	+// }
	1072	+// });
	1073	+
	1074	+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ fullScreenButton.setToolTipText("Full-screen window");
	1076	+ fullScreenButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ collapseButton.setToolTipText("Collapse toolbar");
	1080	+ collapseButton.addActionListener(this);
	1081	+
	1082	+// oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1083	+// maximize3DButton.setToolTipText("Maximize 3D view");
	1084	+// maximize3DButton.addActionListener(this);
	1085	+
	1086	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ twoButton.setToolTipText("Show 3D view only");
	1088	+ twoButton.addActionListener(this);
	1089	+ this.fullscreenLayout = twoButton;
	1090	+
	1091	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1092	+ threeButton.setToolTipText("Show controls and 3D view");
	1093	+ threeButton.addActionListener(this);
	1094	+ if (Globals.ADVANCED)
	1095	+ {
	1096	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1097	+ sixButton.setToolTipText("Show 3D view and controls");
	1098	+ sixButton.addActionListener(this);
	1099	+ }
	1100	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1101	+// sevenButton.setToolTipText("3-column layout");
	1102	+// sevenButton.addActionListener(this);
	1103	+ //
	1104	+
	1105	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1106	+ screenfitButton.setToolTipText("Screen fit");
	1107	+ screenfitButton.addActionListener(this);
498	1108
499		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1110	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1111	+ restoreCameraButton.addActionListener(this);
	1112	+
	1113	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1114	+ saveVersionButton.setToolTipText("Duplicate current version");
	1115	+ saveVersionButton.addActionListener(this);
	1116	+
	1117	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ deleteVersionButton.setToolTipText("Delete current version");
	1119	+ deleteVersionButton.addActionListener(this);
	1120	+ deleteVersionButton.setEnabled(false);
	1121	+
	1122	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ previousVersionButton.setToolTipText("Previous version");
	1124	+ previousVersionButton.addActionListener(this);
	1125	+ previousVersionButton.setEnabled(false);
	1126	+
	1127	+ cGridBag updown = new cGridBag().setVertical(true);
	1128	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ restoreButton.setToolTipText("Undo (restore current version)");
	1130	+ restoreButton.addActionListener(this);
	1131	+ restoreButton.setEnabled(false);
	1132	+
	1133	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ replaceButton.setToolTipText("Save (replace current version)");
	1135	+ replaceButton.addActionListener(this);
	1136	+ replaceButton.setEnabled(false);
	1137	+
	1138	+ versionManagerPanel.add(updown);
	1139	+
	1140	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1141	+ nextVersionButton.setToolTipText("Next version");
	1142	+ nextVersionButton.addActionListener(this);
	1143	+ nextVersionButton.setEnabled(false);
	1144	+
	1145	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
500	1146	oneStepButton.setToolTipText("Animate one step forward");
501	1147	oneStepButton.addActionListener(this);
502	1148
503		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	1149	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1150	+ liveCB.setToolTipText("Enable animation");
	1151	+ liveCB.addItemListener(this);
	1152	+
	1153	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
504	1154	fastCB.setToolTipText("Fast mode");
505	1155	fastCB.addItemListener(this);
506	1156
507		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
508		- trackCB.setToolTipText("Enable tracking");
509		- trackCB.addItemListener(this);
510		-
511		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
512		- screenfitButton.setToolTipText("Screen fit");
513		- screenfitButton.addActionListener(this);
	1157	+ //oe.toolboxPanel.Return();
	1158	+
	1159	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1160	+// trackCB.setToolTipText("Enable tracking");
	1161	+// trackCB.addItemListener(this);
514	1162
515	1163	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
516	1164	// screenfitpointButton.addActionListener(this);
517	1165
518	1166	if (Globals.ADVANCED)
519	1167	{
520		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1168	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
521	1169	snapobjectButton.addActionListener(this);
522	1170	snapobjectButton.setToolTipText("Snap Object");
	1171	+
	1172	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1173	+ fourButton.addActionListener(this);
	1174	+ fourButton.setToolTipText("Show control panel only");
523	1175	}
524	1176
525		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526		- flashSelectionButton.setToolTipText("Show selection");
527		- flashSelectionButton.addActionListener(this);
	1177	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
528	1178
529		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
530		-
531		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
532		- twoButton.setToolTipText("Show center view only");
533		- twoButton.addActionListener(this);
534		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
535		- fourButton.addActionListener(this);
536		- fourButton.setToolTipText("Show left panel only");
537		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538		- sixButton.setToolTipText("2-column layout left");
539		- sixButton.addActionListener(this);
540		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
541		- threeButton.setToolTipText("2-column layout right");
542		- threeButton.addActionListener(this);
543		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544		- sevenButton.setToolTipText("3-column layout");
545		- sevenButton.addActionListener(this);
546		- //
547	1179
548		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
549		- rootButton.setToolTipText("Edit selection in new tab");
	1180	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1181	+ rootButton.setToolTipText("Open selection in new tab");
550	1182	rootButton.addActionListener(this);
551	1183
552		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
553	1185	closeButton.setToolTipText("Close tab");
554	1186	closeButton.addActionListener(this);
555	1187	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
556	1188	//clearButton.addActionListener(this);
557		-
558		- cGridBag commandsPanel = new cGridBag();
	1189	+
	1190	+ cGridBag row1 = new cGridBag();
559	1191
560		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- editButton.setToolTipText("Edit selection");
	1192	+ // INSERT
	1193	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ gridButton.setToolTipText("Create ground");
	1195	+ gridButton.addActionListener(this);
	1196	+
	1197	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ boxButton.setToolTipText("Create box");
	1199	+ boxButton.addActionListener(this);
	1200	+
	1201	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1202	+ superButton.setToolTipText("Create superellipsoid");
	1203	+ superButton.addActionListener(this);
	1204	+
	1205	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ sphereButton.setToolTipText("Create sphere");
	1207	+ sphereButton.addActionListener(this);
	1208	+
	1209	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ coneButton.setToolTipText("Create cone");
	1211	+ coneButton.addActionListener(this);
	1212	+
	1213	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ torusButton.setToolTipText("Create torus");
	1215	+ torusButton.addActionListener(this);
	1216	+
	1217	+ if (false) //Globals.ADVANCED)
	1218	+ {
	1219	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ kleinButton.setToolTipText("Create Klein bottle");
	1221	+ kleinButton.addActionListener(this);
	1222	+ }
	1223	+
	1224	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1225	+ particlesButton.setToolTipText("Create particle system");
	1226	+ particlesButton.addActionListener(this);
	1227	+
	1228	+ oe.toolboxPanel.add(row1);
	1229	+
	1230	+ cGridBag row2 = new cGridBag();
	1231	+
	1232	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ groupButton.setToolTipText("Create group");
	1234	+ groupButton.addActionListener(this);
	1235	+
	1236	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ compositeButton.setToolTipText("Create composite");
	1238	+ compositeButton.addActionListener(this);
	1239	+
	1240	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1241	+ switchButton.setToolTipText("Create item switcher");
	1242	+ switchButton.addActionListener(this);
	1243	+
	1244	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1245	+ loopButton.setToolTipText("Create loop");
	1246	+ loopButton.addActionListener(this);
	1247	+
	1248	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1249	+ textureButton.setToolTipText("Create texture");
	1250	+ textureButton.addActionListener(this);
	1251	+
	1252	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1253	+ overlayButton.setToolTipText("Create overlay");
	1254	+ overlayButton.addActionListener(this);
	1255	+
	1256	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1257	+ lightButton.setToolTipText("Create light");
	1258	+ lightButton.addActionListener(this);
	1259	+
	1260	+ oe.toolboxPanel.add(row2);
	1261	+
	1262	+ cGridBag textures = new cGridBag();
	1263	+
	1264	+ CreateTexturePanel(textures);
	1265	+
	1266	+ int tabCount = resourcecontainer.getTabCount();
	1267	+
	1268	+ if (tabCount > 0)
	1269	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1270	+
	1271	+ oe.toolboxPanel.add(textures);
	1272	+
	1273	+ textures.preferredHeight = 100;
	1274	+
	1275	+ CreateSkyboxPanel(oe.skyboxPanel);
	1276	+
	1277	+ // EDIT panel
	1278	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1279	+ editButton.setToolTipText("Pin selection controls");
562	1280	editButton.addActionListener(this);
563	1281
564		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- uneditButton.setToolTipText("Unedit selection");
	1282	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1283	+ uneditButton.setToolTipText("Unpin and remove selection controls");
566	1284	uneditButton.addActionListener(this);
567	1285
568		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
569		- allParamsButton.setToolTipText("Edit all params");
	1286	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1287	+ allParamsButton.setToolTipText("Show all controls");
570	1288	allParamsButton.addActionListener(this);
571	1289
572		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573		- clearPanelButton.setToolTipText("Clear edit panel");
	1290	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1291	+ clearPanelButton.setToolTipText("Clear all controls");
574	1292	clearPanelButton.addActionListener(this);
575	1293
576		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577		- unselectButton.setToolTipText("Unselect");
578		- unselectButton.addActionListener(this);
	1294	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1295	+ //unselectButton.setToolTipText("Unselect");
	1296	+ //unselectButton.addActionListener(this);
579	1297
580		- commandsPanel.preferredHeight = 1;
	1298	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1299	+ flashSelectionButton.setToolTipText("Highlight selection");
	1300	+ flashSelectionButton.addActionListener(this);
581	1301
582		- oe.treePanel.add(commandsPanel);
583		- oe.treePanel.Return();
	1302	+ editCommandsPanel.preferredHeight = 1;
	1303	+
	1304	+ SetPinStates(false);
	1305	+// oe.treePanel.add(commandsPanel);
	1306	+// oe.treePanel.Return();
584	1307
585	1308	// oe.aConstraints.gridx += 1;
586	1309	// oe.aConstraints.weighty = 0;
..	..	@@ -595,34 +1318,24 @@
595	1318
596	1319	cGridBag jSPPanel = new cGridBag();
597	1320
	1321	+ jSPPanel.preferredHeight = 20;
	1322	+
598	1323	JScrollPane jSP;
599	1324	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
600		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	1325	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
601	1326	ResetModel();
602	1327
603	1328	oe.treePanel.add(jSPPanel);
604	1329	oe.treePanel.Return();
605	1330
606		- cGridBag copyOptionsPanel = new cGridBag();
607		-
608		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
609		- colorCB.setToolTipText("Copy color when dropped");
610		- colorCB.addItemListener(this);
611		-
612		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
613		- materialCB.setToolTipText("Copy material when dropped");
614		- materialCB.addItemListener(this);
615		-
616		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
617		- textureCB.setToolTipText("Copy texture when dropped");
618		- textureCB.addItemListener(this);
619		-
620		- copyOptionsPanel.preferredHeight = 1;
621		- oe.treePanel.add(copyOptionsPanel);
	1331	+ oe.treePanel.add(versionManagerPanel);
622	1332	oe.treePanel.Return();
	1333	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1334	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1335	+ versionSliderPane.preferredHeight = 3;
623	1336
624		-// mainPanel.setDividerLocation(0.5); //1.0);
625		-// mainPanel.setResizeWeight(0.5);
	1337	+// mainPanel.setDividerLocation(0.1); //1.0);
	1338	+ mainPanel.setResizeWeight(0.4);
626	1339
627	1340	//jList.addListSelectionListener(this);
628	1341	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -630,7 +1343,7 @@
630	1343	//jTree.setEditable(true);
631	1344	oe.jTree.setDragEnabled(true);
632	1345	//jTree.setPreferredSize(new Dimension(10,10));
633		- jSP.setPreferredSize(new Dimension(100,200));
	1346	+ //jSP.setPreferredSize(new Dimension(100,200));
634	1347
635	1348	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
636	1349
..	..	@@ -642,29 +1355,49 @@
642	1355	dgr.addDragGestureListener(this);
643	1356	}catch(Exception e) {}
644	1357	*/
645		- radio.layout = sevenButton;
	1358	+ radio.layout = threeButton; // sixButton;
646	1359	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
647	1360	}
648	1361
649	1362	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
650	1363	{
	1364	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1365	+ colorCB.setToolTipText("Copy color when dropped");
	1366	+ colorCB.addItemListener(this);
	1367	+
	1368	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1369	+ materialCB.setToolTipText("Copy material when dropped");
	1370	+ materialCB.addItemListener(this);
	1371	+
	1372	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1373	+ textureCB.setToolTipText("Copy texture when dropped");
	1374	+ textureCB.addItemListener(this);
	1375	+
	1376	+ panel.Return();
	1377	+
651	1378	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
652	1379	boxCB.setToolTipText("Display bounding boxes");
653	1380	boxCB.addItemListener(this);
654	1381
655	1382	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
656		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1383	+ zoomBoxCB.setToolTipText("Display only for wheel");
657	1384	zoomBoxCB.addItemListener(this);
658	1385
659	1386	if (true) // Globals.ADVANCED)
660	1387	{
661		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
662		- supportCB.setToolTipText("Enable rigging");
663		- supportCB.addItemListener(this);
	1388	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1389	+// supportCB.setToolTipText("Enable rigging");
	1390	+// supportCB.addItemListener(this);
	1391	+
	1392	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1393	+ freezeCB.setToolTipText("Fast moving camera");
	1394	+ freezeCB.addItemListener(this);
664	1395
665	1396	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
666	1397	// localCB.addItemListener(this);
667	1398
	1399	+ panel.Return();
	1400	+
668	1401	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
669	1402	crowdCB.setToolTipText("Used for crowds");
670	1403	crowdCB.addItemListener(this);
..	..	@@ -673,14 +1406,19 @@
673	1406	smoothCB.setToolTipText("Snapping delay");
674	1407	smoothCB.addItemListener(this);
675	1408
676		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
677		- slowCB.setToolTipText("Smooth interpolation");
678		- slowCB.addItemListener(this);
	1409	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1410	+// slowCB.setToolTipText("Smooth interpolation");
	1411	+// slowCB.addItemListener(this);
	1412	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1413	+ minshaderCB.setToolTipText("Minimal fast shader");
	1414	+ minshaderCB.addItemListener(this);
679	1415
680	1416	// constraints.gridy += 1;
681	1417	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
682	1418	// speakerMocapCB.addItemListener(this);
683	1419
	1420	+ panel.Return();
	1421	+
684	1422	if (false)
685	1423	{
686	1424	// handled in scripts
..	..	@@ -695,34 +1433,82 @@
695	1433	//constraints.gridy += 1;
696	1434	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
697	1435	smoothfocusCB.addItemListener(this);
	1436	+ panel.Return();
698	1437	}
699	1438
700	1439	//constraints.gridx += 1;
701	1440	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
702	1441	// debugCB.addItemListener(this);
703	1442
	1443	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1444	+ trackCB.setToolTipText("Enable tracking target");
	1445	+ trackCB.addItemListener(this);
	1446	+
704	1447	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1448	+ oeilCB.setToolTipText("Move camera when tracking");
705	1449	oeilCB.addItemListener(this);
706	1450
	1451	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1452	+ shadowCB.setToolTipText("When live compute shadows");
	1453	+ shadowCB.addItemListener(this);
	1454	+
	1455	+ panel.Return();
	1456	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1457	+ toggleTextureCB.setToolTipText("Load textures");
	1458	+ toggleTextureCB.addItemListener(this);
	1459	+
	1460	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1461	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1462	+ toggleSwitchCB.addItemListener(this);
	1463	+
	1464	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1465	+ autokeepCB.setToolTipText("On structure change");
	1466	+ autokeepCB.addItemListener(this);
	1467	+
	1468	+ panel.Return();
	1469	+ if (Globals.ADVANCED)
	1470	+ {
707	1471	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
708	1472	lookAtCB.setToolTipText("Look-at target");
709	1473	lookAtCB.addItemListener(this);
	1474	+ }
710	1475
711	1476	}
712	1477
713	1478	cGridBag fill = new cGridBag();
714		-
715	1479	fill.preferredHeight = 200;
	1480	+ cGridBag fill2 = new cGridBag();
	1481	+ fill2.preferredHeight = 200;
	1482	+ cGridBag fill3 = new cGridBag();
	1483	+ fill3.preferredHeight = 200;
716	1484
717	1485	panel.add(fill);
	1486	+ panel.add(fill2);
	1487	+ panel.add(fill3);
718	1488
719	1489	}
720	1490
721	1491	void EditObject(Object3D obj)
722	1492	{
	1493	+ //assert(obj instanceof Composite);
	1494	+
	1495	+// if (obj.versionlist == null)
	1496	+// {
	1497	+// obj.versionlist = new Object3D[100];
	1498	+// obj.versionindex = -1;
	1499	+// }
	1500	+
723	1501	cRadio radioButton = new cRadio(obj.name);
	1502	+
	1503	+ // June 2019. Patch to avoid bug with transparency.
	1504	+ radioButton.hadMaterial = obj.material != null;
	1505	+ if (!radioButton.hadMaterial)
	1506	+ {
	1507	+ obj.material = new cMaterial();
	1508	+ }
	1509	+
724	1510	radioButton.SetObject(obj);
725		- radioButton.layout = sevenButton;
	1511	+ radioButton.layout = threeButton; // sixButton;
726	1512	radioButton.SetCamera(cameraView.renderCamera, false);
727	1513	radioButton.addActionListener(this);
728	1514	radioPanel.add(radioButton);
..	..	@@ -732,31 +1518,41 @@
732	1518
733	1519	void SetupViews(ObjEditor oe)
734	1520	{
	1521	+ theFrame = this;
	1522	+
735	1523	oe.SetupViews();
736	1524
	1525	+ if (Globals.DEBUG)
737	1526	System.out.println("SetupViews");
738	1527	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
739	1528	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
740	1529	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
741	1530	}
742	1531
743		- JCheckBox liveCB;
744		- JCheckBox supportCB;
745		- JCheckBox localCB;
746		- JCheckBox crowdCB;
747		- JCheckBox smoothCB;
748		- JCheckBox fastCB;
749		- JCheckBox slowCB;
750		- JCheckBox boxCB;
751		- JCheckBox zoomBoxCB;
752		- JCheckBox trackCB;
753		- JCheckBox smoothfocusCB;
	1532	+ cToggleButton liveCB;
	1533	+ cCheckBox supportCB;
	1534	+ cCheckBox localCB;
	1535	+ cCheckBox crowdCB;
	1536	+ cCheckBox smoothCB;
	1537	+ cCheckBox minshaderCB;
	1538	+
	1539	+ cToggleButton fastCB;
	1540	+ cCheckBox slowCB;
	1541	+ cCheckBox boxCB;
	1542	+ cCheckBox zoomBoxCB;
	1543	+ cCheckBox freezeCB;
	1544	+ //cToggleButton trackCB;
	1545	+ cCheckBox trackCB;
	1546	+ cCheckBox smoothfocusCB;
754	1547	// JCheckBox speakerMocapCB;
755		- JCheckBox speakerCameraCB;
756		- JCheckBox speakerFocusCB;
757		- JCheckBox debugCB;
758		- JCheckBox oeilCB;
759		- JCheckBox lookAtCB;
	1548	+ cCheckBox speakerCameraCB;
	1549	+ cCheckBox speakerFocusCB;
	1550	+ cCheckBox debugCB;
	1551	+
	1552	+ cCheckBox oeilCB;
	1553	+ cCheckBox shadowCB;
	1554	+ cCheckBox autokeepCB;
	1555	+ cCheckBox lookAtCB;
760	1556
761	1557	// static int COLOR = 1;
762	1558	// static int MATERIAL = 2;
..	..	@@ -764,9 +1560,9 @@
764	1560
765	1561	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
766	1562
767		- JCheckBox colorCB;
768		- JCheckBox materialCB;
769		- JCheckBox textureCB;
	1563	+ cCheckBox colorCB;
	1564	+ cCheckBox materialCB;
	1565	+ cCheckBox textureCB;
770	1566
771	1567	public void itemStateChanged(ItemEvent e)
772	1568	{
..	..	@@ -794,6 +1590,7 @@
794	1590	} else if(e.getSource() == liveCB)
795	1591	{
796	1592	cameraView.ToggleLive();
	1593	+ refreshContents(false);
797	1594	}
798	1595	else if(e.getSource() == supportCB)
799	1596	{
..	..	@@ -809,6 +1606,12 @@
809	1606	{
810	1607	cameraView.ToggleInertia();
811	1608	cameraView.repaint();
	1609	+ }
	1610	+ else if(e.getSource() == minshaderCB)
	1611	+ {
	1612	+ Globals.MINSHADER ^= true;
	1613	+ cameraView.programInitialized = false;
	1614	+ cameraView.repaint();
812	1615	}
813	1616	else if(e.getSource() == localCB)
814	1617	{
..	..	@@ -858,6 +1661,18 @@
858	1661	{
859	1662	cameraView.ToggleOeil();
860	1663	}
	1664	+ else if(e.getSource() == shadowCB)
	1665	+ {
	1666	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1667	+ }
	1668	+ else if(e.getSource() == freezeCB)
	1669	+ {
	1670	+ Globals.FREEZEONMOVE ^= true;
	1671	+ }
	1672	+ else if(e.getSource() == autokeepCB)
	1673	+ {
	1674	+ Globals.REPLACEONMAKE ^= true;
	1675	+ }
861	1676	else if(e.getSource() == lookAtCB)
862	1677	{
863	1678	cameraView.ToggleLookAt();
..	..	@@ -874,7 +1689,8 @@
874	1689
875	1690	/**/
876	1691	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
877		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1692	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1693	+ TreePath path = objEditor.jTree.getSelectionPath();
878	1694	if ((path == null) \|\| (path.getPathCount() <= 1)) {
879	1695	// We can't move the root node or an empty selection
880	1696	return;
..	..	@@ -937,8 +1753,6 @@
937	1753	}
938	1754	}
939	1755
940		- String string = (String) object;
941		-
942	1756	System.out.println("Transfer = " + object + "; drop : " + target);
943	1757	// if( object instanceof java.io.File[])
944	1758	// {
..	..	@@ -946,6 +1760,8 @@
946	1760	// objEditor.DropFile((java.io.File[]) object, true);
947	1761	// return;
948	1762	// }
	1763	+
	1764	+ String string = object.toString();
949	1765
950	1766	// File path for Mac and Windows
951	1767	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -991,23 +1807,33 @@
991	1807
992	1808	assert target == objEditor.jTree;
993	1809	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1810	+ Object3D destinationLeaf;
994	1811	try {
995		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1812	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
996	1813	} catch (Exception e) {
997	1814	System.out.println("destinationPath : " + destinationPath);
998	1815	return;
999	1816	}
1000	1817
1001		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1818	+ for (int i=group.selection.size(); --i>=0;)
1002	1819	{
	1820	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1821	+
	1822	+ // Cannot move into itself
	1823	+ if (child == destinationLeaf)
	1824	+ return;
	1825	+ }
	1826	+
	1827	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1828	+// {
1003	1829	loadClipboard(true);
1004	1830	objEditor.jTree.setSelectionPath(destinationPath);
1005	1831	pasteInto(false, false);
1006		- } else {
1007		- loadClipboard(false);
1008		- objEditor.jTree.setSelectionPath(destinationPath);
1009		- pasteInto(false, false); // true); // ???
1010		- }
	1832	+// } else {
	1833	+// loadClipboard(false);
	1834	+// objEditor.jTree.setSelectionPath(destinationPath);
	1835	+// pasteInto(false, false); // true); // ???
	1836	+// }
1011	1837	}
1012	1838	public void dropActionChanged(DropTargetDragEvent dtde)
1013	1839	// Called if the user has modified the current drop gesture
..	..	@@ -1063,7 +1889,12 @@
1063	1889	TreePath path;
1064	1890
1065	1891	public TransferableTreePath(TreePath tp) {
1066		- path = tp;
	1892	+ Object[] objs = new Object[tp.getPathCount()];
	1893	+ for (int i=0; i<objs.length; i++)
	1894	+ {
	1895	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1896	+ }
	1897	+ path = new TreePath(objs);
1067	1898	}
1068	1899
1069	1900	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1112,22 +1943,30 @@
1112	1943	{
1113	1944	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1114	1945	//heightFieldItem.addActionListener(this);
1115		- gridItem = menu.add(new MenuItem("Grid"));
1116		- gridItem.addActionListener(this);
1117		- rectoidItem = menu.add(new MenuItem("Box"));
1118		- rectoidItem.addActionListener(this);
1119		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1120		- ellipsoidItem.addActionListener(this);
1121		- coneItem = menu.add(new MenuItem("Cone"));
1122		- coneItem.addActionListener(this);
1123		- torusItem = menu.add(new MenuItem("Torus"));
1124		- torusItem.addActionListener(this);
1125		- superItem = menu.add(new MenuItem("Superellipsoid"));
1126		- superItem.addActionListener(this);
	1946	+// gridItem = menu.add(new MenuItem("Grid"));
	1947	+// gridItem.addActionListener(this);
	1948	+// rectoidItem = menu.add(new MenuItem("Box"));
	1949	+// rectoidItem.addActionListener(this);
	1950	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1951	+// ellipsoidItem.addActionListener(this);
	1952	+// coneItem = menu.add(new MenuItem("Cone"));
	1953	+// coneItem.addActionListener(this);
	1954	+// torusItem = menu.add(new MenuItem("Torus"));
	1955	+// torusItem.addActionListener(this);
	1956	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1957	+// superItem.addActionListener(this);
	1958	+
	1959	+ cameraItem = menu.add(new MenuItem("Camera"));
	1960	+ cameraItem.addActionListener(this);
	1961	+
	1962	+ if (!Globals.ADVANCED)
	1963	+ {
1127	1964	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1128	1965	kleinItem.addActionListener(this);
1129		- particleItem = menu.add(new MenuItem("Particle system"));
1130		- particleItem.addActionListener(this);
	1966	+ }
	1967	+
	1968	+// particleItem = menu.add(new MenuItem("Particle system"));
	1969	+// particleItem.addActionListener(this);
1131	1970	if (Globals.ADVANCED)
1132	1971	{
1133	1972	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1153,15 +1992,15 @@
1153	1992	}
1154	1993	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1155	1994	bezierItem.addActionListener(this);
1156		- overlayItem = menu.add(new MenuItem("Overlay"));
1157		- overlayItem.addActionListener(this);
1158		- lightItem = menu.add(new MenuItem("Light"));
1159		- lightItem.addActionListener(this);
	1995	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1996	+// overlayItem.addActionListener(this);
	1997	+// lightItem = menu.add(new MenuItem("Light"));
	1998	+// lightItem.addActionListener(this);
1160	1999	menu.add("-");
1161	2000	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1162	2001	//superLoopItem.addActionListener(this);
1163		- loopItem = menu.add(new MenuItem("Loop"));
1164		- loopItem.addActionListener(this);
	2002	+// loopItem = menu.add(new MenuItem("Loop"));
	2003	+// loopItem.addActionListener(this);
1165	2004	doubleItem = menu.add(new MenuItem("Fork"));
1166	2005	doubleItem.addActionListener(this);
1167	2006	if (Globals.ADVANCED)
..	..	@@ -1177,6 +2016,9 @@
1177	2016	animationItem.addItemListener(this);
1178	2017	animationItem.setState(Globals.ANIMATION);
1179	2018
	2019	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2020	+ archiveItem.addActionListener(this);
	2021	+
1180	2022	menu.add("-");
1181	2023	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1182	2024	parseverticesItem.addActionListener(this);
..	..	@@ -1189,6 +2031,8 @@
1189	2031	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1190	2032	reduce34MorphItem.addActionListener(this);
1191	2033	menu.add("-");
	2034	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	2035	+ memoryItem.addActionListener(this);
1192	2036	menu.add(computeAOItem = new MenuItem("Compute AO"));
1193	2037	computeAOItem.addActionListener(this);
1194	2038
..	..	@@ -1197,11 +2041,9 @@
1197	2041	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1198	2042	mirrorItem.addActionListener(this);
1199	2043	menu.add("-");
1200		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1201		- memoryItem.addActionListener(this);
1202	2044	menu.add(analyzeItem = new MenuItem("Analyze"));
1203	2045	analyzeItem.addActionListener(this);
1204		- menu.add(dumpItem = new MenuItem("Dump"));
	2046	+ menu.add(dumpItem = new MenuItem("Print"));
1205	2047	dumpItem.addActionListener(this);
1206	2048	// menu.add(pathItem = new MenuItem("From-to path"));
1207	2049	// pathItem.addActionListener(this);
..	..	@@ -1284,24 +2126,24 @@
1284	2126	switch(axis)
1285	2127	{
1286	2128	case 0 :
1287		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1288		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1289		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1290		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2129	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2130	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2131	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2132	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1291	2133	norm = cVector.X;
1292	2134	break;
1293	2135	case 1 :
1294		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1295		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1296		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1297		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2136	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2137	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2138	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2139	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1298	2140	norm = cVector.Y;
1299	2141	break;
1300	2142	case 2 :
1301		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1302		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1303		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1304		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2143	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2144	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2145	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2146	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1305	2147	norm = cVector.Z;
1306	2148	break;
1307	2149	}
..	..	@@ -1342,9 +2184,38 @@
1342	2184	shadow.material = new cMaterial(obj.material);
1343	2185	shadow.material.diffuse = 0.0001f;
1344	2186	shadow.material.specular = 0.0001f;
	2187	+ shadow.material.opacity = 0.75f;
	2188	+
	2189	+ AllocProjectedVertices(shadow);
	2190	+
	2191	+ shadow.projectedVertices[1].x = 300;
1345	2192
1346	2193	makeSomething(shadow);
1347	2194	}
	2195	+
	2196	+ private void ClearUnpinned()
	2197	+ {
	2198	+ //for (Object3D obj : listUI)
	2199	+ for (int i=listUI.size(); --i>=0;)
	2200	+ {
	2201	+ Object3D obj = listUI.elementAt(i);
	2202	+ if (!obj.pinned)
	2203	+ {
	2204	+ obj.CloseUI();
	2205	+ listUI.remove(i);
	2206	+ }
	2207	+ }
	2208	+ }
	2209	+
	2210	+ private void EditElement(Object3D elem, boolean newWindow)
	2211	+ {
	2212	+ // if (!(elem instanceof Composite))
	2213	+ // newWindow = false;
	2214	+ listUI.add(elem);
	2215	+ elem.openEditWindow(this, newWindow); //, false);
	2216	+ System.out.println("edit : " + elem);
	2217	+ elem.editWindow.refreshContents(true); // ? new
	2218	+ }
1348	2219
1349	2220	/**
1350	2221	* applyExample
..	..	@@ -1589,7 +2460,7 @@
1589	2460	{
1590	2461	ScreenFit();
1591	2462	} else
1592		- if (source == switchItem)
	2463	+ if (source == switchViewItem)
1593	2464	{
1594	2465	cVector v1 = new cVector();
1595	2466	cVector v2 = new cVector();
..	..	@@ -1598,11 +2469,11 @@
1598	2469	objEditor.cameraView.renderCamera.setAim(v2, v1);
1599	2470	objEditor.cameraView.repaint();
1600	2471	} else
1601		- if (source == rectoidItem)
	2472	+ if (source == rectoidItem \|\| source == boxButton)
1602	2473	{
1603	2474	makeSomething(new Box());
1604	2475	} else
1605		- if (source == particleItem)
	2476	+ if (source == particleItem \|\| source == particlesButton)
1606	2477	{
1607	2478	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1608	2479	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1681,27 +2552,27 @@
1681	2552
1682	2553	makeSomething(obj);
1683	2554	} else
1684		- if (source == gridItem)
	2555	+ if (source == gridItem \|\| source == gridButton)
1685	2556	{
1686	2557	makeSomething(new Grid());
1687	2558	} else
1688		- if (source == ellipsoidItem)
	2559	+ if (source == ellipsoidItem \|\| source == sphereButton)
1689	2560	{
1690	2561	makeSomething(new Sphere());
1691	2562	} else
1692		- if (source == coneItem)
	2563	+ if (source == coneItem \|\| source == coneButton)
1693	2564	{
1694	2565	makeSomething(new Cone());
1695	2566	} else
1696		- if (source == torusItem)
	2567	+ if (source == torusItem \|\| source == torusButton)
1697	2568	{
1698	2569	makeSomething(new Torus());
1699	2570	} else
1700		- if (source == superItem)
	2571	+ if (source == superItem \|\| source == superButton)
1701	2572	{
1702	2573	makeSomething(new Superellipsoid());
1703	2574	} else
1704		- if (source == kleinItem)
	2575	+ if (source == kleinItem \|\| source == kleinButton)
1705	2576	{
1706	2577	makeSomething(new Klein());
1707	2578	} else
..	..	@@ -1721,7 +2592,7 @@
1721	2592	{
1722	2593	makeSomething(new BezierSurface());
1723	2594	} else
1724		- if (source == overlayItem)
	2595	+ if (source == overlayItem \|\| source == overlayButton)
1725	2596	{
1726	2597	/*
1727	2598	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1769,10 +2640,27 @@
1769	2640	s.setup();
1770	2641	makeSomething(s);
1771	2642	} else
1772		- if (source == lightItem)
	2643	+ if (source == lightItem \|\| source == lightButton)
1773	2644	{
1774	2645	makeSomething(new Light());
1775	2646	} else
	2647	+// if (source == skybox1Button \|\|
	2648	+// source == skybox2Button \|\|
	2649	+// source == skybox3Button \|\|
	2650	+// source == skybox4Button \|\|
	2651	+// source == skybox5Button \|\|
	2652	+// source == skybox6Button \|\|
	2653	+// source == skybox7Button \|\|
	2654	+// source == skybox11Button \|\|
	2655	+// source == skybox12Button \|\|
	2656	+// source == skybox13Button \|\|
	2657	+// source == skybox14Button \|\|
	2658	+// source == skybox15Button \|\|
	2659	+// source == skybox16Button \|\|
	2660	+// source == skybox17Button)
	2661	+// {
	2662	+// ChangeSkybox(source);
	2663	+// } else
1776	2664	if (source == csgItem)
1777	2665	{
1778	2666	group(new CSG());
..	..	@@ -1819,30 +2707,38 @@
1819	2707
1820	2708	group(g);
1821	2709	} else
1822		- if (source == loopItem)
	2710	+ if (source == loopItem \|\| source == loopButton)
1823	2711	{
	2712	+ if (!group.selection.isEmpty())
	2713	+ {
1824	2714	Composite csg = new GroupLeaf();
1825		- csg.count = 5;
1826	2715	group(csg);
1827		- Composite child = new cGroup();
	2716	+ csg.count = 5;
	2717	+ Composite child = new cGroup("Branch");
1828	2718	csg.addChild(child);
1829	2719	child.addChild(csg);
	2720	+ }
1830	2721	} else
1831	2722	if (source == doubleItem)
1832	2723	{
1833		- Composite csg = new GroupLeaf();
1834		- csg.count = 5;
	2724	+ if (!group.selection.isEmpty())
	2725	+ {
	2726	+ Composite csg = new GroupLeaf("Fork");
1835	2727	group(csg);
1836		- Composite child = new cGroup();
	2728	+ csg.count = 5;
	2729	+ Composite child = new cGroup("Branch A");
1837	2730	csg.addChild(child);
1838	2731	child.addChild(csg);
1839		- child = new cGroup();
	2732	+ child = new cGroup("Branch B");
1840	2733	csg.addChild(child);
1841	2734	child.addChild(csg);
	2735	+ }
1842	2736	} else
1843	2737	if (source == tripleItem)
1844	2738	{
1845		- Composite csg = new GroupLeaf();
	2739	+ if (!group.selection.isEmpty())
	2740	+ {
	2741	+ Composite csg = new GroupLeaf("Trident");
1846	2742	csg.count = 4;
1847	2743	group(csg);
1848	2744	Composite child = new cGroup();
..	..	@@ -1854,36 +2750,12 @@
1854	2750	child = new cGroup();
1855	2751	csg.addChild(child);
1856	2752	child.addChild(csg);
1857		- } else
1858		-
1859		- if (source == importGFDItem)
1860		- {
1861		- ImportGFD();
1862		- } else
1863		- if (source == importVRMLX3DItem)
1864		- {
1865		- ImportVRMLX3D();
1866		- } else
1867		- if (source == import3DSItem)
1868		- {
1869		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1870		- } else
1871		- if (source == importOBJItem)
1872		- {
1873		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1874		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1875		- browser.setVisible(true);
1876		- String filename = browser.getFile();
1877		- if (filename != null && filename.length() > 0)
1878		- {
1879		- String fullname = browser.getDirectory() + filename;
1880		- makeSomething(ReadOBJ(fullname), true);
1881		- }
	2753	+ }
1882	2754	} else
1883	2755	if (source == computeAOItem)
1884	2756	{
1885	2757	Globals.drawMode = CameraPane.OCCLUSION;
1886		- Globals.theRenderer.repaint();
	2758	+ cameraView.repaint();
1887	2759	} else
1888	2760	if (source == recompileItem)
1889	2761	{
..	..	@@ -1898,7 +2770,7 @@
1898	2770	if (source == invariantsItem)
1899	2771	{
1900	2772	System.out.println("Invariants:");
1901		- Grafreed.grafreeD.universe.invariants();
	2773	+ Grafreed.grafreed.universe.invariants();
1902	2774	} else
1903	2775	if (source == memoryItem)
1904	2776	{
..	..	@@ -1917,6 +2789,65 @@
1917	2789	{
1918	2790	DumpObject();
1919	2791	} else
	2792	+ if (source == minButton)
	2793	+ {
	2794	+ Minimize();
	2795	+ } else
	2796	+ if (source == maxButton)
	2797	+ {
	2798	+ Maximize();
	2799	+ } else
	2800	+ if (source == fullScreenButton)
	2801	+ {
	2802	+ ToggleFullScreen();
	2803	+ } else
	2804	+ if (source == collapseButton)
	2805	+ {
	2806	+ this.expandedLayout = radio.layout;
	2807	+ CollapseToolbar();
	2808	+ } else
	2809	+// if (source == maximize3DButton)
	2810	+// {
	2811	+// this.expandedLayout = radio.layout;
	2812	+// radio.layout = twoButton;
	2813	+// CollapseToolbar();
	2814	+// Show3DView();
	2815	+// } else
	2816	+ if (source == previousVersionButton)
	2817	+ {
	2818	+ // Go to previous version
	2819	+ //if (!Undo())
	2820	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2821	+ PreviousVersion();
	2822	+ } else
	2823	+ if (source == restoreButton)
	2824	+ {
	2825	+ // Restore current version
	2826	+ Restore();
	2827	+ //restoreButton.setEnabled(false);
	2828	+ } else
	2829	+ if (source == replaceButton)
	2830	+ {
	2831	+ // Overwrite current version
	2832	+ Replace();
	2833	+ //replaceButton.setEnabled(false);
	2834	+ } else
	2835	+ if (source == nextVersionButton)
	2836	+ {
	2837	+ // Go to next version
	2838	+ NextVersion();
	2839	+ } else
	2840	+ if (source == saveVersionButton)
	2841	+ {
	2842	+ // Save a new version
	2843	+ if (!Save(true))
	2844	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2845	+ } else
	2846	+ if (source == deleteVersionButton)
	2847	+ {
	2848	+ // Delete a new version
	2849	+ DeleteVersion();
	2850	+ } else
1920	2851	if (source == oneStepButton)
1921	2852	{
1922	2853	Globals.ONESTEP = true;
..	..	@@ -1924,17 +2855,14 @@
1924	2855	} else
1925	2856	if (source == screenfitButton)
1926	2857	{
1927		- //Reload(lastConverter, lastFilename, true);
1928	2858	ScreenFit();
1929	2859	} else
1930	2860	if (source == screenfitpointButton)
1931	2861	{
1932		- //Reload(lastConverter, lastFilename, true);
1933	2862	ScreenFitPoint();
1934	2863	} else
1935	2864	if (source == snapobjectButton)
1936	2865	{
1937		- //Reload(lastConverter, lastFilename, true);
1938	2866	SnapObject();
1939	2867	} else
1940	2868	// if (event.getSource() == recompileButton)
..	..	@@ -1970,6 +2898,14 @@
1970	2898	if (source == cutItem \|\| source == clearButton)
1971	2899	{
1972	2900	loadClipboard(true);
	2901	+ } else
	2902	+ if (source == undoItem)
	2903	+ {
	2904	+ PreviousVersion();
	2905	+ } else
	2906	+ if (source == redoItem)
	2907	+ {
	2908	+ NextVersion();
1973	2909	} else
1974	2910	if (source == duplicateItem)
1975	2911	{
..	..	@@ -2290,7 +3226,7 @@
2290	3226	{
2291	3227	StepAll();
2292	3228	} else
2293		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3229	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2294	3230	{
2295	3231	//int indices[] = jList.getSelectedIndices();
2296	3232	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2302,9 +3238,9 @@
2302	3238	{
2303	3239	ClearSelection(true);
2304	3240	} else
2305		- if (source == grabItem)
	3241	+ if (source == grabItem \|\| source == groupButton)
2306	3242	{
2307		- group(new cGroup(), true);
	3243	+ group(new cGroup(), false); // true);
2308	3244	} else
2309	3245	if (source == hideItem)
2310	3246	{
..	..	@@ -2322,11 +3258,11 @@
2322	3258	{
2323	3259	makeSomething(new Camera());
2324	3260	} else
2325		- if (source == compositeItem)
	3261	+ if (source == compositeItem \|\| source == compositeButton)
2326	3262	{
2327	3263	group(new Composite());
2328	3264	} else
2329		- if (source == randomItem)
	3265	+ if (source == switchItem \|\| source == switchButton)
2330	3266	{
2331	3267	RandomNode random = new RandomNode();
2332	3268	group(random);
..	..	@@ -2428,7 +3364,7 @@
2428	3364	{
2429	3365	group(new cLinker());
2430	3366	} else
2431		- if (source == textureItem)
	3367	+ if (source == textureItem \|\| source == textureButton)
2432	3368	{
2433	3369	group(new TextureNode());
2434	3370	} else
..	..	@@ -2448,17 +3384,42 @@
2448	3384	{
2449	3385	CastShadow(2);
2450	3386	} else
2451		- if (source == ungroupItem)
	3387	+ if (source == ungroupItem \|\| source == ungroupButton)
2452	3388	{
2453		- //ungroup();
	3389	+ boolean canUngroup = true;
	3390	+
2454	3391	for (int i=0; i<group.selection.size(); i++)
2455	3392	{
2456		- Ungroup(group.selection.get(i));
	3393	+ Object3D selectedItem = group.selection.get(i);
	3394	+
	3395	+ if (selectedItem.Size() == 0)
	3396	+ {
	3397	+ // Cannot ungroup leaves
	3398	+ canUngroup = false;
	3399	+ break;
	3400	+ }
	3401	+
	3402	+ if (selectedItem == group)
	3403	+ {
	3404	+ // Cannot ungroup root
	3405	+ canUngroup = false;
	3406	+ break;
	3407	+ }
2457	3408	}
2458	3409
2459		- ClearSelection(false);
2460		-
2461		- refreshContents();
	3410	+ if (canUngroup)
	3411	+ {
	3412	+ for (int i=0; i<group.selection.size(); i++)
	3413	+ {
	3414	+ Object3D selectedItem = group.selection.get(i);
	3415	+
	3416	+ Ungroup(selectedItem);
	3417	+ }
	3418	+
	3419	+ ClearSelection(false);
	3420	+
	3421	+ refreshContents();
	3422	+ }
2462	3423	} else
2463	3424	if (source == genUVItem)
2464	3425	{
..	..	@@ -2470,7 +3431,7 @@
2470	3431	} else
2471	3432	if (source == genNormalsMESHItem)
2472	3433	{
2473		- GenNormals(true); // TODO
	3434	+ GenNormalsMESH();
2474	3435	} else
2475	3436	if (source == genNormalsORGANItem)
2476	3437	{
..	..	@@ -2504,6 +3465,10 @@
2504	3465	{
2505	3466	ClearMaterials();
2506	3467	} else
	3468	+ if (source == clearVersionsItem)
	3469	+ {
	3470	+ ClearVersions();
	3471	+ } else
2507	3472	if (source == liveleavesItem)
2508	3473	{
2509	3474	LiveLeaves(true);
..	..	@@ -2535,6 +3500,22 @@
2535	3500	if (source == unmarkleavesItem)
2536	3501	{
2537	3502	MarkLeaves(false);
	3503	+ } else
	3504	+ if (source == rewindleavesItem)
	3505	+ {
	3506	+ RewindLeaves(true);
	3507	+ } else
	3508	+ if (source == unrewindleavesItem)
	3509	+ {
	3510	+ RewindLeaves(false);
	3511	+ } else
	3512	+ if (source == randomleavesItem)
	3513	+ {
	3514	+ RandomLeaves(true);
	3515	+ } else
	3516	+ if (source == unrandomleavesItem)
	3517	+ {
	3518	+ RandomLeaves(false);
2538	3519	} else
2539	3520	if (source == flipVItem)
2540	3521	{
..	..	@@ -2627,6 +3608,18 @@
2627	3608	if (source == transformChildrenItem)
2628	3609	{
2629	3610	TransformChildren();
	3611	+ } else
	3612	+ if (source == textureRatioRItem)
	3613	+ {
	3614	+ TextureRatio(0);
	3615	+ } else
	3616	+ if (source == textureRatioGItem)
	3617	+ {
	3618	+ TextureRatio(1);
	3619	+ } else
	3620	+ if (source == textureRatioBItem)
	3621	+ {
	3622	+ TextureRatio(2);
2630	3623	} else
2631	3624	if (source == resetTransformItem)
2632	3625	{
..	..	@@ -2743,7 +3736,7 @@
2743	3736	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2744	3737	{
2745	3738	obj = (Object3D)e.nextElement();
2746		- obj.SetBumpTexture(null);
	3739	+ obj.ResetBumpTexture();
2747	3740	}
2748	3741
2749	3742	refreshContents();
..	..	@@ -2759,6 +3752,31 @@
2759	3752
2760	3753	refreshContents();
2761	3754	} else
	3755	+ if (source == embedTexturesItem)
	3756	+ {
	3757	+ Object3D obj;
	3758	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3759	+ {
	3760	+ obj = (Object3D)e.nextElement();
	3761	+ obj.EmbedTextures(true);
	3762	+ }
	3763	+
	3764	+ refreshContents();
	3765	+ } else
	3766	+ if (source == deEmbedTexturesItem)
	3767	+ {
	3768	+ Object3D obj;
	3769	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3770	+ {
	3771	+ obj = (Object3D)e.nextElement();
	3772	+ obj.EmbedTextures(false);
	3773	+ }
	3774	+
	3775	+ CameraPane.texturepigment.clear();
	3776	+ CameraPane.texturebump.clear();
	3777	+
	3778	+ refreshContents();
	3779	+ } else
2762	3780	if (source == flashSelectionButton)
2763	3781	{
2764	3782	CameraPane.flash = true;
..	..	@@ -2770,42 +3788,36 @@
2770	3788	if (source == twoButton)
2771	3789	{
2772	3790	radio.layout = twoButton;
2773		- // bug
2774		- //gridPanel.setDividerLocation(1.0);
2775		- //bigPanel.setDividerLocation(0.0);
2776		-// bigThree.remove(scenePanel);
2777		-// bigThree.remove(centralPanel);
2778		-// bigThree.remove(XYZPanel);
2779		-// aWindowConstraints.gridx = 0;
2780		-// aWindowConstraints.gridy = 0;
2781		-// aWindowConstraints.gridwidth = 1;
2782		-// // aConstraints.gridheight = 3;
2783		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2784		-// aWindowConstraints.weightx = 0;
2785		-// aWindowConstraints.weighty = 1;
2786		-// //bigThree.add(jtp, aWindowConstraints);
2787		-// aWindowConstraints.weightx = 1;
2788		-// aWindowConstraints.gridwidth = 3;
2789		-// // aConstraints.gridheight = 3;
2790		-// aWindowConstraints.gridx = 1;
2791		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
2792		-// bigThree.add(centralPanel, aWindowConstraints);
2793		-// aWindowConstraints.weightx = 0;
2794		-// aWindowConstraints.gridx = 4;
2795		-// aWindowConstraints.gridwidth = 1;
2796		-// // aConstraints.gridheight = 3;
2797		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2798		-// //bigThree.add(XYZPanel, aWindowConstraints);
2799		-// scenePanel.setVisible(false);
2800		-// centralPanel.setVisible(true);
2801		-// XYZPanel.setVisible(false);
2802		- bigThree.ClearUI();
2803		- bigThree.add(centralPanel);
2804		- bigThree.FlushUI();
	3791	+
	3792	+ if (CameraPane.FULLSCREEN)
	3793	+ fullscreenLayout = radio.layout;
	3794	+
	3795	+ Show3DView();
	3796	+
	3797	+ cameraView.requestFocusInWindow();
	3798	+
	3799	+// refreshContents(true);
	3800	+//
	3801	+// try
	3802	+// {
	3803	+// java.awt.Robot bot = new java.awt.Robot();
	3804	+// int mask = InputEvent.BUTTON1_MASK;
	3805	+// bot.mouseMove(100, 100);
	3806	+// bot.mousePress(mask);
	3807	+// bot.mouseRelease(mask);
	3808	+// }
	3809	+// catch (Exception e)
	3810	+// {
	3811	+//
	3812	+// }
	3813	+
2805	3814	} else
2806	3815	if (source == threeButton)
2807	3816	{
2808	3817	radio.layout = threeButton;
	3818	+
	3819	+ if (CameraPane.FULLSCREEN)
	3820	+ fullscreenLayout = radio.layout;
2809	3821
2810	3822	// bigThree.remove(scenePanel);
2811	3823	// bigThree.remove(centralPanel);
..	..	@@ -2835,13 +3847,18 @@
2835	3847	// centralPanel.setVisible(true);
2836	3848	// XYZPanel.setVisible(true);
2837	3849	bigThree.ClearUI();
	3850	+ bigThree.add(scenePanel);
2838	3851	bigThree.add(centralPanel);
2839		- bigThree.add(XYZPanel);
2840	3852	bigThree.FlushUI();
	3853	+
	3854	+ cameraView.requestFocusInWindow();
2841	3855	} else
2842	3856	if (source == fourButton)
2843	3857	{
2844	3858	radio.layout = fourButton;
	3859	+
	3860	+ if (CameraPane.FULLSCREEN)
	3861	+ fullscreenLayout = radio.layout;
2845	3862
2846	3863	// bigThree.remove(scenePanel);
2847	3864	// bigThree.remove(centralPanel);
..	..	@@ -2873,10 +3890,15 @@
2873	3890	bigThree.ClearUI();
2874	3891	bigThree.add(scenePanel);
2875	3892	bigThree.FlushUI();
	3893	+
	3894	+ cameraView.requestFocusInWindow();
2876	3895	} else
2877	3896	if (source == sixButton)
2878	3897	{
2879	3898	radio.layout = sixButton;
	3899	+
	3900	+ if (CameraPane.FULLSCREEN)
	3901	+ fullscreenLayout = radio.layout;
2880	3902
2881	3903	// bigThree.remove(scenePanel);
2882	3904	// bigThree.remove(centralPanel);
..	..	@@ -2906,13 +3928,18 @@
2906	3928	// centralPanel.setVisible(true);
2907	3929	// XYZPanel.setVisible(false);
2908	3930	bigThree.ClearUI();
2909		- bigThree.add(scenePanel);
2910	3931	bigThree.add(centralPanel);
	3932	+ bigThree.add(scenePanel);
2911	3933	bigThree.FlushUI();
	3934	+
	3935	+ cameraView.requestFocusInWindow();
2912	3936	} else
2913	3937	if (source == sevenButton)
2914	3938	{
2915	3939	radio.layout = sevenButton;
	3940	+
	3941	+ if (CameraPane.FULLSCREEN)
	3942	+ fullscreenLayout = radio.layout;
2916	3943
2917	3944	// bigThree.remove(scenePanel);
2918	3945	// bigThree.remove(centralPanel);
..	..	@@ -2946,9 +3973,12 @@
2946	3973	bigThree.add(centralPanel);
2947	3974	bigThree.add(XYZPanel);
2948	3975	bigThree.FlushUI();
	3976	+
	3977	+ cameraView.requestFocusInWindow();
2949	3978	} else
2950	3979	if (source == rootButton)
2951	3980	{
	3981	+ Replace();
2952	3982	Object3D obj;
2953	3983	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2954	3984	{
..	..	@@ -2957,31 +3987,50 @@
2957	3987	EditObject(obj);
2958	3988	}
2959	3989
	3990	+ cameraView.requestFocusInWindow();
2960	3991	refreshContents(true);
2961	3992	} else
2962	3993	if (source == closeButton)
2963	3994	{
2964	3995	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3996	+ if (copy.versionlist != null)
	3997	+ Replace();
	3998	+
2965	3999	cRadio ab;
2966	4000	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2967	4001	{
2968	4002	ab = (cRadio)e.nextElement();
2969		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	4003	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2970	4004	{
	4005	+ // Patch to avoid bug with transparency.
	4006	+ if (!ab.hadMaterial)
	4007	+ {
	4008	+ ab.object.material = null;
	4009	+ }
	4010	+
2971	4011	buttonGroup.remove(ab);
2972	4012	radioPanel.remove(ab);
2973	4013
2974		- ab.GetObject().editWindow = null;
	4014	+ //ab.GetObject().editWindow = null;
	4015	+ ab.GetObject().manipWindow = null;
2975	4016	// ab.GetObject().objectUI = null; // ?????????
2976	4017
2977	4018	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2978	4019	break;
2979	4020	}
2980	4021	}
	4022	+
	4023	+ cameraView.requestFocusInWindow();
2981	4024	refreshContents(true);
2982	4025	} else
2983	4026	if (source == editItem \|\| source == editButton)
2984	4027	{
	4028	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4029	+ {
	4030	+ Object3D child = (Object3D)e.nextElement();
	4031	+ child.pinned = true;
	4032	+ }
	4033	+
2985	4034	EditSelection(false);
2986	4035	} else
2987	4036	if (source == uneditButton)
..	..	@@ -2990,11 +4039,12 @@
2990	4039	{
2991	4040	Object3D child = (Object3D)e.nextElement();
2992	4041	if(child.editWindow != null)
2993		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4042	+ child.pinned = false;
2994	4043	child.CloseUI();
2995	4044	listUI.remove(child);
	4045	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2996	4046
2997		- child.editWindow = null; // ???????????
	4047	+ //child.editWindow = null; // ???????????
2998	4048	}
2999	4049	objEditor.ctrlPanel.FlushUI();
3000	4050	//objEditor.jTree.clearSelection();
..	..	@@ -3007,16 +4057,18 @@
3007	4057	//copy.ClearUI();
3008	4058	for (Object3D obj : listUI)
3009	4059	{
	4060	+ obj.pinned = false;
3010	4061	obj.CloseUI();
3011	4062	}
3012	4063	listUI.clear();
	4064	+ SetPinStates(group.selection.size() > 0);
3013	4065	refreshContents(true);
3014	4066	} else
3015	4067	if (source == allParamsButton)
3016	4068	{
3017	4069	assert(copy == group);
3018	4070
3019		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4071	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3020	4072
3021	4073	for (Object3D obj : listUI)
3022	4074	{
..	..	@@ -3042,6 +4094,9 @@
3042	4094	} else
3043	4095	if(source instanceof cRadio)
3044	4096	{
	4097	+ if (copy.versionlist != null)
	4098	+ Replace();
	4099	+
3045	4100	group.parent = keepparent;
3046	4101	group.attributes = 0;
3047	4102	//group.editWindow = null;
..	..	@@ -3065,6 +4120,7 @@
3065	4120	}
3066	4121
3067	4122	copy = group;
	4123	+
3068	4124	//Globals.theRenderer.object = group;
3069	4125	if(!useclient)
3070	4126	{
..	..	@@ -3081,7 +4137,9 @@
3081	4137	sideView.object = group;
3082	4138	}
3083	4139
3084		-// fix "+" issue group.editWindow = this;
	4140	+// fix "+" issue
	4141	+ //group.editWindow = this;
	4142	+ group.manipWindow = this;
3085	4143
3086	4144	/*
3087	4145	currentLayout = radio.layout;
..	..	@@ -3089,13 +4147,64 @@
3089	4147	currentLayout = sevenButton;
3090	4148	*/
3091	4149	radio.layout.doClick();
	4150	+
	4151	+ //assert(copy instanceof Composite);
	4152	+
	4153	+ if (copy.versionlist == null)
	4154	+ {
	4155	+ copy.versionindex = -1;
	4156	+
	4157	+ // Cannot work with loops
	4158	+ // To fix this issue, we first mark all nodes above the root,
	4159	+ // and check if any of these nodes are reachable below the root.
	4160	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4161	+
	4162	+ if (copy instanceof Composite && !copy.HasTags())
	4163	+ {
	4164	+ if (copy.versionlist == null)
	4165	+ copy.versionlist = new Object3D[100];
	4166	+
	4167	+ //Save(true);
	4168	+ }
	4169	+ else
	4170	+ copy.versionindex = -2;
	4171	+
	4172	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4173	+ }
	4174	+
	4175	+ SetVersionStates();
	4176	+
	4177	+ ClearUnpinned();
	4178	+
	4179	+ //Grafreed.Assert(group != null);
	4180	+ //Grafreed.Assert(group.selection != null);
	4181	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4182	+ if (group.selection == null \|\| group.selection.size() == 1)
	4183	+ EditSelection(false);
3092	4184	keepparent = group.parent;
3093	4185	// PARENT = NULL or not???
3094	4186	//group.parent = null; // ROOT
3095	4187	//group.attributes = -1;
3096	4188	ResetModel();
	4189	+
	4190	+ cameraView.requestFocusInWindow();
3097	4191	refreshContents(true);
3098		- }
	4192	+ } else if (event.getSource() == editCameraItem)
	4193	+ {
	4194	+ cameraView.ProtectCamera();
	4195	+ cameraView.requestFocusInWindow();
	4196	+ cameraView.repaint();
	4197	+ return;
	4198	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4199	+ {
	4200	+ cameraView.RevertCamera();
	4201	+ cameraView.requestFocusInWindow();
	4202	+ cameraView.repaint();
	4203	+ return;
	4204	+ // } else if (event.getSource() == textureButton)
	4205	+ // {
	4206	+ // return; // true;
	4207	+ }
3099	4208	else
3100	4209	{
3101	4210	//return super.action(event, arg);
..	..	@@ -3104,7 +4213,6 @@
3104	4213	}
3105	4214
3106	4215	boolean useclient = false;
3107		- cRadio radio;
3108	4216
3109	4217	void ToggleRoot()
3110	4218	{
..	..	@@ -3179,6 +4287,18 @@
3179	4287	refreshContents();
3180	4288	}
3181	4289
	4290	+ void TextureRatio(int axis)
	4291	+ {
	4292	+ Object3D obj;
	4293	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4294	+ {
	4295	+ obj = (Object3D)e.nextElement();
	4296	+ obj.TextureRatio(axis);
	4297	+ }
	4298	+
	4299	+ refreshContents();
	4300	+ }
	4301	+
3182	4302	void ResetTransform()
3183	4303	{
3184	4304	ResetTransform(-1);
..	..	@@ -3194,42 +4314,8 @@
3194	4314	if (obj.toParent == null)
3195	4315	continue;
3196	4316
3197		- if (mask == -1)
3198		- {
3199		- if (obj instanceof Camera) // jan 2014
3200		- {
3201		- LA.matIdentity(obj.toParent);
3202		- LA.matIdentity(obj.fromParent);
3203		- }
3204		- else
3205		- {
3206		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
3207		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
3208		- }
3209		- TouchTransform(obj);
3210		- continue;
3211		- }
3212		- if ((mask&2) != 0) // Scale
3213		- {
3214		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
3215		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3216		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3217		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
3218		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3219		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3220		- }
3221		- if ((mask&4) != 0) // Rotation
3222		- {
3223		- // ?
3224		- }
3225		- if ((mask&1) != 0) // Translation
3226		- {
3227		- if (obj.toParent != null)
3228		- {
3229		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
3230		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
3231		- }
3232		- }
	4317	+ obj.ResetTransform(mask);
	4318	+
3233	4319	if (obj.parent == null)
3234	4320	{
3235	4321	System.out.println("NULL PARENT!");
..	..	@@ -3343,7 +4429,8 @@
3343	4429
3344	4430	int size = obj.MemorySize();
3345	4431
3346		- System.err.println((size/1024) + " KB is the size of " + obj);
	4432	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4433	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3347	4434	}
3348	4435	}
3349	4436	catch (Exception e)
..	..	@@ -3424,6 +4511,13 @@
3424	4511	void GenNormals(boolean crease)
3425	4512	{
3426	4513	group.GenNormalsS(crease);
	4514	+
	4515	+ refreshContents();
	4516	+ }
	4517	+
	4518	+ void GenNormalsMESH()
	4519	+ {
	4520	+ group.GenNormalsMeshS();
3427	4521
3428	4522	refreshContents();
3429	4523	}
..	..	@@ -3659,7 +4753,7 @@
3659	4753
3660	4754	try
3661	4755	{
3662		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4756	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
3663	4757	}
3664	4758	catch (Exception e)
3665	4759	{
..	..	@@ -3729,6 +4823,12 @@
3729	4823	for (int i=0; i<group.selection.size(); i++)
3730	4824	{
3731	4825	Object3D obj = group.selection.get(i);
	4826	+
	4827	+ if (obj.toParent == null)
	4828	+ {
	4829	+ obj.toParent = LA.newMatrix();
	4830	+ obj.fromParent = LA.newMatrix();
	4831	+ }
3732	4832
3733	4833	LA.matTranslate(obj.toParent, i * scale, 0, 0);
3734	4834	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
..	..	@@ -4021,6 +5121,12 @@
4021	5121	refreshContents();
4022	5122	}
4023	5123
	5124	+ void ClearVersions()
	5125	+ {
	5126	+ group.selection.ClearVersions();
	5127	+ refreshContents();
	5128	+ }
	5129	+
4024	5130	void FlipV(boolean flip)
4025	5131	{
4026	5132	group.selection.FlipV(flip);
..	..	@@ -4048,6 +5154,18 @@
4048	5154	void MarkLeaves(boolean hide)
4049	5155	{
4050	5156	group.selection.MarkLeaves(hide);
	5157	+ refreshContents();
	5158	+ }
	5159	+
	5160	+ void RewindLeaves(boolean hide)
	5161	+ {
	5162	+ group.selection.RewindLeaves(hide);
	5163	+ refreshContents();
	5164	+ }
	5165	+
	5166	+ void RandomLeaves(boolean hide)
	5167	+ {
	5168	+ group.selection.RandomLeaves(hide);
4051	5169	refreshContents();
4052	5170	}
4053	5171
..	..	@@ -4122,28 +5240,25 @@
4122	5240	// }
4123	5241	// }
4124	5242
4125		- static boolean allparams = true;
4126		-
4127		- static Vector<Object3D> listUI = new Vector<Object3D>();
4128		-
4129	5243	void EditSelection(boolean newWindow)
4130	5244	{
	5245	+ if (group.selection == null)
	5246	+ {
	5247	+ EditElement(group, newWindow); // ? new
	5248	+ return;
	5249	+ }
	5250	+
4131	5251	// aConstraints.gridy = 0;
4132	5252	for (int i=0; i<group.selection.size(); i++)
4133	5253	{
4134	5254	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4135	5255	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4136		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5256	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4137	5257
4138	5258	Object3D elem = (Object3D)group.selection.elementAt(i);
4139	5259	if(elem != group \|\| !newWindow)
4140	5260	{
4141		- // if (!(elem instanceof Composite))
4142		- // newWindow = false;
4143		- listUI.add(elem);
4144		- elem.openEditWindow(this, newWindow); //, false);
4145		- System.out.println("edit : " + elem);
4146		- elem.editWindow.refreshContents(true); // ? new
	5261	+ EditElement(elem, newWindow); // ? new
4147	5262	}
4148	5263	}
4149	5264	}
..	..	@@ -4206,9 +5321,7 @@
4206	5321
4207	5322	freezemodel = false;
4208	5323	}
4209		-
4210		- boolean flashIt = true;
4211		-
	5324	+
4212	5325	public void valueChanged(TreeSelectionEvent e)
4213	5326	//public boolean handleEvent(Event event)
4214	5327	{
..	..	@@ -4218,7 +5331,8 @@
4218	5331	//new Exception().printStackTrace();
4219	5332
4220	5333	freezemodel = true;
4221		-
	5334	+ ClearUnpinned();
	5335	+
4222	5336	/**/
4223	5337	//switch (event.id)
4224	5338	{
..	..	@@ -4226,7 +5340,6 @@
4226	5340	//case 702: // Event.LIST_DESELECT
4227	5341	group.deselectAll();
4228	5342	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4229		- objEditor.ClearInfo(); // .GetMaterial());
4230	5343	if (tps != null)
4231	5344	{
4232	5345	for (int i=0; i < tps.length; i++)
..	..	@@ -4235,10 +5348,8 @@
4235	5348
4236	5349	//if (child.parent != null)
4237	5350	//child.parent.addSelectee(child);
	5351	+ objEditor.SetMaterial(child);
4238	5352	group.addSelectee(child);
4239		- objEditor.SetMaterial(child); // .GetMaterial());
4240		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4241		- System.err.println("info : " + child.GetPath());
4242	5353	}
4243	5354	}
4244	5355	// else
..	..	@@ -4248,20 +5359,28 @@
4248	5359	// System.err.println("info : " + group.GetPath());
4249	5360	// }
4250	5361
4251		- objEditor.SetText(); // jan 2014
4252		-
4253		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5362	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4254	5363	CameraPane.flash = true;
4255	5364
4256		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5365	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4257	5366	// a camera
4258	5367	{
4259		- CameraPane.camerachangeframe = 0; // don't refuse it
4260		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5368	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
	5369	+ {
	5370	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5371	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5372	+ }
4261	5373	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4262	5374	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4263	5375	}
4264	5376
	5377	+ if (tps != null && tps.length == 1)
	5378	+ {
	5379	+ EditSelection(false);
	5380	+ }
	5381	+
	5382	+ SetPinStates(tps != null && tps.length > 0);
	5383	+
4265	5384	refreshContents();
4266	5385	//return true;
4267	5386	}
..	..	@@ -4270,6 +5389,53 @@
4270	5389
4271	5390	freezemodel = false;
4272	5391	}
	5392	+
	5393	+ void SetPinStates(boolean enabled)
	5394	+ {
	5395	+ editButton.setEnabled(enabled);
	5396	+ uneditButton.setEnabled(enabled);
	5397	+ //unselectButton.setEnabled(enabled);
	5398	+ flashSelectionButton.setEnabled(enabled);
	5399	+
	5400	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5401	+
	5402	+ boolean allComposites = true;
	5403	+
	5404	+ if (group.selection != null)
	5405	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5406	+ {
	5407	+ Object next = e.nextElement();
	5408	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5409	+ {
	5410	+ allComposites = false;
	5411	+ break;
	5412	+ }
	5413	+ }
	5414	+
	5415	+ rootButton.setEnabled(true); // allComposites);
	5416	+ }
	5417	+
	5418	+ void refreshContents(boolean cp)
	5419	+ {
	5420	+ if (Globals.SHOWINFO)
	5421	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5422	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5423	+ {
	5424	+ objEditor.ClearInfo(); // .GetMaterial());
	5425	+
	5426	+ for (int i=0; i < group.selection.Size(); i++)
	5427	+ {
	5428	+ Object3D child = (Object3D) group.selection.get(i);
	5429	+
	5430	+ objEditor.AddInfo(child, this, true);
	5431	+// System.err.println("info : " + child.GetPath());
	5432	+ }
	5433	+
	5434	+ objEditor.SetText(); // jan 2014
	5435	+ }
	5436	+
	5437	+ super.refreshContents(cp);
	5438	+ }
4273	5439
4274	5440	void linkSomething(Object3D thing)
4275	5441	{
..	..	@@ -4341,6 +5507,7 @@
4341	5507	{
4342	5508	if (group.selection.isEmpty())
4343	5509	return;
	5510	+
4344	5511	Grafreed.clipboardIsTempGroup = false;
4345	5512	Composite tGroup = null;
4346	5513	if (group.selection.size() > 0) // 1)
..	..	@@ -4351,6 +5518,8 @@
4351	5518
4352	5519	if (cut)
4353	5520	{
	5521	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5522	+// Save();
4354	5523	//int indices[] = jList.getSelectedIndices();
4355	5524	//for (int i = indices.length - 1; i >= 0; i--)
4356	5525	//jList.remove(indices[i]);
..	..	@@ -4440,8 +5609,10 @@
4440	5609	}
4441	5610
4442	5611	}
	5612	+
4443	5613	if (Grafreed.clipboardIsTempGroup)
4444	5614	Grafreed.clipboard = tGroup;
	5615	+
4445	5616	if (cut)
4446	5617	{
4447	5618	ResetModel();
..	..	@@ -4451,6 +5622,10 @@
4451	5622
4452	5623	void paste(boolean expand)
4453	5624	{
	5625	+ if (Globals.REPLACEONMAKE)
	5626	+ Save();
	5627	+ boolean keep = Globals.REPLACEONMAKE;
	5628	+ Globals.REPLACEONMAKE = false;
4454	5629	// if (GrafreeD.clipboard == null)
4455	5630	// return;
4456	5631	boolean first = true;
..	..	@@ -4510,6 +5685,7 @@
4510	5685	Grafreed.clipboard.get(0).parent = keepparent;
4511	5686	}
4512	5687
	5688	+ Globals.REPLACEONMAKE = keep;
4513	5689	ResetModel();
4514	5690	refreshContents();
4515	5691	}
..	..	@@ -4645,6 +5821,10 @@
4645	5821
4646	5822	void group(Object3D csg, boolean grab)
4647	5823	{
	5824	+ if (Globals.REPLACEONMAKE)
	5825	+ Save();
	5826	+ boolean keep = Globals.REPLACEONMAKE;
	5827	+ Globals.REPLACEONMAKE = false;
4648	5828	if (//false) // why??
4649	5829	!group.selection.isEmpty())
4650	5830	{
..	..	@@ -4758,10 +5938,15 @@
4758	5938	//node.add(csg);
4759	5939	//makeSomething(node);
4760	5940	makeSomething(csg);
	5941	+ Globals.REPLACEONMAKE = keep;
4761	5942	}
4762	5943
4763	5944	void Ungroup(Object3D g)
4764	5945	{
	5946	+ if (Globals.REPLACEONMAKE)
	5947	+ Save();
	5948	+ boolean keep = Globals.REPLACEONMAKE;
	5949	+ Globals.REPLACEONMAKE = false;
4765	5950	if (g instanceof HiddenObject)
4766	5951	{
4767	5952	HiddenObject h = (HiddenObject) g;
..	..	@@ -4778,6 +5963,7 @@
4778	5963	objEditor.makeSomething(g.get(i), false);
4779	5964	}
4780	5965	}
	5966	+ Globals.REPLACEONMAKE = keep;
4781	5967	}
4782	5968
4783	5969	void ungroup()
..	..	@@ -4973,21 +6159,6 @@
4973	6159	}
4974	6160	*/
4975	6161
4976		- void ImportGFD()
4977		- {
4978		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4979		- browser.show();
4980		- String filename = browser.getFile();
4981		- if (filename != null && filename.length() > 0)
4982		- {
4983		- String fullname = browser.getDirectory() + filename;
4984		-
4985		- //Object3D readobj =
4986		- objEditor.ReadGFD(fullname, objEditor);
4987		- //makeSomething(readobj);
4988		- }
4989		- }
4990		-
4991	6162	/*
4992	6163	public void Callback(Object obj)
4993	6164	{
..	..	@@ -5011,23 +6182,6 @@
5011	6182	}
5012	6183	*/
5013	6184
5014		- void ImportVRMLX3D()
5015		- {
5016		- if (Grafreed.standAlone)
5017		- {
5018		- /**/
5019		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
5020		- browser.show();
5021		- String filename = browser.getFile();
5022		- if (filename != null && filename.length() > 0)
5023		- {
5024		- String fullname = browser.getDirectory() + filename;
5025		- LoadVRMLX3D(fullname);
5026		- }
5027		- /**/
5028		- }
5029		- }
5030		-
5031	6185	String GetFile(String dialogName)
5032	6186	{
5033	6187	if (Grafreed.standAlone)
..	..	@@ -5098,7 +6252,43 @@
5098	6252	cButton clearpanelButton;
5099	6253	cButton unselectButton;
5100	6254
	6255	+ cButton restoreCameraButton;
	6256	+
5101	6257	cButton oneStepButton;
	6258	+
	6259	+ cButton groupButton;
	6260	+ cButton ungroupButton;
	6261	+ cButton compositeButton;
	6262	+ cButton switchButton;
	6263	+ cButton loopButton;
	6264	+ cButton textureButton;
	6265	+
	6266	+ cButton skybox1Button;
	6267	+ cButton skybox2Button;
	6268	+ cButton skybox3Button;
	6269	+ cButton skybox4Button;
	6270	+ cButton skybox5Button;
	6271	+ cButton skybox6Button;
	6272	+ cButton skybox7Button;
	6273	+
	6274	+ cButton skybox11Button;
	6275	+ cButton skybox12Button;
	6276	+ cButton skybox13Button;
	6277	+ cButton skybox14Button;
	6278	+ cButton skybox15Button;
	6279	+ cButton skybox16Button;
	6280	+ cButton skybox17Button;
	6281	+
	6282	+ cButton gridButton;
	6283	+ cButton boxButton;
	6284	+ cButton sphereButton;
	6285	+ cButton coneButton;
	6286	+ cButton torusButton;
	6287	+ cButton superButton;
	6288	+ cButton kleinButton;
	6289	+ cButton particlesButton;
	6290	+ cButton overlayButton;
	6291	+ cButton lightButton;
5102	6292
5103	6293	cButton screenfitButton;
5104	6294	cButton screenfitpointButton;
..	..	@@ -5111,14 +6301,6 @@
5111	6301
5112	6302	cButton setsupportButton;
5113	6303
5114		- cButton twoButton;
5115		- cButton sixButton;
5116		- cButton threeButton;
5117		- cButton sevenButton;
5118		- cButton fourButton; // full panel
5119		- cButton oneButton; // full XYZ
5120		- //cButton currentLayout;
5121		-
5122	6304	//
5123	6305	//Composite
5124	6306	Object3D // to do !!
..	..	@@ -5128,10 +6310,12 @@
5128	6310	//JTree jTree;
5129	6311	private MenuItem lookAtItem;
5130	6312	private MenuItem lookFromItem;
5131		- private MenuItem switchItem;
5132		- private MenuItem cutItem;
5133		- private MenuItem duplicateItem;
5134		- private MenuItem cloneItem;
	6313	+ private MenuItem switchViewItem;
	6314	+ private JMenuItem cutItem;
	6315	+ private MenuItem undoItem;
	6316	+ private MenuItem redoItem;
	6317	+ private JMenuItem duplicateItem;
	6318	+ private JMenuItem cloneItem;
5135	6319	private MenuItem cloneSupportItem;
5136	6320	private MenuItem overwriteGeoItem;
5137	6321	private MenuItem overwriteMatItem;
..	..	@@ -5152,13 +6336,13 @@
5152	6336	private MenuItem cloneGeometriesItem;
5153	6337	private MenuItem shareGeometriesItem;
5154	6338	private MenuItem mergeGeometriesItem;
5155		- private MenuItem copyItem;
	6339	+ private JMenuItem copyItem;
5156	6340	private MenuItem pasteItem;
5157		- private MenuItem pasteIntoItem;
5158		- private MenuItem pasteLinkItem;
5159		- private MenuItem pasteCloneItem;
5160		- private MenuItem pasteExpandItem;
5161		- private MenuItem clearItem;
	6341	+ private JMenuItem pasteIntoItem;
	6342	+ private JMenuItem pasteLinkItem;
	6343	+ private JMenuItem pasteCloneItem;
	6344	+ private JMenuItem pasteExpandItem;
	6345	+ private JMenuItem deleteItem;
5162	6346	private MenuItem clearAllItem;
5163	6347	private MenuItem genUVItem;
5164	6348	private MenuItem genNormalsMESHItem;
..	..	@@ -5184,6 +6368,7 @@
5184	6368	private MenuItem clipMeshItem;
5185	6369	private MenuItem smoothMeshItem;
5186	6370	private MenuItem clearMaterialsItem;
	6371	+ private MenuItem clearVersionsItem;
5187	6372
5188	6373	private MenuItem liveleavesItem;
5189	6374	private MenuItem unliveleavesItem;
..	..	@@ -5193,6 +6378,10 @@
5193	6378	private MenuItem showleavesItem;
5194	6379	private MenuItem markleavesItem;
5195	6380	private MenuItem unmarkleavesItem;
	6381	+ private MenuItem rewindleavesItem;
	6382	+ private MenuItem unrewindleavesItem;
	6383	+ private MenuItem randomleavesItem;
	6384	+ private MenuItem unrandomleavesItem;
5196	6385
5197	6386	private MenuItem flipVItem;
5198	6387	private MenuItem unflipVItem;
..	..	@@ -5203,18 +6392,21 @@
5203	6392	private MenuItem maxTexturesItem;
5204	6393	private MenuItem panoTexturesItem;
5205	6394
	6395	+ private MenuItem textureRatioRItem;
	6396	+ private MenuItem textureRatioGItem;
	6397	+ private MenuItem textureRatioBItem;
5206	6398	private MenuItem resetCentroidItem;
5207	6399	private MenuItem resetCentroidXZItem;
5208	6400	private MenuItem resetTransformItem;
5209	6401	private MenuItem transformGeometryItem;
5210	6402	private MenuItem transformChildrenItem;
5211	6403	private MenuItem hideItem;
5212		- private MenuItem grabItem;
	6404	+ private JMenuItem grabItem;
5213	6405	private MenuItem backItem;
5214	6406	private MenuItem frontItem;
5215	6407	private MenuItem cameraItem;
5216	6408	private MenuItem compositeItem;
5217		- private MenuItem randomItem;
	6409	+ private MenuItem switchItem;
5218	6410	private MenuItem physicsItem;
5219	6411	private MenuItem frameselectorItem;
5220	6412	private MenuItem scriptNodeItem;
..	..	@@ -5222,7 +6414,7 @@
5222	6414	private MenuItem switchTransfoItem;
5223	6415	private MenuItem morphItem;
5224	6416	private MenuItem linkerItem;
5225		- private MenuItem ungroupItem;
	6417	+ private JMenuItem ungroupItem;
5226	6418	private MenuItem editItem;
5227	6419	private MenuItem openWindowItem;
5228	6420	private MenuItem editLeafItem;
..	..	@@ -5238,6 +6430,8 @@
5238	6430	private MenuItem attachBumpItem;
5239	6431	private MenuItem detachBumpItem;
5240	6432	private MenuItem pigmentBumpItem;
	6433	+ private MenuItem embedTexturesItem;
	6434	+ private MenuItem deEmbedTexturesItem;
5241	6435
5242	6436	private MenuItem particleItem;
5243	6437	private MenuItem ragdollItem;
..	..	@@ -5276,11 +6470,6 @@
5276	6470	private MenuItem doubleItem;
5277	6471	private MenuItem tripleItem;
5278	6472
5279		- private MenuItem importGFDItem;
5280		- private MenuItem importVRMLX3DItem;
5281		- private MenuItem import3DSItem;
5282		- private MenuItem importOBJItem;
5283		-
5284	6473	private MenuItem computeAOItem;
5285	6474	private MenuItem recompileItem;
5286	6475	private MenuItem editScriptItem;
..	..	@@ -5290,4 +6479,8 @@
5290	6479	private MenuItem analyzeItem;
5291	6480	private MenuItem dumpItem;
5292	6481	//boolean freezemodel = false;
	6482	+
	6483	+ Menu cameraMenu;
	6484	+ MenuItem editCameraItem;
	6485	+ MenuItem restoreCameraItem;
5293	6486	}