~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -143,6 +143,8 @@
143	143	//nameField.removeActionListener(this);
144	144	// objEditor.ctrlPanel.remove(nameField);
145	145
	146	+ objEditor.ctrlPanel.remove(namePanel);
	147	+
146	148	if (!GroupEditor.allparams)
147	149	return;
148	150
..	..	@@ -165,8 +167,8 @@
165	167	// objEditor.ctrlPanel.remove(fasterButton);
166	168	// objEditor.ctrlPanel.remove(remarkButton);
167	169
168		- objEditor.ctrlPanel.remove(namePanel);
169	170	objEditor.ctrlPanel.remove(setupPanel);
	171	+ objEditor.ctrlPanel.remove(setupPanel2);
170	172	objEditor.ctrlPanel.remove(commandsPanel);
171	173	objEditor.ctrlPanel.remove(pushPanel);
172	174	//objEditor.ctrlPanel.remove(fillPanel);
..	..	@@ -275,24 +277,40 @@
275	277	void SetupMenu()
276	278	{
277	279	frame.setMenuBar(menuBar = new MenuBar());
278		- menuBar.add(windowMenu = new Menu("File"));
279		- windowMenu.add(loadItem = new MenuItem("Load..."));
280		- windowMenu.add("-");
281		- windowMenu.add(saveItem = new MenuItem("Save"));
282		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	280	+ menuBar.add(fileMenu = new Menu("File"));
	281	+ fileMenu.add(newItem = new MenuItem("New"));
	282	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	283	+
	284	+ //oe.menuBar.add(menu = new Menu("Include"));
	285	+ Menu menu = new Menu("Import");
	286	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	287	+ importOBJItem.addActionListener(this);
	288	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	289	+ import3DSItem.addActionListener(this);
	290	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	291	+ importVRMLX3DItem.addActionListener(this);
	292	+ menu.add("-");
	293	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	294	+ importGFDItem.addActionListener(this);
	295	+ fileMenu.add(menu);
	296	+ fileMenu.add("-");
	297	+
	298	+ fileMenu.add(saveItem = new MenuItem("Save"));
	299	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
283	300	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
284		- windowMenu.add("-");
285		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
286		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
287		- windowMenu.add("-");
	301	+ fileMenu.add("-");
	302	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	303	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	304	+ fileMenu.add("-");
288	305	if (client.parent != null)
289	306	{
290		- windowMenu.add(closeItem = new MenuItem("Close"));
	307	+ fileMenu.add(closeItem = new MenuItem("Close"));
291	308	} else
292	309	{
293		- windowMenu.add(closeItem = new MenuItem("Exit"));
	310	+ fileMenu.add(closeItem = new MenuItem("Exit"));
294	311	}
295	312
	313	+ newItem.addActionListener(this);
296	314	loadItem.addActionListener(this);
297	315	saveItem.addActionListener(this);
298	316	saveAsItem.addActionListener(this);
..	..	@@ -300,61 +318,6 @@
300	318	reexportItem.addActionListener(this);
301	319	//povItem.addActionListener(this);
302	320	closeItem.addActionListener(this);
303		-
304		- menuBar.add(cameraMenu = new Menu("View"));
305		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
306		- //zBufferItem.addActionListener(this);
307		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
308		- //normalLensItem.addActionListener(this);
309		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
310		- revertCameraItem.addActionListener(this);
311		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
312		- toggleTimelineItem.addItemListener(this);
313		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314		- toggleFullScreenItem.addItemListener(this);
315		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316		- cameraMenu.add("-");
317		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
318		- toggleTextureItem.addItemListener(this);
319		- toggleTextureItem.setState(CameraPane.textureon);
320		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
321		- toggleLiveItem.addItemListener(this);
322		- toggleLiveItem.setState(Globals.isLIVE());
323		- cameraMenu.add(stepItem = new MenuItem("Step"));
324		- stepItem.addActionListener(this);
325		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
326		-// toggleDLItem.addItemListener(this);
327		-// toggleDLItem.setState(false);
328		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
329		- toggleRenderItem.addItemListener(this);
330		- toggleRenderItem.setState(!CameraPane.frozen);
331		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
332		- toggleDebugItem.addItemListener(this);
333		- toggleDebugItem.setState(CameraPane.DEBUG);
334		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
335		- toggleFrustumItem.addItemListener(this);
336		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
337		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
338		- toggleFootContactItem.addItemListener(this);
339		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
340		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
341		- toggleRandomItem.addItemListener(this);
342		- toggleRandomItem.setState(CameraPane.RANDOM);
343		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
344		- toggleHandleItem.addItemListener(this);
345		- toggleHandleItem.setState(CameraPane.HANDLES);
346		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
347		- togglePaintItem.addItemListener(this);
348		- togglePaintItem.setState(CameraPane.PAINTMODE);
349		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
350		-// toggleRootItem.addItemListener(this);
351		-// toggleRootItem.setState(false);
352		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
353		-// animationItem.addItemListener(this);
354		-// animationItem.setState(CameraPane.ANIMATION);
355		- cameraMenu.add("-");
356		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
357		- editCameraItem.addActionListener(this);
358	321
359	322	objectPanel = new JTabbedPane();
360	323	toolbarPanel = new JPanel();
..	..	@@ -457,10 +420,10 @@
457	420	e.printStackTrace();
458	421	}
459	422
460		- String selection = infoarea.getText();
461		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
462		- java.awt.datatransfer.Clipboard clipboard =
463		- Toolkit.getDefaultToolkit().getSystemClipboard();
	423	+// String selection = infoarea.getText();
	424	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	425	+// java.awt.datatransfer.Clipboard clipboard =
	426	+// Toolkit.getDefaultToolkit().getSystemClipboard();
464	427	//clipboard.setContents(data, data);
465	428	}
466	429
..	..	@@ -483,13 +446,13 @@
483	446	//SendInfo("Name:", "bold");
484	447	if (sel.GetTextures() != null \|\| debug)
485	448	{
486		- si.SendInfo(sel.toString(), "bold");
	449	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
487	450	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
488	451	if (sel.Size() > 0)
489	452	{
490	453	si.SendInfo("#children = " + sel.Size(), "regular");
491	454	}
492		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	455	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
493	456	if (debug)
494	457	{
495	458	try
..	..	@@ -531,7 +494,7 @@
531	494	}
532	495	if (sel.support != null)
533	496	{
534		- si.SendInfo(" support: " + sel.support, "regular");
	497	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
535	498	}
536	499	if (sel.scriptnode != null)
537	500	{
..	..	@@ -734,7 +697,7 @@
734	697	protected static ImageIcon createImageIcon(String path,
735	698	String description)
736	699	{
737		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	700	+ java.net.URL imgURL = Grafreed.class.getResource(path);
738	701	if (imgURL != null)
739	702	{
740	703	return new ImageIcon(imgURL, description);
..	..	@@ -766,6 +729,7 @@
766	729	// NumberSlider vDivsField;
767	730	// JCheckBox endcaps;
768	731	JCheckBox liveCB;
	732	+ JCheckBox selectCB;
769	733	JCheckBox hideCB;
770	734	JCheckBox link2masterCB;
771	735	JCheckBox markCB;
..	..	@@ -784,6 +748,7 @@
784	748
785	749	cGridBag namePanel;
786	750	cGridBag setupPanel;
	751	+ cGridBag setupPanel2;
787	752	cGridBag commandsPanel;
788	753	cGridBag pushPanel;
789	754	cGridBag fillPanel;
..	..	@@ -967,33 +932,56 @@
967	932	setupPanel = new cGridBag().setVertical(false);
968	933
969	934	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
970		- if (Globals.ADVANCED)
971		- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
972		- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	935	+ liveCB.setToolTipText("Animate object");
	936	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	937	+ selectCB.setToolTipText("Make object selectable");
973	938	// Return();
	939	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	940	+ hideCB.setToolTipText("Hide object");
974	941	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
975		- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
976		- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	942	+ markCB.setToolTipText("Set the animation target transform");
	943	+
	944	+ setupPanel2 = new cGridBag().setVertical(false);
	945	+
	946	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	947	+ rewindCB.setToolTipText("Rewind animation");
	948	+
	949	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	950	+ randomCB.setToolTipText("Rewind or Go back and forth randomly");
977	951
	952	+ if (Globals.ADVANCED)
	953	+ {
	954	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	955	+ link2masterCB.setToolTipText("Attach to support");
	956	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	957	+ speedupCB.setToolTipText("Option motion capture");
	958	+ }
	959	+
978	960	oe.ctrlPanel.add(setupPanel);
	961	+ oe.ctrlPanel.Return();
	962	+ oe.ctrlPanel.add(setupPanel2);
979	963	oe.ctrlPanel.Return();
980	964
981	965	commandsPanel = new cGridBag().setVertical(false);
982	966
983	967	resetButton = AddButton(commandsPanel, "Reset");
	968	+ resetButton.setToolTipText("Jump to frame zero");
984	969	stepButton = AddButton(commandsPanel, "Step");
	970	+ stepButton.setToolTipText("Step one frame");
985	971	// resetAllButton = AddButton(oe, "Reset All");
986	972	// stepAllButton = AddButton(oe, "Step All");
987		- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
988	973	// Return();
989	974	slowerButton = AddButton(commandsPanel, "Slow");
	975	+ slowerButton.setToolTipText("Decrease animation speed");
990	976	fasterButton = AddButton(commandsPanel, "Fast");
	977	+ fasterButton.setToolTipText("Increase animation speed");
991	978	remarkButton = AddButton(commandsPanel, "Remark");
	979	+ remarkButton.setToolTipText("Set the current transform as the target");
992	980
993	981	oe.ctrlPanel.add(commandsPanel);
994	982	oe.ctrlPanel.Return();
995	983
996		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	984	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
997	985	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
998	986	//Return();
999	987
..	..	@@ -1295,7 +1283,7 @@
1295	1283	scrollpane.addMouseWheelListener(this); // Default not fast enough
1296	1284
1297	1285	/JTabbedPane/ scenePanel = new cGridBag();
1298		- scenePanel.preferredWidth = 7;
	1286	+ scenePanel.preferredWidth = 6;
1299	1287
1300	1288	JTabbedPane tabbedPane = new JTabbedPane();
1301	1289	tabbedPane.add(scrollpane);
..	..	@@ -1401,8 +1389,8 @@
1401	1389
1402	1390	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1403	1391
1404		- frame.setSize(1024, 768);
1405		- frame.show();
	1392	+ frame.setSize(1280, 860);
	1393	+ frame.setVisible(true);
1406	1394
1407	1395	gridPanel.setDividerLocation(1.0);
1408	1396
..	..	@@ -1441,19 +1429,22 @@
1441	1429
1442	1430	cGridBag editBar = new cGridBag().setVertical(false);
1443	1431
1444		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1432	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1445	1433	createMaterialButton.setToolTipText("Create material");
1446	1434
1447	1435	/*
1448	1436	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1449	1437	*/
1450	1438
1451		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1439	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1452	1440	clearMaterialButton.setToolTipText("Clear material");
1453	1441
1454		- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1455		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1456		- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1442	+ if (Globals.ADVANCED)
	1443	+ {
	1444	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1445	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1446	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1447	+ }
1457	1448
1458	1449	editBar.preferredHeight = 15;
1459	1450
..	..	@@ -1722,12 +1713,15 @@
1722	1713	opacityPowerField.addChangeListener(this);
1723	1714	/**/
1724	1715
1725		- resetSlidersButton.addActionListener(this);
1726	1716	clearMaterialButton.addActionListener(this);
1727	1717	createMaterialButton.addActionListener(this);
1728		-
1729		- propagateToggle.addItemListener(this);
1730		- multiplyToggle.addItemListener(this);
	1718	+
	1719	+ if (Globals.ADVANCED)
	1720	+ {
	1721	+ resetSlidersButton.addActionListener(this);
	1722	+ propagateToggle.addItemListener(this);
	1723	+ multiplyToggle.addItemListener(this);
	1724	+ }
1731	1725	}
1732	1726
1733	1727	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1898,7 +1892,7 @@
1898	1892
1899	1893	//? flashIt = false;
1900	1894	CameraPane pane = (CameraPane) cameraView;
1901		- pane.clickStart(location.x, location.y, 0);
	1895	+ pane.clickStart(location.x, location.y, 0, 0);
1902	1896	pane.clickEnd(location.x, location.y, 0, true);
1903	1897
1904	1898	if (group.selection.size() == 1)
..	..	@@ -1947,6 +1941,7 @@
1947	1941	e2.printStackTrace();
1948	1942	}
1949	1943	}
	1944	+
1950	1945	LoadJMEThread loadThread;
1951	1946
1952	1947	class LoadJMEThread extends Thread
..	..	@@ -2004,6 +1999,7 @@
2004	1999	//LoadFile0(filename, converter);
2005	2000	}
2006	2001	}
	2002	+
2007	2003	LoadOBJThread loadObjThread;
2008	2004
2009	2005	class LoadOBJThread extends Thread
..	..	@@ -2082,19 +2078,19 @@
2082	2078
2083	2079	void LoadObjFile(String fullname)
2084	2080	{
2085		- /*
	2081	+ System.out.println("Loading " + fullname);
	2082	+ /**/
2086	2083	//lastFilename = fullname;
2087	2084	if(loadObjThread == null)
2088	2085	{
2089		- loadObjThread = new LoadOBJThread();
2090		- loadObjThread.start();
	2086	+ loadObjThread = new LoadOBJThread();
	2087	+ loadObjThread.start();
2091	2088	}
2092	2089
2093	2090	loadObjThread.add(fullname);
2094		- */
	2091	+ /**/
2095	2092
2096		- System.out.println("Loading " + fullname);
2097		- makeSomething(new FileObject(fullname, true), true);
	2093	+ //makeSomething(new FileObject(fullname, true), true);
2098	2094	}
2099	2095
2100	2096	void LoadGFDFile(String fullname)
..	..	@@ -2355,11 +2351,11 @@
2355	2351
2356	2352	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2357	2353	{
2358		- if (GrafreeD.standAlone)
	2354	+ if (Grafreed.standAlone)
2359	2355	{
2360	2356	/**/
2361	2357	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2362		- browser.show();
	2358	+ browser.setVisible(true);
2363	2359	String filename = browser.getFile();
2364	2360	if (filename != null && filename.length() > 0)
2365	2361	{
..	..	@@ -2719,7 +2715,8 @@
2719	2715	return;
2720	2716	}
2721	2717
2722		- multiplyToggle.setSelected(mat.multiply);
	2718	+ if (multiplyToggle != null)
	2719	+ multiplyToggle.setSelected(mat.multiply);
2723	2720
2724	2721	assert (object.projectedVertices != null);
2725	2722
..	..	@@ -2934,9 +2931,9 @@
2934	2931	frame.validate();
2935	2932
2936	2933	return;
2937		- } else if (event.getSource() == toggleRandomItem)
	2934	+ } else if (event.getSource() == toggleSwitchItem)
2938	2935	{
2939		- cameraView.ToggleRandom();
	2936	+ cameraView.ToggleSwitch();
2940	2937	cameraView.repaint();
2941	2938	return;
2942	2939	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2965,6 +2962,10 @@
2965	2962	{
2966	2963	copy.live ^= true;
2967	2964	return;
	2965	+ } else if (event.getSource() == selectCB)
	2966	+ {
	2967	+ copy.dontselect ^= true;
	2968	+ return;
2968	2969	} else if (event.getSource() == hideCB)
2969	2970	{
2970	2971	copy.hide ^= true;
..	..	@@ -2979,6 +2980,7 @@
2979	2980	if (event.getSource() == randomCB)
2980	2981	{
2981	2982	copy.random ^= true;
	2983	+ objEditor.refreshContents();
2982	2984	return;
2983	2985	}
2984	2986	if (event.getSource() == speedupCB)
..	..	@@ -3002,8 +3004,9 @@
3002	3004
3003	3005	public void actionPerformed(ActionEvent event)
3004	3006	{
	3007	+ Object source = event.getSource();
3005	3008	// SCRIPT DIALOG
3006		- if (event.getSource() == okbutton)
	3009	+ if (source == okbutton)
3007	3010	{
3008	3011	textpanel.setVisible(false);
3009	3012	textpanel.remove(textarea);
..	..	@@ -3015,7 +3018,7 @@
3015	3018	textarea = null;
3016	3019	textpanel = null;
3017	3020	}
3018		- if (event.getSource() == cancelbutton)
	3021	+ if (source == cancelbutton)
3019	3022	{
3020	3023	textpanel.setVisible(false);
3021	3024	textpanel.remove(textarea);
..	..	@@ -3027,50 +3030,50 @@
3027	3030	//applySelf();
3028	3031	//client.refreshEditWindow();
3029	3032	//refreshContents();
3030		- if (event.getSource() == nameField)
	3033	+ if (source == nameField)
3031	3034	{
3032	3035	//System.out.println("ObjEditor " + event);
3033	3036	applySelf0(true);
3034	3037	//parent.applySelf();
3035	3038	objEditor.refreshContents();
3036		- } else if (event.getSource() == resetButton)
	3039	+ } else if (source == resetButton)
3037	3040	{
3038	3041	CameraPane.fullreset = true;
3039	3042	copy.Reset(); // ResetMeshes();
3040	3043	copy.Touch();
3041	3044	objEditor.refreshContents();
3042		- } else if (event.getSource() == stepItem)
	3045	+ } else if (source == stepItem)
3043	3046	{
3044	3047	//cameraView.ONESTEP = true;
3045	3048	Globals.ONESTEP = true;
3046	3049	cameraView.repaint();
3047	3050	return;
3048		- } else if (event.getSource() == stepButton)
	3051	+ } else if (source == stepButton)
3049	3052	{
3050	3053	copy.Step();
3051	3054	copy.Touch();
3052	3055	objEditor.refreshContents();
3053		- } else if (event.getSource() == slowerButton)
	3056	+ } else if (source == slowerButton)
3054	3057	{
3055	3058	copy.Slower();
3056	3059	copy.Touch();
3057	3060	objEditor.refreshContents();
3058		- } else if (event.getSource() == fasterButton)
	3061	+ } else if (source == fasterButton)
3059	3062	{
3060	3063	copy.Faster();
3061	3064	copy.Touch();
3062	3065	objEditor.refreshContents();
3063		- } else if (event.getSource() == remarkButton)
	3066	+ } else if (source == remarkButton)
3064	3067	{
3065	3068	copy.Remark();
3066	3069	copy.Touch();
3067	3070	objEditor.refreshContents();
3068		- } else if (event.getSource() == stepAllButton)
	3071	+ } else if (source == stepAllButton)
3069	3072	{
3070	3073	copy.StepAll();
3071	3074	copy.Touch();
3072	3075	objEditor.refreshContents();
3073		- } else if (event.getSource() == resetAllButton)
	3076	+ } else if (source == resetAllButton)
3074	3077	{
3075	3078	//CameraPane.fullreset = true;
3076	3079	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3103,53 +3106,75 @@
3103	3106	// Close();
3104	3107	// }
3105	3108	// else
3106		- if (event.getSource() == resetSlidersButton)
	3109	+ if (source == resetSlidersButton)
3107	3110	{
3108	3111	ResetSliders();
3109		- } else if (event.getSource() == clearMaterialButton)
	3112	+ } else if (source == clearMaterialButton)
3110	3113	{
3111	3114	ClearMaterial();
3112		- } else if (event.getSource() == createMaterialButton)
	3115	+ } else if (source == createMaterialButton)
3113	3116	{
3114	3117	CreateMaterial();
3115		- } else if (event.getSource() == clearPanelButton)
	3118	+ } else if (source == clearPanelButton)
3116	3119	{
3117	3120	copy.ClearUI();
3118	3121	refreshContents(true);
3119		- } /*
3120		- }
3121		-
3122		- public boolean action(Event event, Object arg)
3123		- {
3124		- */ else if (event.getSource() == closeItem)
	3122	+ } else if (source == importGFDItem)
	3123	+ {
	3124	+ ImportGFD();
	3125	+ } else
	3126	+ if (source == importVRMLX3DItem)
	3127	+ {
	3128	+ ImportVRMLX3D();
	3129	+ } else
	3130	+ if (source == import3DSItem)
	3131	+ {
	3132	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3133	+ } else
	3134	+ if (source == importOBJItem)
	3135	+ {
	3136	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3137	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3138	+ browser.setVisible(true);
	3139	+ String filename = browser.getFile();
	3140	+ if (filename != null && filename.length() > 0)
	3141	+ {
	3142	+ String fullname = browser.getDirectory() + filename;
	3143	+ makeSomething(ReadOBJ(fullname), true);
	3144	+ }
	3145	+ } else
	3146	+ if (source == closeItem)
3125	3147	{
3126	3148	Close();
3127	3149	//return true;
3128		- } else if (event.getSource() == loadItem)
	3150	+ } else if (source == loadItem)
3129	3151	{
3130	3152	load();
3131	3153	//return true;
3132		- } else if (event.getSource() == saveItem)
	3154	+ } else if (source == newItem)
	3155	+ {
	3156	+ New();
	3157	+ } else if (source == saveItem)
3133	3158	{
3134	3159	save();
3135	3160	//return true;
3136		- } else if (event.getSource() == saveAsItem)
	3161	+ } else if (source == saveAsItem)
3137	3162	{
3138	3163	saveAs();
3139	3164	//return true;
3140		- } else if (event.getSource() == reexportItem)
	3165	+ } else if (source == reexportItem)
3141	3166	{
3142	3167	reexport();
3143	3168	//return true;
3144		- } else if (event.getSource() == exportAsItem)
	3169	+ } else if (source == exportAsItem)
3145	3170	{
3146	3171	export();
3147	3172	//return true;
3148		- } else if (event.getSource() == povItem)
	3173	+ } else if (source == povItem)
3149	3174	{
3150	3175	generatePOV();
3151	3176	//return true;
3152		- } else if (event.getSource() == zBufferItem)
	3177	+ } else if (source == zBufferItem)
3153	3178	{
3154	3179	try
3155	3180	{
..	..	@@ -3171,21 +3196,8 @@
3171	3196	cameraView.repaint();
3172	3197	//return true;
3173	3198	}
3174		- */ else if (event.getSource() == editCameraItem)
3175		- {
3176		- cameraView.ProtectCamera();
3177		- cameraView.repaint();
3178		- return;
3179		- } else if (event.getSource() == revertCameraItem)
3180		- {
3181		- cameraView.RevertCamera();
3182		- cameraView.repaint();
3183		- return;
3184		-// } else if (event.getSource() == textureButton)
3185		-// {
3186		-// return; // true;
3187		- } else // combos...
3188		- if (event.getSource() == texresMenu)
	3199	+ */ else // combos...
	3200	+ if (source == texresMenu)
3189	3201	{
3190	3202	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3191	3203	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3197,6 +3209,262 @@
3197	3209	}
3198	3210	}
3199	3211
	3212	+ void New()
	3213	+ {
	3214	+ while (copy.Size() > 1)
	3215	+ {
	3216	+ copy.remove(1);
	3217	+ }
	3218	+
	3219	+ ResetModel();
	3220	+ objEditor.refreshContents();
	3221	+ }
	3222	+
	3223	+ static public byte[] Compress(Object3D o)
	3224	+ {
	3225	+ try
	3226	+ {
	3227	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3228	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3229	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3230	+
	3231	+ Object3D parent = o.parent;
	3232	+ o.parent = null;
	3233	+
	3234	+ out.writeObject(o);
	3235	+
	3236	+ o.parent = parent;
	3237	+
	3238	+ out.flush();
	3239	+
	3240	+ zstream.close();
	3241	+ out.close();
	3242	+
	3243	+ return baos.toByteArray();
	3244	+ } catch (Exception e)
	3245	+ {
	3246	+ System.err.println(e);
	3247	+ return null;
	3248	+ }
	3249	+ }
	3250	+
	3251	+ static public Object Uncompress(byte[] bytes)
	3252	+ {
	3253	+ System.out.println("#bytes = " + bytes.length);
	3254	+ try
	3255	+ {
	3256	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3257	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3258	+ ObjectInputStream in = new ObjectInputStream(istream);
	3259	+ Object obj = in.readObject();
	3260	+ in.close();
	3261	+
	3262	+ return obj;
	3263	+ } catch (Exception e)
	3264	+ {
	3265	+ System.err.println(e);
	3266	+ return null;
	3267	+ }
	3268	+ }
	3269	+
	3270	+ static public Object clone(Object o)
	3271	+ {
	3272	+ try
	3273	+ {
	3274	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3275	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3276	+
	3277	+ out.writeObject(o);
	3278	+
	3279	+ out.flush();
	3280	+ out.close();
	3281	+
	3282	+ byte[] bytes = baos.toByteArray();
	3283	+
	3284	+ System.out.println("clone = " + bytes.length);
	3285	+
	3286	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3287	+ ObjectInputStream in = new ObjectInputStream(bais);
	3288	+ Object obj = in.readObject();
	3289	+ in.close();
	3290	+
	3291	+ return obj;
	3292	+ } catch (Exception e)
	3293	+ {
	3294	+ System.err.println(e);
	3295	+ return null;
	3296	+ }
	3297	+ }
	3298	+
	3299	+ cRadio GetCurrentTab()
	3300	+ {
	3301	+ cRadio ab;
	3302	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3303	+ {
	3304	+ ab = (cRadio)e.nextElement();
	3305	+ if(ab.GetObject() == copy)
	3306	+ {
	3307	+ return ab;
	3308	+ }
	3309	+ }
	3310	+
	3311	+ return null;
	3312	+ }
	3313	+
	3314	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3315	+
	3316	+ public void Save()
	3317	+ {
	3318	+ cRadio tab = GetCurrentTab();
	3319	+
	3320	+ boolean temp = CameraPane.SWITCH;
	3321	+ CameraPane.SWITCH = false;
	3322	+
	3323	+ copy.ExtractBigData(hashtable);
	3324	+
	3325	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3326	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3327	+
	3328	+ copy.RestoreBigData(hashtable);
	3329	+
	3330	+ CameraPane.SWITCH = temp;
	3331	+
	3332	+ //assert(hashtable.isEmpty());
	3333	+
	3334	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3335	+ {
	3336	+ tab.graphs[i] = null;
	3337	+ }
	3338	+
	3339	+ // test save
	3340	+ if (false)
	3341	+ {
	3342	+ try
	3343	+ {
	3344	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3345	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3346	+
	3347	+ p.writeObject(copy);
	3348	+
	3349	+ p.flush();
	3350	+
	3351	+ ostream.close();
	3352	+ } catch (Exception e)
	3353	+ {
	3354	+ e.printStackTrace();
	3355	+ }
	3356	+ }
	3357	+ }
	3358	+
	3359	+ void CopyChanged(Object3D obj)
	3360	+ {
	3361	+ boolean temp = CameraPane.SWITCH;
	3362	+ CameraPane.SWITCH = false;
	3363	+
	3364	+ copy.ExtractBigData(hashtable);
	3365	+
	3366	+ copy.clear();
	3367	+
	3368	+ for (int i=0; i<obj.Size(); i++)
	3369	+ {
	3370	+ copy.add(obj.get(i));
	3371	+ }
	3372	+
	3373	+ copy.RestoreBigData(hashtable);
	3374	+
	3375	+ CameraPane.SWITCH = temp;
	3376	+
	3377	+ //assert(hashtable.isEmpty());
	3378	+
	3379	+ copy.Touch();
	3380	+
	3381	+ ResetModel();
	3382	+ copy.HardTouch(); // recompile?
	3383	+
	3384	+ cRadio ab;
	3385	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3386	+ {
	3387	+ ab = (cRadio)e.nextElement();
	3388	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3389	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3390	+ if (test != null)
	3391	+ {
	3392	+ test.editWindow = ab.object.editWindow;
	3393	+ ab.object = test;
	3394	+ }
	3395	+ }
	3396	+
	3397	+ refreshContents();
	3398	+ }
	3399	+
	3400	+ public void Undo()
	3401	+ {
	3402	+ cRadio tab = GetCurrentTab();
	3403	+
	3404	+ if (tab.undoindex == 0)
	3405	+ {
	3406	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3407	+ return;
	3408	+ }
	3409	+
	3410	+ if (tab.graphs[tab.undoindex] == null)
	3411	+ {
	3412	+ Save();
	3413	+ tab.undoindex -= 1;
	3414	+ }
	3415	+
	3416	+ tab.undoindex -= 1;
	3417	+
	3418	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3419	+ }
	3420	+
	3421	+ public void Redo()
	3422	+ {
	3423	+ cRadio tab = GetCurrentTab();
	3424	+
	3425	+ if (tab.graphs[tab.undoindex + 1] == null)
	3426	+ {
	3427	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3428	+ return;
	3429	+ }
	3430	+
	3431	+ tab.undoindex += 1;
	3432	+
	3433	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3434	+ }
	3435	+
	3436	+ void ImportGFD()
	3437	+ {
	3438	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3439	+ browser.show();
	3440	+ String filename = browser.getFile();
	3441	+ if (filename != null && filename.length() > 0)
	3442	+ {
	3443	+ String fullname = browser.getDirectory() + filename;
	3444	+
	3445	+ //Object3D readobj =
	3446	+ objEditor.ReadGFD(fullname, objEditor);
	3447	+ //makeSomething(readobj);
	3448	+ }
	3449	+ }
	3450	+
	3451	+ void ImportVRMLX3D()
	3452	+ {
	3453	+ if (Grafreed.standAlone)
	3454	+ {
	3455	+ /**/
	3456	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3457	+ browser.show();
	3458	+ String filename = browser.getFile();
	3459	+ if (filename != null && filename.length() > 0)
	3460	+ {
	3461	+ String fullname = browser.getDirectory() + filename;
	3462	+ LoadVRMLX3D(fullname);
	3463	+ }
	3464	+ /**/
	3465	+ }
	3466	+ }
	3467	+
3200	3468	void ToggleAnimation()
3201	3469	{
3202	3470	if (!Globals.ANIMATION)
..	..	@@ -3212,8 +3480,8 @@
3212	3480
3213	3481	Globals.ANIMATION ^= true;
3214	3482
3215		- GrafreeD.wav.cursor = 0;
3216		- GrafreeD.wav.loop = 0;
	3483	+ Grafreed.wav.cursor = 0;
	3484	+ Grafreed.wav.loop = 0;
3217	3485	}
3218	3486	} else
3219	3487	{
..	..	@@ -3234,7 +3502,6 @@
3234	3502	callee.refreshContents();
3235	3503	} else
3236	3504	{
3237		- new Exception().printStackTrace();
3238	3505	System.exit(0);
3239	3506	}
3240	3507	}
..	..	@@ -3264,7 +3531,7 @@
3264	3531	void CreateMaterial()
3265	3532	{
3266	3533	//copy.ClearMaterial(); // PATCH
3267		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3534	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3268	3535	if (copy.selection.size() > 0)
3269	3536	//SetMaterial(copy);
3270	3537	{
..	..	@@ -3323,11 +3590,11 @@
3323	3590	{
3324	3591	copy.ResetBlockLoop(); // temporary problem
3325	3592
3326		- boolean random = CameraPane.RANDOM;
3327		- CameraPane.RANDOM = false; // parse everything
	3593	+ boolean random = CameraPane.SWITCH;
	3594	+ CameraPane.SWITCH = false; // parse everything
3328	3595	copy.ResetDisplayList();
3329	3596	copy.HardTouch();
3330		- CameraPane.RANDOM = random;
	3597	+ CameraPane.SWITCH = random;
3331	3598	}
3332	3599
3333	3600	// public void applySelf()
..	..	@@ -3401,6 +3668,36 @@
3401	3668	{
3402	3669	//System.out.println("Propagate = " + propagate);
3403	3670	copy.UpdateMaterial(anchor, current, propagate);
	3671	+
	3672	+ if (copy.material != null)
	3673	+ {
	3674	+ cMaterial mat = copy.material;
	3675	+
	3676	+ colorField.SetToolTipValue((mat.color));
	3677	+ modulationField.SetToolTipValue((mat.modulation));
	3678	+ metalnessField.SetToolTipValue((mat.metalness));
	3679	+ diffuseField.SetToolTipValue((mat.diffuse));
	3680	+ specularField.SetToolTipValue((mat.specular));
	3681	+ shininessField.SetToolTipValue((mat.shininess));
	3682	+ shiftField.SetToolTipValue((mat.shift));
	3683	+ ambientField.SetToolTipValue((mat.ambient));
	3684	+ lightareaField.SetToolTipValue((mat.lightarea));
	3685	+ diffusenessField.SetToolTipValue((mat.factor));
	3686	+ velvetField.SetToolTipValue((mat.velvet));
	3687	+ sheenField.SetToolTipValue((mat.sheen));
	3688	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3689	+ backlitField.SetToolTipValue((mat.bump));
	3690	+ anisoField.SetToolTipValue((mat.aniso));
	3691	+ anisoVField.SetToolTipValue((mat.anisoV));
	3692	+ cameraField.SetToolTipValue((mat.cameralight));
	3693	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3694	+ shadowField.SetToolTipValue((mat.shadow));
	3695	+ textureField.SetToolTipValue((mat.texture));
	3696	+ opacityField.SetToolTipValue((mat.opacity));
	3697	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3698	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3699	+ }
	3700	+
3404	3701	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3405	3702	{
3406	3703	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3516,7 +3813,7 @@
3516	3813	}
3517	3814
3518	3815	if (normalpushField != null)
3519		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3816	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3520	3817	}
3521	3818
3522	3819	void SnapObject()
..	..	@@ -3780,6 +4077,7 @@
3780	4077
3781	4078	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3782	4079	{
	4080	+ Save();
3783	4081	//Tween.set(thing, 0).target(1).start(tweenManager);
3784	4082	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3785	4083	// if (thing instanceof GenericJointDemo)
..	..	@@ -3983,6 +4281,7 @@
3983	4281	}
3984	4282	}
3985	4283	}
	4284	+
3986	4285	LoadGFDThread loadGFDThread;
3987	4286
3988	4287	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4002,8 +4301,10 @@
4002	4301
4003	4302	try
4004	4303	{
	4304	+ // Try compressed version first.
4005	4305	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4006		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4306	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4307	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4007	4308
4008	4309	readobj = (Object3D) p.readObject();
4009	4310	istream.close();
..	..	@@ -4011,7 +4312,20 @@
4011	4312	readobj.ResetDisplayList();
4012	4313	} catch (Exception e)
4013	4314	{
4014		- e.printStackTrace();
	4315	+ //e.printStackTrace();
	4316	+ try
	4317	+ {
	4318	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4319	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4320	+
	4321	+ readobj = (Object3D) p.readObject();
	4322	+ istream.close();
	4323	+
	4324	+ readobj.ResetDisplayList();
	4325	+ } catch (Exception e2)
	4326	+ {
	4327	+ e2.printStackTrace();
	4328	+ }
4015	4329	}
4016	4330	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4017	4331	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4057,6 +4371,12 @@
4057	4371
4058	4372	void LoadIt(Object obj)
4059	4373	{
	4374	+ if (obj == null)
	4375	+ {
	4376	+ // Invalid file
	4377	+ return;
	4378	+ }
	4379	+
4060	4380	System.out.println("Loaded " + obj);
4061	4381	//new Exception().printStackTrace();
4062	4382	Object3D readobj = (Object3D) obj;
..	..	@@ -4066,6 +4386,7 @@
4066	4386
4067	4387	if (readobj != null)
4068	4388	{
	4389	+ Save();
4069	4390	try
4070	4391	{
4071	4392	//readobj.deepCopySelf(copy);
..	..	@@ -4128,7 +4449,7 @@
4128	4449
4129	4450	void load() // throws ClassNotFoundException
4130	4451	{
4131		- if (GrafreeD.standAlone)
	4452	+ if (Grafreed.standAlone)
4132	4453	{
4133	4454	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4134	4455	browser.show();
..	..	@@ -4215,11 +4536,13 @@
4215	4536	try
4216	4537	{
4217	4538	FileOutputStream ostream = new FileOutputStream(lastname);
4218		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4539	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4540	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4219	4541
4220	4542	p.writeObject(copy);
4221	4543	p.flush();
4222	4544
	4545	+ zstream.close();
4223	4546	ostream.close();
4224	4547
4225	4548	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4229,11 +4552,12 @@
4229	4552	{
4230	4553	}
4231	4554	}
	4555	+
4232	4556	String lastname;
4233	4557
4234	4558	void saveAs()
4235	4559	{
4236		- if (GrafreeD.standAlone)
	4560	+ if (Grafreed.standAlone)
4237	4561	{
4238	4562	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4239	4563	browser.setVisible(true);
..	..	@@ -4338,13 +4662,13 @@
4338	4662	try
4339	4663	{
4340	4664	FileOutputStream ostream = new FileOutputStream(filename);
4341		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4342		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4665	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4666	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4343	4667
4344	4668	Object3D objectparent = obj.parent;
4345	4669	obj.parent = null;
4346	4670
4347		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4671	+ Object3D object = (Object3D) Grafreed.clone(obj);
4348	4672
4349	4673	obj.parent = objectparent;
4350	4674
..	..	@@ -4356,8 +4680,8 @@
4356	4680	p.writeObject(object);
4357	4681	p.flush();
4358	4682
	4683	+ zstream.close();
4359	4684	ostream.close();
4360		- // zstream.close();
4361	4685
4362	4686	// group.selection.get(0).parent = parent;
4363	4687	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4378,7 +4702,7 @@
4378	4702	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4379	4703	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4380	4704	copy.generatePOV(buffer);
4381		- if (GrafreeD.standAlone)
	4705	+ if (Grafreed.standAlone)
4382	4706	{
4383	4707	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4384	4708	browser.show();
..	..	@@ -4404,7 +4728,8 @@
4404	4728	Object3D client;
4405	4729	Object3D copy;
4406	4730	MenuBar menuBar;
4407		- Menu windowMenu;
	4731	+ Menu fileMenu;
	4732	+ MenuItem newItem;
4408	4733	MenuItem loadItem;
4409	4734	MenuItem saveItem;
4410	4735	MenuItem saveAsItem;
..	..	@@ -4412,11 +4737,9 @@
4412	4737	MenuItem reexportItem;
4413	4738	MenuItem povItem;
4414	4739	MenuItem closeItem;
4415		- Menu cameraMenu;
	4740	+
4416	4741	CheckboxMenuItem zBufferItem;
4417	4742	//MenuItem normalLensItem;
4418		- MenuItem editCameraItem;
4419		- MenuItem revertCameraItem;
4420	4743	MenuItem stepItem;
4421	4744	CheckboxMenuItem toggleLiveItem;
4422	4745	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4427,7 +4750,7 @@
4427	4750	CheckboxMenuItem toggleFootContactItem;
4428	4751	CheckboxMenuItem toggleDLItem;
4429	4752	CheckboxMenuItem toggleTextureItem;
4430		- CheckboxMenuItem toggleRandomItem;
	4753	+ CheckboxMenuItem toggleSwitchItem;
4431	4754	CheckboxMenuItem toggleRootItem;
4432	4755	CheckboxMenuItem animationItem;
4433	4756	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4564,4 +4887,9 @@
4564	4887	//ObjectUI parent;
4565	4888
4566	4889	cNumberSlider normalpushField;
	4890	+
	4891	+ private MenuItem importGFDItem;
	4892	+ private MenuItem importVRMLX3DItem;
	4893	+ private MenuItem import3DSItem;
	4894	+ private MenuItem importOBJItem;
4567	4895	}