~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,69 +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		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
313		- toggleTimelineItem.addItemListener(this);
314		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
315		- toggleFullScreenItem.addItemListener(this);
316		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
317		- cameraMenu.add("-");
318		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
319		- toggleTextureItem.addItemListener(this);
320		- toggleTextureItem.setState(CameraPane.textureon);
321		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
322		- toggleLiveItem.addItemListener(this);
323		- toggleLiveItem.setState(Globals.isLIVE());
324		- cameraMenu.add(stepItem = new MenuItem("Step"));
325		- stepItem.addActionListener(this);
326		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
327		-// toggleDLItem.addItemListener(this);
328		-// toggleDLItem.setState(false);
329		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
330		- toggleRenderItem.addItemListener(this);
331		- toggleRenderItem.setState(!CameraPane.frozen);
332		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
333		- toggleDebugItem.addItemListener(this);
334		- toggleDebugItem.setState(CameraPane.DEBUG);
335		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
336		- toggleFrustumItem.addItemListener(this);
337		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
338		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
339		- toggleFootContactItem.addItemListener(this);
340		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
341		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
342		- toggleRandomItem.addItemListener(this);
343		- toggleRandomItem.setState(CameraPane.RANDOM);
344		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
345		- toggleHandleItem.addItemListener(this);
346		- toggleHandleItem.setState(CameraPane.HANDLES);
347		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
348		- togglePaintItem.addItemListener(this);
349		- togglePaintItem.setState(CameraPane.PAINTMODE);
350		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
351		-// toggleRootItem.addItemListener(this);
352		-// toggleRootItem.setState(false);
353		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
354		-// animationItem.addItemListener(this);
355		-// animationItem.setState(CameraPane.ANIMATION);
356		- cameraMenu.add("-");
357		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
358		- editCameraItem.addActionListener(this);
359		-
360	325	objectPanel = new JTabbedPane();
361	326	toolbarPanel = new JPanel();
362	327	toolbarPanel.setName("Toolbar");
363	328	treePanel = new cGridBag();
364	329	treePanel.setName("Tree");
	330	+
	331	+ editPanel = new cGridBag().setVertical(true);
	332	+ editPanel.setName("Edit");
	333	+
365	334	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
366		- ctrlPanel.setName("Edit");
	335	+
	336	+ editCommandsPanel = new cGridBag();
	337	+ editPanel.add(editCommandsPanel);
	338	+ editPanel.add(ctrlPanel);
	339	+
367	340	materialPanel = new cGridBag().setVertical(true);
	341	+
368	342	materialPanel.setName("Material");
369	343	/JTextPane/
370	344	infoarea = createTextPane();
..	..	@@ -458,10 +432,10 @@
458	432	e.printStackTrace();
459	433	}
460	434
461		- String selection = infoarea.getText();
462		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
463		- java.awt.datatransfer.Clipboard clipboard =
464		- 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();
465	439	//clipboard.setContents(data, data);
466	440	}
467	441
..	..	@@ -484,13 +458,13 @@
484	458	//SendInfo("Name:", "bold");
485	459	if (sel.GetTextures() != null \|\| debug)
486	460	{
487		- si.SendInfo(sel.toString(), "bold");
	461	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
488	462	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
489	463	if (sel.Size() > 0)
490	464	{
491	465	si.SendInfo("#children = " + sel.Size(), "regular");
492	466	}
493		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	467	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
494	468	if (debug)
495	469	{
496	470	try
..	..	@@ -532,7 +506,7 @@
532	506	}
533	507	if (sel.support != null)
534	508	{
535		- si.SendInfo(" support: " + sel.support, "regular");
	509	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
536	510	}
537	511	if (sel.scriptnode != null)
538	512	{
..	..	@@ -621,19 +595,89 @@
621	595	}
622	596	}
623	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	+
624	638	void ToggleFullScreen()
625	639	{
626	640	if (CameraPane.FULLSCREEN)
627	641	{
628		- frame.getContentPane().remove(/"Center",/bigThree);
629		- framePanel.add(bigThree);
630		- 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	+
631	660	} else
632	661	{
633		- frame.getContentPane().remove(/"Center",/framePanel);
634		- framePanel.remove(bigThree);
635		- 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);
636	679	}
	680	+
637	681	cameraView.ToggleFullScreen();
638	682	}
639	683
..	..	@@ -735,7 +779,7 @@
735	779	protected static ImageIcon createImageIcon(String path,
736	780	String description)
737	781	{
738		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	782	+ java.net.URL imgURL = Grafreed.class.getResource(path);
739	783	if (imgURL != null)
740	784	{
741	785	return new ImageIcon(imgURL, description);
..	..	@@ -767,6 +811,7 @@
767	811	// NumberSlider vDivsField;
768	812	// JCheckBox endcaps;
769	813	JCheckBox liveCB;
	814	+ JCheckBox selectCB;
770	815	JCheckBox hideCB;
771	816	JCheckBox link2masterCB;
772	817	JCheckBox markCB;
..	..	@@ -783,9 +828,13 @@
783	828	JButton fasterButton;
784	829	JButton remarkButton;
785	830
	831	+ cGridBag editPanel;
	832	+ cGridBag editCommandsPanel;
	833	+
786	834	cGridBag namePanel;
787	835	cGridBag setupPanel;
788		- cGridBag commandsPanel;
	836	+ cGridBag setupPanel2;
	837	+ cGridBag objectCommandsPanel;
789	838	cGridBag pushPanel;
790	839	cGridBag fillPanel;
791	840
..	..	@@ -969,49 +1018,55 @@
969	1018
970	1019	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
971	1020	liveCB.setToolTipText("Animate object");
	1021	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1022	+ selectCB.setToolTipText("Make object selectable");
	1023	+// Return();
972	1024	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
973	1025	hideCB.setToolTipText("Hide object");
974		-// Return();
975	1026	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
976	1027	markCB.setToolTipText("Set the animation target transform");
977	1028
978		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1029	+ setupPanel2 = new cGridBag().setVertical(false);
	1030	+
	1031	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
979	1032	rewindCB.setToolTipText("Rewind animation");
980	1033
981		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
982		- randomCB.setToolTipText("Option for switch node");
	1034	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1035	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
983	1036
984	1037	if (Globals.ADVANCED)
985	1038	{
986		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	1039	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
987	1040	link2masterCB.setToolTipText("Attach to support");
988		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1041	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
989	1042	speedupCB.setToolTipText("Option motion capture");
990	1043	}
991	1044
992	1045	oe.ctrlPanel.add(setupPanel);
993	1046	oe.ctrlPanel.Return();
	1047	+ oe.ctrlPanel.add(setupPanel2);
	1048	+ oe.ctrlPanel.Return();
994	1049
995		- commandsPanel = new cGridBag().setVertical(false);
	1050	+ objectCommandsPanel = new cGridBag().setVertical(false);
996	1051
997		- resetButton = AddButton(commandsPanel, "Reset");
	1052	+ resetButton = AddButton(objectCommandsPanel, "Reset");
998	1053	resetButton.setToolTipText("Jump to frame zero");
999		- stepButton = AddButton(commandsPanel, "Step");
	1054	+ stepButton = AddButton(objectCommandsPanel, "Step");
1000	1055	stepButton.setToolTipText("Step one frame");
1001	1056	// resetAllButton = AddButton(oe, "Reset All");
1002	1057	// stepAllButton = AddButton(oe, "Step All");
1003	1058	// Return();
1004		- slowerButton = AddButton(commandsPanel, "Slow");
	1059	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1005	1060	slowerButton.setToolTipText("Decrease animation speed");
1006		- fasterButton = AddButton(commandsPanel, "Fast");
	1061	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1007	1062	fasterButton.setToolTipText("Increase animation speed");
1008		- remarkButton = AddButton(commandsPanel, "Remark");
	1063	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1009	1064	remarkButton.setToolTipText("Set the current transform as the target");
1010	1065
1011		- oe.ctrlPanel.add(commandsPanel);
	1066	+ oe.ctrlPanel.add(objectCommandsPanel);
1012	1067	oe.ctrlPanel.Return();
1013	1068
1014		- 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
1015	1070	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1016	1071	//Return();
1017	1072
..	..	@@ -1214,8 +1269,11 @@
1214	1269	//worldPanel.setName("World");
1215	1270	centralPanel = new cGridBag();
1216	1271	centralPanel.preferredWidth = 20;
1217		- timelinePanel = new JPanel(new BorderLayout());
1218		- 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);
1219	1277
1220	1278	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1221	1279	cameraPanel.setContinuousLayout(true);
..	..	@@ -1224,7 +1282,10 @@
1224	1282	// cameraPanel.setDividerSize(9);
1225	1283	cameraPanel.setResizeWeight(1.0);
1226	1284
	1285	+ }
	1286	+
1227	1287	centralPanel.add(cameraView);
	1288	+ centralPanel.setFocusable(true);
1228	1289	//frame.setJMenuBar(timelineMenubar);
1229	1290	//centralPanel.add(timelinePanel);
1230	1291
..	..	@@ -1291,7 +1352,7 @@
1291	1352	// north.setName("Edit");
1292	1353	// north.add(ctrlPanel, BorderLayout.NORTH);
1293	1354	// objectPanel.add(north);
1294		- objectPanel.add(ctrlPanel);
	1355	+ objectPanel.add(editPanel);
1295	1356	objectPanel.add(infoPanel);
1296	1357
1297	1358	/*
..	..	@@ -1313,7 +1374,7 @@
1313	1374	scrollpane.addMouseWheelListener(this); // Default not fast enough
1314	1375
1315	1376	/JTabbedPane/ scenePanel = new cGridBag();
1316		- scenePanel.preferredWidth = 7;
	1377	+ scenePanel.preferredWidth = 6;
1317	1378
1318	1379	JTabbedPane tabbedPane = new JTabbedPane();
1319	1380	tabbedPane.add(scrollpane);
..	..	@@ -1419,9 +1480,11 @@
1419	1480
1420	1481	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1421	1482
1422		- frame.setSize(1024, 768);
1423		- frame.show();
	1483	+ frame.setSize(1280, 860);
	1484	+ frame.setVisible(true);
1424	1485
	1486	+ cameraView.requestFocusInWindow();
	1487	+
1425	1488	gridPanel.setDividerLocation(1.0);
1426	1489
1427	1490	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1459,19 +1522,22 @@
1459	1522
1460	1523	cGridBag editBar = new cGridBag().setVertical(false);
1461	1524
1462		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1525	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1463	1526	createMaterialButton.setToolTipText("Create material");
1464	1527
1465	1528	/*
1466	1529	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1467	1530	*/
1468	1531
1469		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1532	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1470	1533	clearMaterialButton.setToolTipText("Clear material");
1471	1534
1472		- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1473		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1474		- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1535	+ if (Globals.ADVANCED)
	1536	+ {
	1537	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1538	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1539	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1540	+ }
1475	1541
1476	1542	editBar.preferredHeight = 15;
1477	1543
..	..	@@ -1740,12 +1806,15 @@
1740	1806	opacityPowerField.addChangeListener(this);
1741	1807	/**/
1742	1808
1743		- resetSlidersButton.addActionListener(this);
1744	1809	clearMaterialButton.addActionListener(this);
1745	1810	createMaterialButton.addActionListener(this);
1746		-
1747		- propagateToggle.addItemListener(this);
1748		- multiplyToggle.addItemListener(this);
	1811	+
	1812	+ if (Globals.ADVANCED)
	1813	+ {
	1814	+ resetSlidersButton.addActionListener(this);
	1815	+ propagateToggle.addItemListener(this);
	1816	+ multiplyToggle.addItemListener(this);
	1817	+ }
1749	1818	}
1750	1819
1751	1820	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1916,7 +1985,7 @@
1916	1985
1917	1986	//? flashIt = false;
1918	1987	CameraPane pane = (CameraPane) cameraView;
1919		- pane.clickStart(location.x, location.y, 0);
	1988	+ pane.clickStart(location.x, location.y, 0, 0);
1920	1989	pane.clickEnd(location.x, location.y, 0, true);
1921	1990
1922	1991	if (group.selection.size() == 1)
..	..	@@ -1965,6 +2034,7 @@
1965	2034	e2.printStackTrace();
1966	2035	}
1967	2036	}
	2037	+
1968	2038	LoadJMEThread loadThread;
1969	2039
1970	2040	class LoadJMEThread extends Thread
..	..	@@ -2022,6 +2092,7 @@
2022	2092	//LoadFile0(filename, converter);
2023	2093	}
2024	2094	}
	2095	+
2025	2096	LoadOBJThread loadObjThread;
2026	2097
2027	2098	class LoadOBJThread extends Thread
..	..	@@ -2100,19 +2171,19 @@
2100	2171
2101	2172	void LoadObjFile(String fullname)
2102	2173	{
2103		- /*
	2174	+ System.out.println("Loading " + fullname);
	2175	+ /**/
2104	2176	//lastFilename = fullname;
2105	2177	if(loadObjThread == null)
2106	2178	{
2107		- loadObjThread = new LoadOBJThread();
2108		- loadObjThread.start();
	2179	+ loadObjThread = new LoadOBJThread();
	2180	+ loadObjThread.start();
2109	2181	}
2110	2182
2111	2183	loadObjThread.add(fullname);
2112		- */
	2184	+ /**/
2113	2185
2114		- System.out.println("Loading " + fullname);
2115		- makeSomething(new FileObject(fullname, true), true);
	2186	+ //makeSomething(new FileObject(fullname, true), true);
2116	2187	}
2117	2188
2118	2189	void LoadGFDFile(String fullname)
..	..	@@ -2373,11 +2444,11 @@
2373	2444
2374	2445	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2375	2446	{
2376		- if (GrafreeD.standAlone)
	2447	+ if (Grafreed.standAlone)
2377	2448	{
2378	2449	/**/
2379	2450	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2380		- browser.show();
	2451	+ browser.setVisible(true);
2381	2452	String filename = browser.getFile();
2382	2453	if (filename != null && filename.length() > 0)
2383	2454	{
..	..	@@ -2737,7 +2808,8 @@
2737	2808	return;
2738	2809	}
2739	2810
2740		- multiplyToggle.setSelected(mat.multiply);
	2811	+ if (multiplyToggle != null)
	2812	+ multiplyToggle.setSelected(mat.multiply);
2741	2813
2742	2814	assert (object.projectedVertices != null);
2743	2815
..	..	@@ -2952,9 +3024,9 @@
2952	3024	frame.validate();
2953	3025
2954	3026	return;
2955		- } else if (event.getSource() == toggleRandomItem)
	3027	+ } else if (event.getSource() == toggleSwitchItem)
2956	3028	{
2957		- cameraView.ToggleRandom();
	3029	+ cameraView.ToggleSwitch();
2958	3030	cameraView.repaint();
2959	3031	return;
2960	3032	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2982,6 +3054,10 @@
2982	3054	} else if (event.getSource() == liveCB)
2983	3055	{
2984	3056	copy.live ^= true;
	3057	+ return;
	3058	+ } else if (event.getSource() == selectCB)
	3059	+ {
	3060	+ copy.dontselect ^= true;
2985	3061	return;
2986	3062	} else if (event.getSource() == hideCB)
2987	3063	{
..	..	@@ -3021,8 +3097,9 @@
3021	3097
3022	3098	public void actionPerformed(ActionEvent event)
3023	3099	{
	3100	+ Object source = event.getSource();
3024	3101	// SCRIPT DIALOG
3025		- if (event.getSource() == okbutton)
	3102	+ if (source == okbutton)
3026	3103	{
3027	3104	textpanel.setVisible(false);
3028	3105	textpanel.remove(textarea);
..	..	@@ -3034,7 +3111,7 @@
3034	3111	textarea = null;
3035	3112	textpanel = null;
3036	3113	}
3037		- if (event.getSource() == cancelbutton)
	3114	+ if (source == cancelbutton)
3038	3115	{
3039	3116	textpanel.setVisible(false);
3040	3117	textpanel.remove(textarea);
..	..	@@ -3046,50 +3123,50 @@
3046	3123	//applySelf();
3047	3124	//client.refreshEditWindow();
3048	3125	//refreshContents();
3049		- if (event.getSource() == nameField)
	3126	+ if (source == nameField)
3050	3127	{
3051	3128	//System.out.println("ObjEditor " + event);
3052	3129	applySelf0(true);
3053	3130	//parent.applySelf();
3054	3131	objEditor.refreshContents();
3055		- } else if (event.getSource() == resetButton)
	3132	+ } else if (source == resetButton)
3056	3133	{
3057	3134	CameraPane.fullreset = true;
3058	3135	copy.Reset(); // ResetMeshes();
3059	3136	copy.Touch();
3060	3137	objEditor.refreshContents();
3061		- } else if (event.getSource() == stepItem)
	3138	+ } else if (source == stepItem)
3062	3139	{
3063	3140	//cameraView.ONESTEP = true;
3064	3141	Globals.ONESTEP = true;
3065	3142	cameraView.repaint();
3066	3143	return;
3067		- } else if (event.getSource() == stepButton)
	3144	+ } else if (source == stepButton)
3068	3145	{
3069	3146	copy.Step();
3070	3147	copy.Touch();
3071	3148	objEditor.refreshContents();
3072		- } else if (event.getSource() == slowerButton)
	3149	+ } else if (source == slowerButton)
3073	3150	{
3074	3151	copy.Slower();
3075	3152	copy.Touch();
3076	3153	objEditor.refreshContents();
3077		- } else if (event.getSource() == fasterButton)
	3154	+ } else if (source == fasterButton)
3078	3155	{
3079	3156	copy.Faster();
3080	3157	copy.Touch();
3081	3158	objEditor.refreshContents();
3082		- } else if (event.getSource() == remarkButton)
	3159	+ } else if (source == remarkButton)
3083	3160	{
3084	3161	copy.Remark();
3085	3162	copy.Touch();
3086	3163	objEditor.refreshContents();
3087		- } else if (event.getSource() == stepAllButton)
	3164	+ } else if (source == stepAllButton)
3088	3165	{
3089	3166	copy.StepAll();
3090	3167	copy.Touch();
3091	3168	objEditor.refreshContents();
3092		- } else if (event.getSource() == resetAllButton)
	3169	+ } else if (source == resetAllButton)
3093	3170	{
3094	3171	//CameraPane.fullreset = true;
3095	3172	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3122,53 +3199,75 @@
3122	3199	// Close();
3123	3200	// }
3124	3201	// else
3125		- if (event.getSource() == resetSlidersButton)
	3202	+ if (source == resetSlidersButton)
3126	3203	{
3127	3204	ResetSliders();
3128		- } else if (event.getSource() == clearMaterialButton)
	3205	+ } else if (source == clearMaterialButton)
3129	3206	{
3130	3207	ClearMaterial();
3131		- } else if (event.getSource() == createMaterialButton)
	3208	+ } else if (source == createMaterialButton)
3132	3209	{
3133	3210	CreateMaterial();
3134		- } else if (event.getSource() == clearPanelButton)
	3211	+ } else if (source == clearPanelButton)
3135	3212	{
3136	3213	copy.ClearUI();
3137	3214	refreshContents(true);
3138		- } /*
3139		- }
3140		-
3141		- public boolean action(Event event, Object arg)
3142		- {
3143		- */ 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)
3144	3240	{
3145	3241	Close();
3146	3242	//return true;
3147		- } else if (event.getSource() == loadItem)
	3243	+ } else if (source == loadItem)
3148	3244	{
3149	3245	load();
3150	3246	//return true;
3151		- } else if (event.getSource() == saveItem)
	3247	+ } else if (source == newItem)
	3248	+ {
	3249	+ New();
	3250	+ } else if (source == saveItem)
3152	3251	{
3153	3252	save();
3154	3253	//return true;
3155		- } else if (event.getSource() == saveAsItem)
	3254	+ } else if (source == saveAsItem)
3156	3255	{
3157	3256	saveAs();
3158	3257	//return true;
3159		- } else if (event.getSource() == reexportItem)
	3258	+ } else if (source == reexportItem)
3160	3259	{
3161	3260	reexport();
3162	3261	//return true;
3163		- } else if (event.getSource() == exportAsItem)
	3262	+ } else if (source == exportAsItem)
3164	3263	{
3165	3264	export();
3166	3265	//return true;
3167		- } else if (event.getSource() == povItem)
	3266	+ } else if (source == povItem)
3168	3267	{
3169	3268	generatePOV();
3170	3269	//return true;
3171		- } else if (event.getSource() == zBufferItem)
	3270	+ } else if (source == zBufferItem)
3172	3271	{
3173	3272	try
3174	3273	{
..	..	@@ -3190,21 +3289,8 @@
3190	3289	cameraView.repaint();
3191	3290	//return true;
3192	3291	}
3193		- */ else if (event.getSource() == editCameraItem)
3194		- {
3195		- cameraView.ProtectCamera();
3196		- cameraView.repaint();
3197		- return;
3198		- } else if (event.getSource() == revertCameraItem)
3199		- {
3200		- cameraView.RevertCamera();
3201		- cameraView.repaint();
3202		- return;
3203		-// } else if (event.getSource() == textureButton)
3204		-// {
3205		-// return; // true;
3206		- } else // combos...
3207		- if (event.getSource() == texresMenu)
	3292	+ */ else // combos...
	3293	+ if (source == texresMenu)
3208	3294	{
3209	3295	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3210	3296	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3216,6 +3302,262 @@
3216	3302	}
3217	3303	}
3218	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	+
3219	3561	void ToggleAnimation()
3220	3562	{
3221	3563	if (!Globals.ANIMATION)
..	..	@@ -3231,8 +3573,8 @@
3231	3573
3232	3574	Globals.ANIMATION ^= true;
3233	3575
3234		- GrafreeD.wav.cursor = 0;
3235		- GrafreeD.wav.loop = 0;
	3576	+ Grafreed.wav.cursor = 0;
	3577	+ Grafreed.wav.loop = 0;
3236	3578	}
3237	3579	} else
3238	3580	{
..	..	@@ -3253,7 +3595,6 @@
3253	3595	callee.refreshContents();
3254	3596	} else
3255	3597	{
3256		- new Exception().printStackTrace();
3257	3598	System.exit(0);
3258	3599	}
3259	3600	}
..	..	@@ -3283,7 +3624,7 @@
3283	3624	void CreateMaterial()
3284	3625	{
3285	3626	//copy.ClearMaterial(); // PATCH
3286		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3627	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3287	3628	if (copy.selection.size() > 0)
3288	3629	//SetMaterial(copy);
3289	3630	{
..	..	@@ -3342,11 +3683,11 @@
3342	3683	{
3343	3684	copy.ResetBlockLoop(); // temporary problem
3344	3685
3345		- boolean random = CameraPane.RANDOM;
3346		- CameraPane.RANDOM = false; // parse everything
	3686	+ boolean random = CameraPane.SWITCH;
	3687	+ CameraPane.SWITCH = false; // parse everything
3347	3688	copy.ResetDisplayList();
3348	3689	copy.HardTouch();
3349		- CameraPane.RANDOM = random;
	3690	+ CameraPane.SWITCH = random;
3350	3691	}
3351	3692
3352	3693	// public void applySelf()
..	..	@@ -3420,6 +3761,36 @@
3420	3761	{
3421	3762	//System.out.println("Propagate = " + propagate);
3422	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	+
3423	3794	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3424	3795	{
3425	3796	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3535,7 +3906,7 @@
3535	3906	}
3536	3907
3537	3908	if (normalpushField != null)
3538		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3909	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3539	3910	}
3540	3911
3541	3912	void SnapObject()
..	..	@@ -3799,6 +4170,7 @@
3799	4170
3800	4171	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3801	4172	{
	4173	+ Save();
3802	4174	//Tween.set(thing, 0).target(1).start(tweenManager);
3803	4175	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3804	4176	// if (thing instanceof GenericJointDemo)
..	..	@@ -4002,6 +4374,7 @@
4002	4374	}
4003	4375	}
4004	4376	}
	4377	+
4005	4378	LoadGFDThread loadGFDThread;
4006	4379
4007	4380	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4021,8 +4394,10 @@
4021	4394
4022	4395	try
4023	4396	{
	4397	+ // Try compressed version first.
4024	4398	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4025		- 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);
4026	4401
4027	4402	readobj = (Object3D) p.readObject();
4028	4403	istream.close();
..	..	@@ -4030,7 +4405,20 @@
4030	4405	readobj.ResetDisplayList();
4031	4406	} catch (Exception e)
4032	4407	{
4033		- 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	+ }
4034	4422	}
4035	4423	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4036	4424	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4076,6 +4464,12 @@
4076	4464
4077	4465	void LoadIt(Object obj)
4078	4466	{
	4467	+ if (obj == null)
	4468	+ {
	4469	+ // Invalid file
	4470	+ return;
	4471	+ }
	4472	+
4079	4473	System.out.println("Loaded " + obj);
4080	4474	//new Exception().printStackTrace();
4081	4475	Object3D readobj = (Object3D) obj;
..	..	@@ -4085,6 +4479,7 @@
4085	4479
4086	4480	if (readobj != null)
4087	4481	{
	4482	+ Save();
4088	4483	try
4089	4484	{
4090	4485	//readobj.deepCopySelf(copy);
..	..	@@ -4147,7 +4542,7 @@
4147	4542
4148	4543	void load() // throws ClassNotFoundException
4149	4544	{
4150		- if (GrafreeD.standAlone)
	4545	+ if (Grafreed.standAlone)
4151	4546	{
4152	4547	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4153	4548	browser.show();
..	..	@@ -4234,11 +4629,13 @@
4234	4629	try
4235	4630	{
4236	4631	FileOutputStream ostream = new FileOutputStream(lastname);
4237		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4632	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4633	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4238	4634
4239	4635	p.writeObject(copy);
4240	4636	p.flush();
4241	4637
	4638	+ zstream.close();
4242	4639	ostream.close();
4243	4640
4244	4641	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4248,11 +4645,12 @@
4248	4645	{
4249	4646	}
4250	4647	}
	4648	+
4251	4649	String lastname;
4252	4650
4253	4651	void saveAs()
4254	4652	{
4255		- if (GrafreeD.standAlone)
	4653	+ if (Grafreed.standAlone)
4256	4654	{
4257	4655	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4258	4656	browser.setVisible(true);
..	..	@@ -4357,13 +4755,13 @@
4357	4755	try
4358	4756	{
4359	4757	FileOutputStream ostream = new FileOutputStream(filename);
4360		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4361		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4758	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4759	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4362	4760
4363	4761	Object3D objectparent = obj.parent;
4364	4762	obj.parent = null;
4365	4763
4366		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4764	+ Object3D object = (Object3D) Grafreed.clone(obj);
4367	4765
4368	4766	obj.parent = objectparent;
4369	4767
..	..	@@ -4375,8 +4773,8 @@
4375	4773	p.writeObject(object);
4376	4774	p.flush();
4377	4775
	4776	+ zstream.close();
4378	4777	ostream.close();
4379		- // zstream.close();
4380	4778
4381	4779	// group.selection.get(0).parent = parent;
4382	4780	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4397,7 +4795,7 @@
4397	4795	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4398	4796	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4399	4797	copy.generatePOV(buffer);
4400		- if (GrafreeD.standAlone)
	4798	+ if (Grafreed.standAlone)
4401	4799	{
4402	4800	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4403	4801	browser.show();
..	..	@@ -4423,7 +4821,8 @@
4423	4821	Object3D client;
4424	4822	Object3D copy;
4425	4823	MenuBar menuBar;
4426		- Menu windowMenu;
	4824	+ Menu fileMenu;
	4825	+ MenuItem newItem;
4427	4826	MenuItem loadItem;
4428	4827	MenuItem saveItem;
4429	4828	MenuItem saveAsItem;
..	..	@@ -4431,11 +4830,9 @@
4431	4830	MenuItem reexportItem;
4432	4831	MenuItem povItem;
4433	4832	MenuItem closeItem;
4434		- Menu cameraMenu;
	4833	+
4435	4834	CheckboxMenuItem zBufferItem;
4436	4835	//MenuItem normalLensItem;
4437		- MenuItem editCameraItem;
4438		- MenuItem revertCameraItem;
4439	4836	MenuItem stepItem;
4440	4837	CheckboxMenuItem toggleLiveItem;
4441	4838	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4446,7 +4843,7 @@
4446	4843	CheckboxMenuItem toggleFootContactItem;
4447	4844	CheckboxMenuItem toggleDLItem;
4448	4845	CheckboxMenuItem toggleTextureItem;
4449		- CheckboxMenuItem toggleRandomItem;
	4846	+ CheckboxMenuItem toggleSwitchItem;
4450	4847	CheckboxMenuItem toggleRootItem;
4451	4848	CheckboxMenuItem animationItem;
4452	4849	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4583,4 +4980,9 @@
4583	4980	//ObjectUI parent;
4584	4981
4585	4982	cNumberSlider normalpushField;
	4983	+
	4984	+ private MenuItem importGFDItem;
	4985	+ private MenuItem importVRMLX3DItem;
	4986	+ private MenuItem import3DSItem;
	4987	+ private MenuItem importOBJItem;
4586	4988	}