~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -36,6 +36,8 @@
36	36	GroupEditor callee;
37	37	JFrame frame;
38	38
	39	+ static ObjEditor theFrame;
	40	+
39	41	// SCRIPT
40	42
41	43	transient JFrame textpanel = null;
..	..	@@ -168,6 +170,7 @@
168	170	// objEditor.ctrlPanel.remove(remarkButton);
169	171
170	172	objEditor.ctrlPanel.remove(setupPanel);
	173	+ objEditor.ctrlPanel.remove(setupPanel2);
171	174	objEditor.ctrlPanel.remove(commandsPanel);
172	175	objEditor.ctrlPanel.remove(pushPanel);
173	176	//objEditor.ctrlPanel.remove(fillPanel);
..	..	@@ -243,6 +246,7 @@
243	246	//localCopy.parent = null;
244	247
245	248	frame = new JFrame();
	249	+ frame.setUndecorated(true);
246	250	objEditor = this;
247	251	this.callee = callee;
248	252
..	..	@@ -276,24 +280,40 @@
276	280	void SetupMenu()
277	281	{
278	282	frame.setMenuBar(menuBar = new MenuBar());
279		- menuBar.add(windowMenu = new Menu("File"));
280		- windowMenu.add(loadItem = new MenuItem("Load..."));
281		- windowMenu.add("-");
282		- windowMenu.add(saveItem = new MenuItem("Save"));
283		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	283	+ menuBar.add(fileMenu = new Menu("File"));
	284	+ fileMenu.add(newItem = new MenuItem("New"));
	285	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	286	+
	287	+ //oe.menuBar.add(menu = new Menu("Include"));
	288	+ Menu menu = new Menu("Import");
	289	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	290	+ importOBJItem.addActionListener(this);
	291	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	292	+ import3DSItem.addActionListener(this);
	293	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	294	+ importVRMLX3DItem.addActionListener(this);
	295	+ menu.add("-");
	296	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	297	+ importGFDItem.addActionListener(this);
	298	+ fileMenu.add(menu);
	299	+ fileMenu.add("-");
	300	+
	301	+ fileMenu.add(saveItem = new MenuItem("Save"));
	302	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284	303	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
285		- windowMenu.add("-");
286		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
287		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
288		- windowMenu.add("-");
	304	+ fileMenu.add("-");
	305	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	306	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	307	+ fileMenu.add("-");
289	308	if (client.parent != null)
290	309	{
291		- windowMenu.add(closeItem = new MenuItem("Close"));
	310	+ fileMenu.add(closeItem = new MenuItem("Close"));
292	311	} else
293	312	{
294		- windowMenu.add(closeItem = new MenuItem("Exit"));
	313	+ fileMenu.add(closeItem = new MenuItem("Exit"));
295	314	}
296	315
	316	+ newItem.addActionListener(this);
297	317	loadItem.addActionListener(this);
298	318	saveItem.addActionListener(this);
299	319	saveAsItem.addActionListener(this);
..	..	@@ -301,77 +321,6 @@
301	321	reexportItem.addActionListener(this);
302	322	//povItem.addActionListener(this);
303	323	closeItem.addActionListener(this);
304		-
305		- menuBar.add(cameraMenu = new Menu("View"));
306		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
307		- //zBufferItem.addActionListener(this);
308		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
309		- //normalLensItem.addActionListener(this);
310		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
311		- revertCameraItem.addActionListener(this);
312		-
313		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314		- toggleFullScreenItem.addItemListener(this);
315		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316		- cameraMenu.add("-");
317		-
318		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
319		- toggleTextureItem.addItemListener(this);
320		- toggleTextureItem.setState(CameraPane.textureon);
321		-
322		- if (Globals.ADVANCED)
323		- {
324		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
325		- toggleLiveItem.addItemListener(this);
326		- toggleLiveItem.setState(Globals.isLIVE());
327		-
328		- cameraMenu.add(stepItem = new MenuItem("Step"));
329		- stepItem.addActionListener(this);
330		- // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
331		- // toggleDLItem.addItemListener(this);
332		- // toggleDLItem.setState(false);
333		-
334		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
335		- toggleRenderItem.addItemListener(this);
336		- toggleRenderItem.setState(!CameraPane.frozen);
337		-
338		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
339		- toggleDebugItem.addItemListener(this);
340		- toggleDebugItem.setState(CameraPane.DEBUG);
341		-
342		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
343		- toggleFrustumItem.addItemListener(this);
344		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
345		-
346		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
347		- toggleFootContactItem.addItemListener(this);
348		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
349		-
350		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
351		- toggleTimelineItem.addItemListener(this);
352		- }
353		-
354		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
355		- toggleSwitchItem.addItemListener(this);
356		- toggleSwitchItem.setState(CameraPane.SWITCH);
357		-
358		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
359		- toggleHandleItem.addItemListener(this);
360		- toggleHandleItem.setState(CameraPane.HANDLES);
361		-
362		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
363		- togglePaintItem.addItemListener(this);
364		- togglePaintItem.setState(CameraPane.PAINTMODE);
365		-
366		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
367		-// toggleRootItem.addItemListener(this);
368		-// toggleRootItem.setState(false);
369		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
370		-// animationItem.addItemListener(this);
371		-// animationItem.setState(CameraPane.ANIMATION);
372		- cameraMenu.add("-");
373		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
374		- editCameraItem.addActionListener(this);
375	324
376	325	objectPanel = new JTabbedPane();
377	326	toolbarPanel = new JPanel();
..	..	@@ -474,10 +423,10 @@
474	423	e.printStackTrace();
475	424	}
476	425
477		- String selection = infoarea.getText();
478		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
479		- java.awt.datatransfer.Clipboard clipboard =
480		- Toolkit.getDefaultToolkit().getSystemClipboard();
	426	+// String selection = infoarea.getText();
	427	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	428	+// java.awt.datatransfer.Clipboard clipboard =
	429	+// Toolkit.getDefaultToolkit().getSystemClipboard();
481	430	//clipboard.setContents(data, data);
482	431	}
483	432
..	..	@@ -500,13 +449,13 @@
500	449	//SendInfo("Name:", "bold");
501	450	if (sel.GetTextures() != null \|\| debug)
502	451	{
503		- si.SendInfo(sel.toString(), "bold");
	452	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
504	453	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
505	454	if (sel.Size() > 0)
506	455	{
507	456	si.SendInfo("#children = " + sel.Size(), "regular");
508	457	}
509		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	458	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
510	459	if (debug)
511	460	{
512	461	try
..	..	@@ -548,7 +497,7 @@
548	497	}
549	498	if (sel.support != null)
550	499	{
551		- si.SendInfo(" support: " + sel.support, "regular");
	500	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
552	501	}
553	502	if (sel.scriptnode != null)
554	503	{
..	..	@@ -637,19 +586,89 @@
637	586	}
638	587	}
639	588
	589	+static GraphicsDevice device = GraphicsEnvironment
	590	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	591	+
	592	+ Rectangle keeprect;
	593	+ cRadio radio;
	594	+
	595	+cButton keepButton;
	596	+ cButton twoButton; // Full 3D
	597	+ cButton sixButton;
	598	+ cButton threeButton;
	599	+ cButton sevenButton;
	600	+ cButton fourButton; // full panel
	601	+ cButton oneButton; // full XYZ
	602	+ //cButton currentLayout;
	603	+
	604	+ boolean maximized;
	605	+
	606	+ void Minimize()
	607	+ {
	608	+ frame.setState(Frame.ICONIFIED);
	609	+ }
	610	+
	611	+ void Maximize()
	612	+ {
	613	+ if (maximized)
	614	+ {
	615	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	616	+ }
	617	+ else
	618	+ {
	619	+ keeprect = frame.getBounds();
	620	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	621	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	622	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	623	+// frame.setState(Frame.MAXIMIZED_BOTH);
	624	+ }
	625	+
	626	+ maximized ^= true;
	627	+ }
	628	+
640	629	void ToggleFullScreen()
641	630	{
642	631	if (CameraPane.FULLSCREEN)
643	632	{
644		- frame.getContentPane().remove(/"Center",/bigThree);
645		- framePanel.add(bigThree);
646		- frame.getContentPane().add(/"Center",/framePanel);
	633	+ device.setFullScreenWindow(null);
	634	+ //frame.setVisible(false);
	635	+// frame.removeNotify();
	636	+// frame.setUndecorated(false);
	637	+// frame.addNotify();
	638	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	639	+
	640	+// X frame.getContentPane().remove(/"Center",/bigThree);
	641	+// X framePanel.add(bigThree);
	642	+// X frame.getContentPane().add(/"Center",/framePanel);
	643	+ framePanel.setDividerLocation(1);
	644	+
	645	+ //frame.setVisible(true);
	646	+ radio.layout = keepButton;
	647	+ //theFrame = null;
	648	+ keepButton = null;
	649	+ radio.layout.doClick();
	650	+
647	651	} else
648	652	{
649		- frame.getContentPane().remove(/"Center",/framePanel);
650		- framePanel.remove(bigThree);
651		- frame.getContentPane().add(/"Center",/bigThree);
	653	+ keepButton = radio.layout;
	654	+ //keeprect = frame.getBounds();
	655	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	656	+// frame.getToolkit().getScreenSize().height);
	657	+ //frame.setVisible(false);
	658	+ device.setFullScreenWindow(frame);
	659	+// frame.removeNotify();
	660	+// frame.setUndecorated(true);
	661	+// frame.addNotify();
	662	+// X frame.getContentPane().remove(/"Center",/framePanel);
	663	+// X framePanel.remove(bigThree);
	664	+// X frame.getContentPane().add(/"Center",/bigThree);
	665	+ framePanel.setDividerLocation(0);
	666	+
	667	+ radio.layout = twoButton;
	668	+ radio.layout.doClick();
	669	+ //frame.setVisible(true);
652	670	}
	671	+
653	672	cameraView.ToggleFullScreen();
654	673	}
655	674
..	..	@@ -751,7 +770,7 @@
751	770	protected static ImageIcon createImageIcon(String path,
752	771	String description)
753	772	{
754		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	773	+ java.net.URL imgURL = Grafreed.class.getResource(path);
755	774	if (imgURL != null)
756	775	{
757	776	return new ImageIcon(imgURL, description);
..	..	@@ -783,6 +802,7 @@
783	802	// NumberSlider vDivsField;
784	803	// JCheckBox endcaps;
785	804	JCheckBox liveCB;
	805	+ JCheckBox selectCB;
786	806	JCheckBox hideCB;
787	807	JCheckBox link2masterCB;
788	808	JCheckBox markCB;
..	..	@@ -801,6 +821,7 @@
801	821
802	822	cGridBag namePanel;
803	823	cGridBag setupPanel;
	824	+ cGridBag setupPanel2;
804	825	cGridBag commandsPanel;
805	826	cGridBag pushPanel;
806	827	cGridBag fillPanel;
..	..	@@ -985,27 +1006,33 @@
985	1006
986	1007	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
987	1008	liveCB.setToolTipText("Animate object");
	1009	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1010	+ selectCB.setToolTipText("Make object selectable");
	1011	+// Return();
988	1012	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
989	1013	hideCB.setToolTipText("Hide object");
990		-// Return();
991	1014	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
992	1015	markCB.setToolTipText("Set the animation target transform");
993	1016
994		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1017	+ setupPanel2 = new cGridBag().setVertical(false);
	1018	+
	1019	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
995	1020	rewindCB.setToolTipText("Rewind animation");
996	1021
997		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
998		- randomCB.setToolTipText("Option for switch node");
	1022	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1023	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
999	1024
1000	1025	if (Globals.ADVANCED)
1001	1026	{
1002		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	1027	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1003	1028	link2masterCB.setToolTipText("Attach to support");
1004		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1029	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1005	1030	speedupCB.setToolTipText("Option motion capture");
1006	1031	}
1007	1032
1008	1033	oe.ctrlPanel.add(setupPanel);
	1034	+ oe.ctrlPanel.Return();
	1035	+ oe.ctrlPanel.add(setupPanel2);
1009	1036	oe.ctrlPanel.Return();
1010	1037
1011	1038	commandsPanel = new cGridBag().setVertical(false);
..	..	@@ -1027,7 +1054,7 @@
1027	1054	oe.ctrlPanel.add(commandsPanel);
1028	1055	oe.ctrlPanel.Return();
1029	1056
1030		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1057	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1031	1058	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1032	1059	//Return();
1033	1060
..	..	@@ -1230,8 +1257,11 @@
1230	1257	//worldPanel.setName("World");
1231	1258	centralPanel = new cGridBag();
1232	1259	centralPanel.preferredWidth = 20;
1233		- timelinePanel = new JPanel(new BorderLayout());
1234		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1260	+
	1261	+ if (Globals.ADVANCED)
	1262	+ {
	1263	+ timelinePanel = new JPanel(new BorderLayout());
	1264	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1235	1265
1236	1266	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1237	1267	cameraPanel.setContinuousLayout(true);
..	..	@@ -1240,7 +1270,10 @@
1240	1270	// cameraPanel.setDividerSize(9);
1241	1271	cameraPanel.setResizeWeight(1.0);
1242	1272
	1273	+ }
	1274	+
1243	1275	centralPanel.add(cameraView);
	1276	+ centralPanel.setFocusable(true);
1244	1277	//frame.setJMenuBar(timelineMenubar);
1245	1278	//centralPanel.add(timelinePanel);
1246	1279
..	..	@@ -1329,7 +1362,7 @@
1329	1362	scrollpane.addMouseWheelListener(this); // Default not fast enough
1330	1363
1331	1364	/JTabbedPane/ scenePanel = new cGridBag();
1332		- scenePanel.preferredWidth = 7;
	1365	+ scenePanel.preferredWidth = 6;
1333	1366
1334	1367	JTabbedPane tabbedPane = new JTabbedPane();
1335	1368	tabbedPane.add(scrollpane);
..	..	@@ -1435,9 +1468,11 @@
1435	1468
1436	1469	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1437	1470
1438		- frame.setSize(1024, 768);
1439		- frame.show();
	1471	+ frame.setSize(1280, 860);
	1472	+ frame.setVisible(true);
1440	1473
	1474	+ cameraView.requestFocusInWindow();
	1475	+
1441	1476	gridPanel.setDividerLocation(1.0);
1442	1477
1443	1478	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1475,19 +1510,19 @@
1475	1510
1476	1511	cGridBag editBar = new cGridBag().setVertical(false);
1477	1512
1478		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1513	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1479	1514	createMaterialButton.setToolTipText("Create material");
1480	1515
1481	1516	/*
1482	1517	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1483	1518	*/
1484	1519
1485		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1520	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1486	1521	clearMaterialButton.setToolTipText("Clear material");
1487	1522
1488	1523	if (Globals.ADVANCED)
1489	1524	{
1490		- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1525	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
1491	1526	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1492	1527	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1493	1528	}
..	..	@@ -1938,7 +1973,7 @@
1938	1973
1939	1974	//? flashIt = false;
1940	1975	CameraPane pane = (CameraPane) cameraView;
1941		- pane.clickStart(location.x, location.y, 0);
	1976	+ pane.clickStart(location.x, location.y, 0, 0);
1942	1977	pane.clickEnd(location.x, location.y, 0, true);
1943	1978
1944	1979	if (group.selection.size() == 1)
..	..	@@ -1987,6 +2022,7 @@
1987	2022	e2.printStackTrace();
1988	2023	}
1989	2024	}
	2025	+
1990	2026	LoadJMEThread loadThread;
1991	2027
1992	2028	class LoadJMEThread extends Thread
..	..	@@ -2044,6 +2080,7 @@
2044	2080	//LoadFile0(filename, converter);
2045	2081	}
2046	2082	}
	2083	+
2047	2084	LoadOBJThread loadObjThread;
2048	2085
2049	2086	class LoadOBJThread extends Thread
..	..	@@ -2122,19 +2159,19 @@
2122	2159
2123	2160	void LoadObjFile(String fullname)
2124	2161	{
2125		- /*
	2162	+ System.out.println("Loading " + fullname);
	2163	+ /**/
2126	2164	//lastFilename = fullname;
2127	2165	if(loadObjThread == null)
2128	2166	{
2129		- loadObjThread = new LoadOBJThread();
2130		- loadObjThread.start();
	2167	+ loadObjThread = new LoadOBJThread();
	2168	+ loadObjThread.start();
2131	2169	}
2132	2170
2133	2171	loadObjThread.add(fullname);
2134		- */
	2172	+ /**/
2135	2173
2136		- System.out.println("Loading " + fullname);
2137		- makeSomething(new FileObject(fullname, true), true);
	2174	+ //makeSomething(new FileObject(fullname, true), true);
2138	2175	}
2139	2176
2140	2177	void LoadGFDFile(String fullname)
..	..	@@ -2395,11 +2432,11 @@
2395	2432
2396	2433	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2397	2434	{
2398		- if (GrafreeD.standAlone)
	2435	+ if (Grafreed.standAlone)
2399	2436	{
2400	2437	/**/
2401	2438	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2402		- browser.show();
	2439	+ browser.setVisible(true);
2403	2440	String filename = browser.getFile();
2404	2441	if (filename != null && filename.length() > 0)
2405	2442	{
..	..	@@ -2977,7 +3014,7 @@
2977	3014	return;
2978	3015	} else if (event.getSource() == toggleSwitchItem)
2979	3016	{
2980		- cameraView.ToggleRandom();
	3017	+ cameraView.ToggleSwitch();
2981	3018	cameraView.repaint();
2982	3019	return;
2983	3020	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3005,6 +3042,10 @@
3005	3042	} else if (event.getSource() == liveCB)
3006	3043	{
3007	3044	copy.live ^= true;
	3045	+ return;
	3046	+ } else if (event.getSource() == selectCB)
	3047	+ {
	3048	+ copy.dontselect ^= true;
3008	3049	return;
3009	3050	} else if (event.getSource() == hideCB)
3010	3051	{
..	..	@@ -3044,8 +3085,9 @@
3044	3085
3045	3086	public void actionPerformed(ActionEvent event)
3046	3087	{
	3088	+ Object source = event.getSource();
3047	3089	// SCRIPT DIALOG
3048		- if (event.getSource() == okbutton)
	3090	+ if (source == okbutton)
3049	3091	{
3050	3092	textpanel.setVisible(false);
3051	3093	textpanel.remove(textarea);
..	..	@@ -3057,7 +3099,7 @@
3057	3099	textarea = null;
3058	3100	textpanel = null;
3059	3101	}
3060		- if (event.getSource() == cancelbutton)
	3102	+ if (source == cancelbutton)
3061	3103	{
3062	3104	textpanel.setVisible(false);
3063	3105	textpanel.remove(textarea);
..	..	@@ -3069,50 +3111,50 @@
3069	3111	//applySelf();
3070	3112	//client.refreshEditWindow();
3071	3113	//refreshContents();
3072		- if (event.getSource() == nameField)
	3114	+ if (source == nameField)
3073	3115	{
3074	3116	//System.out.println("ObjEditor " + event);
3075	3117	applySelf0(true);
3076	3118	//parent.applySelf();
3077	3119	objEditor.refreshContents();
3078		- } else if (event.getSource() == resetButton)
	3120	+ } else if (source == resetButton)
3079	3121	{
3080	3122	CameraPane.fullreset = true;
3081	3123	copy.Reset(); // ResetMeshes();
3082	3124	copy.Touch();
3083	3125	objEditor.refreshContents();
3084		- } else if (event.getSource() == stepItem)
	3126	+ } else if (source == stepItem)
3085	3127	{
3086	3128	//cameraView.ONESTEP = true;
3087	3129	Globals.ONESTEP = true;
3088	3130	cameraView.repaint();
3089	3131	return;
3090		- } else if (event.getSource() == stepButton)
	3132	+ } else if (source == stepButton)
3091	3133	{
3092	3134	copy.Step();
3093	3135	copy.Touch();
3094	3136	objEditor.refreshContents();
3095		- } else if (event.getSource() == slowerButton)
	3137	+ } else if (source == slowerButton)
3096	3138	{
3097	3139	copy.Slower();
3098	3140	copy.Touch();
3099	3141	objEditor.refreshContents();
3100		- } else if (event.getSource() == fasterButton)
	3142	+ } else if (source == fasterButton)
3101	3143	{
3102	3144	copy.Faster();
3103	3145	copy.Touch();
3104	3146	objEditor.refreshContents();
3105		- } else if (event.getSource() == remarkButton)
	3147	+ } else if (source == remarkButton)
3106	3148	{
3107	3149	copy.Remark();
3108	3150	copy.Touch();
3109	3151	objEditor.refreshContents();
3110		- } else if (event.getSource() == stepAllButton)
	3152	+ } else if (source == stepAllButton)
3111	3153	{
3112	3154	copy.StepAll();
3113	3155	copy.Touch();
3114	3156	objEditor.refreshContents();
3115		- } else if (event.getSource() == resetAllButton)
	3157	+ } else if (source == resetAllButton)
3116	3158	{
3117	3159	//CameraPane.fullreset = true;
3118	3160	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3145,53 +3187,75 @@
3145	3187	// Close();
3146	3188	// }
3147	3189	// else
3148		- if (event.getSource() == resetSlidersButton)
	3190	+ if (source == resetSlidersButton)
3149	3191	{
3150	3192	ResetSliders();
3151		- } else if (event.getSource() == clearMaterialButton)
	3193	+ } else if (source == clearMaterialButton)
3152	3194	{
3153	3195	ClearMaterial();
3154		- } else if (event.getSource() == createMaterialButton)
	3196	+ } else if (source == createMaterialButton)
3155	3197	{
3156	3198	CreateMaterial();
3157		- } else if (event.getSource() == clearPanelButton)
	3199	+ } else if (source == clearPanelButton)
3158	3200	{
3159	3201	copy.ClearUI();
3160	3202	refreshContents(true);
3161		- } /*
3162		- }
3163		-
3164		- public boolean action(Event event, Object arg)
3165		- {
3166		- */ else if (event.getSource() == closeItem)
	3203	+ } else if (source == importGFDItem)
	3204	+ {
	3205	+ ImportGFD();
	3206	+ } else
	3207	+ if (source == importVRMLX3DItem)
	3208	+ {
	3209	+ ImportVRMLX3D();
	3210	+ } else
	3211	+ if (source == import3DSItem)
	3212	+ {
	3213	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3214	+ } else
	3215	+ if (source == importOBJItem)
	3216	+ {
	3217	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3218	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3219	+ browser.setVisible(true);
	3220	+ String filename = browser.getFile();
	3221	+ if (filename != null && filename.length() > 0)
	3222	+ {
	3223	+ String fullname = browser.getDirectory() + filename;
	3224	+ makeSomething(ReadOBJ(fullname), true);
	3225	+ }
	3226	+ } else
	3227	+ if (source == closeItem)
3167	3228	{
3168	3229	Close();
3169	3230	//return true;
3170		- } else if (event.getSource() == loadItem)
	3231	+ } else if (source == loadItem)
3171	3232	{
3172	3233	load();
3173	3234	//return true;
3174		- } else if (event.getSource() == saveItem)
	3235	+ } else if (source == newItem)
	3236	+ {
	3237	+ New();
	3238	+ } else if (source == saveItem)
3175	3239	{
3176	3240	save();
3177	3241	//return true;
3178		- } else if (event.getSource() == saveAsItem)
	3242	+ } else if (source == saveAsItem)
3179	3243	{
3180	3244	saveAs();
3181	3245	//return true;
3182		- } else if (event.getSource() == reexportItem)
	3246	+ } else if (source == reexportItem)
3183	3247	{
3184	3248	reexport();
3185	3249	//return true;
3186		- } else if (event.getSource() == exportAsItem)
	3250	+ } else if (source == exportAsItem)
3187	3251	{
3188	3252	export();
3189	3253	//return true;
3190		- } else if (event.getSource() == povItem)
	3254	+ } else if (source == povItem)
3191	3255	{
3192	3256	generatePOV();
3193	3257	//return true;
3194		- } else if (event.getSource() == zBufferItem)
	3258	+ } else if (source == zBufferItem)
3195	3259	{
3196	3260	try
3197	3261	{
..	..	@@ -3213,21 +3277,8 @@
3213	3277	cameraView.repaint();
3214	3278	//return true;
3215	3279	}
3216		- */ else if (event.getSource() == editCameraItem)
3217		- {
3218		- cameraView.ProtectCamera();
3219		- cameraView.repaint();
3220		- return;
3221		- } else if (event.getSource() == revertCameraItem)
3222		- {
3223		- cameraView.RevertCamera();
3224		- cameraView.repaint();
3225		- return;
3226		-// } else if (event.getSource() == textureButton)
3227		-// {
3228		-// return; // true;
3229		- } else // combos...
3230		- if (event.getSource() == texresMenu)
	3280	+ */ else // combos...
	3281	+ if (source == texresMenu)
3231	3282	{
3232	3283	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3233	3284	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3239,6 +3290,262 @@
3239	3290	}
3240	3291	}
3241	3292
	3293	+ void New()
	3294	+ {
	3295	+ while (copy.Size() > 1)
	3296	+ {
	3297	+ copy.remove(1);
	3298	+ }
	3299	+
	3300	+ ResetModel();
	3301	+ objEditor.refreshContents();
	3302	+ }
	3303	+
	3304	+ static public byte[] Compress(Object3D o)
	3305	+ {
	3306	+ try
	3307	+ {
	3308	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3309	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3310	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3311	+
	3312	+ Object3D parent = o.parent;
	3313	+ o.parent = null;
	3314	+
	3315	+ out.writeObject(o);
	3316	+
	3317	+ o.parent = parent;
	3318	+
	3319	+ out.flush();
	3320	+
	3321	+ zstream.close();
	3322	+ out.close();
	3323	+
	3324	+ return baos.toByteArray();
	3325	+ } catch (Exception e)
	3326	+ {
	3327	+ System.err.println(e);
	3328	+ return null;
	3329	+ }
	3330	+ }
	3331	+
	3332	+ static public Object Uncompress(byte[] bytes)
	3333	+ {
	3334	+ System.out.println("#bytes = " + bytes.length);
	3335	+ try
	3336	+ {
	3337	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3338	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3339	+ ObjectInputStream in = new ObjectInputStream(istream);
	3340	+ Object obj = in.readObject();
	3341	+ in.close();
	3342	+
	3343	+ return obj;
	3344	+ } catch (Exception e)
	3345	+ {
	3346	+ System.err.println(e);
	3347	+ return null;
	3348	+ }
	3349	+ }
	3350	+
	3351	+ static public Object clone(Object o)
	3352	+ {
	3353	+ try
	3354	+ {
	3355	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3356	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3357	+
	3358	+ out.writeObject(o);
	3359	+
	3360	+ out.flush();
	3361	+ out.close();
	3362	+
	3363	+ byte[] bytes = baos.toByteArray();
	3364	+
	3365	+ System.out.println("clone = " + bytes.length);
	3366	+
	3367	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3368	+ ObjectInputStream in = new ObjectInputStream(bais);
	3369	+ Object obj = in.readObject();
	3370	+ in.close();
	3371	+
	3372	+ return obj;
	3373	+ } catch (Exception e)
	3374	+ {
	3375	+ System.err.println(e);
	3376	+ return null;
	3377	+ }
	3378	+ }
	3379	+
	3380	+ cRadio GetCurrentTab()
	3381	+ {
	3382	+ cRadio ab;
	3383	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3384	+ {
	3385	+ ab = (cRadio)e.nextElement();
	3386	+ if(ab.GetObject() == copy)
	3387	+ {
	3388	+ return ab;
	3389	+ }
	3390	+ }
	3391	+
	3392	+ return null;
	3393	+ }
	3394	+
	3395	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3396	+
	3397	+ public void Save()
	3398	+ {
	3399	+ cRadio tab = GetCurrentTab();
	3400	+
	3401	+ boolean temp = CameraPane.SWITCH;
	3402	+ CameraPane.SWITCH = false;
	3403	+
	3404	+ copy.ExtractBigData(hashtable);
	3405	+
	3406	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3407	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3408	+
	3409	+ copy.RestoreBigData(hashtable);
	3410	+
	3411	+ CameraPane.SWITCH = temp;
	3412	+
	3413	+ //assert(hashtable.isEmpty());
	3414	+
	3415	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3416	+ {
	3417	+ tab.graphs[i] = null;
	3418	+ }
	3419	+
	3420	+ // test save
	3421	+ if (false)
	3422	+ {
	3423	+ try
	3424	+ {
	3425	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3426	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3427	+
	3428	+ p.writeObject(copy);
	3429	+
	3430	+ p.flush();
	3431	+
	3432	+ ostream.close();
	3433	+ } catch (Exception e)
	3434	+ {
	3435	+ e.printStackTrace();
	3436	+ }
	3437	+ }
	3438	+ }
	3439	+
	3440	+ void CopyChanged(Object3D obj)
	3441	+ {
	3442	+ boolean temp = CameraPane.SWITCH;
	3443	+ CameraPane.SWITCH = false;
	3444	+
	3445	+ copy.ExtractBigData(hashtable);
	3446	+
	3447	+ copy.clear();
	3448	+
	3449	+ for (int i=0; i<obj.Size(); i++)
	3450	+ {
	3451	+ copy.add(obj.get(i));
	3452	+ }
	3453	+
	3454	+ copy.RestoreBigData(hashtable);
	3455	+
	3456	+ CameraPane.SWITCH = temp;
	3457	+
	3458	+ //assert(hashtable.isEmpty());
	3459	+
	3460	+ copy.Touch();
	3461	+
	3462	+ ResetModel();
	3463	+ copy.HardTouch(); // recompile?
	3464	+
	3465	+ cRadio ab;
	3466	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3467	+ {
	3468	+ ab = (cRadio)e.nextElement();
	3469	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3470	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3471	+ if (test != null)
	3472	+ {
	3473	+ test.editWindow = ab.object.editWindow;
	3474	+ ab.object = test;
	3475	+ }
	3476	+ }
	3477	+
	3478	+ refreshContents();
	3479	+ }
	3480	+
	3481	+ public void Undo()
	3482	+ {
	3483	+ cRadio tab = GetCurrentTab();
	3484	+
	3485	+ if (tab.undoindex == 0)
	3486	+ {
	3487	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3488	+ return;
	3489	+ }
	3490	+
	3491	+ if (tab.graphs[tab.undoindex] == null)
	3492	+ {
	3493	+ Save();
	3494	+ tab.undoindex -= 1;
	3495	+ }
	3496	+
	3497	+ tab.undoindex -= 1;
	3498	+
	3499	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3500	+ }
	3501	+
	3502	+ public void Redo()
	3503	+ {
	3504	+ cRadio tab = GetCurrentTab();
	3505	+
	3506	+ if (tab.graphs[tab.undoindex + 1] == null)
	3507	+ {
	3508	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3509	+ return;
	3510	+ }
	3511	+
	3512	+ tab.undoindex += 1;
	3513	+
	3514	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3515	+ }
	3516	+
	3517	+ void ImportGFD()
	3518	+ {
	3519	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3520	+ browser.show();
	3521	+ String filename = browser.getFile();
	3522	+ if (filename != null && filename.length() > 0)
	3523	+ {
	3524	+ String fullname = browser.getDirectory() + filename;
	3525	+
	3526	+ //Object3D readobj =
	3527	+ objEditor.ReadGFD(fullname, objEditor);
	3528	+ //makeSomething(readobj);
	3529	+ }
	3530	+ }
	3531	+
	3532	+ void ImportVRMLX3D()
	3533	+ {
	3534	+ if (Grafreed.standAlone)
	3535	+ {
	3536	+ /**/
	3537	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3538	+ browser.show();
	3539	+ String filename = browser.getFile();
	3540	+ if (filename != null && filename.length() > 0)
	3541	+ {
	3542	+ String fullname = browser.getDirectory() + filename;
	3543	+ LoadVRMLX3D(fullname);
	3544	+ }
	3545	+ /**/
	3546	+ }
	3547	+ }
	3548	+
3242	3549	void ToggleAnimation()
3243	3550	{
3244	3551	if (!Globals.ANIMATION)
..	..	@@ -3254,8 +3561,8 @@
3254	3561
3255	3562	Globals.ANIMATION ^= true;
3256	3563
3257		- GrafreeD.wav.cursor = 0;
3258		- GrafreeD.wav.loop = 0;
	3564	+ Grafreed.wav.cursor = 0;
	3565	+ Grafreed.wav.loop = 0;
3259	3566	}
3260	3567	} else
3261	3568	{
..	..	@@ -3276,7 +3583,6 @@
3276	3583	callee.refreshContents();
3277	3584	} else
3278	3585	{
3279		- new Exception().printStackTrace();
3280	3586	System.exit(0);
3281	3587	}
3282	3588	}
..	..	@@ -3443,6 +3749,36 @@
3443	3749	{
3444	3750	//System.out.println("Propagate = " + propagate);
3445	3751	copy.UpdateMaterial(anchor, current, propagate);
	3752	+
	3753	+ if (copy.material != null)
	3754	+ {
	3755	+ cMaterial mat = copy.material;
	3756	+
	3757	+ colorField.SetToolTipValue((mat.color));
	3758	+ modulationField.SetToolTipValue((mat.modulation));
	3759	+ metalnessField.SetToolTipValue((mat.metalness));
	3760	+ diffuseField.SetToolTipValue((mat.diffuse));
	3761	+ specularField.SetToolTipValue((mat.specular));
	3762	+ shininessField.SetToolTipValue((mat.shininess));
	3763	+ shiftField.SetToolTipValue((mat.shift));
	3764	+ ambientField.SetToolTipValue((mat.ambient));
	3765	+ lightareaField.SetToolTipValue((mat.lightarea));
	3766	+ diffusenessField.SetToolTipValue((mat.factor));
	3767	+ velvetField.SetToolTipValue((mat.velvet));
	3768	+ sheenField.SetToolTipValue((mat.sheen));
	3769	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3770	+ backlitField.SetToolTipValue((mat.bump));
	3771	+ anisoField.SetToolTipValue((mat.aniso));
	3772	+ anisoVField.SetToolTipValue((mat.anisoV));
	3773	+ cameraField.SetToolTipValue((mat.cameralight));
	3774	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3775	+ shadowField.SetToolTipValue((mat.shadow));
	3776	+ textureField.SetToolTipValue((mat.texture));
	3777	+ opacityField.SetToolTipValue((mat.opacity));
	3778	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3779	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3780	+ }
	3781	+
3446	3782	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3447	3783	{
3448	3784	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3558,7 +3894,7 @@
3558	3894	}
3559	3895
3560	3896	if (normalpushField != null)
3561		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3897	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3562	3898	}
3563	3899
3564	3900	void SnapObject()
..	..	@@ -3822,6 +4158,7 @@
3822	4158
3823	4159	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3824	4160	{
	4161	+ Save();
3825	4162	//Tween.set(thing, 0).target(1).start(tweenManager);
3826	4163	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3827	4164	// if (thing instanceof GenericJointDemo)
..	..	@@ -4025,6 +4362,7 @@
4025	4362	}
4026	4363	}
4027	4364	}
	4365	+
4028	4366	LoadGFDThread loadGFDThread;
4029	4367
4030	4368	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4044,8 +4382,10 @@
4044	4382
4045	4383	try
4046	4384	{
	4385	+ // Try compressed version first.
4047	4386	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4048		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4387	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4388	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4049	4389
4050	4390	readobj = (Object3D) p.readObject();
4051	4391	istream.close();
..	..	@@ -4053,7 +4393,20 @@
4053	4393	readobj.ResetDisplayList();
4054	4394	} catch (Exception e)
4055	4395	{
4056		- e.printStackTrace();
	4396	+ //e.printStackTrace();
	4397	+ try
	4398	+ {
	4399	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4400	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4401	+
	4402	+ readobj = (Object3D) p.readObject();
	4403	+ istream.close();
	4404	+
	4405	+ readobj.ResetDisplayList();
	4406	+ } catch (Exception e2)
	4407	+ {
	4408	+ e2.printStackTrace();
	4409	+ }
4057	4410	}
4058	4411	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4059	4412	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4099,6 +4452,12 @@
4099	4452
4100	4453	void LoadIt(Object obj)
4101	4454	{
	4455	+ if (obj == null)
	4456	+ {
	4457	+ // Invalid file
	4458	+ return;
	4459	+ }
	4460	+
4102	4461	System.out.println("Loaded " + obj);
4103	4462	//new Exception().printStackTrace();
4104	4463	Object3D readobj = (Object3D) obj;
..	..	@@ -4108,6 +4467,7 @@
4108	4467
4109	4468	if (readobj != null)
4110	4469	{
	4470	+ Save();
4111	4471	try
4112	4472	{
4113	4473	//readobj.deepCopySelf(copy);
..	..	@@ -4170,7 +4530,7 @@
4170	4530
4171	4531	void load() // throws ClassNotFoundException
4172	4532	{
4173		- if (GrafreeD.standAlone)
	4533	+ if (Grafreed.standAlone)
4174	4534	{
4175	4535	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4176	4536	browser.show();
..	..	@@ -4257,11 +4617,13 @@
4257	4617	try
4258	4618	{
4259	4619	FileOutputStream ostream = new FileOutputStream(lastname);
4260		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4620	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4621	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4261	4622
4262	4623	p.writeObject(copy);
4263	4624	p.flush();
4264	4625
	4626	+ zstream.close();
4265	4627	ostream.close();
4266	4628
4267	4629	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4271,11 +4633,12 @@
4271	4633	{
4272	4634	}
4273	4635	}
	4636	+
4274	4637	String lastname;
4275	4638
4276	4639	void saveAs()
4277	4640	{
4278		- if (GrafreeD.standAlone)
	4641	+ if (Grafreed.standAlone)
4279	4642	{
4280	4643	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4281	4644	browser.setVisible(true);
..	..	@@ -4380,13 +4743,13 @@
4380	4743	try
4381	4744	{
4382	4745	FileOutputStream ostream = new FileOutputStream(filename);
4383		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4384		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4746	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4747	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4385	4748
4386	4749	Object3D objectparent = obj.parent;
4387	4750	obj.parent = null;
4388	4751
4389		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4752	+ Object3D object = (Object3D) Grafreed.clone(obj);
4390	4753
4391	4754	obj.parent = objectparent;
4392	4755
..	..	@@ -4398,8 +4761,8 @@
4398	4761	p.writeObject(object);
4399	4762	p.flush();
4400	4763
	4764	+ zstream.close();
4401	4765	ostream.close();
4402		- // zstream.close();
4403	4766
4404	4767	// group.selection.get(0).parent = parent;
4405	4768	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4420,7 +4783,7 @@
4420	4783	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4421	4784	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4422	4785	copy.generatePOV(buffer);
4423		- if (GrafreeD.standAlone)
	4786	+ if (Grafreed.standAlone)
4424	4787	{
4425	4788	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4426	4789	browser.show();
..	..	@@ -4446,7 +4809,8 @@
4446	4809	Object3D client;
4447	4810	Object3D copy;
4448	4811	MenuBar menuBar;
4449		- Menu windowMenu;
	4812	+ Menu fileMenu;
	4813	+ MenuItem newItem;
4450	4814	MenuItem loadItem;
4451	4815	MenuItem saveItem;
4452	4816	MenuItem saveAsItem;
..	..	@@ -4454,11 +4818,9 @@
4454	4818	MenuItem reexportItem;
4455	4819	MenuItem povItem;
4456	4820	MenuItem closeItem;
4457		- Menu cameraMenu;
	4821	+
4458	4822	CheckboxMenuItem zBufferItem;
4459	4823	//MenuItem normalLensItem;
4460		- MenuItem editCameraItem;
4461		- MenuItem revertCameraItem;
4462	4824	MenuItem stepItem;
4463	4825	CheckboxMenuItem toggleLiveItem;
4464	4826	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4606,4 +4968,9 @@
4606	4968	//ObjectUI parent;
4607	4969
4608	4970	cNumberSlider normalpushField;
	4971	+
	4972	+ private MenuItem importGFDItem;
	4973	+ private MenuItem importVRMLX3DItem;
	4974	+ private MenuItem import3DSItem;
	4975	+ private MenuItem importOBJItem;
4609	4976	}