~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -143,6 +143,8 @@
143	143	//nameField.removeActionListener(this);
144	144	// objEditor.ctrlPanel.remove(nameField);
145	145
	146	+ objEditor.ctrlPanel.remove(namePanel);
	147	+
146	148	if (!GroupEditor.allparams)
147	149	return;
148	150
..	..	@@ -165,7 +167,6 @@
165	167	// objEditor.ctrlPanel.remove(fasterButton);
166	168	// objEditor.ctrlPanel.remove(remarkButton);
167	169
168		- objEditor.ctrlPanel.remove(namePanel);
169	170	objEditor.ctrlPanel.remove(setupPanel);
170	171	objEditor.ctrlPanel.remove(commandsPanel);
171	172	objEditor.ctrlPanel.remove(pushPanel);
..	..	@@ -275,24 +276,40 @@
275	276	void SetupMenu()
276	277	{
277	278	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..."));
	279	+ menuBar.add(fileMenu = new Menu("File"));
	280	+ fileMenu.add(newItem = new MenuItem("New"));
	281	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	282	+
	283	+ //oe.menuBar.add(menu = new Menu("Include"));
	284	+ Menu menu = new Menu("Import");
	285	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	286	+ importOBJItem.addActionListener(this);
	287	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	288	+ import3DSItem.addActionListener(this);
	289	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	290	+ importVRMLX3DItem.addActionListener(this);
	291	+ menu.add("-");
	292	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	293	+ importGFDItem.addActionListener(this);
	294	+ fileMenu.add(menu);
	295	+ fileMenu.add("-");
	296	+
	297	+ fileMenu.add(saveItem = new MenuItem("Save"));
	298	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
283	299	//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("-");
	300	+ fileMenu.add("-");
	301	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	302	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	303	+ fileMenu.add("-");
288	304	if (client.parent != null)
289	305	{
290		- windowMenu.add(closeItem = new MenuItem("Close"));
	306	+ fileMenu.add(closeItem = new MenuItem("Close"));
291	307	} else
292	308	{
293		- windowMenu.add(closeItem = new MenuItem("Exit"));
	309	+ fileMenu.add(closeItem = new MenuItem("Exit"));
294	310	}
295	311
	312	+ newItem.addActionListener(this);
296	313	loadItem.addActionListener(this);
297	314	saveItem.addActionListener(this);
298	315	saveAsItem.addActionListener(this);
..	..	@@ -301,65 +318,10 @@
301	318	//povItem.addActionListener(this);
302	319	closeItem.addActionListener(this);
303	320
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		-
359	321	objectPanel = new JTabbedPane();
360	322	toolbarPanel = new JPanel();
361	323	toolbarPanel.setName("Toolbar");
362		- treePanel = new JPanel();
	324	+ treePanel = new cGridBag();
363	325	treePanel.setName("Tree");
364	326	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
365	327	ctrlPanel.setName("Edit");
..	..	@@ -367,13 +329,15 @@
367	329	materialPanel.setName("Material");
368	330	/JTextPane/
369	331	infoarea = createTextPane();
	332	+ doc = infoarea.getStyledDocument();
	333	+
370	334	infoarea.setEditable(true);
371	335	SetText();
372	336	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
373	337	// infoarea.setOpaque(false);
374	338	// //infoarea.setForeground(textcolor);
375		- infoarea.setLineWrap(true);
376		- infoarea.setWrapStyleWord(true);
	339	+// TEXTAREA infoarea.setLineWrap(true);
	340	+// TEXTAREA infoarea.setWrapStyleWord(true);
377	341	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
378	342	infoPanel.setPreferredSize(new Dimension(50, 200));
379	343	infoPanel.setName("Info");
..	..	@@ -384,14 +348,14 @@
384	348	mainPanel.setName("Main");
385	349	mainPanel.setContinuousLayout(true);
386	350	mainPanel.setOneTouchExpandable(true);
387		- mainPanel.setDividerLocation(1.0);
388	351	mainPanel.setDividerSize(9);
389		- mainPanel.setResizeWeight(0);
	352	+ mainPanel.setDividerLocation(0.5); //1.0);
	353	+ mainPanel.setResizeWeight(0.5);
390	354
391	355	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
392	356	//mainPanel.setLayout(new GridBagLayout());
393	357	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
394		- treePanel.setLayout(new GridBagLayout());
	358	+// treePanel.setLayout(new GridBagLayout());
395	359	//ctrlPanel.setLayout(new GridBagLayout());
396	360	//materialPanel.setLayout(new GridBagLayout());
397	361
..	..	@@ -432,7 +396,7 @@
432	396	static String newline = "\n";
433	397	protected static final String buttonString = "JButton";
434	398	StyledDocument doc;
435		- JTextArea infoarea;
	399	+ JTextPane infoarea;
436	400
437	401	void ClearInfo()
438	402	{
..	..	@@ -481,13 +445,13 @@
481	445	//SendInfo("Name:", "bold");
482	446	if (sel.GetTextures() != null \|\| debug)
483	447	{
484		- si.SendInfo(sel.toString(), "bold");
	448	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
485	449	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
486	450	if (sel.Size() > 0)
487	451	{
488	452	si.SendInfo("#children = " + sel.Size(), "regular");
489	453	}
490		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	454	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
491	455	if (debug)
492	456	{
493	457	try
..	..	@@ -499,7 +463,10 @@
499	463	}
500	464
501	465	if (full)
502		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	466	+ {
	467	+ si.SendInfo(" BBox min: " + minima, "regular");
	468	+ si.SendInfo(" BBox max: " + maxima, "regular");
	469	+ }
503	470
504	471	if (sel.bRep != null)
505	472	{
..	..	@@ -526,7 +493,7 @@
526	493	}
527	494	if (sel.support != null)
528	495	{
529		- si.SendInfo(" support: " + sel.support, "regular");
	496	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
530	497	}
531	498	if (sel.scriptnode != null)
532	499	{
..	..	@@ -597,6 +564,9 @@
597	564	{
598	565	CameraPane.pointflow = (PointFlow) sel;
599	566	}
	567	+
	568	+ si.SendInfo("_____________________", "regular");
	569	+ si.SendInfo("", "regular");
600	570	}
601	571	}
602	572
..	..	@@ -628,52 +598,52 @@
628	598	cameraView.ToggleFullScreen();
629	599	}
630	600
631		- private JTextArea createTextPane()
	601	+ private JTextPane createTextPane()
632	602	{
633		- String[] initString =
634		- {
635		- "This is an editable JTextPane, ", //regular
636		- "another ", //italic
637		- "styled ", //bold
638		- "text ", //small
639		- "component, ", //large
640		- "which supports embedded components..." + newline,//regular
641		- " " + newline, //button
642		- "...and embedded icons..." + newline, //regular
643		- " ", //icon
644		- newline + "JTextPane is a subclass of JEditorPane that "
645		- + "uses a StyledEditorKit and StyledDocument, and provides "
646		- + "cover methods for interacting with those objects."
647		- };
	603	+// TEXTAREA String[] initString =
	604	+// {
	605	+// "This is an editable JTextPane, ", //regular
	606	+// "another ", //italic
	607	+// "styled ", //bold
	608	+// "text ", //small
	609	+// "component, ", //large
	610	+// "which supports embedded components..." + newline,//regular
	611	+// " " + newline, //button
	612	+// "...and embedded icons..." + newline, //regular
	613	+// " ", //icon
	614	+// newline + "JTextPane is a subclass of JEditorPane that "
	615	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	616	+// + "cover methods for interacting with those objects."
	617	+// };
	618	+//
	619	+// String[] initStyles =
	620	+// {
	621	+// "regular", "italic", "bold", "small", "large",
	622	+// "regular", "button", "regular", "icon",
	623	+// "regular"
	624	+// };
	625	+//
	626	+// JTextPane textPane = new JTextPane();
	627	+// textPane.setEditable(true);
	628	+// /StyledDocument/ doc = textPane.getStyledDocument();
	629	+// addStylesToDocument(doc);
	630	+//
	631	+// try
	632	+// {
	633	+// for (int j = 0; j < 2; j++)
	634	+// {
	635	+// for (int i = 0; i < initString.length; i++)
	636	+// {
	637	+// doc.insertString(doc.getLength(), initString[i],
	638	+// doc.getStyle(initStyles[i]));
	639	+// }
	640	+// }
	641	+// } catch (BadLocationException ble)
	642	+// {
	643	+// System.err.println("Couldn't insert initial text into text pane.");
	644	+// }
648	645
649		- String[] initStyles =
650		- {
651		- "regular", "italic", "bold", "small", "large",
652		- "regular", "button", "regular", "icon",
653		- "regular"
654		- };
655		-
656		- JTextPane textPane = new JTextPane();
657		- textPane.setEditable(true);
658		- /StyledDocument/ doc = textPane.getStyledDocument();
659		- addStylesToDocument(doc);
660		-
661		- try
662		- {
663		- for (int j = 0; j < 2; j++)
664		- {
665		- for (int i = 0; i < initString.length; i++)
666		- {
667		- doc.insertString(doc.getLength(), initString[i],
668		- doc.getStyle(initStyles[i]));
669		- }
670		- }
671		- } catch (BadLocationException ble)
672		- {
673		- System.err.println("Couldn't insert initial text into text pane.");
674		- }
675		-
676		- return new JTextArea(); // textPane;
	646	+ return new JTextPane(); // textPane;
677	647	}
678	648
679	649	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -726,7 +696,7 @@
726	696	protected static ImageIcon createImageIcon(String path,
727	697	String description)
728	698	{
729		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	699	+ java.net.URL imgURL = Grafreed.class.getResource(path);
730	700	if (imgURL != null)
731	701	{
732	702	return new ImageIcon(imgURL, description);
..	..	@@ -758,6 +728,7 @@
758	728	// NumberSlider vDivsField;
759	729	// JCheckBox endcaps;
760	730	JCheckBox liveCB;
	731	+ JCheckBox selectCB;
761	732	JCheckBox hideCB;
762	733	JCheckBox link2masterCB;
763	734	JCheckBox markCB;
..	..	@@ -943,10 +914,6 @@
943	914
944	915	void SetupUI2(ObjEditor oe)
945	916	{
946		-// oe.aConstraints.weightx = 0;
947		-// oe.aConstraints.weighty = 0;
948		-// oe.aConstraints.gridx = 0;
949		-// oe.aConstraints.gridy = 0;
950	917	//SetupName(oe);
951	918
952	919	namePanel = new cGridBag();
..	..	@@ -963,32 +930,52 @@
963	930	setupPanel = new cGridBag().setVertical(false);
964	931
965	932	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
966		- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
967		- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	933	+ liveCB.setToolTipText("Animate object");
	934	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	935	+ selectCB.setToolTipText("Make object selectable");
968	936	// Return();
	937	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	938	+ hideCB.setToolTipText("Hide object");
969	939	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
970		- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
971		- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	940	+ markCB.setToolTipText("Set the animation target transform");
	941	+
	942	+ rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	943	+ rewindCB.setToolTipText("Rewind animation");
	944	+
	945	+ randomCB = AddCheckBox(setupPanel, "Random", copy.random);
	946	+ randomCB.setToolTipText("Option for switch node");
972	947
	948	+ if (Globals.ADVANCED)
	949	+ {
	950	+ link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	951	+ link2masterCB.setToolTipText("Attach to support");
	952	+ speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	953	+ speedupCB.setToolTipText("Option motion capture");
	954	+ }
	955	+
973	956	oe.ctrlPanel.add(setupPanel);
974	957	oe.ctrlPanel.Return();
975	958
976	959	commandsPanel = new cGridBag().setVertical(false);
977	960
978	961	resetButton = AddButton(commandsPanel, "Reset");
	962	+ resetButton.setToolTipText("Jump to frame zero");
979	963	stepButton = AddButton(commandsPanel, "Step");
	964	+ stepButton.setToolTipText("Step one frame");
980	965	// resetAllButton = AddButton(oe, "Reset All");
981	966	// stepAllButton = AddButton(oe, "Step All");
982		- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
983	967	// Return();
984	968	slowerButton = AddButton(commandsPanel, "Slow");
	969	+ slowerButton.setToolTipText("Decrease animation speed");
985	970	fasterButton = AddButton(commandsPanel, "Fast");
	971	+ fasterButton.setToolTipText("Increase animation speed");
986	972	remarkButton = AddButton(commandsPanel, "Remark");
	973	+ remarkButton.setToolTipText("Set the current transform as the target");
987	974
988	975	oe.ctrlPanel.add(commandsPanel);
989	976	oe.ctrlPanel.Return();
990	977
991		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	978	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
992	979	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
993	980	//Return();
994	981
..	..	@@ -1290,7 +1277,7 @@
1290	1277	scrollpane.addMouseWheelListener(this); // Default not fast enough
1291	1278
1292	1279	/JTabbedPane/ scenePanel = new cGridBag();
1293		- scenePanel.preferredWidth = 7;
	1280	+ scenePanel.preferredWidth = 6;
1294	1281
1295	1282	JTabbedPane tabbedPane = new JTabbedPane();
1296	1283	tabbedPane.add(scrollpane);
..	..	@@ -1396,8 +1383,8 @@
1396	1383
1397	1384	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1398	1385
1399		- frame.setSize(1024, 768);
1400		- frame.show();
	1386	+ frame.setSize(1280, 860);
	1387	+ frame.setVisible(true);
1401	1388
1402	1389	gridPanel.setDividerLocation(1.0);
1403	1390
..	..	@@ -1436,17 +1423,25 @@
1436	1423
1437	1424	cGridBag editBar = new cGridBag().setVertical(false);
1438	1425
1439		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	1426	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1427	+ createMaterialButton.setToolTipText("Create material");
1440	1428
1441	1429	/*
1442	1430	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1443	1431	*/
1444	1432
1445		- editBar.add(clearMaterialButton = new cButton("Clear")); // , aConstraints);
1446		- editBar.add(resetSlidersButton = new cButton("Reset")); // , aConstraints);
1447		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1448		- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1433	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1434	+ clearMaterialButton.setToolTipText("Clear material");
	1435	+
	1436	+ if (Globals.ADVANCED)
	1437	+ {
	1438	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1439	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1440	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1441	+ }
1449	1442
	1443	+ editBar.preferredHeight = 15;
	1444	+
1450	1445	panel.add(editBar);
1451	1446
1452	1447	/**/
..	..	@@ -1712,12 +1707,15 @@
1712	1707	opacityPowerField.addChangeListener(this);
1713	1708	/**/
1714	1709
1715		- resetSlidersButton.addActionListener(this);
1716	1710	clearMaterialButton.addActionListener(this);
1717	1711	createMaterialButton.addActionListener(this);
1718		-
1719		- propagateToggle.addItemListener(this);
1720		- multiplyToggle.addItemListener(this);
	1712	+
	1713	+ if (Globals.ADVANCED)
	1714	+ {
	1715	+ resetSlidersButton.addActionListener(this);
	1716	+ propagateToggle.addItemListener(this);
	1717	+ multiplyToggle.addItemListener(this);
	1718	+ }
1721	1719	}
1722	1720
1723	1721	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1888,7 +1886,7 @@
1888	1886
1889	1887	//? flashIt = false;
1890	1888	CameraPane pane = (CameraPane) cameraView;
1891		- pane.clickStart(location.x, location.y, 0);
	1889	+ pane.clickStart(location.x, location.y, 0, 0);
1892	1890	pane.clickEnd(location.x, location.y, 0, true);
1893	1891
1894	1892	if (group.selection.size() == 1)
..	..	@@ -1937,6 +1935,7 @@
1937	1935	e2.printStackTrace();
1938	1936	}
1939	1937	}
	1938	+
1940	1939	LoadJMEThread loadThread;
1941	1940
1942	1941	class LoadJMEThread extends Thread
..	..	@@ -1994,6 +1993,7 @@
1994	1993	//LoadFile0(filename, converter);
1995	1994	}
1996	1995	}
	1996	+
1997	1997	LoadOBJThread loadObjThread;
1998	1998
1999	1999	class LoadOBJThread extends Thread
..	..	@@ -2072,19 +2072,19 @@
2072	2072
2073	2073	void LoadObjFile(String fullname)
2074	2074	{
2075		- /*
	2075	+ System.out.println("Loading " + fullname);
	2076	+ /**/
2076	2077	//lastFilename = fullname;
2077	2078	if(loadObjThread == null)
2078	2079	{
2079		- loadObjThread = new LoadOBJThread();
2080		- loadObjThread.start();
	2080	+ loadObjThread = new LoadOBJThread();
	2081	+ loadObjThread.start();
2081	2082	}
2082	2083
2083	2084	loadObjThread.add(fullname);
2084		- */
	2085	+ /**/
2085	2086
2086		- System.out.println("Loading " + fullname);
2087		- makeSomething(new FileObject(fullname, true), true);
	2087	+ //makeSomething(new FileObject(fullname, true), true);
2088	2088	}
2089	2089
2090	2090	void LoadGFDFile(String fullname)
..	..	@@ -2345,11 +2345,11 @@
2345	2345
2346	2346	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2347	2347	{
2348		- if (GrafreeD.standAlone)
	2348	+ if (Grafreed.standAlone)
2349	2349	{
2350	2350	/**/
2351	2351	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2352		- browser.show();
	2352	+ browser.setVisible(true);
2353	2353	String filename = browser.getFile();
2354	2354	if (filename != null && filename.length() > 0)
2355	2355	{
..	..	@@ -2709,7 +2709,8 @@
2709	2709	return;
2710	2710	}
2711	2711
2712		- multiplyToggle.setSelected(mat.multiply);
	2712	+ if (multiplyToggle != null)
	2713	+ multiplyToggle.setSelected(mat.multiply);
2713	2714
2714	2715	assert (object.projectedVertices != null);
2715	2716
..	..	@@ -2924,9 +2925,9 @@
2924	2925	frame.validate();
2925	2926
2926	2927	return;
2927		- } else if (event.getSource() == toggleRandomItem)
	2928	+ } else if (event.getSource() == toggleSwitchItem)
2928	2929	{
2929		- cameraView.ToggleRandom();
	2930	+ cameraView.ToggleSwitch();
2930	2931	cameraView.repaint();
2931	2932	return;
2932	2933	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2955,6 +2956,10 @@
2955	2956	{
2956	2957	copy.live ^= true;
2957	2958	return;
	2959	+ } else if (event.getSource() == selectCB)
	2960	+ {
	2961	+ copy.dontselect ^= true;
	2962	+ return;
2958	2963	} else if (event.getSource() == hideCB)
2959	2964	{
2960	2965	copy.hide ^= true;
..	..	@@ -2969,6 +2974,7 @@
2969	2974	if (event.getSource() == randomCB)
2970	2975	{
2971	2976	copy.random ^= true;
	2977	+ objEditor.refreshContents();
2972	2978	return;
2973	2979	}
2974	2980	if (event.getSource() == speedupCB)
..	..	@@ -2992,8 +2998,9 @@
2992	2998
2993	2999	public void actionPerformed(ActionEvent event)
2994	3000	{
	3001	+ Object source = event.getSource();
2995	3002	// SCRIPT DIALOG
2996		- if (event.getSource() == okbutton)
	3003	+ if (source == okbutton)
2997	3004	{
2998	3005	textpanel.setVisible(false);
2999	3006	textpanel.remove(textarea);
..	..	@@ -3005,7 +3012,7 @@
3005	3012	textarea = null;
3006	3013	textpanel = null;
3007	3014	}
3008		- if (event.getSource() == cancelbutton)
	3015	+ if (source == cancelbutton)
3009	3016	{
3010	3017	textpanel.setVisible(false);
3011	3018	textpanel.remove(textarea);
..	..	@@ -3017,50 +3024,50 @@
3017	3024	//applySelf();
3018	3025	//client.refreshEditWindow();
3019	3026	//refreshContents();
3020		- if (event.getSource() == nameField)
	3027	+ if (source == nameField)
3021	3028	{
3022	3029	//System.out.println("ObjEditor " + event);
3023	3030	applySelf0(true);
3024	3031	//parent.applySelf();
3025	3032	objEditor.refreshContents();
3026		- } else if (event.getSource() == resetButton)
	3033	+ } else if (source == resetButton)
3027	3034	{
3028	3035	CameraPane.fullreset = true;
3029	3036	copy.Reset(); // ResetMeshes();
3030	3037	copy.Touch();
3031	3038	objEditor.refreshContents();
3032		- } else if (event.getSource() == stepItem)
	3039	+ } else if (source == stepItem)
3033	3040	{
3034	3041	//cameraView.ONESTEP = true;
3035	3042	Globals.ONESTEP = true;
3036	3043	cameraView.repaint();
3037	3044	return;
3038		- } else if (event.getSource() == stepButton)
	3045	+ } else if (source == stepButton)
3039	3046	{
3040	3047	copy.Step();
3041	3048	copy.Touch();
3042	3049	objEditor.refreshContents();
3043		- } else if (event.getSource() == slowerButton)
	3050	+ } else if (source == slowerButton)
3044	3051	{
3045	3052	copy.Slower();
3046	3053	copy.Touch();
3047	3054	objEditor.refreshContents();
3048		- } else if (event.getSource() == fasterButton)
	3055	+ } else if (source == fasterButton)
3049	3056	{
3050	3057	copy.Faster();
3051	3058	copy.Touch();
3052	3059	objEditor.refreshContents();
3053		- } else if (event.getSource() == remarkButton)
	3060	+ } else if (source == remarkButton)
3054	3061	{
3055	3062	copy.Remark();
3056	3063	copy.Touch();
3057	3064	objEditor.refreshContents();
3058		- } else if (event.getSource() == stepAllButton)
	3065	+ } else if (source == stepAllButton)
3059	3066	{
3060	3067	copy.StepAll();
3061	3068	copy.Touch();
3062	3069	objEditor.refreshContents();
3063		- } else if (event.getSource() == resetAllButton)
	3070	+ } else if (source == resetAllButton)
3064	3071	{
3065	3072	//CameraPane.fullreset = true;
3066	3073	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3093,53 +3100,75 @@
3093	3100	// Close();
3094	3101	// }
3095	3102	// else
3096		- if (event.getSource() == resetSlidersButton)
	3103	+ if (source == resetSlidersButton)
3097	3104	{
3098	3105	ResetSliders();
3099		- } else if (event.getSource() == clearMaterialButton)
	3106	+ } else if (source == clearMaterialButton)
3100	3107	{
3101	3108	ClearMaterial();
3102		- } else if (event.getSource() == createMaterialButton)
	3109	+ } else if (source == createMaterialButton)
3103	3110	{
3104	3111	CreateMaterial();
3105		- } else if (event.getSource() == clearPanelButton)
	3112	+ } else if (source == clearPanelButton)
3106	3113	{
3107	3114	copy.ClearUI();
3108	3115	refreshContents(true);
3109		- } /*
3110		- }
3111		-
3112		- public boolean action(Event event, Object arg)
3113		- {
3114		- */ else if (event.getSource() == closeItem)
	3116	+ } else if (source == importGFDItem)
	3117	+ {
	3118	+ ImportGFD();
	3119	+ } else
	3120	+ if (source == importVRMLX3DItem)
	3121	+ {
	3122	+ ImportVRMLX3D();
	3123	+ } else
	3124	+ if (source == import3DSItem)
	3125	+ {
	3126	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3127	+ } else
	3128	+ if (source == importOBJItem)
	3129	+ {
	3130	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3131	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3132	+ browser.setVisible(true);
	3133	+ String filename = browser.getFile();
	3134	+ if (filename != null && filename.length() > 0)
	3135	+ {
	3136	+ String fullname = browser.getDirectory() + filename;
	3137	+ makeSomething(ReadOBJ(fullname), true);
	3138	+ }
	3139	+ } else
	3140	+ if (source == closeItem)
3115	3141	{
3116	3142	Close();
3117	3143	//return true;
3118		- } else if (event.getSource() == loadItem)
	3144	+ } else if (source == loadItem)
3119	3145	{
3120	3146	load();
3121	3147	//return true;
3122		- } else if (event.getSource() == saveItem)
	3148	+ } else if (source == newItem)
	3149	+ {
	3150	+ New();
	3151	+ } else if (source == saveItem)
3123	3152	{
3124	3153	save();
3125	3154	//return true;
3126		- } else if (event.getSource() == saveAsItem)
	3155	+ } else if (source == saveAsItem)
3127	3156	{
3128	3157	saveAs();
3129	3158	//return true;
3130		- } else if (event.getSource() == reexportItem)
	3159	+ } else if (source == reexportItem)
3131	3160	{
3132	3161	reexport();
3133	3162	//return true;
3134		- } else if (event.getSource() == exportAsItem)
	3163	+ } else if (source == exportAsItem)
3135	3164	{
3136	3165	export();
3137	3166	//return true;
3138		- } else if (event.getSource() == povItem)
	3167	+ } else if (source == povItem)
3139	3168	{
3140	3169	generatePOV();
3141	3170	//return true;
3142		- } else if (event.getSource() == zBufferItem)
	3171	+ } else if (source == zBufferItem)
3143	3172	{
3144	3173	try
3145	3174	{
..	..	@@ -3161,21 +3190,8 @@
3161	3190	cameraView.repaint();
3162	3191	//return true;
3163	3192	}
3164		- */ else if (event.getSource() == editCameraItem)
3165		- {
3166		- cameraView.ProtectCamera();
3167		- cameraView.repaint();
3168		- return;
3169		- } else if (event.getSource() == revertCameraItem)
3170		- {
3171		- cameraView.RevertCamera();
3172		- cameraView.repaint();
3173		- return;
3174		-// } else if (event.getSource() == textureButton)
3175		-// {
3176		-// return; // true;
3177		- } else // combos...
3178		- if (event.getSource() == texresMenu)
	3193	+ */ else // combos...
	3194	+ if (source == texresMenu)
3179	3195	{
3180	3196	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3181	3197	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3187,12 +3203,268 @@
3187	3203	}
3188	3204	}
3189	3205
	3206	+ void New()
	3207	+ {
	3208	+ while (copy.Size() > 1)
	3209	+ {
	3210	+ copy.remove(1);
	3211	+ }
	3212	+
	3213	+ ResetModel();
	3214	+ objEditor.refreshContents();
	3215	+ }
	3216	+
	3217	+ static public byte[] Compress(Object3D o)
	3218	+ {
	3219	+ try
	3220	+ {
	3221	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3222	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3223	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3224	+
	3225	+ Object3D parent = o.parent;
	3226	+ o.parent = null;
	3227	+
	3228	+ out.writeObject(o);
	3229	+
	3230	+ o.parent = parent;
	3231	+
	3232	+ out.flush();
	3233	+
	3234	+ zstream.close();
	3235	+ out.close();
	3236	+
	3237	+ return baos.toByteArray();
	3238	+ } catch (Exception e)
	3239	+ {
	3240	+ System.err.println(e);
	3241	+ return null;
	3242	+ }
	3243	+ }
	3244	+
	3245	+ static public Object Uncompress(byte[] bytes)
	3246	+ {
	3247	+ System.out.println("#bytes = " + bytes.length);
	3248	+ try
	3249	+ {
	3250	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3251	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3252	+ ObjectInputStream in = new ObjectInputStream(istream);
	3253	+ Object obj = in.readObject();
	3254	+ in.close();
	3255	+
	3256	+ return obj;
	3257	+ } catch (Exception e)
	3258	+ {
	3259	+ System.err.println(e);
	3260	+ return null;
	3261	+ }
	3262	+ }
	3263	+
	3264	+ static public Object clone(Object o)
	3265	+ {
	3266	+ try
	3267	+ {
	3268	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3269	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3270	+
	3271	+ out.writeObject(o);
	3272	+
	3273	+ out.flush();
	3274	+ out.close();
	3275	+
	3276	+ byte[] bytes = baos.toByteArray();
	3277	+
	3278	+ System.out.println("clone = " + bytes.length);
	3279	+
	3280	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3281	+ ObjectInputStream in = new ObjectInputStream(bais);
	3282	+ Object obj = in.readObject();
	3283	+ in.close();
	3284	+
	3285	+ return obj;
	3286	+ } catch (Exception e)
	3287	+ {
	3288	+ System.err.println(e);
	3289	+ return null;
	3290	+ }
	3291	+ }
	3292	+
	3293	+ cRadio GetCurrentTab()
	3294	+ {
	3295	+ cRadio ab;
	3296	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3297	+ {
	3298	+ ab = (cRadio)e.nextElement();
	3299	+ if(ab.GetObject() == copy)
	3300	+ {
	3301	+ return ab;
	3302	+ }
	3303	+ }
	3304	+
	3305	+ return null;
	3306	+ }
	3307	+
	3308	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3309	+
	3310	+ public void Save()
	3311	+ {
	3312	+ cRadio tab = GetCurrentTab();
	3313	+
	3314	+ boolean temp = CameraPane.SWITCH;
	3315	+ CameraPane.SWITCH = false;
	3316	+
	3317	+ copy.ExtractBigData(hashtable);
	3318	+
	3319	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3320	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3321	+
	3322	+ copy.RestoreBigData(hashtable);
	3323	+
	3324	+ CameraPane.SWITCH = temp;
	3325	+
	3326	+ //assert(hashtable.isEmpty());
	3327	+
	3328	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3329	+ {
	3330	+ tab.graphs[i] = null;
	3331	+ }
	3332	+
	3333	+ // test save
	3334	+ if (false)
	3335	+ {
	3336	+ try
	3337	+ {
	3338	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3339	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3340	+
	3341	+ p.writeObject(copy);
	3342	+
	3343	+ p.flush();
	3344	+
	3345	+ ostream.close();
	3346	+ } catch (Exception e)
	3347	+ {
	3348	+ e.printStackTrace();
	3349	+ }
	3350	+ }
	3351	+ }
	3352	+
	3353	+ void CopyChanged(Object3D obj)
	3354	+ {
	3355	+ boolean temp = CameraPane.SWITCH;
	3356	+ CameraPane.SWITCH = false;
	3357	+
	3358	+ copy.ExtractBigData(hashtable);
	3359	+
	3360	+ copy.clear();
	3361	+
	3362	+ for (int i=0; i<obj.Size(); i++)
	3363	+ {
	3364	+ copy.add(obj.get(i));
	3365	+ }
	3366	+
	3367	+ copy.RestoreBigData(hashtable);
	3368	+
	3369	+ CameraPane.SWITCH = temp;
	3370	+
	3371	+ //assert(hashtable.isEmpty());
	3372	+
	3373	+ copy.Touch();
	3374	+
	3375	+ ResetModel();
	3376	+ copy.HardTouch(); // recompile?
	3377	+
	3378	+ cRadio ab;
	3379	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3380	+ {
	3381	+ ab = (cRadio)e.nextElement();
	3382	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3383	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3384	+ if (test != null)
	3385	+ {
	3386	+ test.editWindow = ab.object.editWindow;
	3387	+ ab.object = test;
	3388	+ }
	3389	+ }
	3390	+
	3391	+ refreshContents();
	3392	+ }
	3393	+
	3394	+ public void Undo()
	3395	+ {
	3396	+ cRadio tab = GetCurrentTab();
	3397	+
	3398	+ if (tab.undoindex == 0)
	3399	+ {
	3400	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3401	+ return;
	3402	+ }
	3403	+
	3404	+ if (tab.graphs[tab.undoindex] == null)
	3405	+ {
	3406	+ Save();
	3407	+ tab.undoindex -= 1;
	3408	+ }
	3409	+
	3410	+ tab.undoindex -= 1;
	3411	+
	3412	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3413	+ }
	3414	+
	3415	+ public void Redo()
	3416	+ {
	3417	+ cRadio tab = GetCurrentTab();
	3418	+
	3419	+ if (tab.graphs[tab.undoindex + 1] == null)
	3420	+ {
	3421	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3422	+ return;
	3423	+ }
	3424	+
	3425	+ tab.undoindex += 1;
	3426	+
	3427	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3428	+ }
	3429	+
	3430	+ void ImportGFD()
	3431	+ {
	3432	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3433	+ browser.show();
	3434	+ String filename = browser.getFile();
	3435	+ if (filename != null && filename.length() > 0)
	3436	+ {
	3437	+ String fullname = browser.getDirectory() + filename;
	3438	+
	3439	+ //Object3D readobj =
	3440	+ objEditor.ReadGFD(fullname, objEditor);
	3441	+ //makeSomething(readobj);
	3442	+ }
	3443	+ }
	3444	+
	3445	+ void ImportVRMLX3D()
	3446	+ {
	3447	+ if (Grafreed.standAlone)
	3448	+ {
	3449	+ /**/
	3450	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3451	+ browser.show();
	3452	+ String filename = browser.getFile();
	3453	+ if (filename != null && filename.length() > 0)
	3454	+ {
	3455	+ String fullname = browser.getDirectory() + filename;
	3456	+ LoadVRMLX3D(fullname);
	3457	+ }
	3458	+ /**/
	3459	+ }
	3460	+ }
	3461	+
3190	3462	void ToggleAnimation()
3191	3463	{
3192	3464	if (!Globals.ANIMATION)
3193	3465	{
3194	3466	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3195		- browser.show();
	3467	+ browser.setVisible(true);
3196	3468	String filename = browser.getFile();
3197	3469	if (filename != null && filename.length() > 0)
3198	3470	{
..	..	@@ -3202,8 +3474,8 @@
3202	3474
3203	3475	Globals.ANIMATION ^= true;
3204	3476
3205		- GrafreeD.wav.cursor = 0;
3206		- GrafreeD.wav.loop = 0;
	3477	+ Grafreed.wav.cursor = 0;
	3478	+ Grafreed.wav.loop = 0;
3207	3479	}
3208	3480	} else
3209	3481	{
..	..	@@ -3224,7 +3496,6 @@
3224	3496	callee.refreshContents();
3225	3497	} else
3226	3498	{
3227		- new Exception().printStackTrace();
3228	3499	System.exit(0);
3229	3500	}
3230	3501	}
..	..	@@ -3254,7 +3525,7 @@
3254	3525	void CreateMaterial()
3255	3526	{
3256	3527	//copy.ClearMaterial(); // PATCH
3257		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3528	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3258	3529	if (copy.selection.size() > 0)
3259	3530	//SetMaterial(copy);
3260	3531	{
..	..	@@ -3313,11 +3584,11 @@
3313	3584	{
3314	3585	copy.ResetBlockLoop(); // temporary problem
3315	3586
3316		- boolean random = CameraPane.RANDOM;
3317		- CameraPane.RANDOM = false; // parse everything
	3587	+ boolean random = CameraPane.SWITCH;
	3588	+ CameraPane.SWITCH = false; // parse everything
3318	3589	copy.ResetDisplayList();
3319	3590	copy.HardTouch();
3320		- CameraPane.RANDOM = random;
	3591	+ CameraPane.SWITCH = random;
3321	3592	}
3322	3593
3323	3594	// public void applySelf()
..	..	@@ -3391,6 +3662,36 @@
3391	3662	{
3392	3663	//System.out.println("Propagate = " + propagate);
3393	3664	copy.UpdateMaterial(anchor, current, propagate);
	3665	+
	3666	+ if (copy.material != null)
	3667	+ {
	3668	+ cMaterial mat = copy.material;
	3669	+
	3670	+ colorField.SetToolTipValue((mat.color));
	3671	+ modulationField.SetToolTipValue((mat.modulation));
	3672	+ metalnessField.SetToolTipValue((mat.metalness));
	3673	+ diffuseField.SetToolTipValue((mat.diffuse));
	3674	+ specularField.SetToolTipValue((mat.specular));
	3675	+ shininessField.SetToolTipValue((mat.shininess));
	3676	+ shiftField.SetToolTipValue((mat.shift));
	3677	+ ambientField.SetToolTipValue((mat.ambient));
	3678	+ lightareaField.SetToolTipValue((mat.lightarea));
	3679	+ diffusenessField.SetToolTipValue((mat.factor));
	3680	+ velvetField.SetToolTipValue((mat.velvet));
	3681	+ sheenField.SetToolTipValue((mat.sheen));
	3682	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3683	+ backlitField.SetToolTipValue((mat.bump));
	3684	+ anisoField.SetToolTipValue((mat.aniso));
	3685	+ anisoVField.SetToolTipValue((mat.anisoV));
	3686	+ cameraField.SetToolTipValue((mat.cameralight));
	3687	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3688	+ shadowField.SetToolTipValue((mat.shadow));
	3689	+ textureField.SetToolTipValue((mat.texture));
	3690	+ opacityField.SetToolTipValue((mat.opacity));
	3691	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3692	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3693	+ }
	3694	+
3394	3695	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3395	3696	{
3396	3697	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3506,7 +3807,7 @@
3506	3807	}
3507	3808
3508	3809	if (normalpushField != null)
3509		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3810	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3510	3811	}
3511	3812
3512	3813	void SnapObject()
..	..	@@ -3770,6 +4071,7 @@
3770	4071
3771	4072	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3772	4073	{
	4074	+ Save();
3773	4075	//Tween.set(thing, 0).target(1).start(tweenManager);
3774	4076	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3775	4077	// if (thing instanceof GenericJointDemo)
..	..	@@ -3973,6 +4275,7 @@
3973	4275	}
3974	4276	}
3975	4277	}
	4278	+
3976	4279	LoadGFDThread loadGFDThread;
3977	4280
3978	4281	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3993,7 +4296,8 @@
3993	4296	try
3994	4297	{
3995	4298	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3996		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4299	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4300	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3997	4301
3998	4302	readobj = (Object3D) p.readObject();
3999	4303	istream.close();
..	..	@@ -4001,7 +4305,20 @@
4001	4305	readobj.ResetDisplayList();
4002	4306	} catch (Exception e)
4003	4307	{
4004		- e.printStackTrace();
	4308	+ //e.printStackTrace();
	4309	+ try
	4310	+ {
	4311	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4312	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4313	+
	4314	+ readobj = (Object3D) p.readObject();
	4315	+ istream.close();
	4316	+
	4317	+ readobj.ResetDisplayList();
	4318	+ } catch (Exception e2)
	4319	+ {
	4320	+ e2.printStackTrace();
	4321	+ }
4005	4322	}
4006	4323	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4007	4324	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4056,6 +4373,7 @@
4056	4373
4057	4374	if (readobj != null)
4058	4375	{
	4376	+ Save();
4059	4377	try
4060	4378	{
4061	4379	//readobj.deepCopySelf(copy);
..	..	@@ -4118,7 +4436,7 @@
4118	4436
4119	4437	void load() // throws ClassNotFoundException
4120	4438	{
4121		- if (GrafreeD.standAlone)
	4439	+ if (Grafreed.standAlone)
4122	4440	{
4123	4441	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4124	4442	browser.show();
..	..	@@ -4205,11 +4523,13 @@
4205	4523	try
4206	4524	{
4207	4525	FileOutputStream ostream = new FileOutputStream(lastname);
4208		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4526	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4527	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4209	4528
4210	4529	p.writeObject(copy);
4211	4530	p.flush();
4212	4531
	4532	+ zstream.close();
4213	4533	ostream.close();
4214	4534
4215	4535	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4219,11 +4539,12 @@
4219	4539	{
4220	4540	}
4221	4541	}
	4542	+
4222	4543	String lastname;
4223	4544
4224	4545	void saveAs()
4225	4546	{
4226		- if (GrafreeD.standAlone)
	4547	+ if (Grafreed.standAlone)
4227	4548	{
4228	4549	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4229	4550	browser.setVisible(true);
..	..	@@ -4328,13 +4649,13 @@
4328	4649	try
4329	4650	{
4330	4651	FileOutputStream ostream = new FileOutputStream(filename);
4331		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4332		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4652	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4653	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4333	4654
4334	4655	Object3D objectparent = obj.parent;
4335	4656	obj.parent = null;
4336	4657
4337		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4658	+ Object3D object = (Object3D) Grafreed.clone(obj);
4338	4659
4339	4660	obj.parent = objectparent;
4340	4661
..	..	@@ -4346,8 +4667,8 @@
4346	4667	p.writeObject(object);
4347	4668	p.flush();
4348	4669
	4670	+ zstream.close();
4349	4671	ostream.close();
4350		- // zstream.close();
4351	4672
4352	4673	// group.selection.get(0).parent = parent;
4353	4674	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4368,7 +4689,7 @@
4368	4689	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4369	4690	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4370	4691	copy.generatePOV(buffer);
4371		- if (GrafreeD.standAlone)
	4692	+ if (Grafreed.standAlone)
4372	4693	{
4373	4694	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4374	4695	browser.show();
..	..	@@ -4394,7 +4715,8 @@
4394	4715	Object3D client;
4395	4716	Object3D copy;
4396	4717	MenuBar menuBar;
4397		- Menu windowMenu;
	4718	+ Menu fileMenu;
	4719	+ MenuItem newItem;
4398	4720	MenuItem loadItem;
4399	4721	MenuItem saveItem;
4400	4722	MenuItem saveAsItem;
..	..	@@ -4402,11 +4724,9 @@
4402	4724	MenuItem reexportItem;
4403	4725	MenuItem povItem;
4404	4726	MenuItem closeItem;
4405		- Menu cameraMenu;
	4727	+
4406	4728	CheckboxMenuItem zBufferItem;
4407	4729	//MenuItem normalLensItem;
4408		- MenuItem editCameraItem;
4409		- MenuItem revertCameraItem;
4410	4730	MenuItem stepItem;
4411	4731	CheckboxMenuItem toggleLiveItem;
4412	4732	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4417,7 +4737,7 @@
4417	4737	CheckboxMenuItem toggleFootContactItem;
4418	4738	CheckboxMenuItem toggleDLItem;
4419	4739	CheckboxMenuItem toggleTextureItem;
4420		- CheckboxMenuItem toggleRandomItem;
	4740	+ CheckboxMenuItem toggleSwitchItem;
4421	4741	CheckboxMenuItem toggleRootItem;
4422	4742	CheckboxMenuItem animationItem;
4423	4743	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4425,7 +4745,7 @@
4425	4745	JSplitPane mainPanel;
4426	4746	JScrollPane scrollpane;
4427	4747	JPanel toolbarPanel;
4428		- JPanel treePanel;
	4748	+ cGridBag treePanel;
4429	4749	JPanel radioPanel;
4430	4750	ButtonGroup buttonGroup;
4431	4751	cGridBag ctrlPanel;
..	..	@@ -4554,4 +4874,9 @@
4554	4874	//ObjectUI parent;
4555	4875
4556	4876	cNumberSlider normalpushField;
	4877	+
	4878	+ private MenuItem importGFDItem;
	4879	+ private MenuItem importVRMLX3DItem;
	4880	+ private MenuItem import3DSItem;
	4881	+ private MenuItem importOBJItem;
4557	4882	}