~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,9 +169,9 @@
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);
170		- objEditor.ctrlPanel.remove(commandsPanel);
	173	+ objEditor.ctrlPanel.remove(setupPanel2);
	174	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
171	175	objEditor.ctrlPanel.remove(pushPanel);
172	176	//objEditor.ctrlPanel.remove(fillPanel);
173	177
..	..	@@ -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);
..	..	@@ -301,69 +322,23 @@
301	322	//povItem.addActionListener(this);
302	323	closeItem.addActionListener(this);
303	324
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	325	objectPanel = new JTabbedPane();
360	326	toolbarPanel = new JPanel();
361	327	toolbarPanel.setName("Toolbar");
362	328	treePanel = new cGridBag();
363	329	treePanel.setName("Tree");
	330	+
	331	+ editPanel = new cGridBag().setVertical(true);
	332	+ editPanel.setName("Edit");
	333	+
364	334	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
365		- ctrlPanel.setName("Edit");
	335	+
	336	+ editCommandsPanel = new cGridBag();
	337	+ editPanel.add(editCommandsPanel);
	338	+ editPanel.add(ctrlPanel);
	339	+
366	340	materialPanel = new cGridBag().setVertical(true);
	341	+
367	342	materialPanel.setName("Material");
368	343	/JTextPane/
369	344	infoarea = createTextPane();
..	..	@@ -457,10 +432,10 @@
457	432	e.printStackTrace();
458	433	}
459	434
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();
	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();
464	439	//clipboard.setContents(data, data);
465	440	}
466	441
..	..	@@ -483,13 +458,13 @@
483	458	//SendInfo("Name:", "bold");
484	459	if (sel.GetTextures() != null \|\| debug)
485	460	{
486		- si.SendInfo(sel.toString(), "bold");
	461	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
487	462	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
488	463	if (sel.Size() > 0)
489	464	{
490	465	si.SendInfo("#children = " + sel.Size(), "regular");
491	466	}
492		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	467	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
493	468	if (debug)
494	469	{
495	470	try
..	..	@@ -531,7 +506,7 @@
531	506	}
532	507	if (sel.support != null)
533	508	{
534		- si.SendInfo(" support: " + sel.support, "regular");
	509	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
535	510	}
536	511	if (sel.scriptnode != null)
537	512	{
..	..	@@ -620,19 +595,89 @@
620	595	}
621	596	}
622	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	+
623	638	void ToggleFullScreen()
624	639	{
625	640	if (CameraPane.FULLSCREEN)
626	641	{
627		- frame.getContentPane().remove(/"Center",/bigThree);
628		- framePanel.add(bigThree);
629		- 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	+
630	660	} else
631	661	{
632		- frame.getContentPane().remove(/"Center",/framePanel);
633		- framePanel.remove(bigThree);
634		- 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);
635	679	}
	680	+
636	681	cameraView.ToggleFullScreen();
637	682	}
638	683
..	..	@@ -734,7 +779,7 @@
734	779	protected static ImageIcon createImageIcon(String path,
735	780	String description)
736	781	{
737		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	782	+ java.net.URL imgURL = Grafreed.class.getResource(path);
738	783	if (imgURL != null)
739	784	{
740	785	return new ImageIcon(imgURL, description);
..	..	@@ -766,6 +811,7 @@
766	811	// NumberSlider vDivsField;
767	812	// JCheckBox endcaps;
768	813	JCheckBox liveCB;
	814	+ JCheckBox selectCB;
769	815	JCheckBox hideCB;
770	816	JCheckBox link2masterCB;
771	817	JCheckBox markCB;
..	..	@@ -782,9 +828,13 @@
782	828	JButton fasterButton;
783	829	JButton remarkButton;
784	830
	831	+ cGridBag editPanel;
	832	+ cGridBag editCommandsPanel;
	833	+
785	834	cGridBag namePanel;
786	835	cGridBag setupPanel;
787		- cGridBag commandsPanel;
	836	+ cGridBag setupPanel2;
	837	+ cGridBag objectCommandsPanel;
788	838	cGridBag pushPanel;
789	839	cGridBag fillPanel;
790	840
..	..	@@ -951,10 +1001,6 @@
951	1001
952	1002	void SetupUI2(ObjEditor oe)
953	1003	{
954		-// oe.aConstraints.weightx = 0;
955		-// oe.aConstraints.weighty = 0;
956		-// oe.aConstraints.gridx = 0;
957		-// oe.aConstraints.gridy = 0;
958	1004	//SetupName(oe);
959	1005
960	1006	namePanel = new cGridBag();
..	..	@@ -971,32 +1017,56 @@
971	1017	setupPanel = new cGridBag().setVertical(false);
972	1018
973	1019	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
974		- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
975		- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1020	+ liveCB.setToolTipText("Animate object");
	1021	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1022	+ selectCB.setToolTipText("Make object selectable");
976	1023	// Return();
	1024	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1025	+ hideCB.setToolTipText("Hide object");
977	1026	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
978		- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
979		- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	1027	+ markCB.setToolTipText("Set the animation target transform");
	1028	+
	1029	+ setupPanel2 = new cGridBag().setVertical(false);
	1030	+
	1031	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1032	+ rewindCB.setToolTipText("Rewind animation");
	1033	+
	1034	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1035	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
980	1036
	1037	+ if (Globals.ADVANCED)
	1038	+ {
	1039	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1040	+ link2masterCB.setToolTipText("Attach to support");
	1041	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1042	+ speedupCB.setToolTipText("Option motion capture");
	1043	+ }
	1044	+
981	1045	oe.ctrlPanel.add(setupPanel);
982	1046	oe.ctrlPanel.Return();
	1047	+ oe.ctrlPanel.add(setupPanel2);
	1048	+ oe.ctrlPanel.Return();
983	1049
984		- commandsPanel = new cGridBag().setVertical(false);
	1050	+ objectCommandsPanel = new cGridBag().setVertical(false);
985	1051
986		- resetButton = AddButton(commandsPanel, "Reset");
987		- stepButton = AddButton(commandsPanel, "Step");
	1052	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1053	+ resetButton.setToolTipText("Jump to frame zero");
	1054	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1055	+ stepButton.setToolTipText("Step one frame");
988	1056	// resetAllButton = AddButton(oe, "Reset All");
989	1057	// stepAllButton = AddButton(oe, "Step All");
990		- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
991	1058	// Return();
992		- slowerButton = AddButton(commandsPanel, "Slow");
993		- fasterButton = AddButton(commandsPanel, "Fast");
994		- remarkButton = AddButton(commandsPanel, "Remark");
	1059	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1060	+ slowerButton.setToolTipText("Decrease animation speed");
	1061	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1062	+ fasterButton.setToolTipText("Increase animation speed");
	1063	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1064	+ remarkButton.setToolTipText("Set the current transform as the target");
995	1065
996		- oe.ctrlPanel.add(commandsPanel);
	1066	+ oe.ctrlPanel.add(objectCommandsPanel);
997	1067	oe.ctrlPanel.Return();
998	1068
999		- 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
1000	1070	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1001	1071	//Return();
1002	1072
..	..	@@ -1199,8 +1269,11 @@
1199	1269	//worldPanel.setName("World");
1200	1270	centralPanel = new cGridBag();
1201	1271	centralPanel.preferredWidth = 20;
1202		- timelinePanel = new JPanel(new BorderLayout());
1203		- 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);
1204	1277
1205	1278	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1206	1279	cameraPanel.setContinuousLayout(true);
..	..	@@ -1209,7 +1282,10 @@
1209	1282	// cameraPanel.setDividerSize(9);
1210	1283	cameraPanel.setResizeWeight(1.0);
1211	1284
	1285	+ }
	1286	+
1212	1287	centralPanel.add(cameraView);
	1288	+ centralPanel.setFocusable(true);
1213	1289	//frame.setJMenuBar(timelineMenubar);
1214	1290	//centralPanel.add(timelinePanel);
1215	1291
..	..	@@ -1276,7 +1352,7 @@
1276	1352	// north.setName("Edit");
1277	1353	// north.add(ctrlPanel, BorderLayout.NORTH);
1278	1354	// objectPanel.add(north);
1279		- objectPanel.add(ctrlPanel);
	1355	+ objectPanel.add(editPanel);
1280	1356	objectPanel.add(infoPanel);
1281	1357
1282	1358	/*
..	..	@@ -1298,7 +1374,7 @@
1298	1374	scrollpane.addMouseWheelListener(this); // Default not fast enough
1299	1375
1300	1376	/JTabbedPane/ scenePanel = new cGridBag();
1301		- scenePanel.preferredWidth = 7;
	1377	+ scenePanel.preferredWidth = 6;
1302	1378
1303	1379	JTabbedPane tabbedPane = new JTabbedPane();
1304	1380	tabbedPane.add(scrollpane);
..	..	@@ -1404,9 +1480,11 @@
1404	1480
1405	1481	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1406	1482
1407		- frame.setSize(1024, 768);
1408		- frame.show();
	1483	+ frame.setSize(1280, 860);
	1484	+ frame.setVisible(true);
1409	1485
	1486	+ cameraView.requestFocusInWindow();
	1487	+
1410	1488	gridPanel.setDividerLocation(1.0);
1411	1489
1412	1490	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1444,19 +1522,22 @@
1444	1522
1445	1523	cGridBag editBar = new cGridBag().setVertical(false);
1446	1524
1447		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1525	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1448	1526	createMaterialButton.setToolTipText("Create material");
1449	1527
1450	1528	/*
1451	1529	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1452	1530	*/
1453	1531
1454		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1532	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1455	1533	clearMaterialButton.setToolTipText("Clear material");
1456	1534
1457		- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1458		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1459		- 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	+ }
1460	1541
1461	1542	editBar.preferredHeight = 15;
1462	1543
..	..	@@ -1725,12 +1806,15 @@
1725	1806	opacityPowerField.addChangeListener(this);
1726	1807	/**/
1727	1808
1728		- resetSlidersButton.addActionListener(this);
1729	1809	clearMaterialButton.addActionListener(this);
1730	1810	createMaterialButton.addActionListener(this);
1731		-
1732		- propagateToggle.addItemListener(this);
1733		- multiplyToggle.addItemListener(this);
	1811	+
	1812	+ if (Globals.ADVANCED)
	1813	+ {
	1814	+ resetSlidersButton.addActionListener(this);
	1815	+ propagateToggle.addItemListener(this);
	1816	+ multiplyToggle.addItemListener(this);
	1817	+ }
1734	1818	}
1735	1819
1736	1820	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1901,7 +1985,7 @@
1901	1985
1902	1986	//? flashIt = false;
1903	1987	CameraPane pane = (CameraPane) cameraView;
1904		- pane.clickStart(location.x, location.y, 0);
	1988	+ pane.clickStart(location.x, location.y, 0, 0);
1905	1989	pane.clickEnd(location.x, location.y, 0, true);
1906	1990
1907	1991	if (group.selection.size() == 1)
..	..	@@ -1950,6 +2034,7 @@
1950	2034	e2.printStackTrace();
1951	2035	}
1952	2036	}
	2037	+
1953	2038	LoadJMEThread loadThread;
1954	2039
1955	2040	class LoadJMEThread extends Thread
..	..	@@ -2007,6 +2092,7 @@
2007	2092	//LoadFile0(filename, converter);
2008	2093	}
2009	2094	}
	2095	+
2010	2096	LoadOBJThread loadObjThread;
2011	2097
2012	2098	class LoadOBJThread extends Thread
..	..	@@ -2085,19 +2171,19 @@
2085	2171
2086	2172	void LoadObjFile(String fullname)
2087	2173	{
2088		- /*
	2174	+ System.out.println("Loading " + fullname);
	2175	+ /**/
2089	2176	//lastFilename = fullname;
2090	2177	if(loadObjThread == null)
2091	2178	{
2092		- loadObjThread = new LoadOBJThread();
2093		- loadObjThread.start();
	2179	+ loadObjThread = new LoadOBJThread();
	2180	+ loadObjThread.start();
2094	2181	}
2095	2182
2096	2183	loadObjThread.add(fullname);
2097		- */
	2184	+ /**/
2098	2185
2099		- System.out.println("Loading " + fullname);
2100		- makeSomething(new FileObject(fullname, true), true);
	2186	+ //makeSomething(new FileObject(fullname, true), true);
2101	2187	}
2102	2188
2103	2189	void LoadGFDFile(String fullname)
..	..	@@ -2358,11 +2444,11 @@
2358	2444
2359	2445	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2360	2446	{
2361		- if (GrafreeD.standAlone)
	2447	+ if (Grafreed.standAlone)
2362	2448	{
2363	2449	/**/
2364	2450	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2365		- browser.show();
	2451	+ browser.setVisible(true);
2366	2452	String filename = browser.getFile();
2367	2453	if (filename != null && filename.length() > 0)
2368	2454	{
..	..	@@ -2722,7 +2808,8 @@
2722	2808	return;
2723	2809	}
2724	2810
2725		- multiplyToggle.setSelected(mat.multiply);
	2811	+ if (multiplyToggle != null)
	2812	+ multiplyToggle.setSelected(mat.multiply);
2726	2813
2727	2814	assert (object.projectedVertices != null);
2728	2815
..	..	@@ -2937,9 +3024,9 @@
2937	3024	frame.validate();
2938	3025
2939	3026	return;
2940		- } else if (event.getSource() == toggleRandomItem)
	3027	+ } else if (event.getSource() == toggleSwitchItem)
2941	3028	{
2942		- cameraView.ToggleRandom();
	3029	+ cameraView.ToggleSwitch();
2943	3030	cameraView.repaint();
2944	3031	return;
2945	3032	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2968,6 +3055,10 @@
2968	3055	{
2969	3056	copy.live ^= true;
2970	3057	return;
	3058	+ } else if (event.getSource() == selectCB)
	3059	+ {
	3060	+ copy.dontselect ^= true;
	3061	+ return;
2971	3062	} else if (event.getSource() == hideCB)
2972	3063	{
2973	3064	copy.hide ^= true;
..	..	@@ -2982,6 +3073,7 @@
2982	3073	if (event.getSource() == randomCB)
2983	3074	{
2984	3075	copy.random ^= true;
	3076	+ objEditor.refreshContents();
2985	3077	return;
2986	3078	}
2987	3079	if (event.getSource() == speedupCB)
..	..	@@ -3005,8 +3097,9 @@
3005	3097
3006	3098	public void actionPerformed(ActionEvent event)
3007	3099	{
	3100	+ Object source = event.getSource();
3008	3101	// SCRIPT DIALOG
3009		- if (event.getSource() == okbutton)
	3102	+ if (source == okbutton)
3010	3103	{
3011	3104	textpanel.setVisible(false);
3012	3105	textpanel.remove(textarea);
..	..	@@ -3018,7 +3111,7 @@
3018	3111	textarea = null;
3019	3112	textpanel = null;
3020	3113	}
3021		- if (event.getSource() == cancelbutton)
	3114	+ if (source == cancelbutton)
3022	3115	{
3023	3116	textpanel.setVisible(false);
3024	3117	textpanel.remove(textarea);
..	..	@@ -3030,50 +3123,50 @@
3030	3123	//applySelf();
3031	3124	//client.refreshEditWindow();
3032	3125	//refreshContents();
3033		- if (event.getSource() == nameField)
	3126	+ if (source == nameField)
3034	3127	{
3035	3128	//System.out.println("ObjEditor " + event);
3036	3129	applySelf0(true);
3037	3130	//parent.applySelf();
3038	3131	objEditor.refreshContents();
3039		- } else if (event.getSource() == resetButton)
	3132	+ } else if (source == resetButton)
3040	3133	{
3041	3134	CameraPane.fullreset = true;
3042	3135	copy.Reset(); // ResetMeshes();
3043	3136	copy.Touch();
3044	3137	objEditor.refreshContents();
3045		- } else if (event.getSource() == stepItem)
	3138	+ } else if (source == stepItem)
3046	3139	{
3047	3140	//cameraView.ONESTEP = true;
3048	3141	Globals.ONESTEP = true;
3049	3142	cameraView.repaint();
3050	3143	return;
3051		- } else if (event.getSource() == stepButton)
	3144	+ } else if (source == stepButton)
3052	3145	{
3053	3146	copy.Step();
3054	3147	copy.Touch();
3055	3148	objEditor.refreshContents();
3056		- } else if (event.getSource() == slowerButton)
	3149	+ } else if (source == slowerButton)
3057	3150	{
3058	3151	copy.Slower();
3059	3152	copy.Touch();
3060	3153	objEditor.refreshContents();
3061		- } else if (event.getSource() == fasterButton)
	3154	+ } else if (source == fasterButton)
3062	3155	{
3063	3156	copy.Faster();
3064	3157	copy.Touch();
3065	3158	objEditor.refreshContents();
3066		- } else if (event.getSource() == remarkButton)
	3159	+ } else if (source == remarkButton)
3067	3160	{
3068	3161	copy.Remark();
3069	3162	copy.Touch();
3070	3163	objEditor.refreshContents();
3071		- } else if (event.getSource() == stepAllButton)
	3164	+ } else if (source == stepAllButton)
3072	3165	{
3073	3166	copy.StepAll();
3074	3167	copy.Touch();
3075	3168	objEditor.refreshContents();
3076		- } else if (event.getSource() == resetAllButton)
	3169	+ } else if (source == resetAllButton)
3077	3170	{
3078	3171	//CameraPane.fullreset = true;
3079	3172	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3106,53 +3199,75 @@
3106	3199	// Close();
3107	3200	// }
3108	3201	// else
3109		- if (event.getSource() == resetSlidersButton)
	3202	+ if (source == resetSlidersButton)
3110	3203	{
3111	3204	ResetSliders();
3112		- } else if (event.getSource() == clearMaterialButton)
	3205	+ } else if (source == clearMaterialButton)
3113	3206	{
3114	3207	ClearMaterial();
3115		- } else if (event.getSource() == createMaterialButton)
	3208	+ } else if (source == createMaterialButton)
3116	3209	{
3117	3210	CreateMaterial();
3118		- } else if (event.getSource() == clearPanelButton)
	3211	+ } else if (source == clearPanelButton)
3119	3212	{
3120	3213	copy.ClearUI();
3121	3214	refreshContents(true);
3122		- } /*
3123		- }
3124		-
3125		- public boolean action(Event event, Object arg)
3126		- {
3127		- */ 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)
3128	3240	{
3129	3241	Close();
3130	3242	//return true;
3131		- } else if (event.getSource() == loadItem)
	3243	+ } else if (source == loadItem)
3132	3244	{
3133	3245	load();
3134	3246	//return true;
3135		- } else if (event.getSource() == saveItem)
	3247	+ } else if (source == newItem)
	3248	+ {
	3249	+ New();
	3250	+ } else if (source == saveItem)
3136	3251	{
3137	3252	save();
3138	3253	//return true;
3139		- } else if (event.getSource() == saveAsItem)
	3254	+ } else if (source == saveAsItem)
3140	3255	{
3141	3256	saveAs();
3142	3257	//return true;
3143		- } else if (event.getSource() == reexportItem)
	3258	+ } else if (source == reexportItem)
3144	3259	{
3145	3260	reexport();
3146	3261	//return true;
3147		- } else if (event.getSource() == exportAsItem)
	3262	+ } else if (source == exportAsItem)
3148	3263	{
3149	3264	export();
3150	3265	//return true;
3151		- } else if (event.getSource() == povItem)
	3266	+ } else if (source == povItem)
3152	3267	{
3153	3268	generatePOV();
3154	3269	//return true;
3155		- } else if (event.getSource() == zBufferItem)
	3270	+ } else if (source == zBufferItem)
3156	3271	{
3157	3272	try
3158	3273	{
..	..	@@ -3174,21 +3289,8 @@
3174	3289	cameraView.repaint();
3175	3290	//return true;
3176	3291	}
3177		- */ else if (event.getSource() == editCameraItem)
3178		- {
3179		- cameraView.ProtectCamera();
3180		- cameraView.repaint();
3181		- return;
3182		- } else if (event.getSource() == revertCameraItem)
3183		- {
3184		- cameraView.RevertCamera();
3185		- cameraView.repaint();
3186		- return;
3187		-// } else if (event.getSource() == textureButton)
3188		-// {
3189		-// return; // true;
3190		- } else // combos...
3191		- if (event.getSource() == texresMenu)
	3292	+ */ else // combos...
	3293	+ if (source == texresMenu)
3192	3294	{
3193	3295	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3194	3296	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3200,12 +3302,268 @@
3200	3302	}
3201	3303	}
3202	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	+
3203	3561	void ToggleAnimation()
3204	3562	{
3205	3563	if (!Globals.ANIMATION)
3206	3564	{
3207	3565	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3208		- browser.show();
	3566	+ browser.setVisible(true);
3209	3567	String filename = browser.getFile();
3210	3568	if (filename != null && filename.length() > 0)
3211	3569	{
..	..	@@ -3215,8 +3573,8 @@
3215	3573
3216	3574	Globals.ANIMATION ^= true;
3217	3575
3218		- GrafreeD.wav.cursor = 0;
3219		- GrafreeD.wav.loop = 0;
	3576	+ Grafreed.wav.cursor = 0;
	3577	+ Grafreed.wav.loop = 0;
3220	3578	}
3221	3579	} else
3222	3580	{
..	..	@@ -3237,7 +3595,6 @@
3237	3595	callee.refreshContents();
3238	3596	} else
3239	3597	{
3240		- new Exception().printStackTrace();
3241	3598	System.exit(0);
3242	3599	}
3243	3600	}
..	..	@@ -3267,7 +3624,7 @@
3267	3624	void CreateMaterial()
3268	3625	{
3269	3626	//copy.ClearMaterial(); // PATCH
3270		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3627	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3271	3628	if (copy.selection.size() > 0)
3272	3629	//SetMaterial(copy);
3273	3630	{
..	..	@@ -3326,11 +3683,11 @@
3326	3683	{
3327	3684	copy.ResetBlockLoop(); // temporary problem
3328	3685
3329		- boolean random = CameraPane.RANDOM;
3330		- CameraPane.RANDOM = false; // parse everything
	3686	+ boolean random = CameraPane.SWITCH;
	3687	+ CameraPane.SWITCH = false; // parse everything
3331	3688	copy.ResetDisplayList();
3332	3689	copy.HardTouch();
3333		- CameraPane.RANDOM = random;
	3690	+ CameraPane.SWITCH = random;
3334	3691	}
3335	3692
3336	3693	// public void applySelf()
..	..	@@ -3404,6 +3761,36 @@
3404	3761	{
3405	3762	//System.out.println("Propagate = " + propagate);
3406	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	+
3407	3794	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3408	3795	{
3409	3796	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3519,7 +3906,7 @@
3519	3906	}
3520	3907
3521	3908	if (normalpushField != null)
3522		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3909	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3523	3910	}
3524	3911
3525	3912	void SnapObject()
..	..	@@ -3783,6 +4170,7 @@
3783	4170
3784	4171	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3785	4172	{
	4173	+ Save();
3786	4174	//Tween.set(thing, 0).target(1).start(tweenManager);
3787	4175	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3788	4176	// if (thing instanceof GenericJointDemo)
..	..	@@ -3986,6 +4374,7 @@
3986	4374	}
3987	4375	}
3988	4376	}
	4377	+
3989	4378	LoadGFDThread loadGFDThread;
3990	4379
3991	4380	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4005,8 +4394,10 @@
4005	4394
4006	4395	try
4007	4396	{
	4397	+ // Try compressed version first.
4008	4398	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4009		- 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);
4010	4401
4011	4402	readobj = (Object3D) p.readObject();
4012	4403	istream.close();
..	..	@@ -4014,7 +4405,20 @@
4014	4405	readobj.ResetDisplayList();
4015	4406	} catch (Exception e)
4016	4407	{
4017		- 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	+ }
4018	4422	}
4019	4423	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4020	4424	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4060,6 +4464,12 @@
4060	4464
4061	4465	void LoadIt(Object obj)
4062	4466	{
	4467	+ if (obj == null)
	4468	+ {
	4469	+ // Invalid file
	4470	+ return;
	4471	+ }
	4472	+
4063	4473	System.out.println("Loaded " + obj);
4064	4474	//new Exception().printStackTrace();
4065	4475	Object3D readobj = (Object3D) obj;
..	..	@@ -4069,6 +4479,7 @@
4069	4479
4070	4480	if (readobj != null)
4071	4481	{
	4482	+ Save();
4072	4483	try
4073	4484	{
4074	4485	//readobj.deepCopySelf(copy);
..	..	@@ -4131,7 +4542,7 @@
4131	4542
4132	4543	void load() // throws ClassNotFoundException
4133	4544	{
4134		- if (GrafreeD.standAlone)
	4545	+ if (Grafreed.standAlone)
4135	4546	{
4136	4547	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4137	4548	browser.show();
..	..	@@ -4218,11 +4629,13 @@
4218	4629	try
4219	4630	{
4220	4631	FileOutputStream ostream = new FileOutputStream(lastname);
4221		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4632	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4633	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4222	4634
4223	4635	p.writeObject(copy);
4224	4636	p.flush();
4225	4637
	4638	+ zstream.close();
4226	4639	ostream.close();
4227	4640
4228	4641	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4232,11 +4645,12 @@
4232	4645	{
4233	4646	}
4234	4647	}
	4648	+
4235	4649	String lastname;
4236	4650
4237	4651	void saveAs()
4238	4652	{
4239		- if (GrafreeD.standAlone)
	4653	+ if (Grafreed.standAlone)
4240	4654	{
4241	4655	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4242	4656	browser.setVisible(true);
..	..	@@ -4341,13 +4755,13 @@
4341	4755	try
4342	4756	{
4343	4757	FileOutputStream ostream = new FileOutputStream(filename);
4344		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4345		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4758	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4759	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4346	4760
4347	4761	Object3D objectparent = obj.parent;
4348	4762	obj.parent = null;
4349	4763
4350		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4764	+ Object3D object = (Object3D) Grafreed.clone(obj);
4351	4765
4352	4766	obj.parent = objectparent;
4353	4767
..	..	@@ -4359,8 +4773,8 @@
4359	4773	p.writeObject(object);
4360	4774	p.flush();
4361	4775
	4776	+ zstream.close();
4362	4777	ostream.close();
4363		- // zstream.close();
4364	4778
4365	4779	// group.selection.get(0).parent = parent;
4366	4780	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4381,7 +4795,7 @@
4381	4795	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4382	4796	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4383	4797	copy.generatePOV(buffer);
4384		- if (GrafreeD.standAlone)
	4798	+ if (Grafreed.standAlone)
4385	4799	{
4386	4800	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4387	4801	browser.show();
..	..	@@ -4407,7 +4821,8 @@
4407	4821	Object3D client;
4408	4822	Object3D copy;
4409	4823	MenuBar menuBar;
4410		- Menu windowMenu;
	4824	+ Menu fileMenu;
	4825	+ MenuItem newItem;
4411	4826	MenuItem loadItem;
4412	4827	MenuItem saveItem;
4413	4828	MenuItem saveAsItem;
..	..	@@ -4415,11 +4830,9 @@
4415	4830	MenuItem reexportItem;
4416	4831	MenuItem povItem;
4417	4832	MenuItem closeItem;
4418		- Menu cameraMenu;
	4833	+
4419	4834	CheckboxMenuItem zBufferItem;
4420	4835	//MenuItem normalLensItem;
4421		- MenuItem editCameraItem;
4422		- MenuItem revertCameraItem;
4423	4836	MenuItem stepItem;
4424	4837	CheckboxMenuItem toggleLiveItem;
4425	4838	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4430,7 +4843,7 @@
4430	4843	CheckboxMenuItem toggleFootContactItem;
4431	4844	CheckboxMenuItem toggleDLItem;
4432	4845	CheckboxMenuItem toggleTextureItem;
4433		- CheckboxMenuItem toggleRandomItem;
	4846	+ CheckboxMenuItem toggleSwitchItem;
4434	4847	CheckboxMenuItem toggleRootItem;
4435	4848	CheckboxMenuItem animationItem;
4436	4849	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4567,4 +4980,9 @@
4567	4980	//ObjectUI parent;
4568	4981
4569	4982	cNumberSlider normalpushField;
	4983	+
	4984	+ private MenuItem importGFDItem;
	4985	+ private MenuItem importVRMLX3DItem;
	4986	+ private MenuItem import3DSItem;
	4987	+ private MenuItem importOBJItem;
4570	4988	}