~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;
..	..	@@ -143,6 +145,8 @@
143	145	//nameField.removeActionListener(this);
144	146	// objEditor.ctrlPanel.remove(nameField);
145	147
	148	+ objEditor.ctrlPanel.remove(namePanel);
	149	+
146	150	if (!GroupEditor.allparams)
147	151	return;
148	152
..	..	@@ -165,8 +169,8 @@
165	169	// objEditor.ctrlPanel.remove(fasterButton);
166	170	// objEditor.ctrlPanel.remove(remarkButton);
167	171
168		- objEditor.ctrlPanel.remove(namePanel);
169	172	objEditor.ctrlPanel.remove(setupPanel);
	173	+ objEditor.ctrlPanel.remove(setupPanel2);
170	174	objEditor.ctrlPanel.remove(commandsPanel);
171	175	objEditor.ctrlPanel.remove(pushPanel);
172	176	//objEditor.ctrlPanel.remove(fillPanel);
..	..	@@ -242,6 +246,7 @@
242	246	//localCopy.parent = null;
243	247
244	248	frame = new JFrame();
	249	+ frame.setUndecorated(true);
245	250	objEditor = this;
246	251	this.callee = callee;
247	252
..	..	@@ -275,24 +280,40 @@
275	280	void SetupMenu()
276	281	{
277	282	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..."));
	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..."));
283	303	//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("-");
	304	+ fileMenu.add("-");
	305	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	306	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	307	+ fileMenu.add("-");
288	308	if (client.parent != null)
289	309	{
290		- windowMenu.add(closeItem = new MenuItem("Close"));
	310	+ fileMenu.add(closeItem = new MenuItem("Close"));
291	311	} else
292	312	{
293		- windowMenu.add(closeItem = new MenuItem("Exit"));
	313	+ fileMenu.add(closeItem = new MenuItem("Exit"));
294	314	}
295	315
	316	+ newItem.addActionListener(this);
296	317	loadItem.addActionListener(this);
297	318	saveItem.addActionListener(this);
298	319	saveAsItem.addActionListener(this);
..	..	@@ -300,61 +321,6 @@
300	321	reexportItem.addActionListener(this);
301	322	//povItem.addActionListener(this);
302	323	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	324
359	325	objectPanel = new JTabbedPane();
360	326	toolbarPanel = new JPanel();
..	..	@@ -457,10 +423,10 @@
457	423	e.printStackTrace();
458	424	}
459	425
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();
	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();
464	430	//clipboard.setContents(data, data);
465	431	}
466	432
..	..	@@ -483,13 +449,13 @@
483	449	//SendInfo("Name:", "bold");
484	450	if (sel.GetTextures() != null \|\| debug)
485	451	{
486		- si.SendInfo(sel.toString(), "bold");
	452	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
487	453	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
488	454	if (sel.Size() > 0)
489	455	{
490	456	si.SendInfo("#children = " + sel.Size(), "regular");
491	457	}
492		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	458	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
493	459	if (debug)
494	460	{
495	461	try
..	..	@@ -531,7 +497,7 @@
531	497	}
532	498	if (sel.support != null)
533	499	{
534		- si.SendInfo(" support: " + sel.support, "regular");
	500	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
535	501	}
536	502	if (sel.scriptnode != null)
537	503	{
..	..	@@ -620,19 +586,89 @@
620	586	}
621	587	}
622	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	+
623	629	void ToggleFullScreen()
624	630	{
625	631	if (CameraPane.FULLSCREEN)
626	632	{
627		- frame.getContentPane().remove(/"Center",/bigThree);
628		- framePanel.add(bigThree);
629		- 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	+
630	651	} else
631	652	{
632		- frame.getContentPane().remove(/"Center",/framePanel);
633		- framePanel.remove(bigThree);
634		- 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);
635	670	}
	671	+
636	672	cameraView.ToggleFullScreen();
637	673	}
638	674
..	..	@@ -734,7 +770,7 @@
734	770	protected static ImageIcon createImageIcon(String path,
735	771	String description)
736	772	{
737		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	773	+ java.net.URL imgURL = Grafreed.class.getResource(path);
738	774	if (imgURL != null)
739	775	{
740	776	return new ImageIcon(imgURL, description);
..	..	@@ -766,6 +802,7 @@
766	802	// NumberSlider vDivsField;
767	803	// JCheckBox endcaps;
768	804	JCheckBox liveCB;
	805	+ JCheckBox selectCB;
769	806	JCheckBox hideCB;
770	807	JCheckBox link2masterCB;
771	808	JCheckBox markCB;
..	..	@@ -784,6 +821,7 @@
784	821
785	822	cGridBag namePanel;
786	823	cGridBag setupPanel;
	824	+ cGridBag setupPanel2;
787	825	cGridBag commandsPanel;
788	826	cGridBag pushPanel;
789	827	cGridBag fillPanel;
..	..	@@ -967,33 +1005,56 @@
967	1005	setupPanel = new cGridBag().setVertical(false);
968	1006
969	1007	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
970		- if (Globals.ADVANCED)
971		- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
972		- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1008	+ liveCB.setToolTipText("Animate object");
	1009	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1010	+ selectCB.setToolTipText("Make object selectable");
973	1011	// Return();
	1012	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1013	+ hideCB.setToolTipText("Hide object");
974	1014	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
975		- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
976		- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	1015	+ markCB.setToolTipText("Set the animation target transform");
	1016	+
	1017	+ setupPanel2 = new cGridBag().setVertical(false);
	1018	+
	1019	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1020	+ rewindCB.setToolTipText("Rewind animation");
	1021	+
	1022	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1023	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
977	1024
	1025	+ if (Globals.ADVANCED)
	1026	+ {
	1027	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1028	+ link2masterCB.setToolTipText("Attach to support");
	1029	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1030	+ speedupCB.setToolTipText("Option motion capture");
	1031	+ }
	1032	+
978	1033	oe.ctrlPanel.add(setupPanel);
	1034	+ oe.ctrlPanel.Return();
	1035	+ oe.ctrlPanel.add(setupPanel2);
979	1036	oe.ctrlPanel.Return();
980	1037
981	1038	commandsPanel = new cGridBag().setVertical(false);
982	1039
983	1040	resetButton = AddButton(commandsPanel, "Reset");
	1041	+ resetButton.setToolTipText("Jump to frame zero");
984	1042	stepButton = AddButton(commandsPanel, "Step");
	1043	+ stepButton.setToolTipText("Step one frame");
985	1044	// resetAllButton = AddButton(oe, "Reset All");
986	1045	// stepAllButton = AddButton(oe, "Step All");
987		- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
988	1046	// Return();
989	1047	slowerButton = AddButton(commandsPanel, "Slow");
	1048	+ slowerButton.setToolTipText("Decrease animation speed");
990	1049	fasterButton = AddButton(commandsPanel, "Fast");
	1050	+ fasterButton.setToolTipText("Increase animation speed");
991	1051	remarkButton = AddButton(commandsPanel, "Remark");
	1052	+ remarkButton.setToolTipText("Set the current transform as the target");
992	1053
993	1054	oe.ctrlPanel.add(commandsPanel);
994	1055	oe.ctrlPanel.Return();
995	1056
996		- 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
997	1058	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
998	1059	//Return();
999	1060
..	..	@@ -1196,8 +1257,11 @@
1196	1257	//worldPanel.setName("World");
1197	1258	centralPanel = new cGridBag();
1198	1259	centralPanel.preferredWidth = 20;
1199		- timelinePanel = new JPanel(new BorderLayout());
1200		- 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);
1201	1265
1202	1266	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1203	1267	cameraPanel.setContinuousLayout(true);
..	..	@@ -1206,7 +1270,10 @@
1206	1270	// cameraPanel.setDividerSize(9);
1207	1271	cameraPanel.setResizeWeight(1.0);
1208	1272
	1273	+ }
	1274	+
1209	1275	centralPanel.add(cameraView);
	1276	+ centralPanel.setFocusable(true);
1210	1277	//frame.setJMenuBar(timelineMenubar);
1211	1278	//centralPanel.add(timelinePanel);
1212	1279
..	..	@@ -1295,7 +1362,7 @@
1295	1362	scrollpane.addMouseWheelListener(this); // Default not fast enough
1296	1363
1297	1364	/JTabbedPane/ scenePanel = new cGridBag();
1298		- scenePanel.preferredWidth = 7;
	1365	+ scenePanel.preferredWidth = 6;
1299	1366
1300	1367	JTabbedPane tabbedPane = new JTabbedPane();
1301	1368	tabbedPane.add(scrollpane);
..	..	@@ -1401,9 +1468,11 @@
1401	1468
1402	1469	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1403	1470
1404		- frame.setSize(1024, 768);
1405		- frame.show();
	1471	+ frame.setSize(1280, 860);
	1472	+ frame.setVisible(true);
1406	1473
	1474	+ cameraView.requestFocusInWindow();
	1475	+
1407	1476	gridPanel.setDividerLocation(1.0);
1408	1477
1409	1478	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1441,19 +1510,22 @@
1441	1510
1442	1511	cGridBag editBar = new cGridBag().setVertical(false);
1443	1512
1444		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1513	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1445	1514	createMaterialButton.setToolTipText("Create material");
1446	1515
1447	1516	/*
1448	1517	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1449	1518	*/
1450	1519
1451		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1520	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1452	1521	clearMaterialButton.setToolTipText("Clear material");
1453	1522
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);
	1523	+ if (Globals.ADVANCED)
	1524	+ {
	1525	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1526	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1527	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1528	+ }
1457	1529
1458	1530	editBar.preferredHeight = 15;
1459	1531
..	..	@@ -1722,12 +1794,15 @@
1722	1794	opacityPowerField.addChangeListener(this);
1723	1795	/**/
1724	1796
1725		- resetSlidersButton.addActionListener(this);
1726	1797	clearMaterialButton.addActionListener(this);
1727	1798	createMaterialButton.addActionListener(this);
1728		-
1729		- propagateToggle.addItemListener(this);
1730		- multiplyToggle.addItemListener(this);
	1799	+
	1800	+ if (Globals.ADVANCED)
	1801	+ {
	1802	+ resetSlidersButton.addActionListener(this);
	1803	+ propagateToggle.addItemListener(this);
	1804	+ multiplyToggle.addItemListener(this);
	1805	+ }
1731	1806	}
1732	1807
1733	1808	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1898,7 +1973,7 @@
1898	1973
1899	1974	//? flashIt = false;
1900	1975	CameraPane pane = (CameraPane) cameraView;
1901		- pane.clickStart(location.x, location.y, 0);
	1976	+ pane.clickStart(location.x, location.y, 0, 0);
1902	1977	pane.clickEnd(location.x, location.y, 0, true);
1903	1978
1904	1979	if (group.selection.size() == 1)
..	..	@@ -1947,6 +2022,7 @@
1947	2022	e2.printStackTrace();
1948	2023	}
1949	2024	}
	2025	+
1950	2026	LoadJMEThread loadThread;
1951	2027
1952	2028	class LoadJMEThread extends Thread
..	..	@@ -2004,6 +2080,7 @@
2004	2080	//LoadFile0(filename, converter);
2005	2081	}
2006	2082	}
	2083	+
2007	2084	LoadOBJThread loadObjThread;
2008	2085
2009	2086	class LoadOBJThread extends Thread
..	..	@@ -2082,19 +2159,19 @@
2082	2159
2083	2160	void LoadObjFile(String fullname)
2084	2161	{
2085		- /*
	2162	+ System.out.println("Loading " + fullname);
	2163	+ /**/
2086	2164	//lastFilename = fullname;
2087	2165	if(loadObjThread == null)
2088	2166	{
2089		- loadObjThread = new LoadOBJThread();
2090		- loadObjThread.start();
	2167	+ loadObjThread = new LoadOBJThread();
	2168	+ loadObjThread.start();
2091	2169	}
2092	2170
2093	2171	loadObjThread.add(fullname);
2094		- */
	2172	+ /**/
2095	2173
2096		- System.out.println("Loading " + fullname);
2097		- makeSomething(new FileObject(fullname, true), true);
	2174	+ //makeSomething(new FileObject(fullname, true), true);
2098	2175	}
2099	2176
2100	2177	void LoadGFDFile(String fullname)
..	..	@@ -2355,11 +2432,11 @@
2355	2432
2356	2433	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2357	2434	{
2358		- if (GrafreeD.standAlone)
	2435	+ if (Grafreed.standAlone)
2359	2436	{
2360	2437	/**/
2361	2438	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2362		- browser.show();
	2439	+ browser.setVisible(true);
2363	2440	String filename = browser.getFile();
2364	2441	if (filename != null && filename.length() > 0)
2365	2442	{
..	..	@@ -2719,7 +2796,8 @@
2719	2796	return;
2720	2797	}
2721	2798
2722		- multiplyToggle.setSelected(mat.multiply);
	2799	+ if (multiplyToggle != null)
	2800	+ multiplyToggle.setSelected(mat.multiply);
2723	2801
2724	2802	assert (object.projectedVertices != null);
2725	2803
..	..	@@ -2934,9 +3012,9 @@
2934	3012	frame.validate();
2935	3013
2936	3014	return;
2937		- } else if (event.getSource() == toggleRandomItem)
	3015	+ } else if (event.getSource() == toggleSwitchItem)
2938	3016	{
2939		- cameraView.ToggleRandom();
	3017	+ cameraView.ToggleSwitch();
2940	3018	cameraView.repaint();
2941	3019	return;
2942	3020	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2965,6 +3043,10 @@
2965	3043	{
2966	3044	copy.live ^= true;
2967	3045	return;
	3046	+ } else if (event.getSource() == selectCB)
	3047	+ {
	3048	+ copy.dontselect ^= true;
	3049	+ return;
2968	3050	} else if (event.getSource() == hideCB)
2969	3051	{
2970	3052	copy.hide ^= true;
..	..	@@ -2979,6 +3061,7 @@
2979	3061	if (event.getSource() == randomCB)
2980	3062	{
2981	3063	copy.random ^= true;
	3064	+ objEditor.refreshContents();
2982	3065	return;
2983	3066	}
2984	3067	if (event.getSource() == speedupCB)
..	..	@@ -3002,8 +3085,9 @@
3002	3085
3003	3086	public void actionPerformed(ActionEvent event)
3004	3087	{
	3088	+ Object source = event.getSource();
3005	3089	// SCRIPT DIALOG
3006		- if (event.getSource() == okbutton)
	3090	+ if (source == okbutton)
3007	3091	{
3008	3092	textpanel.setVisible(false);
3009	3093	textpanel.remove(textarea);
..	..	@@ -3015,7 +3099,7 @@
3015	3099	textarea = null;
3016	3100	textpanel = null;
3017	3101	}
3018		- if (event.getSource() == cancelbutton)
	3102	+ if (source == cancelbutton)
3019	3103	{
3020	3104	textpanel.setVisible(false);
3021	3105	textpanel.remove(textarea);
..	..	@@ -3027,50 +3111,50 @@
3027	3111	//applySelf();
3028	3112	//client.refreshEditWindow();
3029	3113	//refreshContents();
3030		- if (event.getSource() == nameField)
	3114	+ if (source == nameField)
3031	3115	{
3032	3116	//System.out.println("ObjEditor " + event);
3033	3117	applySelf0(true);
3034	3118	//parent.applySelf();
3035	3119	objEditor.refreshContents();
3036		- } else if (event.getSource() == resetButton)
	3120	+ } else if (source == resetButton)
3037	3121	{
3038	3122	CameraPane.fullreset = true;
3039	3123	copy.Reset(); // ResetMeshes();
3040	3124	copy.Touch();
3041	3125	objEditor.refreshContents();
3042		- } else if (event.getSource() == stepItem)
	3126	+ } else if (source == stepItem)
3043	3127	{
3044	3128	//cameraView.ONESTEP = true;
3045	3129	Globals.ONESTEP = true;
3046	3130	cameraView.repaint();
3047	3131	return;
3048		- } else if (event.getSource() == stepButton)
	3132	+ } else if (source == stepButton)
3049	3133	{
3050	3134	copy.Step();
3051	3135	copy.Touch();
3052	3136	objEditor.refreshContents();
3053		- } else if (event.getSource() == slowerButton)
	3137	+ } else if (source == slowerButton)
3054	3138	{
3055	3139	copy.Slower();
3056	3140	copy.Touch();
3057	3141	objEditor.refreshContents();
3058		- } else if (event.getSource() == fasterButton)
	3142	+ } else if (source == fasterButton)
3059	3143	{
3060	3144	copy.Faster();
3061	3145	copy.Touch();
3062	3146	objEditor.refreshContents();
3063		- } else if (event.getSource() == remarkButton)
	3147	+ } else if (source == remarkButton)
3064	3148	{
3065	3149	copy.Remark();
3066	3150	copy.Touch();
3067	3151	objEditor.refreshContents();
3068		- } else if (event.getSource() == stepAllButton)
	3152	+ } else if (source == stepAllButton)
3069	3153	{
3070	3154	copy.StepAll();
3071	3155	copy.Touch();
3072	3156	objEditor.refreshContents();
3073		- } else if (event.getSource() == resetAllButton)
	3157	+ } else if (source == resetAllButton)
3074	3158	{
3075	3159	//CameraPane.fullreset = true;
3076	3160	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3103,53 +3187,75 @@
3103	3187	// Close();
3104	3188	// }
3105	3189	// else
3106		- if (event.getSource() == resetSlidersButton)
	3190	+ if (source == resetSlidersButton)
3107	3191	{
3108	3192	ResetSliders();
3109		- } else if (event.getSource() == clearMaterialButton)
	3193	+ } else if (source == clearMaterialButton)
3110	3194	{
3111	3195	ClearMaterial();
3112		- } else if (event.getSource() == createMaterialButton)
	3196	+ } else if (source == createMaterialButton)
3113	3197	{
3114	3198	CreateMaterial();
3115		- } else if (event.getSource() == clearPanelButton)
	3199	+ } else if (source == clearPanelButton)
3116	3200	{
3117	3201	copy.ClearUI();
3118	3202	refreshContents(true);
3119		- } /*
3120		- }
3121		-
3122		- public boolean action(Event event, Object arg)
3123		- {
3124		- */ 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)
3125	3228	{
3126	3229	Close();
3127	3230	//return true;
3128		- } else if (event.getSource() == loadItem)
	3231	+ } else if (source == loadItem)
3129	3232	{
3130	3233	load();
3131	3234	//return true;
3132		- } else if (event.getSource() == saveItem)
	3235	+ } else if (source == newItem)
	3236	+ {
	3237	+ New();
	3238	+ } else if (source == saveItem)
3133	3239	{
3134	3240	save();
3135	3241	//return true;
3136		- } else if (event.getSource() == saveAsItem)
	3242	+ } else if (source == saveAsItem)
3137	3243	{
3138	3244	saveAs();
3139	3245	//return true;
3140		- } else if (event.getSource() == reexportItem)
	3246	+ } else if (source == reexportItem)
3141	3247	{
3142	3248	reexport();
3143	3249	//return true;
3144		- } else if (event.getSource() == exportAsItem)
	3250	+ } else if (source == exportAsItem)
3145	3251	{
3146	3252	export();
3147	3253	//return true;
3148		- } else if (event.getSource() == povItem)
	3254	+ } else if (source == povItem)
3149	3255	{
3150	3256	generatePOV();
3151	3257	//return true;
3152		- } else if (event.getSource() == zBufferItem)
	3258	+ } else if (source == zBufferItem)
3153	3259	{
3154	3260	try
3155	3261	{
..	..	@@ -3171,21 +3277,8 @@
3171	3277	cameraView.repaint();
3172	3278	//return true;
3173	3279	}
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)
	3280	+ */ else // combos...
	3281	+ if (source == texresMenu)
3189	3282	{
3190	3283	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3191	3284	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3197,6 +3290,262 @@
3197	3290	}
3198	3291	}
3199	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	+
3200	3549	void ToggleAnimation()
3201	3550	{
3202	3551	if (!Globals.ANIMATION)
..	..	@@ -3212,8 +3561,8 @@
3212	3561
3213	3562	Globals.ANIMATION ^= true;
3214	3563
3215		- GrafreeD.wav.cursor = 0;
3216		- GrafreeD.wav.loop = 0;
	3564	+ Grafreed.wav.cursor = 0;
	3565	+ Grafreed.wav.loop = 0;
3217	3566	}
3218	3567	} else
3219	3568	{
..	..	@@ -3234,7 +3583,6 @@
3234	3583	callee.refreshContents();
3235	3584	} else
3236	3585	{
3237		- new Exception().printStackTrace();
3238	3586	System.exit(0);
3239	3587	}
3240	3588	}
..	..	@@ -3264,7 +3612,7 @@
3264	3612	void CreateMaterial()
3265	3613	{
3266	3614	//copy.ClearMaterial(); // PATCH
3267		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3615	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3268	3616	if (copy.selection.size() > 0)
3269	3617	//SetMaterial(copy);
3270	3618	{
..	..	@@ -3323,11 +3671,11 @@
3323	3671	{
3324	3672	copy.ResetBlockLoop(); // temporary problem
3325	3673
3326		- boolean random = CameraPane.RANDOM;
3327		- CameraPane.RANDOM = false; // parse everything
	3674	+ boolean random = CameraPane.SWITCH;
	3675	+ CameraPane.SWITCH = false; // parse everything
3328	3676	copy.ResetDisplayList();
3329	3677	copy.HardTouch();
3330		- CameraPane.RANDOM = random;
	3678	+ CameraPane.SWITCH = random;
3331	3679	}
3332	3680
3333	3681	// public void applySelf()
..	..	@@ -3401,6 +3749,36 @@
3401	3749	{
3402	3750	//System.out.println("Propagate = " + propagate);
3403	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	+
3404	3782	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3405	3783	{
3406	3784	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3516,7 +3894,7 @@
3516	3894	}
3517	3895
3518	3896	if (normalpushField != null)
3519		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3897	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3520	3898	}
3521	3899
3522	3900	void SnapObject()
..	..	@@ -3780,6 +4158,7 @@
3780	4158
3781	4159	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3782	4160	{
	4161	+ Save();
3783	4162	//Tween.set(thing, 0).target(1).start(tweenManager);
3784	4163	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3785	4164	// if (thing instanceof GenericJointDemo)
..	..	@@ -3983,6 +4362,7 @@
3983	4362	}
3984	4363	}
3985	4364	}
	4365	+
3986	4366	LoadGFDThread loadGFDThread;
3987	4367
3988	4368	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4002,8 +4382,10 @@
4002	4382
4003	4383	try
4004	4384	{
	4385	+ // Try compressed version first.
4005	4386	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4006		- 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);
4007	4389
4008	4390	readobj = (Object3D) p.readObject();
4009	4391	istream.close();
..	..	@@ -4011,7 +4393,20 @@
4011	4393	readobj.ResetDisplayList();
4012	4394	} catch (Exception e)
4013	4395	{
4014		- 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	+ }
4015	4410	}
4016	4411	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4017	4412	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4057,6 +4452,12 @@
4057	4452
4058	4453	void LoadIt(Object obj)
4059	4454	{
	4455	+ if (obj == null)
	4456	+ {
	4457	+ // Invalid file
	4458	+ return;
	4459	+ }
	4460	+
4060	4461	System.out.println("Loaded " + obj);
4061	4462	//new Exception().printStackTrace();
4062	4463	Object3D readobj = (Object3D) obj;
..	..	@@ -4066,6 +4467,7 @@
4066	4467
4067	4468	if (readobj != null)
4068	4469	{
	4470	+ Save();
4069	4471	try
4070	4472	{
4071	4473	//readobj.deepCopySelf(copy);
..	..	@@ -4128,7 +4530,7 @@
4128	4530
4129	4531	void load() // throws ClassNotFoundException
4130	4532	{
4131		- if (GrafreeD.standAlone)
	4533	+ if (Grafreed.standAlone)
4132	4534	{
4133	4535	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4134	4536	browser.show();
..	..	@@ -4215,11 +4617,13 @@
4215	4617	try
4216	4618	{
4217	4619	FileOutputStream ostream = new FileOutputStream(lastname);
4218		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4620	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4621	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4219	4622
4220	4623	p.writeObject(copy);
4221	4624	p.flush();
4222	4625
	4626	+ zstream.close();
4223	4627	ostream.close();
4224	4628
4225	4629	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4229,11 +4633,12 @@
4229	4633	{
4230	4634	}
4231	4635	}
	4636	+
4232	4637	String lastname;
4233	4638
4234	4639	void saveAs()
4235	4640	{
4236		- if (GrafreeD.standAlone)
	4641	+ if (Grafreed.standAlone)
4237	4642	{
4238	4643	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4239	4644	browser.setVisible(true);
..	..	@@ -4338,13 +4743,13 @@
4338	4743	try
4339	4744	{
4340	4745	FileOutputStream ostream = new FileOutputStream(filename);
4341		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4342		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4746	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4747	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4343	4748
4344	4749	Object3D objectparent = obj.parent;
4345	4750	obj.parent = null;
4346	4751
4347		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4752	+ Object3D object = (Object3D) Grafreed.clone(obj);
4348	4753
4349	4754	obj.parent = objectparent;
4350	4755
..	..	@@ -4356,8 +4761,8 @@
4356	4761	p.writeObject(object);
4357	4762	p.flush();
4358	4763
	4764	+ zstream.close();
4359	4765	ostream.close();
4360		- // zstream.close();
4361	4766
4362	4767	// group.selection.get(0).parent = parent;
4363	4768	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4378,7 +4783,7 @@
4378	4783	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4379	4784	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4380	4785	copy.generatePOV(buffer);
4381		- if (GrafreeD.standAlone)
	4786	+ if (Grafreed.standAlone)
4382	4787	{
4383	4788	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4384	4789	browser.show();
..	..	@@ -4404,7 +4809,8 @@
4404	4809	Object3D client;
4405	4810	Object3D copy;
4406	4811	MenuBar menuBar;
4407		- Menu windowMenu;
	4812	+ Menu fileMenu;
	4813	+ MenuItem newItem;
4408	4814	MenuItem loadItem;
4409	4815	MenuItem saveItem;
4410	4816	MenuItem saveAsItem;
..	..	@@ -4412,11 +4818,9 @@
4412	4818	MenuItem reexportItem;
4413	4819	MenuItem povItem;
4414	4820	MenuItem closeItem;
4415		- Menu cameraMenu;
	4821	+
4416	4822	CheckboxMenuItem zBufferItem;
4417	4823	//MenuItem normalLensItem;
4418		- MenuItem editCameraItem;
4419		- MenuItem revertCameraItem;
4420	4824	MenuItem stepItem;
4421	4825	CheckboxMenuItem toggleLiveItem;
4422	4826	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4427,7 +4831,7 @@
4427	4831	CheckboxMenuItem toggleFootContactItem;
4428	4832	CheckboxMenuItem toggleDLItem;
4429	4833	CheckboxMenuItem toggleTextureItem;
4430		- CheckboxMenuItem toggleRandomItem;
	4834	+ CheckboxMenuItem toggleSwitchItem;
4431	4835	CheckboxMenuItem toggleRootItem;
4432	4836	CheckboxMenuItem animationItem;
4433	4837	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4564,4 +4968,9 @@
4564	4968	//ObjectUI parent;
4565	4969
4566	4970	cNumberSlider normalpushField;
	4971	+
	4972	+ private MenuItem importGFDItem;
	4973	+ private MenuItem importVRMLX3DItem;
	4974	+ private MenuItem import3DSItem;
	4975	+ private MenuItem importOBJItem;
4567	4976	}