~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,7 +170,8 @@
168	170	// objEditor.ctrlPanel.remove(remarkButton);
169	171
170	172	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	173	+ objEditor.ctrlPanel.remove(setupPanel2);
	174	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	175	objEditor.ctrlPanel.remove(pushPanel);
173	176	//objEditor.ctrlPanel.remove(fillPanel);
174	177
..	..	@@ -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);
..	..	@@ -302,85 +322,23 @@
302	322	//povItem.addActionListener(this);
303	323	closeItem.addActionListener(this);
304	324
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		-
376	325	objectPanel = new JTabbedPane();
377	326	toolbarPanel = new JPanel();
378	327	toolbarPanel.setName("Toolbar");
379	328	treePanel = new cGridBag();
380	329	treePanel.setName("Tree");
	330	+
	331	+ editPanel = new cGridBag().setVertical(true);
	332	+ editPanel.setName("Edit");
	333	+
381	334	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
382		- ctrlPanel.setName("Edit");
	335	+
	336	+ editCommandsPanel = new cGridBag();
	337	+ editPanel.add(editCommandsPanel);
	338	+ editPanel.add(ctrlPanel);
	339	+
383	340	materialPanel = new cGridBag().setVertical(true);
	341	+
384	342	materialPanel.setName("Material");
385	343	/JTextPane/
386	344	infoarea = createTextPane();
..	..	@@ -474,10 +432,10 @@
474	432	e.printStackTrace();
475	433	}
476	434
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();
	435	+// String selection = infoarea.getText();
	436	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	437	+// java.awt.datatransfer.Clipboard clipboard =
	438	+// Toolkit.getDefaultToolkit().getSystemClipboard();
481	439	//clipboard.setContents(data, data);
482	440	}
483	441
..	..	@@ -500,13 +458,13 @@
500	458	//SendInfo("Name:", "bold");
501	459	if (sel.GetTextures() != null \|\| debug)
502	460	{
503		- si.SendInfo(sel.toString(), "bold");
	461	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
504	462	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
505	463	if (sel.Size() > 0)
506	464	{
507	465	si.SendInfo("#children = " + sel.Size(), "regular");
508	466	}
509		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	467	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
510	468	if (debug)
511	469	{
512	470	try
..	..	@@ -548,7 +506,7 @@
548	506	}
549	507	if (sel.support != null)
550	508	{
551		- si.SendInfo(" support: " + sel.support, "regular");
	509	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
552	510	}
553	511	if (sel.scriptnode != null)
554	512	{
..	..	@@ -637,19 +595,89 @@
637	595	}
638	596	}
639	597
	598	+static GraphicsDevice device = GraphicsEnvironment
	599	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	600	+
	601	+ Rectangle keeprect;
	602	+ cRadio radio;
	603	+
	604	+cButton keepButton;
	605	+ cButton twoButton; // Full 3D
	606	+ cButton sixButton;
	607	+ cButton threeButton;
	608	+ cButton sevenButton;
	609	+ cButton fourButton; // full panel
	610	+ cButton oneButton; // full XYZ
	611	+ //cButton currentLayout;
	612	+
	613	+ boolean maximized;
	614	+
	615	+ void Minimize()
	616	+ {
	617	+ frame.setState(Frame.ICONIFIED);
	618	+ }
	619	+
	620	+ void Maximize()
	621	+ {
	622	+ if (maximized)
	623	+ {
	624	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	625	+ }
	626	+ else
	627	+ {
	628	+ keeprect = frame.getBounds();
	629	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	630	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	631	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	632	+// frame.setState(Frame.MAXIMIZED_BOTH);
	633	+ }
	634	+
	635	+ maximized ^= true;
	636	+ }
	637	+
640	638	void ToggleFullScreen()
641	639	{
642	640	if (CameraPane.FULLSCREEN)
643	641	{
644		- frame.getContentPane().remove(/"Center",/bigThree);
645		- framePanel.add(bigThree);
646		- frame.getContentPane().add(/"Center",/framePanel);
	642	+ device.setFullScreenWindow(null);
	643	+ //frame.setVisible(false);
	644	+// frame.removeNotify();
	645	+// frame.setUndecorated(false);
	646	+// frame.addNotify();
	647	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	648	+
	649	+// X frame.getContentPane().remove(/"Center",/bigThree);
	650	+// X framePanel.add(bigThree);
	651	+// X frame.getContentPane().add(/"Center",/framePanel);
	652	+ framePanel.setDividerLocation(1);
	653	+
	654	+ //frame.setVisible(true);
	655	+ radio.layout = keepButton;
	656	+ //theFrame = null;
	657	+ keepButton = null;
	658	+ radio.layout.doClick();
	659	+
647	660	} else
648	661	{
649		- frame.getContentPane().remove(/"Center",/framePanel);
650		- framePanel.remove(bigThree);
651		- frame.getContentPane().add(/"Center",/bigThree);
	662	+ keepButton = radio.layout;
	663	+ //keeprect = frame.getBounds();
	664	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	665	+// frame.getToolkit().getScreenSize().height);
	666	+ //frame.setVisible(false);
	667	+ device.setFullScreenWindow(frame);
	668	+// frame.removeNotify();
	669	+// frame.setUndecorated(true);
	670	+// frame.addNotify();
	671	+// X frame.getContentPane().remove(/"Center",/framePanel);
	672	+// X framePanel.remove(bigThree);
	673	+// X frame.getContentPane().add(/"Center",/bigThree);
	674	+ framePanel.setDividerLocation(0);
	675	+
	676	+ radio.layout = twoButton;
	677	+ radio.layout.doClick();
	678	+ //frame.setVisible(true);
652	679	}
	680	+
653	681	cameraView.ToggleFullScreen();
654	682	}
655	683
..	..	@@ -751,7 +779,7 @@
751	779	protected static ImageIcon createImageIcon(String path,
752	780	String description)
753	781	{
754		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	782	+ java.net.URL imgURL = Grafreed.class.getResource(path);
755	783	if (imgURL != null)
756	784	{
757	785	return new ImageIcon(imgURL, description);
..	..	@@ -783,6 +811,7 @@
783	811	// NumberSlider vDivsField;
784	812	// JCheckBox endcaps;
785	813	JCheckBox liveCB;
	814	+ JCheckBox selectCB;
786	815	JCheckBox hideCB;
787	816	JCheckBox link2masterCB;
788	817	JCheckBox markCB;
..	..	@@ -799,9 +828,13 @@
799	828	JButton fasterButton;
800	829	JButton remarkButton;
801	830
	831	+ cGridBag editPanel;
	832	+ cGridBag editCommandsPanel;
	833	+
802	834	cGridBag namePanel;
803	835	cGridBag setupPanel;
804		- cGridBag commandsPanel;
	836	+ cGridBag setupPanel2;
	837	+ cGridBag objectCommandsPanel;
805	838	cGridBag pushPanel;
806	839	cGridBag fillPanel;
807	840
..	..	@@ -985,49 +1018,55 @@
985	1018
986	1019	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
987	1020	liveCB.setToolTipText("Animate object");
	1021	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1022	+ selectCB.setToolTipText("Make object selectable");
	1023	+// Return();
988	1024	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
989	1025	hideCB.setToolTipText("Hide object");
990		-// Return();
991	1026	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
992	1027	markCB.setToolTipText("Set the animation target transform");
993	1028
994		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1029	+ setupPanel2 = new cGridBag().setVertical(false);
	1030	+
	1031	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
995	1032	rewindCB.setToolTipText("Rewind animation");
996	1033
997		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
998		- randomCB.setToolTipText("Option for switch node");
	1034	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1035	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
999	1036
1000	1037	if (Globals.ADVANCED)
1001	1038	{
1002		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	1039	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1003	1040	link2masterCB.setToolTipText("Attach to support");
1004		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1041	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1005	1042	speedupCB.setToolTipText("Option motion capture");
1006	1043	}
1007	1044
1008	1045	oe.ctrlPanel.add(setupPanel);
1009	1046	oe.ctrlPanel.Return();
	1047	+ oe.ctrlPanel.add(setupPanel2);
	1048	+ oe.ctrlPanel.Return();
1010	1049
1011		- commandsPanel = new cGridBag().setVertical(false);
	1050	+ objectCommandsPanel = new cGridBag().setVertical(false);
1012	1051
1013		- resetButton = AddButton(commandsPanel, "Reset");
	1052	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1014	1053	resetButton.setToolTipText("Jump to frame zero");
1015		- stepButton = AddButton(commandsPanel, "Step");
	1054	+ stepButton = AddButton(objectCommandsPanel, "Step");
1016	1055	stepButton.setToolTipText("Step one frame");
1017	1056	// resetAllButton = AddButton(oe, "Reset All");
1018	1057	// stepAllButton = AddButton(oe, "Step All");
1019	1058	// Return();
1020		- slowerButton = AddButton(commandsPanel, "Slow");
	1059	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1021	1060	slowerButton.setToolTipText("Decrease animation speed");
1022		- fasterButton = AddButton(commandsPanel, "Fast");
	1061	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1023	1062	fasterButton.setToolTipText("Increase animation speed");
1024		- remarkButton = AddButton(commandsPanel, "Remark");
	1063	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1025	1064	remarkButton.setToolTipText("Set the current transform as the target");
1026	1065
1027		- oe.ctrlPanel.add(commandsPanel);
	1066	+ oe.ctrlPanel.add(objectCommandsPanel);
1028	1067	oe.ctrlPanel.Return();
1029	1068
1030		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1069	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1031	1070	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1032	1071	//Return();
1033	1072
..	..	@@ -1230,8 +1269,11 @@
1230	1269	//worldPanel.setName("World");
1231	1270	centralPanel = new cGridBag();
1232	1271	centralPanel.preferredWidth = 20;
1233		- timelinePanel = new JPanel(new BorderLayout());
1234		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1272	+
	1273	+ if (Globals.ADVANCED)
	1274	+ {
	1275	+ timelinePanel = new JPanel(new BorderLayout());
	1276	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1235	1277
1236	1278	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1237	1279	cameraPanel.setContinuousLayout(true);
..	..	@@ -1240,7 +1282,10 @@
1240	1282	// cameraPanel.setDividerSize(9);
1241	1283	cameraPanel.setResizeWeight(1.0);
1242	1284
	1285	+ }
	1286	+
1243	1287	centralPanel.add(cameraView);
	1288	+ centralPanel.setFocusable(true);
1244	1289	//frame.setJMenuBar(timelineMenubar);
1245	1290	//centralPanel.add(timelinePanel);
1246	1291
..	..	@@ -1307,7 +1352,7 @@
1307	1352	// north.setName("Edit");
1308	1353	// north.add(ctrlPanel, BorderLayout.NORTH);
1309	1354	// objectPanel.add(north);
1310		- objectPanel.add(ctrlPanel);
	1355	+ objectPanel.add(editPanel);
1311	1356	objectPanel.add(infoPanel);
1312	1357
1313	1358	/*
..	..	@@ -1329,7 +1374,7 @@
1329	1374	scrollpane.addMouseWheelListener(this); // Default not fast enough
1330	1375
1331	1376	/JTabbedPane/ scenePanel = new cGridBag();
1332		- scenePanel.preferredWidth = 7;
	1377	+ scenePanel.preferredWidth = 6;
1333	1378
1334	1379	JTabbedPane tabbedPane = new JTabbedPane();
1335	1380	tabbedPane.add(scrollpane);
..	..	@@ -1435,9 +1480,11 @@
1435	1480
1436	1481	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1437	1482
1438		- frame.setSize(1024, 768);
1439		- frame.show();
	1483	+ frame.setSize(1280, 860);
	1484	+ frame.setVisible(true);
1440	1485
	1486	+ cameraView.requestFocusInWindow();
	1487	+
1441	1488	gridPanel.setDividerLocation(1.0);
1442	1489
1443	1490	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1475,19 +1522,19 @@
1475	1522
1476	1523	cGridBag editBar = new cGridBag().setVertical(false);
1477	1524
1478		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1525	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1479	1526	createMaterialButton.setToolTipText("Create material");
1480	1527
1481	1528	/*
1482	1529	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1483	1530	*/
1484	1531
1485		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1532	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1486	1533	clearMaterialButton.setToolTipText("Clear material");
1487	1534
1488	1535	if (Globals.ADVANCED)
1489	1536	{
1490		- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1537	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
1491	1538	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1492	1539	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1493	1540	}
..	..	@@ -1938,7 +1985,7 @@
1938	1985
1939	1986	//? flashIt = false;
1940	1987	CameraPane pane = (CameraPane) cameraView;
1941		- pane.clickStart(location.x, location.y, 0);
	1988	+ pane.clickStart(location.x, location.y, 0, 0);
1942	1989	pane.clickEnd(location.x, location.y, 0, true);
1943	1990
1944	1991	if (group.selection.size() == 1)
..	..	@@ -1987,6 +2034,7 @@
1987	2034	e2.printStackTrace();
1988	2035	}
1989	2036	}
	2037	+
1990	2038	LoadJMEThread loadThread;
1991	2039
1992	2040	class LoadJMEThread extends Thread
..	..	@@ -2044,6 +2092,7 @@
2044	2092	//LoadFile0(filename, converter);
2045	2093	}
2046	2094	}
	2095	+
2047	2096	LoadOBJThread loadObjThread;
2048	2097
2049	2098	class LoadOBJThread extends Thread
..	..	@@ -2122,19 +2171,19 @@
2122	2171
2123	2172	void LoadObjFile(String fullname)
2124	2173	{
2125		- /*
	2174	+ System.out.println("Loading " + fullname);
	2175	+ /**/
2126	2176	//lastFilename = fullname;
2127	2177	if(loadObjThread == null)
2128	2178	{
2129		- loadObjThread = new LoadOBJThread();
2130		- loadObjThread.start();
	2179	+ loadObjThread = new LoadOBJThread();
	2180	+ loadObjThread.start();
2131	2181	}
2132	2182
2133	2183	loadObjThread.add(fullname);
2134		- */
	2184	+ /**/
2135	2185
2136		- System.out.println("Loading " + fullname);
2137		- makeSomething(new FileObject(fullname, true), true);
	2186	+ //makeSomething(new FileObject(fullname, true), true);
2138	2187	}
2139	2188
2140	2189	void LoadGFDFile(String fullname)
..	..	@@ -2395,11 +2444,11 @@
2395	2444
2396	2445	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2397	2446	{
2398		- if (GrafreeD.standAlone)
	2447	+ if (Grafreed.standAlone)
2399	2448	{
2400	2449	/**/
2401	2450	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2402		- browser.show();
	2451	+ browser.setVisible(true);
2403	2452	String filename = browser.getFile();
2404	2453	if (filename != null && filename.length() > 0)
2405	2454	{
..	..	@@ -2977,7 +3026,7 @@
2977	3026	return;
2978	3027	} else if (event.getSource() == toggleSwitchItem)
2979	3028	{
2980		- cameraView.ToggleRandom();
	3029	+ cameraView.ToggleSwitch();
2981	3030	cameraView.repaint();
2982	3031	return;
2983	3032	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3005,6 +3054,10 @@
3005	3054	} else if (event.getSource() == liveCB)
3006	3055	{
3007	3056	copy.live ^= true;
	3057	+ return;
	3058	+ } else if (event.getSource() == selectCB)
	3059	+ {
	3060	+ copy.dontselect ^= true;
3008	3061	return;
3009	3062	} else if (event.getSource() == hideCB)
3010	3063	{
..	..	@@ -3044,8 +3097,9 @@
3044	3097
3045	3098	public void actionPerformed(ActionEvent event)
3046	3099	{
	3100	+ Object source = event.getSource();
3047	3101	// SCRIPT DIALOG
3048		- if (event.getSource() == okbutton)
	3102	+ if (source == okbutton)
3049	3103	{
3050	3104	textpanel.setVisible(false);
3051	3105	textpanel.remove(textarea);
..	..	@@ -3057,7 +3111,7 @@
3057	3111	textarea = null;
3058	3112	textpanel = null;
3059	3113	}
3060		- if (event.getSource() == cancelbutton)
	3114	+ if (source == cancelbutton)
3061	3115	{
3062	3116	textpanel.setVisible(false);
3063	3117	textpanel.remove(textarea);
..	..	@@ -3069,50 +3123,50 @@
3069	3123	//applySelf();
3070	3124	//client.refreshEditWindow();
3071	3125	//refreshContents();
3072		- if (event.getSource() == nameField)
	3126	+ if (source == nameField)
3073	3127	{
3074	3128	//System.out.println("ObjEditor " + event);
3075	3129	applySelf0(true);
3076	3130	//parent.applySelf();
3077	3131	objEditor.refreshContents();
3078		- } else if (event.getSource() == resetButton)
	3132	+ } else if (source == resetButton)
3079	3133	{
3080	3134	CameraPane.fullreset = true;
3081	3135	copy.Reset(); // ResetMeshes();
3082	3136	copy.Touch();
3083	3137	objEditor.refreshContents();
3084		- } else if (event.getSource() == stepItem)
	3138	+ } else if (source == stepItem)
3085	3139	{
3086	3140	//cameraView.ONESTEP = true;
3087	3141	Globals.ONESTEP = true;
3088	3142	cameraView.repaint();
3089	3143	return;
3090		- } else if (event.getSource() == stepButton)
	3144	+ } else if (source == stepButton)
3091	3145	{
3092	3146	copy.Step();
3093	3147	copy.Touch();
3094	3148	objEditor.refreshContents();
3095		- } else if (event.getSource() == slowerButton)
	3149	+ } else if (source == slowerButton)
3096	3150	{
3097	3151	copy.Slower();
3098	3152	copy.Touch();
3099	3153	objEditor.refreshContents();
3100		- } else if (event.getSource() == fasterButton)
	3154	+ } else if (source == fasterButton)
3101	3155	{
3102	3156	copy.Faster();
3103	3157	copy.Touch();
3104	3158	objEditor.refreshContents();
3105		- } else if (event.getSource() == remarkButton)
	3159	+ } else if (source == remarkButton)
3106	3160	{
3107	3161	copy.Remark();
3108	3162	copy.Touch();
3109	3163	objEditor.refreshContents();
3110		- } else if (event.getSource() == stepAllButton)
	3164	+ } else if (source == stepAllButton)
3111	3165	{
3112	3166	copy.StepAll();
3113	3167	copy.Touch();
3114	3168	objEditor.refreshContents();
3115		- } else if (event.getSource() == resetAllButton)
	3169	+ } else if (source == resetAllButton)
3116	3170	{
3117	3171	//CameraPane.fullreset = true;
3118	3172	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3145,53 +3199,75 @@
3145	3199	// Close();
3146	3200	// }
3147	3201	// else
3148		- if (event.getSource() == resetSlidersButton)
	3202	+ if (source == resetSlidersButton)
3149	3203	{
3150	3204	ResetSliders();
3151		- } else if (event.getSource() == clearMaterialButton)
	3205	+ } else if (source == clearMaterialButton)
3152	3206	{
3153	3207	ClearMaterial();
3154		- } else if (event.getSource() == createMaterialButton)
	3208	+ } else if (source == createMaterialButton)
3155	3209	{
3156	3210	CreateMaterial();
3157		- } else if (event.getSource() == clearPanelButton)
	3211	+ } else if (source == clearPanelButton)
3158	3212	{
3159	3213	copy.ClearUI();
3160	3214	refreshContents(true);
3161		- } /*
3162		- }
3163		-
3164		- public boolean action(Event event, Object arg)
3165		- {
3166		- */ else if (event.getSource() == closeItem)
	3215	+ } else if (source == importGFDItem)
	3216	+ {
	3217	+ ImportGFD();
	3218	+ } else
	3219	+ if (source == importVRMLX3DItem)
	3220	+ {
	3221	+ ImportVRMLX3D();
	3222	+ } else
	3223	+ if (source == import3DSItem)
	3224	+ {
	3225	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3226	+ } else
	3227	+ if (source == importOBJItem)
	3228	+ {
	3229	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3230	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3231	+ browser.setVisible(true);
	3232	+ String filename = browser.getFile();
	3233	+ if (filename != null && filename.length() > 0)
	3234	+ {
	3235	+ String fullname = browser.getDirectory() + filename;
	3236	+ makeSomething(ReadOBJ(fullname), true);
	3237	+ }
	3238	+ } else
	3239	+ if (source == closeItem)
3167	3240	{
3168	3241	Close();
3169	3242	//return true;
3170		- } else if (event.getSource() == loadItem)
	3243	+ } else if (source == loadItem)
3171	3244	{
3172	3245	load();
3173	3246	//return true;
3174		- } else if (event.getSource() == saveItem)
	3247	+ } else if (source == newItem)
	3248	+ {
	3249	+ New();
	3250	+ } else if (source == saveItem)
3175	3251	{
3176	3252	save();
3177	3253	//return true;
3178		- } else if (event.getSource() == saveAsItem)
	3254	+ } else if (source == saveAsItem)
3179	3255	{
3180	3256	saveAs();
3181	3257	//return true;
3182		- } else if (event.getSource() == reexportItem)
	3258	+ } else if (source == reexportItem)
3183	3259	{
3184	3260	reexport();
3185	3261	//return true;
3186		- } else if (event.getSource() == exportAsItem)
	3262	+ } else if (source == exportAsItem)
3187	3263	{
3188	3264	export();
3189	3265	//return true;
3190		- } else if (event.getSource() == povItem)
	3266	+ } else if (source == povItem)
3191	3267	{
3192	3268	generatePOV();
3193	3269	//return true;
3194		- } else if (event.getSource() == zBufferItem)
	3270	+ } else if (source == zBufferItem)
3195	3271	{
3196	3272	try
3197	3273	{
..	..	@@ -3213,21 +3289,8 @@
3213	3289	cameraView.repaint();
3214	3290	//return true;
3215	3291	}
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)
	3292	+ */ else // combos...
	3293	+ if (source == texresMenu)
3231	3294	{
3232	3295	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3233	3296	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3239,6 +3302,262 @@
3239	3302	}
3240	3303	}
3241	3304
	3305	+ void New()
	3306	+ {
	3307	+ while (copy.Size() > 1)
	3308	+ {
	3309	+ copy.remove(1);
	3310	+ }
	3311	+
	3312	+ ResetModel();
	3313	+ objEditor.refreshContents();
	3314	+ }
	3315	+
	3316	+ static public byte[] Compress(Object3D o)
	3317	+ {
	3318	+ try
	3319	+ {
	3320	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3321	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3322	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3323	+
	3324	+ Object3D parent = o.parent;
	3325	+ o.parent = null;
	3326	+
	3327	+ out.writeObject(o);
	3328	+
	3329	+ o.parent = parent;
	3330	+
	3331	+ out.flush();
	3332	+
	3333	+ zstream.close();
	3334	+ out.close();
	3335	+
	3336	+ return baos.toByteArray();
	3337	+ } catch (Exception e)
	3338	+ {
	3339	+ System.err.println(e);
	3340	+ return null;
	3341	+ }
	3342	+ }
	3343	+
	3344	+ static public Object Uncompress(byte[] bytes)
	3345	+ {
	3346	+ System.out.println("#bytes = " + bytes.length);
	3347	+ try
	3348	+ {
	3349	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3350	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3351	+ ObjectInputStream in = new ObjectInputStream(istream);
	3352	+ Object obj = in.readObject();
	3353	+ in.close();
	3354	+
	3355	+ return obj;
	3356	+ } catch (Exception e)
	3357	+ {
	3358	+ System.err.println(e);
	3359	+ return null;
	3360	+ }
	3361	+ }
	3362	+
	3363	+ static public Object clone(Object o)
	3364	+ {
	3365	+ try
	3366	+ {
	3367	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3368	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3369	+
	3370	+ out.writeObject(o);
	3371	+
	3372	+ out.flush();
	3373	+ out.close();
	3374	+
	3375	+ byte[] bytes = baos.toByteArray();
	3376	+
	3377	+ System.out.println("clone = " + bytes.length);
	3378	+
	3379	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3380	+ ObjectInputStream in = new ObjectInputStream(bais);
	3381	+ Object obj = in.readObject();
	3382	+ in.close();
	3383	+
	3384	+ return obj;
	3385	+ } catch (Exception e)
	3386	+ {
	3387	+ System.err.println(e);
	3388	+ return null;
	3389	+ }
	3390	+ }
	3391	+
	3392	+ cRadio GetCurrentTab()
	3393	+ {
	3394	+ cRadio ab;
	3395	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3396	+ {
	3397	+ ab = (cRadio)e.nextElement();
	3398	+ if(ab.GetObject() == copy)
	3399	+ {
	3400	+ return ab;
	3401	+ }
	3402	+ }
	3403	+
	3404	+ return null;
	3405	+ }
	3406	+
	3407	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3408	+
	3409	+ public void Save()
	3410	+ {
	3411	+ cRadio tab = GetCurrentTab();
	3412	+
	3413	+ boolean temp = CameraPane.SWITCH;
	3414	+ CameraPane.SWITCH = false;
	3415	+
	3416	+ copy.ExtractBigData(hashtable);
	3417	+
	3418	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3419	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3420	+
	3421	+ copy.RestoreBigData(hashtable);
	3422	+
	3423	+ CameraPane.SWITCH = temp;
	3424	+
	3425	+ //assert(hashtable.isEmpty());
	3426	+
	3427	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3428	+ {
	3429	+ tab.graphs[i] = null;
	3430	+ }
	3431	+
	3432	+ // test save
	3433	+ if (false)
	3434	+ {
	3435	+ try
	3436	+ {
	3437	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3438	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3439	+
	3440	+ p.writeObject(copy);
	3441	+
	3442	+ p.flush();
	3443	+
	3444	+ ostream.close();
	3445	+ } catch (Exception e)
	3446	+ {
	3447	+ e.printStackTrace();
	3448	+ }
	3449	+ }
	3450	+ }
	3451	+
	3452	+ void CopyChanged(Object3D obj)
	3453	+ {
	3454	+ boolean temp = CameraPane.SWITCH;
	3455	+ CameraPane.SWITCH = false;
	3456	+
	3457	+ copy.ExtractBigData(hashtable);
	3458	+
	3459	+ copy.clear();
	3460	+
	3461	+ for (int i=0; i<obj.Size(); i++)
	3462	+ {
	3463	+ copy.add(obj.get(i));
	3464	+ }
	3465	+
	3466	+ copy.RestoreBigData(hashtable);
	3467	+
	3468	+ CameraPane.SWITCH = temp;
	3469	+
	3470	+ //assert(hashtable.isEmpty());
	3471	+
	3472	+ copy.Touch();
	3473	+
	3474	+ ResetModel();
	3475	+ copy.HardTouch(); // recompile?
	3476	+
	3477	+ cRadio ab;
	3478	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3479	+ {
	3480	+ ab = (cRadio)e.nextElement();
	3481	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3482	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3483	+ if (test != null)
	3484	+ {
	3485	+ test.editWindow = ab.object.editWindow;
	3486	+ ab.object = test;
	3487	+ }
	3488	+ }
	3489	+
	3490	+ refreshContents();
	3491	+ }
	3492	+
	3493	+ public void Undo()
	3494	+ {
	3495	+ cRadio tab = GetCurrentTab();
	3496	+
	3497	+ if (tab.undoindex == 0)
	3498	+ {
	3499	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3500	+ return;
	3501	+ }
	3502	+
	3503	+ if (tab.graphs[tab.undoindex] == null)
	3504	+ {
	3505	+ Save();
	3506	+ tab.undoindex -= 1;
	3507	+ }
	3508	+
	3509	+ tab.undoindex -= 1;
	3510	+
	3511	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3512	+ }
	3513	+
	3514	+ public void Redo()
	3515	+ {
	3516	+ cRadio tab = GetCurrentTab();
	3517	+
	3518	+ if (tab.graphs[tab.undoindex + 1] == null)
	3519	+ {
	3520	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3521	+ return;
	3522	+ }
	3523	+
	3524	+ tab.undoindex += 1;
	3525	+
	3526	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3527	+ }
	3528	+
	3529	+ void ImportGFD()
	3530	+ {
	3531	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3532	+ browser.show();
	3533	+ String filename = browser.getFile();
	3534	+ if (filename != null && filename.length() > 0)
	3535	+ {
	3536	+ String fullname = browser.getDirectory() + filename;
	3537	+
	3538	+ //Object3D readobj =
	3539	+ objEditor.ReadGFD(fullname, objEditor);
	3540	+ //makeSomething(readobj);
	3541	+ }
	3542	+ }
	3543	+
	3544	+ void ImportVRMLX3D()
	3545	+ {
	3546	+ if (Grafreed.standAlone)
	3547	+ {
	3548	+ /**/
	3549	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3550	+ browser.show();
	3551	+ String filename = browser.getFile();
	3552	+ if (filename != null && filename.length() > 0)
	3553	+ {
	3554	+ String fullname = browser.getDirectory() + filename;
	3555	+ LoadVRMLX3D(fullname);
	3556	+ }
	3557	+ /**/
	3558	+ }
	3559	+ }
	3560	+
3242	3561	void ToggleAnimation()
3243	3562	{
3244	3563	if (!Globals.ANIMATION)
..	..	@@ -3254,8 +3573,8 @@
3254	3573
3255	3574	Globals.ANIMATION ^= true;
3256	3575
3257		- GrafreeD.wav.cursor = 0;
3258		- GrafreeD.wav.loop = 0;
	3576	+ Grafreed.wav.cursor = 0;
	3577	+ Grafreed.wav.loop = 0;
3259	3578	}
3260	3579	} else
3261	3580	{
..	..	@@ -3276,7 +3595,6 @@
3276	3595	callee.refreshContents();
3277	3596	} else
3278	3597	{
3279		- new Exception().printStackTrace();
3280	3598	System.exit(0);
3281	3599	}
3282	3600	}
..	..	@@ -3443,6 +3761,36 @@
3443	3761	{
3444	3762	//System.out.println("Propagate = " + propagate);
3445	3763	copy.UpdateMaterial(anchor, current, propagate);
	3764	+
	3765	+ if (copy.material != null)
	3766	+ {
	3767	+ cMaterial mat = copy.material;
	3768	+
	3769	+ colorField.SetToolTipValue((mat.color));
	3770	+ modulationField.SetToolTipValue((mat.modulation));
	3771	+ metalnessField.SetToolTipValue((mat.metalness));
	3772	+ diffuseField.SetToolTipValue((mat.diffuse));
	3773	+ specularField.SetToolTipValue((mat.specular));
	3774	+ shininessField.SetToolTipValue((mat.shininess));
	3775	+ shiftField.SetToolTipValue((mat.shift));
	3776	+ ambientField.SetToolTipValue((mat.ambient));
	3777	+ lightareaField.SetToolTipValue((mat.lightarea));
	3778	+ diffusenessField.SetToolTipValue((mat.factor));
	3779	+ velvetField.SetToolTipValue((mat.velvet));
	3780	+ sheenField.SetToolTipValue((mat.sheen));
	3781	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3782	+ backlitField.SetToolTipValue((mat.bump));
	3783	+ anisoField.SetToolTipValue((mat.aniso));
	3784	+ anisoVField.SetToolTipValue((mat.anisoV));
	3785	+ cameraField.SetToolTipValue((mat.cameralight));
	3786	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3787	+ shadowField.SetToolTipValue((mat.shadow));
	3788	+ textureField.SetToolTipValue((mat.texture));
	3789	+ opacityField.SetToolTipValue((mat.opacity));
	3790	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3791	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3792	+ }
	3793	+
3446	3794	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3447	3795	{
3448	3796	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3558,7 +3906,7 @@
3558	3906	}
3559	3907
3560	3908	if (normalpushField != null)
3561		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3909	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3562	3910	}
3563	3911
3564	3912	void SnapObject()
..	..	@@ -3822,6 +4170,7 @@
3822	4170
3823	4171	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3824	4172	{
	4173	+ Save();
3825	4174	//Tween.set(thing, 0).target(1).start(tweenManager);
3826	4175	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3827	4176	// if (thing instanceof GenericJointDemo)
..	..	@@ -4025,6 +4374,7 @@
4025	4374	}
4026	4375	}
4027	4376	}
	4377	+
4028	4378	LoadGFDThread loadGFDThread;
4029	4379
4030	4380	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4044,8 +4394,10 @@
4044	4394
4045	4395	try
4046	4396	{
	4397	+ // Try compressed version first.
4047	4398	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4048		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4399	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4400	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4049	4401
4050	4402	readobj = (Object3D) p.readObject();
4051	4403	istream.close();
..	..	@@ -4053,7 +4405,20 @@
4053	4405	readobj.ResetDisplayList();
4054	4406	} catch (Exception e)
4055	4407	{
4056		- e.printStackTrace();
	4408	+ //e.printStackTrace();
	4409	+ try
	4410	+ {
	4411	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4412	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4413	+
	4414	+ readobj = (Object3D) p.readObject();
	4415	+ istream.close();
	4416	+
	4417	+ readobj.ResetDisplayList();
	4418	+ } catch (Exception e2)
	4419	+ {
	4420	+ e2.printStackTrace();
	4421	+ }
4057	4422	}
4058	4423	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4059	4424	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4099,6 +4464,12 @@
4099	4464
4100	4465	void LoadIt(Object obj)
4101	4466	{
	4467	+ if (obj == null)
	4468	+ {
	4469	+ // Invalid file
	4470	+ return;
	4471	+ }
	4472	+
4102	4473	System.out.println("Loaded " + obj);
4103	4474	//new Exception().printStackTrace();
4104	4475	Object3D readobj = (Object3D) obj;
..	..	@@ -4108,6 +4479,7 @@
4108	4479
4109	4480	if (readobj != null)
4110	4481	{
	4482	+ Save();
4111	4483	try
4112	4484	{
4113	4485	//readobj.deepCopySelf(copy);
..	..	@@ -4170,7 +4542,7 @@
4170	4542
4171	4543	void load() // throws ClassNotFoundException
4172	4544	{
4173		- if (GrafreeD.standAlone)
	4545	+ if (Grafreed.standAlone)
4174	4546	{
4175	4547	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4176	4548	browser.show();
..	..	@@ -4257,11 +4629,13 @@
4257	4629	try
4258	4630	{
4259	4631	FileOutputStream ostream = new FileOutputStream(lastname);
4260		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4632	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4633	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4261	4634
4262	4635	p.writeObject(copy);
4263	4636	p.flush();
4264	4637
	4638	+ zstream.close();
4265	4639	ostream.close();
4266	4640
4267	4641	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4271,11 +4645,12 @@
4271	4645	{
4272	4646	}
4273	4647	}
	4648	+
4274	4649	String lastname;
4275	4650
4276	4651	void saveAs()
4277	4652	{
4278		- if (GrafreeD.standAlone)
	4653	+ if (Grafreed.standAlone)
4279	4654	{
4280	4655	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4281	4656	browser.setVisible(true);
..	..	@@ -4380,13 +4755,13 @@
4380	4755	try
4381	4756	{
4382	4757	FileOutputStream ostream = new FileOutputStream(filename);
4383		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4384		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4758	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4759	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4385	4760
4386	4761	Object3D objectparent = obj.parent;
4387	4762	obj.parent = null;
4388	4763
4389		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4764	+ Object3D object = (Object3D) Grafreed.clone(obj);
4390	4765
4391	4766	obj.parent = objectparent;
4392	4767
..	..	@@ -4398,8 +4773,8 @@
4398	4773	p.writeObject(object);
4399	4774	p.flush();
4400	4775
	4776	+ zstream.close();
4401	4777	ostream.close();
4402		- // zstream.close();
4403	4778
4404	4779	// group.selection.get(0).parent = parent;
4405	4780	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4420,7 +4795,7 @@
4420	4795	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4421	4796	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4422	4797	copy.generatePOV(buffer);
4423		- if (GrafreeD.standAlone)
	4798	+ if (Grafreed.standAlone)
4424	4799	{
4425	4800	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4426	4801	browser.show();
..	..	@@ -4446,7 +4821,8 @@
4446	4821	Object3D client;
4447	4822	Object3D copy;
4448	4823	MenuBar menuBar;
4449		- Menu windowMenu;
	4824	+ Menu fileMenu;
	4825	+ MenuItem newItem;
4450	4826	MenuItem loadItem;
4451	4827	MenuItem saveItem;
4452	4828	MenuItem saveAsItem;
..	..	@@ -4454,11 +4830,9 @@
4454	4830	MenuItem reexportItem;
4455	4831	MenuItem povItem;
4456	4832	MenuItem closeItem;
4457		- Menu cameraMenu;
	4833	+
4458	4834	CheckboxMenuItem zBufferItem;
4459	4835	//MenuItem normalLensItem;
4460		- MenuItem editCameraItem;
4461		- MenuItem revertCameraItem;
4462	4836	MenuItem stepItem;
4463	4837	CheckboxMenuItem toggleLiveItem;
4464	4838	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4606,4 +4980,9 @@
4606	4980	//ObjectUI parent;
4607	4981
4608	4982	cNumberSlider normalpushField;
	4983	+
	4984	+ private MenuItem importGFDItem;
	4985	+ private MenuItem importVRMLX3DItem;
	4986	+ private MenuItem import3DSItem;
	4987	+ private MenuItem importOBJItem;
4609	4988	}