~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -35,6 +39,67 @@
35	39
36	40	GroupEditor callee;
37	41	JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ cButton GetButton(String name, boolean border)
	46	+ {
	47	+ try
	48	+ {
	49	+ ImageIcon icon = GetIcon(name);
	50	+ return new cButton(icon, border);
	51	+ }
	52	+ catch (Exception e)
	53	+ {
	54	+ return new cButton(name, border);
	55	+ }
	56	+ }
	57	+
	58	+ cToggleButton GetToggleButton(String name, boolean border)
	59	+ {
	60	+ try
	61	+ {
	62	+ ImageIcon icon = GetIcon(name);
	63	+ return new cToggleButton(icon, border);
	64	+ }
	65	+ catch (Exception e)
	66	+ {
	67	+ return new cToggleButton(name, border);
	68	+ }
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ try
	74	+ {
	75	+ ImageIcon icon = GetIcon(name);
	76	+ return new cCheckBox(icon, border);
	77	+ }
	78	+ catch (Exception e)
	79	+ {
	80	+ return new cCheckBox(name, border);
	81	+ }
	82	+ }
	83	+
	84	+ private ImageIcon GetIcon(String name) throws IOException
	85	+ {
	86	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	87	+
	88	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	89	+ {
	90	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	91	+ Graphics2D g = resized.createGraphics();
	92	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	93	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	94	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	95	+ g.dispose();
	96	+
	97	+ image = resized;
	98	+ }
	99	+
	100	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	101	+ return icon;
	102	+ }
38	103
39	104	// SCRIPT
40	105
..	..	@@ -145,7 +210,7 @@
145	210
146	211	objEditor.ctrlPanel.remove(namePanel);
147	212
148		- if (!GroupEditor.allparams)
	213	+ if (!allparams)
149	214	return;
150	215
151	216	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -168,7 +233,8 @@
168	233	// objEditor.ctrlPanel.remove(remarkButton);
169	234
170	235	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	236	+ objEditor.ctrlPanel.remove(setupPanel2);
	237	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	238	objEditor.ctrlPanel.remove(pushPanel);
173	239	//objEditor.ctrlPanel.remove(fillPanel);
174	240
..	..	@@ -243,6 +309,7 @@
243	309	//localCopy.parent = null;
244	310
245	311	frame = new JFrame();
	312	+ frame.setUndecorated(false);
246	313	objEditor = this;
247	314	this.callee = callee;
248	315
..	..	@@ -273,27 +340,48 @@
273	340	return frame.action(event, obj);
274	341	}
275	342
	343	+ // Cannot work without static
	344	+ static boolean allparams = true;
	345	+
	346	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	347	+
276	348	void SetupMenu()
277	349	{
278	350	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..."));
	351	+ menuBar.add(fileMenu = new Menu("File"));
	352	+ fileMenu.add(newItem = new MenuItem("New"));
	353	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	354	+
	355	+ //oe.menuBar.add(menu = new Menu("Include"));
	356	+ Menu menu = new Menu("Import");
	357	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	358	+ importOBJItem.addActionListener(this);
	359	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	360	+ import3DSItem.addActionListener(this);
	361	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	362	+ importVRMLX3DItem.addActionListener(this);
	363	+ menu.add("-");
	364	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	365	+ importGFDItem.addActionListener(this);
	366	+ fileMenu.add(menu);
	367	+ fileMenu.add("-");
	368	+
	369	+ fileMenu.add(saveItem = new MenuItem("Save"));
	370	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284	371	//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("-");
	372	+ fileMenu.add("-");
	373	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	374	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	375	+ fileMenu.add("-");
289	376	if (client.parent != null)
290	377	{
291		- windowMenu.add(closeItem = new MenuItem("Close"));
	378	+ fileMenu.add(closeItem = new MenuItem("Close"));
292	379	} else
293	380	{
294		- windowMenu.add(closeItem = new MenuItem("Exit"));
	381	+ fileMenu.add(closeItem = new MenuItem("Exit"));
295	382	}
296	383
	384	+ newItem.addActionListener(this);
297	385	loadItem.addActionListener(this);
298	386	saveItem.addActionListener(this);
299	387	saveAsItem.addActionListener(this);
..	..	@@ -302,70 +390,53 @@
302	390	//povItem.addActionListener(this);
303	391	closeItem.addActionListener(this);
304	392
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	393	objectPanel = new JTabbedPane();
	394	+
	395	+ ChangeListener changeListener = new ChangeListener()
	396	+ {
	397	+ public void stateChanged(ChangeEvent changeEvent)
	398	+ {
	399	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	400	+// {
	401	+// if (latestObject != null)
	402	+// {
	403	+// refreshContents(true);
	404	+// SetMaterial(latestObject);
	405	+// }
	406	+//
	407	+// materialFlushed = true;
	408	+// }
	409	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	410	+// {
	411	+// if (listUI.size() == 0)
	412	+// EditSelection(false);
	413	+// }
	414	+
	415	+ refreshContents(false); // To refresh Info tab
	416	+ }
	417	+ };
	418	+ objectPanel.addChangeListener(changeListener);
	419	+
361	420	toolbarPanel = new JPanel();
362	421	toolbarPanel.setName("Toolbar");
363	422	treePanel = new cGridBag();
364	423	treePanel.setName("Tree");
	424	+
	425	+ editPanel = new cGridBag().setVertical(true);
	426	+ editPanel.setName("Edit");
	427	+
365	428	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
366		- ctrlPanel.setName("Edit");
	429	+
	430	+ editCommandsPanel = new cGridBag();
	431	+ editPanel.add(editCommandsPanel);
	432	+ editPanel.add(ctrlPanel);
	433	+
	434	+ toolboxPanel = new cGridBag().setVertical(false);
	435	+ toolboxPanel.setName("Toolbox");
	436	+
367	437	materialPanel = new cGridBag().setVertical(true);
368	438	materialPanel.setName("Material");
	439	+
369	440	/JTextPane/
370	441	infoarea = createTextPane();
371	442	doc = infoarea.getStyledDocument();
..	..	@@ -378,7 +449,7 @@
378	449	// TEXTAREA infoarea.setLineWrap(true);
379	450	// TEXTAREA infoarea.setWrapStyleWord(true);
380	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
381		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ //infoPanel.setPreferredSize(new Dimension(50, 200));
382	453	infoPanel.setName("Info");
383	454	//infoPanel.setLayout(new BorderLayout());
384	455	//infoPanel.add(createTextPane());
..	..	@@ -390,7 +461,14 @@
390	461	mainPanel.setDividerSize(9);
391	462	mainPanel.setDividerLocation(0.5); //1.0);
392	463	mainPanel.setResizeWeight(0.5);
393		-
	464	+
	465	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	466	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	467	+ divider.setDividerSize(15);
	468	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	469	+
	470	+ mainPanel.setUI(new BasicSplitPaneUI());
	471	+
394	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
395	473	//mainPanel.setLayout(new GridBagLayout());
396	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -458,10 +536,10 @@
458	536	e.printStackTrace();
459	537	}
460	538
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();
	539	+// String selection = infoarea.getText();
	540	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	541	+// java.awt.datatransfer.Clipboard clipboard =
	542	+// Toolkit.getDefaultToolkit().getSystemClipboard();
465	543	//clipboard.setContents(data, data);
466	544	}
467	545
..	..	@@ -484,13 +562,13 @@
484	562	//SendInfo("Name:", "bold");
485	563	if (sel.GetTextures() != null \|\| debug)
486	564	{
487		- si.SendInfo(sel.toString(), "bold");
	565	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
488	566	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
489	567	if (sel.Size() > 0)
490	568	{
491	569	si.SendInfo("#children = " + sel.Size(), "regular");
492	570	}
493		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	571	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
494	572	if (debug)
495	573	{
496	574	try
..	..	@@ -532,7 +610,7 @@
532	610	}
533	611	if (sel.support != null)
534	612	{
535		- si.SendInfo(" support: " + sel.support, "regular");
	613	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
536	614	}
537	615	if (sel.scriptnode != null)
538	616	{
..	..	@@ -621,20 +699,121 @@
621	699	}
622	700	}
623	701
	702	+//static GraphicsDevice device = GraphicsEnvironment
	703	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	704	+
	705	+ Rectangle keeprect;
	706	+ cRadio radio;
	707	+
	708	+cButton keepButton;
	709	+ cButton twoButton; // Full 3D
	710	+ cButton sixButton;
	711	+ cButton threeButton;
	712	+ cButton sevenButton;
	713	+ cButton fourButton; // full panel
	714	+ cButton oneButton; // full XYZ
	715	+ //cButton currentLayout;
	716	+
	717	+ boolean maximized;
	718	+
	719	+ cButton fullscreenLayout;
	720	+
	721	+ void Minimize()
	722	+ {
	723	+ frame.setState(Frame.ICONIFIED);
	724	+ frame.validate();
	725	+ }
	726	+
	727	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	728	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	729	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	730	+ void Maximize()
	731	+ {
	732	+ if (CameraPane.FULLSCREEN)
	733	+ {
	734	+ ToggleFullScreen();
	735	+ }
	736	+
	737	+ if (maximized)
	738	+ {
	739	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	740	+ }
	741	+ else
	742	+ {
	743	+ keeprect = frame.getBounds();
	744	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	745	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	746	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	747	+// frame.setState(Frame.MAXIMIZED_BOTH);
	748	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	749	+ }
	750	+
	751	+ maximized ^= true;
	752	+
	753	+ frame.validate();
	754	+ }
	755	+
	756	+ cButton minButton;
	757	+ cButton maxButton;
	758	+ cButton fullButton;
	759	+
624	760	void ToggleFullScreen()
625	761	{
626		- if (CameraPane.FULLSCREEN)
	762	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	763	+
	764	+ cameraView.ToggleFullScreen();
	765	+
	766	+ if (!CameraPane.FULLSCREEN)
627	767	{
628		- frame.getContentPane().remove(/"Center",/bigThree);
629		- framePanel.add(bigThree);
630		- frame.getContentPane().add(/"Center",/framePanel);
	768	+ device.setFullScreenWindow(null);
	769	+ frame.dispose();
	770	+ frame.setUndecorated(false);
	771	+ frame.validate();
	772	+ frame.setVisible(true);
	773	+
	774	+ //frame.setVisible(false);
	775	+// frame.removeNotify();
	776	+// frame.setUndecorated(false);
	777	+// frame.addNotify();
	778	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	779	+
	780	+// X frame.getContentPane().remove(/"Center",/bigThree);
	781	+// X framePanel.add(bigThree);
	782	+// X frame.getContentPane().add(/"Center",/framePanel);
	783	+ framePanel.setDividerLocation(1);
	784	+
	785	+ //frame.setVisible(true);
	786	+ radio.layout = keepButton;
	787	+ //theFrame = null;
	788	+ keepButton = null;
	789	+ radio.layout.doClick();
	790	+
631	791	} else
632	792	{
633		- frame.getContentPane().remove(/"Center",/framePanel);
634		- framePanel.remove(bigThree);
635		- frame.getContentPane().add(/"Center",/bigThree);
	793	+ keepButton = radio.layout;
	794	+ //keeprect = frame.getBounds();
	795	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	796	+// frame.getToolkit().getScreenSize().height);
	797	+ //frame.setVisible(false);
	798	+
	799	+ frame.dispose();
	800	+ frame.setUndecorated(true);
	801	+ device.setFullScreenWindow(frame);
	802	+ frame.validate();
	803	+ frame.setVisible(true);
	804	+// frame.removeNotify();
	805	+// frame.setUndecorated(true);
	806	+// frame.addNotify();
	807	+// X frame.getContentPane().remove(/"Center",/framePanel);
	808	+// X framePanel.remove(bigThree);
	809	+// X frame.getContentPane().add(/"Center",/bigThree);
	810	+ framePanel.setDividerLocation(0);
	811	+
	812	+ radio.layout = fullscreenLayout;
	813	+ radio.layout.doClick();
	814	+ //frame.setVisible(true);
636	815	}
637		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
638	817	}
639	818
640	819	private JTextPane createTextPane()
..	..	@@ -735,7 +914,7 @@
735	914	protected static ImageIcon createImageIcon(String path,
736	915	String description)
737	916	{
738		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	917	+ java.net.URL imgURL = Grafreed.class.getResource(path);
739	918	if (imgURL != null)
740	919	{
741	920	return new ImageIcon(imgURL, description);
..	..	@@ -767,6 +946,7 @@
767	946	// NumberSlider vDivsField;
768	947	// JCheckBox endcaps;
769	948	JCheckBox liveCB;
	949	+ JCheckBox selectCB;
770	950	JCheckBox hideCB;
771	951	JCheckBox link2masterCB;
772	952	JCheckBox markCB;
..	..	@@ -774,7 +954,12 @@
774	954	JCheckBox speedupCB;
775	955	JCheckBox rewindCB;
776	956	JCheckBox flipVCB;
	957	+
	958	+ cCheckBox toggleTextureCB;
	959	+ cCheckBox toggleSwitchCB;
	960	+
777	961	JComboBox texresMenu;
	962	+
778	963	JButton resetButton;
779	964	JButton stepButton;
780	965	JButton stepAllButton;
..	..	@@ -783,9 +968,13 @@
783	968	JButton fasterButton;
784	969	JButton remarkButton;
785	970
	971	+ cGridBag editPanel;
	972	+ cGridBag editCommandsPanel;
	973	+
786	974	cGridBag namePanel;
787	975	cGridBag setupPanel;
788		- cGridBag commandsPanel;
	976	+ cGridBag setupPanel2;
	977	+ cGridBag objectCommandsPanel;
789	978	cGridBag pushPanel;
790	979	cGridBag fillPanel;
791	980
..	..	@@ -957,61 +1146,67 @@
957	1146	namePanel = new cGridBag();
958	1147
959	1148	nameField = AddText(namePanel, copy.GetName());
960		- namePanel.add(nameField);
	1149	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
961	1150	oe.ctrlPanel.add(namePanel);
962	1151
963	1152	oe.ctrlPanel.Return();
964	1153
965		- if (!GroupEditor.allparams)
	1154	+ if (!allparams)
966	1155	return;
967	1156
968	1157	setupPanel = new cGridBag().setVertical(false);
969	1158
970	1159	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
971	1160	liveCB.setToolTipText("Animate object");
	1161	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1162	+ selectCB.setToolTipText("Make object selectable");
	1163	+// Return();
972	1164	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
973	1165	hideCB.setToolTipText("Hide object");
974		-// Return();
975	1166	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
976		- markCB.setToolTipText("Set the animation target transform");
	1167	+ markCB.setToolTipText("As animation target transform");
977	1168
978		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1169	+ setupPanel2 = new cGridBag().setVertical(false);
	1170	+
	1171	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
979	1172	rewindCB.setToolTipText("Rewind animation");
980	1173
981		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
982		- randomCB.setToolTipText("Option for switch node");
	1174	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1175	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
983	1176
984	1177	if (Globals.ADVANCED)
985	1178	{
986		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	1179	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
987	1180	link2masterCB.setToolTipText("Attach to support");
988		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1181	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
989	1182	speedupCB.setToolTipText("Option motion capture");
990	1183	}
991	1184
992	1185	oe.ctrlPanel.add(setupPanel);
993	1186	oe.ctrlPanel.Return();
	1187	+ oe.ctrlPanel.add(setupPanel2);
	1188	+ oe.ctrlPanel.Return();
994	1189
995		- commandsPanel = new cGridBag().setVertical(false);
	1190	+ objectCommandsPanel = new cGridBag().setVertical(false);
996	1191
997		- resetButton = AddButton(commandsPanel, "Reset");
	1192	+ resetButton = AddButton(objectCommandsPanel, "Reset");
998	1193	resetButton.setToolTipText("Jump to frame zero");
999		- stepButton = AddButton(commandsPanel, "Step");
	1194	+ stepButton = AddButton(objectCommandsPanel, "Step");
1000	1195	stepButton.setToolTipText("Step one frame");
1001	1196	// resetAllButton = AddButton(oe, "Reset All");
1002	1197	// stepAllButton = AddButton(oe, "Step All");
1003	1198	// Return();
1004		- slowerButton = AddButton(commandsPanel, "Slow");
	1199	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1005	1200	slowerButton.setToolTipText("Decrease animation speed");
1006		- fasterButton = AddButton(commandsPanel, "Fast");
	1201	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1007	1202	fasterButton.setToolTipText("Increase animation speed");
1008		- remarkButton = AddButton(commandsPanel, "Remark");
	1203	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1009	1204	remarkButton.setToolTipText("Set the current transform as the target");
1010	1205
1011		- oe.ctrlPanel.add(commandsPanel);
	1206	+ oe.ctrlPanel.add(objectCommandsPanel);
1012	1207	oe.ctrlPanel.Return();
1013	1208
1014		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1209	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1015	1210	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1016	1211	//Return();
1017	1212
..	..	@@ -1214,8 +1409,11 @@
1214	1409	//worldPanel.setName("World");
1215	1410	centralPanel = new cGridBag();
1216	1411	centralPanel.preferredWidth = 20;
1217		- timelinePanel = new JPanel(new BorderLayout());
1218		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1412	+
	1413	+ if (Globals.ADVANCED)
	1414	+ {
	1415	+ timelinePanel = new JPanel(new BorderLayout());
	1416	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1219	1417
1220	1418	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1221	1419	cameraPanel.setContinuousLayout(true);
..	..	@@ -1224,7 +1422,10 @@
1224	1422	// cameraPanel.setDividerSize(9);
1225	1423	cameraPanel.setResizeWeight(1.0);
1226	1424
	1425	+ }
	1426	+
1227	1427	centralPanel.add(cameraView);
	1428	+ centralPanel.setFocusable(true);
1228	1429	//frame.setJMenuBar(timelineMenubar);
1229	1430	//centralPanel.add(timelinePanel);
1230	1431
..	..	@@ -1291,8 +1492,9 @@
1291	1492	// north.setName("Edit");
1292	1493	// north.add(ctrlPanel, BorderLayout.NORTH);
1293	1494	// objectPanel.add(north);
1294		- objectPanel.add(ctrlPanel);
	1495	+ objectPanel.add(editPanel);
1295	1496	objectPanel.add(infoPanel);
	1497	+ objectPanel.add(toolboxPanel);
1296	1498
1297	1499	/*
1298	1500	aConstraints.gridx = 0;
..	..	@@ -1301,7 +1503,7 @@
1301	1503	aConstraints.gridy += 1;
1302	1504	aConstraints.gridwidth = 1;
1303	1505	mainPanel.add(objectPanel, aConstraints);
1304		- */
	1506	+ */
1305	1507
1306	1508	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1307	1509	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1313,14 +1515,12 @@
1313	1515	scrollpane.addMouseWheelListener(this); // Default not fast enough
1314	1516
1315	1517	/JTabbedPane/ scenePanel = new cGridBag();
1316		- scenePanel.preferredWidth = 7;
	1518	+ scenePanel.preferredWidth = 6;
1317	1519
1318	1520	JTabbedPane tabbedPane = new JTabbedPane();
1319	1521	tabbedPane.add(scrollpane);
1320	1522
1321		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1322		-
1323		- optionsPanel = new cGridBag().setVertical(true);
	1523	+ optionsPanel = new cGridBag().setVertical(false);
1324	1524
1325	1525	optionsPanel.setName("Options");
1326	1526
..	..	@@ -1328,6 +1528,8 @@
1328	1528
1329	1529	tabbedPane.add(optionsPanel);
1330	1530
	1531	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1532	+
1331	1533	scenePanel.add(tabbedPane);
1332	1534
1333	1535	/*
..	..	@@ -1419,10 +1621,15 @@
1419	1621
1420	1622	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1421	1623
1422		- frame.setSize(1024, 768);
1423		- frame.show();
1424		-
	1624	+ frame.setSize(1280, 860);
	1625	+
	1626	+ cameraView.requestFocusInWindow();
	1627	+
1425	1628	gridPanel.setDividerLocation(1.0);
	1629	+
	1630	+ frame.validate();
	1631	+
	1632	+ frame.setVisible(true);
1426	1633
1427	1634	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1428	1635	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1459,19 +1666,22 @@
1459	1666
1460	1667	cGridBag editBar = new cGridBag().setVertical(false);
1461	1668
1462		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1669	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1463	1670	createMaterialButton.setToolTipText("Create material");
1464	1671
1465	1672	/*
1466	1673	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1467	1674	*/
1468	1675
1469		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1676	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1470	1677	clearMaterialButton.setToolTipText("Clear material");
1471	1678
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);
	1679	+ if (Globals.ADVANCED)
	1680	+ {
	1681	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1682	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1683	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1684	+ }
1475	1685
1476	1686	editBar.preferredHeight = 15;
1477	1687
..	..	@@ -1505,24 +1715,6 @@
1505	1715	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1506	1716	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1507	1717	colorSection.add(texture);
1508		-
1509		- cGridBag anisoU = new cGridBag();
1510		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1511		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1512		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1513		- colorSection.add(anisoU);
1514		-
1515		- cGridBag anisoV = new cGridBag();
1516		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1517		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1518		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1519		- colorSection.add(anisoV);
1520		-
1521		- cGridBag shadowbias = new cGridBag();
1522		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1523		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1524		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1525		- colorSection.add(shadowbias);
1526	1718
1527	1719	panel.add(new JSeparator());
1528	1720
..	..	@@ -1574,6 +1766,12 @@
1574	1766	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1575	1767	diffuseSection.add(fakedepth);
1576	1768
	1769	+ cGridBag shadowbias = new cGridBag();
	1770	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1771	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1772	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1773	+ diffuseSection.add(shadowbias);
	1774	+
1577	1775	panel.add(new JSeparator());
1578	1776
1579	1777	panel.add(diffuseSection);
..	..	@@ -1624,6 +1822,18 @@
1624	1822	// aConstraints.gridy += 1;
1625	1823	// aConstraints.gridwidth = 1;
1626	1824
	1825	+ cGridBag anisoU = new cGridBag();
	1826	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1827	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1828	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1829	+ specularSection.add(anisoU);
	1830	+
	1831	+ cGridBag anisoV = new cGridBag();
	1832	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1833	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1834	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1835	+ specularSection.add(anisoV);
	1836	+
1627	1837
1628	1838	panel.add(new JSeparator());
1629	1839
..	..	@@ -1631,35 +1841,35 @@
1631	1841
1632	1842	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1633	1843
1634		- cGridBag globalSection = new cGridBag().setVertical(true);
	1844	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1635	1845
1636	1846	cGridBag camera = new cGridBag();
1637	1847	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1638	1848	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1639	1849	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1640		- globalSection.add(camera);
	1850	+ colorSection.add(camera);
1641	1851
1642	1852	cGridBag ambient = new cGridBag();
1643	1853	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1644	1854	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1645	1855	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1646		- globalSection.add(ambient);
	1856	+ colorSection.add(ambient);
1647	1857
1648	1858	cGridBag backlit = new cGridBag();
1649	1859	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1650	1860	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651	1861	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1652		- globalSection.add(backlit);
	1862	+ colorSection.add(backlit);
1653	1863
1654	1864	cGridBag opacity = new cGridBag();
1655	1865	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1656	1866	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1657	1867	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1658		- globalSection.add(opacity);
	1868	+ colorSection.add(opacity);
1659	1869
1660		- panel.add(new JSeparator());
	1870	+ //panel.add(new JSeparator());
1661	1871
1662		- panel.add(globalSection);
	1872	+ //panel.add(globalSection);
1663	1873
1664	1874	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1665	1875
..	..	@@ -1740,12 +1950,15 @@
1740	1950	opacityPowerField.addChangeListener(this);
1741	1951	/**/
1742	1952
1743		- resetSlidersButton.addActionListener(this);
1744	1953	clearMaterialButton.addActionListener(this);
1745	1954	createMaterialButton.addActionListener(this);
1746		-
1747		- propagateToggle.addItemListener(this);
1748		- multiplyToggle.addItemListener(this);
	1955	+
	1956	+ if (Globals.ADVANCED)
	1957	+ {
	1958	+ resetSlidersButton.addActionListener(this);
	1959	+ propagateToggle.addItemListener(this);
	1960	+ multiplyToggle.addItemListener(this);
	1961	+ }
1749	1962	}
1750	1963
1751	1964	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1916,7 +2129,7 @@
1916	2129
1917	2130	//? flashIt = false;
1918	2131	CameraPane pane = (CameraPane) cameraView;
1919		- pane.clickStart(location.x, location.y, 0);
	2132	+ pane.clickStart(location.x, location.y, 0, 0);
1920	2133	pane.clickEnd(location.x, location.y, 0, true);
1921	2134
1922	2135	if (group.selection.size() == 1)
..	..	@@ -1965,6 +2178,7 @@
1965	2178	e2.printStackTrace();
1966	2179	}
1967	2180	}
	2181	+
1968	2182	LoadJMEThread loadThread;
1969	2183
1970	2184	class LoadJMEThread extends Thread
..	..	@@ -2022,6 +2236,7 @@
2022	2236	//LoadFile0(filename, converter);
2023	2237	}
2024	2238	}
	2239	+
2025	2240	LoadOBJThread loadObjThread;
2026	2241
2027	2242	class LoadOBJThread extends Thread
..	..	@@ -2100,19 +2315,19 @@
2100	2315
2101	2316	void LoadObjFile(String fullname)
2102	2317	{
2103		- /*
	2318	+ System.out.println("Loading " + fullname);
	2319	+ /**/
2104	2320	//lastFilename = fullname;
2105	2321	if(loadObjThread == null)
2106	2322	{
2107		- loadObjThread = new LoadOBJThread();
2108		- loadObjThread.start();
	2323	+ loadObjThread = new LoadOBJThread();
	2324	+ loadObjThread.start();
2109	2325	}
2110	2326
2111	2327	loadObjThread.add(fullname);
2112		- */
	2328	+ /**/
2113	2329
2114		- System.out.println("Loading " + fullname);
2115		- makeSomething(new FileObject(fullname, true), true);
	2330	+ //makeSomething(new FileObject(fullname, true), true);
2116	2331	}
2117	2332
2118	2333	void LoadGFDFile(String fullname)
..	..	@@ -2373,11 +2588,11 @@
2373	2588
2374	2589	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2375	2590	{
2376		- if (GrafreeD.standAlone)
	2591	+ if (Grafreed.standAlone)
2377	2592	{
2378	2593	/**/
2379	2594	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2380		- browser.show();
	2595	+ browser.setVisible(true);
2381	2596	String filename = browser.getFile();
2382	2597	if (filename != null && filename.length() > 0)
2383	2598	{
..	..	@@ -2729,6 +2944,8 @@
2729	2944
2730	2945	void SetMaterial(Object3D object)
2731	2946	{
	2947	+ latestObject = object;
	2948	+
2732	2949	cMaterial mat = object.material;
2733	2950
2734	2951	if (mat == null)
..	..	@@ -2737,7 +2954,8 @@
2737	2954	return;
2738	2955	}
2739	2956
2740		- multiplyToggle.setSelected(mat.multiply);
	2957	+ if (multiplyToggle != null)
	2958	+ multiplyToggle.setSelected(mat.multiply);
2741	2959
2742	2960	assert (object.projectedVertices != null);
2743	2961
..	..	@@ -2839,12 +3057,17 @@
2839	3057	// }
2840	3058
2841	3059	/**/
2842		- if (deselect)
	3060	+ if (deselect \|\| child == null)
2843	3061	{
2844	3062	//group.deselectAll();
2845	3063	//freeze = true;
2846	3064	GetTree().clearSelection();
2847	3065	//freeze = false;
	3066	+
	3067	+ if (child == null)
	3068	+ {
	3069	+ return;
	3070	+ }
2848	3071	}
2849	3072
2850	3073	//group.addSelectee(child);
..	..	@@ -2913,7 +3136,7 @@
2913	3136	cameraView.ToggleDL();
2914	3137	cameraView.repaint();
2915	3138	return;
2916		- } else if (event.getSource() == toggleTextureItem)
	3139	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2917	3140	{
2918	3141	cameraView.ToggleTexture();
2919	3142	// june 2013 copy.HardTouch();
..	..	@@ -2952,9 +3175,9 @@
2952	3175	frame.validate();
2953	3176
2954	3177	return;
2955		- } else if (event.getSource() == toggleRandomItem)
	3178	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2956	3179	{
2957		- cameraView.ToggleRandom();
	3180	+ cameraView.ToggleSwitch();
2958	3181	cameraView.repaint();
2959	3182	return;
2960	3183	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2982,6 +3205,10 @@
2982	3205	} else if (event.getSource() == liveCB)
2983	3206	{
2984	3207	copy.live ^= true;
	3208	+ return;
	3209	+ } else if (event.getSource() == selectCB)
	3210	+ {
	3211	+ copy.dontselect ^= true;
2985	3212	return;
2986	3213	} else if (event.getSource() == hideCB)
2987	3214	{
..	..	@@ -3021,8 +3248,9 @@
3021	3248
3022	3249	public void actionPerformed(ActionEvent event)
3023	3250	{
	3251	+ Object source = event.getSource();
3024	3252	// SCRIPT DIALOG
3025		- if (event.getSource() == okbutton)
	3253	+ if (source == okbutton)
3026	3254	{
3027	3255	textpanel.setVisible(false);
3028	3256	textpanel.remove(textarea);
..	..	@@ -3034,7 +3262,7 @@
3034	3262	textarea = null;
3035	3263	textpanel = null;
3036	3264	}
3037		- if (event.getSource() == cancelbutton)
	3265	+ if (source == cancelbutton)
3038	3266	{
3039	3267	textpanel.setVisible(false);
3040	3268	textpanel.remove(textarea);
..	..	@@ -3046,50 +3274,50 @@
3046	3274	//applySelf();
3047	3275	//client.refreshEditWindow();
3048	3276	//refreshContents();
3049		- if (event.getSource() == nameField)
	3277	+ if (source == nameField)
3050	3278	{
3051	3279	//System.out.println("ObjEditor " + event);
3052	3280	applySelf0(true);
3053	3281	//parent.applySelf();
3054	3282	objEditor.refreshContents();
3055		- } else if (event.getSource() == resetButton)
	3283	+ } else if (source == resetButton)
3056	3284	{
3057	3285	CameraPane.fullreset = true;
3058	3286	copy.Reset(); // ResetMeshes();
3059	3287	copy.Touch();
3060	3288	objEditor.refreshContents();
3061		- } else if (event.getSource() == stepItem)
	3289	+ } else if (source == stepItem)
3062	3290	{
3063	3291	//cameraView.ONESTEP = true;
3064	3292	Globals.ONESTEP = true;
3065	3293	cameraView.repaint();
3066	3294	return;
3067		- } else if (event.getSource() == stepButton)
	3295	+ } else if (source == stepButton)
3068	3296	{
3069	3297	copy.Step();
3070	3298	copy.Touch();
3071	3299	objEditor.refreshContents();
3072		- } else if (event.getSource() == slowerButton)
	3300	+ } else if (source == slowerButton)
3073	3301	{
3074	3302	copy.Slower();
3075	3303	copy.Touch();
3076	3304	objEditor.refreshContents();
3077		- } else if (event.getSource() == fasterButton)
	3305	+ } else if (source == fasterButton)
3078	3306	{
3079	3307	copy.Faster();
3080	3308	copy.Touch();
3081	3309	objEditor.refreshContents();
3082		- } else if (event.getSource() == remarkButton)
	3310	+ } else if (source == remarkButton)
3083	3311	{
3084	3312	copy.Remark();
3085	3313	copy.Touch();
3086	3314	objEditor.refreshContents();
3087		- } else if (event.getSource() == stepAllButton)
	3315	+ } else if (source == stepAllButton)
3088	3316	{
3089	3317	copy.StepAll();
3090	3318	copy.Touch();
3091	3319	objEditor.refreshContents();
3092		- } else if (event.getSource() == resetAllButton)
	3320	+ } else if (source == resetAllButton)
3093	3321	{
3094	3322	//CameraPane.fullreset = true;
3095	3323	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3122,53 +3350,75 @@
3122	3350	// Close();
3123	3351	// }
3124	3352	// else
3125		- if (event.getSource() == resetSlidersButton)
	3353	+ if (source == resetSlidersButton)
3126	3354	{
3127	3355	ResetSliders();
3128		- } else if (event.getSource() == clearMaterialButton)
	3356	+ } else if (source == clearMaterialButton)
3129	3357	{
3130	3358	ClearMaterial();
3131		- } else if (event.getSource() == createMaterialButton)
	3359	+ } else if (source == createMaterialButton)
3132	3360	{
3133	3361	CreateMaterial();
3134		- } else if (event.getSource() == clearPanelButton)
	3362	+ } else if (source == clearPanelButton)
3135	3363	{
3136	3364	copy.ClearUI();
3137	3365	refreshContents(true);
3138		- } /*
3139		- }
3140		-
3141		- public boolean action(Event event, Object arg)
3142		- {
3143		- */ else if (event.getSource() == closeItem)
	3366	+ } else if (source == importGFDItem)
	3367	+ {
	3368	+ ImportGFD();
	3369	+ } else
	3370	+ if (source == importVRMLX3DItem)
	3371	+ {
	3372	+ ImportVRMLX3D();
	3373	+ } else
	3374	+ if (source == import3DSItem)
	3375	+ {
	3376	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3377	+ } else
	3378	+ if (source == importOBJItem)
	3379	+ {
	3380	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3381	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3382	+ browser.setVisible(true);
	3383	+ String filename = browser.getFile();
	3384	+ if (filename != null && filename.length() > 0)
	3385	+ {
	3386	+ String fullname = browser.getDirectory() + filename;
	3387	+ makeSomething(ReadOBJ(fullname), true);
	3388	+ }
	3389	+ } else
	3390	+ if (source == closeItem)
3144	3391	{
3145	3392	Close();
3146	3393	//return true;
3147		- } else if (event.getSource() == loadItem)
	3394	+ } else if (source == loadItem)
3148	3395	{
3149	3396	load();
3150	3397	//return true;
3151		- } else if (event.getSource() == saveItem)
	3398	+ } else if (source == newItem)
	3399	+ {
	3400	+ New();
	3401	+ } else if (source == saveItem)
3152	3402	{
3153	3403	save();
3154	3404	//return true;
3155		- } else if (event.getSource() == saveAsItem)
	3405	+ } else if (source == saveAsItem)
3156	3406	{
3157	3407	saveAs();
3158	3408	//return true;
3159		- } else if (event.getSource() == reexportItem)
	3409	+ } else if (source == reexportItem)
3160	3410	{
3161	3411	reexport();
3162	3412	//return true;
3163		- } else if (event.getSource() == exportAsItem)
	3413	+ } else if (source == exportAsItem)
3164	3414	{
3165	3415	export();
3166	3416	//return true;
3167		- } else if (event.getSource() == povItem)
	3417	+ } else if (source == povItem)
3168	3418	{
3169	3419	generatePOV();
3170	3420	//return true;
3171		- } else if (event.getSource() == zBufferItem)
	3421	+ } else if (source == zBufferItem)
3172	3422	{
3173	3423	try
3174	3424	{
..	..	@@ -3190,21 +3440,8 @@
3190	3440	cameraView.repaint();
3191	3441	//return true;
3192	3442	}
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)
	3443	+ */ else // combos...
	3444	+ if (source == texresMenu)
3208	3445	{
3209	3446	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3210	3447	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3216,6 +3453,283 @@
3216	3453	}
3217	3454	}
3218	3455
	3456	+ void New()
	3457	+ {
	3458	+ while (copy.Size() > 1)
	3459	+ {
	3460	+ copy.remove(1);
	3461	+ }
	3462	+
	3463	+ ResetModel();
	3464	+ objEditor.refreshContents();
	3465	+ }
	3466	+
	3467	+ static public byte[] Compress(Object3D o)
	3468	+ {
	3469	+ try
	3470	+ {
	3471	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3472	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3473	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3474	+
	3475	+ Object3D parent = o.parent;
	3476	+ o.parent = null;
	3477	+
	3478	+ out.writeObject(o);
	3479	+
	3480	+ o.parent = parent;
	3481	+
	3482	+ out.flush();
	3483	+
	3484	+ zstream.close();
	3485	+ out.close();
	3486	+
	3487	+ return baos.toByteArray();
	3488	+ } catch (Exception e)
	3489	+ {
	3490	+ System.err.println(e);
	3491	+ return null;
	3492	+ }
	3493	+ }
	3494	+
	3495	+ static public Object Uncompress(byte[] bytes)
	3496	+ {
	3497	+ System.out.println("#bytes = " + bytes.length);
	3498	+ try
	3499	+ {
	3500	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3501	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3502	+ ObjectInputStream in = new ObjectInputStream(istream);
	3503	+ Object obj = in.readObject();
	3504	+ in.close();
	3505	+
	3506	+ return obj;
	3507	+ } catch (Exception e)
	3508	+ {
	3509	+ System.err.println(e);
	3510	+ return null;
	3511	+ }
	3512	+ }
	3513	+
	3514	+ static public Object clone(Object o)
	3515	+ {
	3516	+ try
	3517	+ {
	3518	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3519	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3520	+
	3521	+ out.writeObject(o);
	3522	+
	3523	+ out.flush();
	3524	+ out.close();
	3525	+
	3526	+ byte[] bytes = baos.toByteArray();
	3527	+
	3528	+ System.out.println("clone = " + bytes.length);
	3529	+
	3530	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3531	+ ObjectInputStream in = new ObjectInputStream(bais);
	3532	+ Object obj = in.readObject();
	3533	+ in.close();
	3534	+
	3535	+ return obj;
	3536	+ } catch (Exception e)
	3537	+ {
	3538	+ System.err.println(e);
	3539	+ return null;
	3540	+ }
	3541	+ }
	3542	+
	3543	+ cRadio GetCurrentTab()
	3544	+ {
	3545	+ cRadio ab;
	3546	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3547	+ {
	3548	+ ab = (cRadio)e.nextElement();
	3549	+ if(ab.GetObject() == copy)
	3550	+ {
	3551	+ return ab;
	3552	+ }
	3553	+ }
	3554	+
	3555	+ return null;
	3556	+ }
	3557	+
	3558	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3559	+
	3560	+ public void Save()
	3561	+ {
	3562	+ System.err.println("Save");
	3563	+
	3564	+ cRadio tab = GetCurrentTab();
	3565	+
	3566	+ boolean temp = CameraPane.SWITCH;
	3567	+ CameraPane.SWITCH = false;
	3568	+
	3569	+ copy.ExtractBigData(hashtable);
	3570	+
	3571	+ byte[] compress = Compress(copy);
	3572	+
	3573	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3574	+ tab.graphs[tab.undoindex++] = compress;
	3575	+
	3576	+ copy.RestoreBigData(hashtable);
	3577	+
	3578	+ CameraPane.SWITCH = temp;
	3579	+
	3580	+ //assert(hashtable.isEmpty());
	3581	+
	3582	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3583	+ {
	3584	+ tab.graphs[i] = null;
	3585	+ }
	3586	+
	3587	+ SetUndoStates();
	3588	+
	3589	+ // test save
	3590	+ if (false)
	3591	+ {
	3592	+ try
	3593	+ {
	3594	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3595	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3596	+
	3597	+ p.writeObject(copy);
	3598	+
	3599	+ p.flush();
	3600	+
	3601	+ ostream.close();
	3602	+ } catch (Exception e)
	3603	+ {
	3604	+ e.printStackTrace();
	3605	+ }
	3606	+ }
	3607	+ }
	3608	+
	3609	+ void CopyChanged(Object3D obj)
	3610	+ {
	3611	+ SetUndoStates();
	3612	+
	3613	+ boolean temp = CameraPane.SWITCH;
	3614	+ CameraPane.SWITCH = false;
	3615	+
	3616	+ copy.ExtractBigData(hashtable);
	3617	+
	3618	+ copy.clear();
	3619	+
	3620	+ for (int i=0; i<obj.Size(); i++)
	3621	+ {
	3622	+ copy.add(obj.get(i));
	3623	+ }
	3624	+
	3625	+ copy.RestoreBigData(hashtable);
	3626	+
	3627	+ CameraPane.SWITCH = temp;
	3628	+
	3629	+ //assert(hashtable.isEmpty());
	3630	+
	3631	+ copy.Touch();
	3632	+
	3633	+ ResetModel();
	3634	+ copy.HardTouch(); // recompile?
	3635	+
	3636	+ cRadio ab;
	3637	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3638	+ {
	3639	+ ab = (cRadio)e.nextElement();
	3640	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3641	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3642	+ if (test != null)
	3643	+ {
	3644	+ test.editWindow = ab.object.editWindow;
	3645	+ ab.object = test;
	3646	+ }
	3647	+ }
	3648	+
	3649	+ refreshContents();
	3650	+ }
	3651	+
	3652	+ cButton undoButton;
	3653	+ cButton redoButton;
	3654	+
	3655	+ void SetUndoStates()
	3656	+ {
	3657	+ cRadio tab = GetCurrentTab();
	3658	+
	3659	+ undoButton.setEnabled(tab.undoindex > 0);
	3660	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3661	+ }
	3662	+
	3663	+ public void Undo()
	3664	+ {
	3665	+ System.err.println("Undo");
	3666	+
	3667	+ cRadio tab = GetCurrentTab();
	3668	+
	3669	+ if (tab.undoindex == 0)
	3670	+ {
	3671	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3672	+ return;
	3673	+ }
	3674	+
	3675	+ if (tab.graphs[tab.undoindex] == null)
	3676	+ {
	3677	+ Save();
	3678	+ tab.undoindex -= 1;
	3679	+ }
	3680	+
	3681	+ tab.undoindex -= 1;
	3682	+
	3683	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3684	+ }
	3685	+
	3686	+ public void Redo()
	3687	+ {
	3688	+ cRadio tab = GetCurrentTab();
	3689	+
	3690	+ if (tab.graphs[tab.undoindex + 1] == null)
	3691	+ {
	3692	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3693	+ return;
	3694	+ }
	3695	+
	3696	+ tab.undoindex += 1;
	3697	+
	3698	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3699	+ }
	3700	+
	3701	+ void ImportGFD()
	3702	+ {
	3703	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3704	+ browser.show();
	3705	+ String filename = browser.getFile();
	3706	+ if (filename != null && filename.length() > 0)
	3707	+ {
	3708	+ String fullname = browser.getDirectory() + filename;
	3709	+
	3710	+ //Object3D readobj =
	3711	+ objEditor.ReadGFD(fullname, objEditor);
	3712	+ //makeSomething(readobj);
	3713	+ }
	3714	+ }
	3715	+
	3716	+ void ImportVRMLX3D()
	3717	+ {
	3718	+ if (Grafreed.standAlone)
	3719	+ {
	3720	+ /**/
	3721	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3722	+ browser.show();
	3723	+ String filename = browser.getFile();
	3724	+ if (filename != null && filename.length() > 0)
	3725	+ {
	3726	+ String fullname = browser.getDirectory() + filename;
	3727	+ LoadVRMLX3D(fullname);
	3728	+ }
	3729	+ /**/
	3730	+ }
	3731	+ }
	3732	+
3219	3733	void ToggleAnimation()
3220	3734	{
3221	3735	if (!Globals.ANIMATION)
..	..	@@ -3231,8 +3745,8 @@
3231	3745
3232	3746	Globals.ANIMATION ^= true;
3233	3747
3234		- GrafreeD.wav.cursor = 0;
3235		- GrafreeD.wav.loop = 0;
	3748	+ Grafreed.wav.cursor = 0;
	3749	+ Grafreed.wav.loop = 0;
3236	3750	}
3237	3751	} else
3238	3752	{
..	..	@@ -3253,7 +3767,6 @@
3253	3767	callee.refreshContents();
3254	3768	} else
3255	3769	{
3256		- new Exception().printStackTrace();
3257	3770	System.exit(0);
3258	3771	}
3259	3772	}
..	..	@@ -3283,7 +3796,7 @@
3283	3796	void CreateMaterial()
3284	3797	{
3285	3798	//copy.ClearMaterial(); // PATCH
3286		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3799	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3287	3800	if (copy.selection.size() > 0)
3288	3801	//SetMaterial(copy);
3289	3802	{
..	..	@@ -3334,7 +3847,7 @@
3334	3847	assert false;
3335	3848	}
3336	3849
3337		- void EditSelection()
	3850	+ void EditSelection(boolean newWindow)
3338	3851	{
3339	3852	}
3340	3853
..	..	@@ -3342,11 +3855,11 @@
3342	3855	{
3343	3856	copy.ResetBlockLoop(); // temporary problem
3344	3857
3345		- boolean random = CameraPane.RANDOM;
3346		- CameraPane.RANDOM = false; // parse everything
	3858	+ boolean random = CameraPane.SWITCH;
	3859	+ CameraPane.SWITCH = false; // parse everything
3347	3860	copy.ResetDisplayList();
3348	3861	copy.HardTouch();
3349		- CameraPane.RANDOM = random;
	3862	+ CameraPane.SWITCH = random;
3350	3863	}
3351	3864
3352	3865	// public void applySelf()
..	..	@@ -3420,6 +3933,36 @@
3420	3933	{
3421	3934	//System.out.println("Propagate = " + propagate);
3422	3935	copy.UpdateMaterial(anchor, current, propagate);
	3936	+
	3937	+ if (copy.material != null)
	3938	+ {
	3939	+ cMaterial mat = copy.material;
	3940	+
	3941	+ colorField.SetToolTipValue((mat.color));
	3942	+ modulationField.SetToolTipValue((mat.modulation));
	3943	+ metalnessField.SetToolTipValue((mat.metalness));
	3944	+ diffuseField.SetToolTipValue((mat.diffuse));
	3945	+ specularField.SetToolTipValue((mat.specular));
	3946	+ shininessField.SetToolTipValue((mat.shininess));
	3947	+ shiftField.SetToolTipValue((mat.shift));
	3948	+ ambientField.SetToolTipValue((mat.ambient));
	3949	+ lightareaField.SetToolTipValue((mat.lightarea));
	3950	+ diffusenessField.SetToolTipValue((mat.factor));
	3951	+ velvetField.SetToolTipValue((mat.velvet));
	3952	+ sheenField.SetToolTipValue((mat.sheen));
	3953	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3954	+ backlitField.SetToolTipValue((mat.bump));
	3955	+ anisoField.SetToolTipValue((mat.aniso));
	3956	+ anisoVField.SetToolTipValue((mat.anisoV));
	3957	+ cameraField.SetToolTipValue((mat.cameralight));
	3958	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3959	+ shadowField.SetToolTipValue((mat.shadow));
	3960	+ textureField.SetToolTipValue((mat.texture));
	3961	+ opacityField.SetToolTipValue((mat.opacity));
	3962	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3963	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3964	+ }
	3965	+
3423	3966	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3424	3967	{
3425	3968	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3535,7 +4078,7 @@
3535	4078	}
3536	4079
3537	4080	if (normalpushField != null)
3538		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4081	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3539	4082	}
3540	4083
3541	4084	void SnapObject()
..	..	@@ -3799,6 +4342,8 @@
3799	4342
3800	4343	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3801	4344	{
	4345	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4346	+ Save();
3802	4347	//Tween.set(thing, 0).target(1).start(tweenManager);
3803	4348	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3804	4349	// if (thing instanceof GenericJointDemo)
..	..	@@ -3885,6 +4430,12 @@
3885	4430	{
3886	4431	ResetModel();
3887	4432	Select(thing.GetTreePath(), true, false); // unselect... false);
	4433	+
	4434	+ if (thing.Size() == 0)
	4435	+ {
	4436	+ //EditSelection(false);
	4437	+ }
	4438	+
3888	4439	refreshContents();
3889	4440	}
3890	4441
..	..	@@ -4002,6 +4553,7 @@
4002	4553	}
4003	4554	}
4004	4555	}
	4556	+
4005	4557	LoadGFDThread loadGFDThread;
4006	4558
4007	4559	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4021,8 +4573,10 @@
4021	4573
4022	4574	try
4023	4575	{
	4576	+ // Try compressed version first.
4024	4577	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4025		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4578	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4579	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4026	4580
4027	4581	readobj = (Object3D) p.readObject();
4028	4582	istream.close();
..	..	@@ -4030,7 +4584,20 @@
4030	4584	readobj.ResetDisplayList();
4031	4585	} catch (Exception e)
4032	4586	{
4033		- e.printStackTrace();
	4587	+ //e.printStackTrace();
	4588	+ try
	4589	+ {
	4590	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4591	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4592	+
	4593	+ readobj = (Object3D) p.readObject();
	4594	+ istream.close();
	4595	+
	4596	+ readobj.ResetDisplayList();
	4597	+ } catch (Exception e2)
	4598	+ {
	4599	+ e2.printStackTrace();
	4600	+ }
4034	4601	}
4035	4602	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4036	4603	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4076,6 +4643,12 @@
4076	4643
4077	4644	void LoadIt(Object obj)
4078	4645	{
	4646	+ if (obj == null)
	4647	+ {
	4648	+ // Invalid file
	4649	+ return;
	4650	+ }
	4651	+
4079	4652	System.out.println("Loaded " + obj);
4080	4653	//new Exception().printStackTrace();
4081	4654	Object3D readobj = (Object3D) obj;
..	..	@@ -4085,6 +4658,8 @@
4085	4658
4086	4659	if (readobj != null)
4087	4660	{
	4661	+ if (Globals.SAVEONMAKE)
	4662	+ Save();
4088	4663	try
4089	4664	{
4090	4665	//readobj.deepCopySelf(copy);
..	..	@@ -4147,7 +4722,7 @@
4147	4722
4148	4723	void load() // throws ClassNotFoundException
4149	4724	{
4150		- if (GrafreeD.standAlone)
	4725	+ if (Grafreed.standAlone)
4151	4726	{
4152	4727	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4153	4728	browser.show();
..	..	@@ -4234,11 +4809,13 @@
4234	4809	try
4235	4810	{
4236	4811	FileOutputStream ostream = new FileOutputStream(lastname);
4237		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4812	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4813	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4238	4814
4239	4815	p.writeObject(copy);
4240	4816	p.flush();
4241	4817
	4818	+ zstream.close();
4242	4819	ostream.close();
4243	4820
4244	4821	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4248,17 +4825,20 @@
4248	4825	{
4249	4826	}
4250	4827	}
	4828	+
4251	4829	String lastname;
4252	4830
4253	4831	void saveAs()
4254	4832	{
4255		- if (GrafreeD.standAlone)
	4833	+ if (Grafreed.standAlone)
4256	4834	{
4257	4835	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4258	4836	browser.setVisible(true);
4259	4837	String filename = browser.getFile();
4260	4838	if (filename != null && filename.length() > 0)
4261	4839	{
	4840	+ if (!filename.endsWith(".gfd"))
	4841	+ filename += ".gfd";
4262	4842	lastname = browser.getDirectory() + filename;
4263	4843	save();
4264	4844	}
..	..	@@ -4357,13 +4937,13 @@
4357	4937	try
4358	4938	{
4359	4939	FileOutputStream ostream = new FileOutputStream(filename);
4360		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4361		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4940	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4941	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4362	4942
4363	4943	Object3D objectparent = obj.parent;
4364	4944	obj.parent = null;
4365	4945
4366		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4946	+ Object3D object = (Object3D) Grafreed.clone(obj);
4367	4947
4368	4948	obj.parent = objectparent;
4369	4949
..	..	@@ -4375,8 +4955,8 @@
4375	4955	p.writeObject(object);
4376	4956	p.flush();
4377	4957
	4958	+ zstream.close();
4378	4959	ostream.close();
4379		- // zstream.close();
4380	4960
4381	4961	// group.selection.get(0).parent = parent;
4382	4962	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4397,7 +4977,7 @@
4397	4977	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4398	4978	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4399	4979	copy.generatePOV(buffer);
4400		- if (GrafreeD.standAlone)
	4980	+ if (Grafreed.standAlone)
4401	4981	{
4402	4982	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4403	4983	browser.show();
..	..	@@ -4423,7 +5003,8 @@
4423	5003	Object3D client;
4424	5004	Object3D copy;
4425	5005	MenuBar menuBar;
4426		- Menu windowMenu;
	5006	+ Menu fileMenu;
	5007	+ MenuItem newItem;
4427	5008	MenuItem loadItem;
4428	5009	MenuItem saveItem;
4429	5010	MenuItem saveAsItem;
..	..	@@ -4431,11 +5012,9 @@
4431	5012	MenuItem reexportItem;
4432	5013	MenuItem povItem;
4433	5014	MenuItem closeItem;
4434		- Menu cameraMenu;
	5015	+
4435	5016	CheckboxMenuItem zBufferItem;
4436	5017	//MenuItem normalLensItem;
4437		- MenuItem editCameraItem;
4438		- MenuItem revertCameraItem;
4439	5018	MenuItem stepItem;
4440	5019	CheckboxMenuItem toggleLiveItem;
4441	5020	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4446,25 +5025,38 @@
4446	5025	CheckboxMenuItem toggleFootContactItem;
4447	5026	CheckboxMenuItem toggleDLItem;
4448	5027	CheckboxMenuItem toggleTextureItem;
4449		- CheckboxMenuItem toggleRandomItem;
	5028	+ CheckboxMenuItem toggleSwitchItem;
4450	5029	CheckboxMenuItem toggleRootItem;
4451	5030	CheckboxMenuItem animationItem;
4452	5031	CheckboxMenuItem toggleHandleItem;
4453	5032	CheckboxMenuItem togglePaintItem;
4454	5033	JSplitPane mainPanel;
4455	5034	JScrollPane scrollpane;
	5035	+
4456	5036	JPanel toolbarPanel;
	5037	+
4457	5038	cGridBag treePanel;
	5039	+
4458	5040	JPanel radioPanel;
4459	5041	ButtonGroup buttonGroup;
4460		- cGridBag ctrlPanel;
	5042	+
	5043	+ cGridBag toolboxPanel;
4461	5044	cGridBag materialPanel;
	5045	+ cGridBag ctrlPanel;
	5046	+
4462	5047	JScrollPane infoPanel;
	5048	+
4463	5049	cGridBag optionsPanel;
	5050	+
4464	5051	JTabbedPane objectPanel;
	5052	+ boolean materialFlushed;
	5053	+ Object3D latestObject;
	5054	+
4465	5055	cGridBag XYZPanel;
	5056	+
4466	5057	JSplitPane gridPanel;
4467	5058	JSplitPane bigPanel;
	5059	+
4468	5060	cGridBag bigThree;
4469	5061	cGridBag scenePanel;
4470	5062	cGridBag centralPanel;
..	..	@@ -4579,8 +5171,13 @@
4579	5171	cNumberSlider fogField;
4580	5172	JLabel opacityPowerLabel;
4581	5173	cNumberSlider opacityPowerField;
4582		- JTree jTree;
	5174	+ cTree jTree;
4583	5175	//ObjectUI parent;
4584	5176
4585	5177	cNumberSlider normalpushField;
	5178	+
	5179	+ private MenuItem importGFDItem;
	5180	+ private MenuItem importVRMLX3DItem;
	5181	+ private MenuItem import3DSItem;
	5182	+ private MenuItem importOBJItem;
4586	5183	}