~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
..	..	@@ -143,7 +208,9 @@
143	208	//nameField.removeActionListener(this);
144	209	// objEditor.ctrlPanel.remove(nameField);
145	210
146		- if (!GroupEditor.allparams)
	211	+ objEditor.ctrlPanel.remove(namePanel);
	212	+
	213	+ if (!allparams)
147	214	return;
148	215
149	216	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -165,9 +232,9 @@
165	232	// objEditor.ctrlPanel.remove(fasterButton);
166	233	// objEditor.ctrlPanel.remove(remarkButton);
167	234
168		- objEditor.ctrlPanel.remove(namePanel);
169	235	objEditor.ctrlPanel.remove(setupPanel);
170		- objEditor.ctrlPanel.remove(commandsPanel);
	236	+ objEditor.ctrlPanel.remove(setupPanel2);
	237	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
171	238	objEditor.ctrlPanel.remove(pushPanel);
172	239	//objEditor.ctrlPanel.remove(fillPanel);
173	240
..	..	@@ -242,6 +309,7 @@
242	309	//localCopy.parent = null;
243	310
244	311	frame = new JFrame();
	312	+ frame.setUndecorated(false);
245	313	objEditor = this;
246	314	this.callee = callee;
247	315
..	..	@@ -272,27 +340,48 @@
272	340	return frame.action(event, obj);
273	341	}
274	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	+
275	348	void SetupMenu()
276	349	{
277	350	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..."));
	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..."));
283	371	//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("-");
	372	+ fileMenu.add("-");
	373	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	374	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	375	+ fileMenu.add("-");
288	376	if (client.parent != null)
289	377	{
290		- windowMenu.add(closeItem = new MenuItem("Close"));
	378	+ fileMenu.add(closeItem = new MenuItem("Close"));
291	379	} else
292	380	{
293		- windowMenu.add(closeItem = new MenuItem("Exit"));
	381	+ fileMenu.add(closeItem = new MenuItem("Exit"));
294	382	}
295	383
	384	+ newItem.addActionListener(this);
296	385	loadItem.addActionListener(this);
297	386	saveItem.addActionListener(this);
298	387	saveAsItem.addActionListener(this);
..	..	@@ -301,70 +390,53 @@
301	390	//povItem.addActionListener(this);
302	391	closeItem.addActionListener(this);
303	392
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	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	+
360	420	toolbarPanel = new JPanel();
361	421	toolbarPanel.setName("Toolbar");
362	422	treePanel = new cGridBag();
363	423	treePanel.setName("Tree");
	424	+
	425	+ editPanel = new cGridBag().setVertical(true);
	426	+ editPanel.setName("Edit");
	427	+
364	428	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
365		- 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	+
366	437	materialPanel = new cGridBag().setVertical(true);
367	438	materialPanel.setName("Material");
	439	+
368	440	/JTextPane/
369	441	infoarea = createTextPane();
370	442	doc = infoarea.getStyledDocument();
..	..	@@ -377,7 +449,7 @@
377	449	// TEXTAREA infoarea.setLineWrap(true);
378	450	// TEXTAREA infoarea.setWrapStyleWord(true);
379	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
380		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ //infoPanel.setPreferredSize(new Dimension(50, 200));
381	453	infoPanel.setName("Info");
382	454	//infoPanel.setLayout(new BorderLayout());
383	455	//infoPanel.add(createTextPane());
..	..	@@ -389,7 +461,14 @@
389	461	mainPanel.setDividerSize(9);
390	462	mainPanel.setDividerLocation(0.5); //1.0);
391	463	mainPanel.setResizeWeight(0.5);
392		-
	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	+
393	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
394	473	//mainPanel.setLayout(new GridBagLayout());
395	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -457,10 +536,10 @@
457	536	e.printStackTrace();
458	537	}
459	538
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();
	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();
464	543	//clipboard.setContents(data, data);
465	544	}
466	545
..	..	@@ -483,13 +562,13 @@
483	562	//SendInfo("Name:", "bold");
484	563	if (sel.GetTextures() != null \|\| debug)
485	564	{
486		- si.SendInfo(sel.toString(), "bold");
	565	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
487	566	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
488	567	if (sel.Size() > 0)
489	568	{
490	569	si.SendInfo("#children = " + sel.Size(), "regular");
491	570	}
492		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	571	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
493	572	if (debug)
494	573	{
495	574	try
..	..	@@ -531,7 +610,7 @@
531	610	}
532	611	if (sel.support != null)
533	612	{
534		- si.SendInfo(" support: " + sel.support, "regular");
	613	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
535	614	}
536	615	if (sel.scriptnode != null)
537	616	{
..	..	@@ -620,20 +699,121 @@
620	699	}
621	700	}
622	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	+
623	760	void ToggleFullScreen()
624	761	{
625		- if (CameraPane.FULLSCREEN)
	762	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	763	+
	764	+ cameraView.ToggleFullScreen();
	765	+
	766	+ if (!CameraPane.FULLSCREEN)
626	767	{
627		- frame.getContentPane().remove(/"Center",/bigThree);
628		- framePanel.add(bigThree);
629		- 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	+
630	791	} else
631	792	{
632		- frame.getContentPane().remove(/"Center",/framePanel);
633		- framePanel.remove(bigThree);
634		- 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);
635	815	}
636		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
637	817	}
638	818
639	819	private JTextPane createTextPane()
..	..	@@ -734,7 +914,7 @@
734	914	protected static ImageIcon createImageIcon(String path,
735	915	String description)
736	916	{
737		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	917	+ java.net.URL imgURL = Grafreed.class.getResource(path);
738	918	if (imgURL != null)
739	919	{
740	920	return new ImageIcon(imgURL, description);
..	..	@@ -766,6 +946,7 @@
766	946	// NumberSlider vDivsField;
767	947	// JCheckBox endcaps;
768	948	JCheckBox liveCB;
	949	+ JCheckBox selectCB;
769	950	JCheckBox hideCB;
770	951	JCheckBox link2masterCB;
771	952	JCheckBox markCB;
..	..	@@ -773,7 +954,12 @@
773	954	JCheckBox speedupCB;
774	955	JCheckBox rewindCB;
775	956	JCheckBox flipVCB;
	957	+
	958	+ cCheckBox toggleTextureCB;
	959	+ cCheckBox toggleSwitchCB;
	960	+
776	961	JComboBox texresMenu;
	962	+
777	963	JButton resetButton;
778	964	JButton stepButton;
779	965	JButton stepAllButton;
..	..	@@ -782,9 +968,13 @@
782	968	JButton fasterButton;
783	969	JButton remarkButton;
784	970
	971	+ cGridBag editPanel;
	972	+ cGridBag editCommandsPanel;
	973	+
785	974	cGridBag namePanel;
786	975	cGridBag setupPanel;
787		- cGridBag commandsPanel;
	976	+ cGridBag setupPanel2;
	977	+ cGridBag objectCommandsPanel;
788	978	cGridBag pushPanel;
789	979	cGridBag fillPanel;
790	980
..	..	@@ -951,52 +1141,72 @@
951	1141
952	1142	void SetupUI2(ObjEditor oe)
953	1143	{
954		-// oe.aConstraints.weightx = 0;
955		-// oe.aConstraints.weighty = 0;
956		-// oe.aConstraints.gridx = 0;
957		-// oe.aConstraints.gridy = 0;
958	1144	//SetupName(oe);
959	1145
960	1146	namePanel = new cGridBag();
961	1147
962	1148	nameField = AddText(namePanel, copy.GetName());
963		- namePanel.add(nameField);
	1149	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
964	1150	oe.ctrlPanel.add(namePanel);
965	1151
966	1152	oe.ctrlPanel.Return();
967	1153
968		- if (!GroupEditor.allparams)
	1154	+ if (!allparams)
969	1155	return;
970	1156
971	1157	setupPanel = new cGridBag().setVertical(false);
972	1158
973	1159	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
974		- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
975		- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1160	+ liveCB.setToolTipText("Animate object");
	1161	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1162	+ selectCB.setToolTipText("Make object selectable");
976	1163	// Return();
	1164	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1165	+ hideCB.setToolTipText("Hide object");
977	1166	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
978		- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
979		- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	1167	+ markCB.setToolTipText("As animation target transform");
	1168	+
	1169	+ setupPanel2 = new cGridBag().setVertical(false);
	1170	+
	1171	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1172	+ rewindCB.setToolTipText("Rewind animation");
	1173	+
	1174	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1175	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
980	1176
	1177	+ if (Globals.ADVANCED)
	1178	+ {
	1179	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1180	+ link2masterCB.setToolTipText("Attach to support");
	1181	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1182	+ speedupCB.setToolTipText("Option motion capture");
	1183	+ }
	1184	+
981	1185	oe.ctrlPanel.add(setupPanel);
982	1186	oe.ctrlPanel.Return();
	1187	+ oe.ctrlPanel.add(setupPanel2);
	1188	+ oe.ctrlPanel.Return();
983	1189
984		- commandsPanel = new cGridBag().setVertical(false);
	1190	+ objectCommandsPanel = new cGridBag().setVertical(false);
985	1191
986		- resetButton = AddButton(commandsPanel, "Reset");
987		- stepButton = AddButton(commandsPanel, "Step");
	1192	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1193	+ resetButton.setToolTipText("Jump to frame zero");
	1194	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1195	+ stepButton.setToolTipText("Step one frame");
988	1196	// resetAllButton = AddButton(oe, "Reset All");
989	1197	// stepAllButton = AddButton(oe, "Step All");
990		- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
991	1198	// Return();
992		- slowerButton = AddButton(commandsPanel, "Slow");
993		- fasterButton = AddButton(commandsPanel, "Fast");
994		- remarkButton = AddButton(commandsPanel, "Remark");
	1199	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1200	+ slowerButton.setToolTipText("Decrease animation speed");
	1201	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1202	+ fasterButton.setToolTipText("Increase animation speed");
	1203	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1204	+ remarkButton.setToolTipText("Set the current transform as the target");
995	1205
996		- oe.ctrlPanel.add(commandsPanel);
	1206	+ oe.ctrlPanel.add(objectCommandsPanel);
997	1207	oe.ctrlPanel.Return();
998	1208
999		- 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
1000	1210	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1001	1211	//Return();
1002	1212
..	..	@@ -1199,8 +1409,11 @@
1199	1409	//worldPanel.setName("World");
1200	1410	centralPanel = new cGridBag();
1201	1411	centralPanel.preferredWidth = 20;
1202		- timelinePanel = new JPanel(new BorderLayout());
1203		- 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);
1204	1417
1205	1418	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1206	1419	cameraPanel.setContinuousLayout(true);
..	..	@@ -1209,7 +1422,10 @@
1209	1422	// cameraPanel.setDividerSize(9);
1210	1423	cameraPanel.setResizeWeight(1.0);
1211	1424
	1425	+ }
	1426	+
1212	1427	centralPanel.add(cameraView);
	1428	+ centralPanel.setFocusable(true);
1213	1429	//frame.setJMenuBar(timelineMenubar);
1214	1430	//centralPanel.add(timelinePanel);
1215	1431
..	..	@@ -1276,8 +1492,9 @@
1276	1492	// north.setName("Edit");
1277	1493	// north.add(ctrlPanel, BorderLayout.NORTH);
1278	1494	// objectPanel.add(north);
1279		- objectPanel.add(ctrlPanel);
	1495	+ objectPanel.add(editPanel);
1280	1496	objectPanel.add(infoPanel);
	1497	+ objectPanel.add(toolboxPanel);
1281	1498
1282	1499	/*
1283	1500	aConstraints.gridx = 0;
..	..	@@ -1286,7 +1503,7 @@
1286	1503	aConstraints.gridy += 1;
1287	1504	aConstraints.gridwidth = 1;
1288	1505	mainPanel.add(objectPanel, aConstraints);
1289		- */
	1506	+ */
1290	1507
1291	1508	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1292	1509	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1298,14 +1515,12 @@
1298	1515	scrollpane.addMouseWheelListener(this); // Default not fast enough
1299	1516
1300	1517	/JTabbedPane/ scenePanel = new cGridBag();
1301		- scenePanel.preferredWidth = 7;
	1518	+ scenePanel.preferredWidth = 6;
1302	1519
1303	1520	JTabbedPane tabbedPane = new JTabbedPane();
1304	1521	tabbedPane.add(scrollpane);
1305	1522
1306		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1307		-
1308		- optionsPanel = new cGridBag().setVertical(true);
	1523	+ optionsPanel = new cGridBag().setVertical(false);
1309	1524
1310	1525	optionsPanel.setName("Options");
1311	1526
..	..	@@ -1313,6 +1528,8 @@
1313	1528
1314	1529	tabbedPane.add(optionsPanel);
1315	1530
	1531	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1532	+
1316	1533	scenePanel.add(tabbedPane);
1317	1534
1318	1535	/*
..	..	@@ -1404,10 +1621,15 @@
1404	1621
1405	1622	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1406	1623
1407		- frame.setSize(1024, 768);
1408		- frame.show();
1409		-
	1624	+ frame.setSize(1280, 860);
	1625	+
	1626	+ cameraView.requestFocusInWindow();
	1627	+
1410	1628	gridPanel.setDividerLocation(1.0);
	1629	+
	1630	+ frame.validate();
	1631	+
	1632	+ frame.setVisible(true);
1411	1633
1412	1634	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1413	1635	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1444,19 +1666,22 @@
1444	1666
1445	1667	cGridBag editBar = new cGridBag().setVertical(false);
1446	1668
1447		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1669	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1448	1670	createMaterialButton.setToolTipText("Create material");
1449	1671
1450	1672	/*
1451	1673	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1452	1674	*/
1453	1675
1454		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1676	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1455	1677	clearMaterialButton.setToolTipText("Clear material");
1456	1678
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);
	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	+ }
1460	1685
1461	1686	editBar.preferredHeight = 15;
1462	1687
..	..	@@ -1490,24 +1715,6 @@
1490	1715	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491	1716	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1492	1717	colorSection.add(texture);
1493		-
1494		- cGridBag anisoU = new cGridBag();
1495		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1496		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1497		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1498		- colorSection.add(anisoU);
1499		-
1500		- cGridBag anisoV = new cGridBag();
1501		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1502		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1503		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1504		- colorSection.add(anisoV);
1505		-
1506		- cGridBag shadowbias = new cGridBag();
1507		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1508		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1509		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1510		- colorSection.add(shadowbias);
1511	1718
1512	1719	panel.add(new JSeparator());
1513	1720
..	..	@@ -1559,6 +1766,12 @@
1559	1766	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1560	1767	diffuseSection.add(fakedepth);
1561	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	+
1562	1775	panel.add(new JSeparator());
1563	1776
1564	1777	panel.add(diffuseSection);
..	..	@@ -1609,6 +1822,18 @@
1609	1822	// aConstraints.gridy += 1;
1610	1823	// aConstraints.gridwidth = 1;
1611	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	+
1612	1837
1613	1838	panel.add(new JSeparator());
1614	1839
..	..	@@ -1616,35 +1841,35 @@
1616	1841
1617	1842	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1618	1843
1619		- cGridBag globalSection = new cGridBag().setVertical(true);
	1844	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1620	1845
1621	1846	cGridBag camera = new cGridBag();
1622	1847	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1623	1848	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624	1849	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1625		- globalSection.add(camera);
	1850	+ colorSection.add(camera);
1626	1851
1627	1852	cGridBag ambient = new cGridBag();
1628	1853	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1629	1854	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1630	1855	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1631		- globalSection.add(ambient);
	1856	+ colorSection.add(ambient);
1632	1857
1633	1858	cGridBag backlit = new cGridBag();
1634	1859	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1635	1860	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1636	1861	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1637		- globalSection.add(backlit);
	1862	+ colorSection.add(backlit);
1638	1863
1639	1864	cGridBag opacity = new cGridBag();
1640	1865	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1641	1866	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1642	1867	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1643		- globalSection.add(opacity);
	1868	+ colorSection.add(opacity);
1644	1869
1645		- panel.add(new JSeparator());
	1870	+ //panel.add(new JSeparator());
1646	1871
1647		- panel.add(globalSection);
	1872	+ //panel.add(globalSection);
1648	1873
1649	1874	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1650	1875
..	..	@@ -1725,12 +1950,15 @@
1725	1950	opacityPowerField.addChangeListener(this);
1726	1951	/**/
1727	1952
1728		- resetSlidersButton.addActionListener(this);
1729	1953	clearMaterialButton.addActionListener(this);
1730	1954	createMaterialButton.addActionListener(this);
1731		-
1732		- propagateToggle.addItemListener(this);
1733		- multiplyToggle.addItemListener(this);
	1955	+
	1956	+ if (Globals.ADVANCED)
	1957	+ {
	1958	+ resetSlidersButton.addActionListener(this);
	1959	+ propagateToggle.addItemListener(this);
	1960	+ multiplyToggle.addItemListener(this);
	1961	+ }
1734	1962	}
1735	1963
1736	1964	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1901,7 +2129,7 @@
1901	2129
1902	2130	//? flashIt = false;
1903	2131	CameraPane pane = (CameraPane) cameraView;
1904		- pane.clickStart(location.x, location.y, 0);
	2132	+ pane.clickStart(location.x, location.y, 0, 0);
1905	2133	pane.clickEnd(location.x, location.y, 0, true);
1906	2134
1907	2135	if (group.selection.size() == 1)
..	..	@@ -1950,6 +2178,7 @@
1950	2178	e2.printStackTrace();
1951	2179	}
1952	2180	}
	2181	+
1953	2182	LoadJMEThread loadThread;
1954	2183
1955	2184	class LoadJMEThread extends Thread
..	..	@@ -2007,6 +2236,7 @@
2007	2236	//LoadFile0(filename, converter);
2008	2237	}
2009	2238	}
	2239	+
2010	2240	LoadOBJThread loadObjThread;
2011	2241
2012	2242	class LoadOBJThread extends Thread
..	..	@@ -2085,19 +2315,19 @@
2085	2315
2086	2316	void LoadObjFile(String fullname)
2087	2317	{
2088		- /*
	2318	+ System.out.println("Loading " + fullname);
	2319	+ /**/
2089	2320	//lastFilename = fullname;
2090	2321	if(loadObjThread == null)
2091	2322	{
2092		- loadObjThread = new LoadOBJThread();
2093		- loadObjThread.start();
	2323	+ loadObjThread = new LoadOBJThread();
	2324	+ loadObjThread.start();
2094	2325	}
2095	2326
2096	2327	loadObjThread.add(fullname);
2097		- */
	2328	+ /**/
2098	2329
2099		- System.out.println("Loading " + fullname);
2100		- makeSomething(new FileObject(fullname, true), true);
	2330	+ //makeSomething(new FileObject(fullname, true), true);
2101	2331	}
2102	2332
2103	2333	void LoadGFDFile(String fullname)
..	..	@@ -2358,11 +2588,11 @@
2358	2588
2359	2589	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2360	2590	{
2361		- if (GrafreeD.standAlone)
	2591	+ if (Grafreed.standAlone)
2362	2592	{
2363	2593	/**/
2364	2594	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2365		- browser.show();
	2595	+ browser.setVisible(true);
2366	2596	String filename = browser.getFile();
2367	2597	if (filename != null && filename.length() > 0)
2368	2598	{
..	..	@@ -2714,6 +2944,8 @@
2714	2944
2715	2945	void SetMaterial(Object3D object)
2716	2946	{
	2947	+ latestObject = object;
	2948	+
2717	2949	cMaterial mat = object.material;
2718	2950
2719	2951	if (mat == null)
..	..	@@ -2722,7 +2954,8 @@
2722	2954	return;
2723	2955	}
2724	2956
2725		- multiplyToggle.setSelected(mat.multiply);
	2957	+ if (multiplyToggle != null)
	2958	+ multiplyToggle.setSelected(mat.multiply);
2726	2959
2727	2960	assert (object.projectedVertices != null);
2728	2961
..	..	@@ -2824,12 +3057,17 @@
2824	3057	// }
2825	3058
2826	3059	/**/
2827		- if (deselect)
	3060	+ if (deselect \|\| child == null)
2828	3061	{
2829	3062	//group.deselectAll();
2830	3063	//freeze = true;
2831	3064	GetTree().clearSelection();
2832	3065	//freeze = false;
	3066	+
	3067	+ if (child == null)
	3068	+ {
	3069	+ return;
	3070	+ }
2833	3071	}
2834	3072
2835	3073	//group.addSelectee(child);
..	..	@@ -2898,7 +3136,7 @@
2898	3136	cameraView.ToggleDL();
2899	3137	cameraView.repaint();
2900	3138	return;
2901		- } else if (event.getSource() == toggleTextureItem)
	3139	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2902	3140	{
2903	3141	cameraView.ToggleTexture();
2904	3142	// june 2013 copy.HardTouch();
..	..	@@ -2937,9 +3175,9 @@
2937	3175	frame.validate();
2938	3176
2939	3177	return;
2940		- } else if (event.getSource() == toggleRandomItem)
	3178	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2941	3179	{
2942		- cameraView.ToggleRandom();
	3180	+ cameraView.ToggleSwitch();
2943	3181	cameraView.repaint();
2944	3182	return;
2945	3183	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2968,6 +3206,10 @@
2968	3206	{
2969	3207	copy.live ^= true;
2970	3208	return;
	3209	+ } else if (event.getSource() == selectCB)
	3210	+ {
	3211	+ copy.dontselect ^= true;
	3212	+ return;
2971	3213	} else if (event.getSource() == hideCB)
2972	3214	{
2973	3215	copy.hide ^= true;
..	..	@@ -2982,6 +3224,7 @@
2982	3224	if (event.getSource() == randomCB)
2983	3225	{
2984	3226	copy.random ^= true;
	3227	+ objEditor.refreshContents();
2985	3228	return;
2986	3229	}
2987	3230	if (event.getSource() == speedupCB)
..	..	@@ -3005,8 +3248,9 @@
3005	3248
3006	3249	public void actionPerformed(ActionEvent event)
3007	3250	{
	3251	+ Object source = event.getSource();
3008	3252	// SCRIPT DIALOG
3009		- if (event.getSource() == okbutton)
	3253	+ if (source == okbutton)
3010	3254	{
3011	3255	textpanel.setVisible(false);
3012	3256	textpanel.remove(textarea);
..	..	@@ -3018,7 +3262,7 @@
3018	3262	textarea = null;
3019	3263	textpanel = null;
3020	3264	}
3021		- if (event.getSource() == cancelbutton)
	3265	+ if (source == cancelbutton)
3022	3266	{
3023	3267	textpanel.setVisible(false);
3024	3268	textpanel.remove(textarea);
..	..	@@ -3030,50 +3274,50 @@
3030	3274	//applySelf();
3031	3275	//client.refreshEditWindow();
3032	3276	//refreshContents();
3033		- if (event.getSource() == nameField)
	3277	+ if (source == nameField)
3034	3278	{
3035	3279	//System.out.println("ObjEditor " + event);
3036	3280	applySelf0(true);
3037	3281	//parent.applySelf();
3038	3282	objEditor.refreshContents();
3039		- } else if (event.getSource() == resetButton)
	3283	+ } else if (source == resetButton)
3040	3284	{
3041	3285	CameraPane.fullreset = true;
3042	3286	copy.Reset(); // ResetMeshes();
3043	3287	copy.Touch();
3044	3288	objEditor.refreshContents();
3045		- } else if (event.getSource() == stepItem)
	3289	+ } else if (source == stepItem)
3046	3290	{
3047	3291	//cameraView.ONESTEP = true;
3048	3292	Globals.ONESTEP = true;
3049	3293	cameraView.repaint();
3050	3294	return;
3051		- } else if (event.getSource() == stepButton)
	3295	+ } else if (source == stepButton)
3052	3296	{
3053	3297	copy.Step();
3054	3298	copy.Touch();
3055	3299	objEditor.refreshContents();
3056		- } else if (event.getSource() == slowerButton)
	3300	+ } else if (source == slowerButton)
3057	3301	{
3058	3302	copy.Slower();
3059	3303	copy.Touch();
3060	3304	objEditor.refreshContents();
3061		- } else if (event.getSource() == fasterButton)
	3305	+ } else if (source == fasterButton)
3062	3306	{
3063	3307	copy.Faster();
3064	3308	copy.Touch();
3065	3309	objEditor.refreshContents();
3066		- } else if (event.getSource() == remarkButton)
	3310	+ } else if (source == remarkButton)
3067	3311	{
3068	3312	copy.Remark();
3069	3313	copy.Touch();
3070	3314	objEditor.refreshContents();
3071		- } else if (event.getSource() == stepAllButton)
	3315	+ } else if (source == stepAllButton)
3072	3316	{
3073	3317	copy.StepAll();
3074	3318	copy.Touch();
3075	3319	objEditor.refreshContents();
3076		- } else if (event.getSource() == resetAllButton)
	3320	+ } else if (source == resetAllButton)
3077	3321	{
3078	3322	//CameraPane.fullreset = true;
3079	3323	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3106,53 +3350,75 @@
3106	3350	// Close();
3107	3351	// }
3108	3352	// else
3109		- if (event.getSource() == resetSlidersButton)
	3353	+ if (source == resetSlidersButton)
3110	3354	{
3111	3355	ResetSliders();
3112		- } else if (event.getSource() == clearMaterialButton)
	3356	+ } else if (source == clearMaterialButton)
3113	3357	{
3114	3358	ClearMaterial();
3115		- } else if (event.getSource() == createMaterialButton)
	3359	+ } else if (source == createMaterialButton)
3116	3360	{
3117	3361	CreateMaterial();
3118		- } else if (event.getSource() == clearPanelButton)
	3362	+ } else if (source == clearPanelButton)
3119	3363	{
3120	3364	copy.ClearUI();
3121	3365	refreshContents(true);
3122		- } /*
3123		- }
3124		-
3125		- public boolean action(Event event, Object arg)
3126		- {
3127		- */ 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)
3128	3391	{
3129	3392	Close();
3130	3393	//return true;
3131		- } else if (event.getSource() == loadItem)
	3394	+ } else if (source == loadItem)
3132	3395	{
3133	3396	load();
3134	3397	//return true;
3135		- } else if (event.getSource() == saveItem)
	3398	+ } else if (source == newItem)
	3399	+ {
	3400	+ New();
	3401	+ } else if (source == saveItem)
3136	3402	{
3137	3403	save();
3138	3404	//return true;
3139		- } else if (event.getSource() == saveAsItem)
	3405	+ } else if (source == saveAsItem)
3140	3406	{
3141	3407	saveAs();
3142	3408	//return true;
3143		- } else if (event.getSource() == reexportItem)
	3409	+ } else if (source == reexportItem)
3144	3410	{
3145	3411	reexport();
3146	3412	//return true;
3147		- } else if (event.getSource() == exportAsItem)
	3413	+ } else if (source == exportAsItem)
3148	3414	{
3149	3415	export();
3150	3416	//return true;
3151		- } else if (event.getSource() == povItem)
	3417	+ } else if (source == povItem)
3152	3418	{
3153	3419	generatePOV();
3154	3420	//return true;
3155		- } else if (event.getSource() == zBufferItem)
	3421	+ } else if (source == zBufferItem)
3156	3422	{
3157	3423	try
3158	3424	{
..	..	@@ -3174,21 +3440,8 @@
3174	3440	cameraView.repaint();
3175	3441	//return true;
3176	3442	}
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)
	3443	+ */ else // combos...
	3444	+ if (source == texresMenu)
3192	3445	{
3193	3446	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3194	3447	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3200,6 +3453,283 @@
3200	3453	}
3201	3454	}
3202	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	+
3203	3733	void ToggleAnimation()
3204	3734	{
3205	3735	if (!Globals.ANIMATION)
..	..	@@ -3215,8 +3745,8 @@
3215	3745
3216	3746	Globals.ANIMATION ^= true;
3217	3747
3218		- GrafreeD.wav.cursor = 0;
3219		- GrafreeD.wav.loop = 0;
	3748	+ Grafreed.wav.cursor = 0;
	3749	+ Grafreed.wav.loop = 0;
3220	3750	}
3221	3751	} else
3222	3752	{
..	..	@@ -3237,7 +3767,6 @@
3237	3767	callee.refreshContents();
3238	3768	} else
3239	3769	{
3240		- new Exception().printStackTrace();
3241	3770	System.exit(0);
3242	3771	}
3243	3772	}
..	..	@@ -3267,7 +3796,7 @@
3267	3796	void CreateMaterial()
3268	3797	{
3269	3798	//copy.ClearMaterial(); // PATCH
3270		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3799	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3271	3800	if (copy.selection.size() > 0)
3272	3801	//SetMaterial(copy);
3273	3802	{
..	..	@@ -3318,7 +3847,7 @@
3318	3847	assert false;
3319	3848	}
3320	3849
3321		- void EditSelection()
	3850	+ void EditSelection(boolean newWindow)
3322	3851	{
3323	3852	}
3324	3853
..	..	@@ -3326,11 +3855,11 @@
3326	3855	{
3327	3856	copy.ResetBlockLoop(); // temporary problem
3328	3857
3329		- boolean random = CameraPane.RANDOM;
3330		- CameraPane.RANDOM = false; // parse everything
	3858	+ boolean random = CameraPane.SWITCH;
	3859	+ CameraPane.SWITCH = false; // parse everything
3331	3860	copy.ResetDisplayList();
3332	3861	copy.HardTouch();
3333		- CameraPane.RANDOM = random;
	3862	+ CameraPane.SWITCH = random;
3334	3863	}
3335	3864
3336	3865	// public void applySelf()
..	..	@@ -3404,6 +3933,36 @@
3404	3933	{
3405	3934	//System.out.println("Propagate = " + propagate);
3406	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	+
3407	3966	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3408	3967	{
3409	3968	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3519,7 +4078,7 @@
3519	4078	}
3520	4079
3521	4080	if (normalpushField != null)
3522		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4081	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3523	4082	}
3524	4083
3525	4084	void SnapObject()
..	..	@@ -3783,6 +4342,8 @@
3783	4342
3784	4343	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3785	4344	{
	4345	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4346	+ Save();
3786	4347	//Tween.set(thing, 0).target(1).start(tweenManager);
3787	4348	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3788	4349	// if (thing instanceof GenericJointDemo)
..	..	@@ -3869,6 +4430,12 @@
3869	4430	{
3870	4431	ResetModel();
3871	4432	Select(thing.GetTreePath(), true, false); // unselect... false);
	4433	+
	4434	+ if (thing.Size() == 0)
	4435	+ {
	4436	+ //EditSelection(false);
	4437	+ }
	4438	+
3872	4439	refreshContents();
3873	4440	}
3874	4441
..	..	@@ -3986,6 +4553,7 @@
3986	4553	}
3987	4554	}
3988	4555	}
	4556	+
3989	4557	LoadGFDThread loadGFDThread;
3990	4558
3991	4559	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4005,8 +4573,10 @@
4005	4573
4006	4574	try
4007	4575	{
	4576	+ // Try compressed version first.
4008	4577	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4009		- 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);
4010	4580
4011	4581	readobj = (Object3D) p.readObject();
4012	4582	istream.close();
..	..	@@ -4014,7 +4584,20 @@
4014	4584	readobj.ResetDisplayList();
4015	4585	} catch (Exception e)
4016	4586	{
4017		- 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	+ }
4018	4601	}
4019	4602	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4020	4603	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4060,6 +4643,12 @@
4060	4643
4061	4644	void LoadIt(Object obj)
4062	4645	{
	4646	+ if (obj == null)
	4647	+ {
	4648	+ // Invalid file
	4649	+ return;
	4650	+ }
	4651	+
4063	4652	System.out.println("Loaded " + obj);
4064	4653	//new Exception().printStackTrace();
4065	4654	Object3D readobj = (Object3D) obj;
..	..	@@ -4069,6 +4658,8 @@
4069	4658
4070	4659	if (readobj != null)
4071	4660	{
	4661	+ if (Globals.SAVEONMAKE)
	4662	+ Save();
4072	4663	try
4073	4664	{
4074	4665	//readobj.deepCopySelf(copy);
..	..	@@ -4131,7 +4722,7 @@
4131	4722
4132	4723	void load() // throws ClassNotFoundException
4133	4724	{
4134		- if (GrafreeD.standAlone)
	4725	+ if (Grafreed.standAlone)
4135	4726	{
4136	4727	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4137	4728	browser.show();
..	..	@@ -4218,11 +4809,13 @@
4218	4809	try
4219	4810	{
4220	4811	FileOutputStream ostream = new FileOutputStream(lastname);
4221		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4812	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4813	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4222	4814
4223	4815	p.writeObject(copy);
4224	4816	p.flush();
4225	4817
	4818	+ zstream.close();
4226	4819	ostream.close();
4227	4820
4228	4821	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4232,17 +4825,20 @@
4232	4825	{
4233	4826	}
4234	4827	}
	4828	+
4235	4829	String lastname;
4236	4830
4237	4831	void saveAs()
4238	4832	{
4239		- if (GrafreeD.standAlone)
	4833	+ if (Grafreed.standAlone)
4240	4834	{
4241	4835	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4242	4836	browser.setVisible(true);
4243	4837	String filename = browser.getFile();
4244	4838	if (filename != null && filename.length() > 0)
4245	4839	{
	4840	+ if (!filename.endsWith(".gfd"))
	4841	+ filename += ".gfd";
4246	4842	lastname = browser.getDirectory() + filename;
4247	4843	save();
4248	4844	}
..	..	@@ -4341,13 +4937,13 @@
4341	4937	try
4342	4938	{
4343	4939	FileOutputStream ostream = new FileOutputStream(filename);
4344		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4345		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4940	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4941	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4346	4942
4347	4943	Object3D objectparent = obj.parent;
4348	4944	obj.parent = null;
4349	4945
4350		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4946	+ Object3D object = (Object3D) Grafreed.clone(obj);
4351	4947
4352	4948	obj.parent = objectparent;
4353	4949
..	..	@@ -4359,8 +4955,8 @@
4359	4955	p.writeObject(object);
4360	4956	p.flush();
4361	4957
	4958	+ zstream.close();
4362	4959	ostream.close();
4363		- // zstream.close();
4364	4960
4365	4961	// group.selection.get(0).parent = parent;
4366	4962	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4381,7 +4977,7 @@
4381	4977	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4382	4978	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4383	4979	copy.generatePOV(buffer);
4384		- if (GrafreeD.standAlone)
	4980	+ if (Grafreed.standAlone)
4385	4981	{
4386	4982	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4387	4983	browser.show();
..	..	@@ -4407,7 +5003,8 @@
4407	5003	Object3D client;
4408	5004	Object3D copy;
4409	5005	MenuBar menuBar;
4410		- Menu windowMenu;
	5006	+ Menu fileMenu;
	5007	+ MenuItem newItem;
4411	5008	MenuItem loadItem;
4412	5009	MenuItem saveItem;
4413	5010	MenuItem saveAsItem;
..	..	@@ -4415,11 +5012,9 @@
4415	5012	MenuItem reexportItem;
4416	5013	MenuItem povItem;
4417	5014	MenuItem closeItem;
4418		- Menu cameraMenu;
	5015	+
4419	5016	CheckboxMenuItem zBufferItem;
4420	5017	//MenuItem normalLensItem;
4421		- MenuItem editCameraItem;
4422		- MenuItem revertCameraItem;
4423	5018	MenuItem stepItem;
4424	5019	CheckboxMenuItem toggleLiveItem;
4425	5020	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4430,25 +5025,38 @@
4430	5025	CheckboxMenuItem toggleFootContactItem;
4431	5026	CheckboxMenuItem toggleDLItem;
4432	5027	CheckboxMenuItem toggleTextureItem;
4433		- CheckboxMenuItem toggleRandomItem;
	5028	+ CheckboxMenuItem toggleSwitchItem;
4434	5029	CheckboxMenuItem toggleRootItem;
4435	5030	CheckboxMenuItem animationItem;
4436	5031	CheckboxMenuItem toggleHandleItem;
4437	5032	CheckboxMenuItem togglePaintItem;
4438	5033	JSplitPane mainPanel;
4439	5034	JScrollPane scrollpane;
	5035	+
4440	5036	JPanel toolbarPanel;
	5037	+
4441	5038	cGridBag treePanel;
	5039	+
4442	5040	JPanel radioPanel;
4443	5041	ButtonGroup buttonGroup;
4444		- cGridBag ctrlPanel;
	5042	+
	5043	+ cGridBag toolboxPanel;
4445	5044	cGridBag materialPanel;
	5045	+ cGridBag ctrlPanel;
	5046	+
4446	5047	JScrollPane infoPanel;
	5048	+
4447	5049	cGridBag optionsPanel;
	5050	+
4448	5051	JTabbedPane objectPanel;
	5052	+ boolean materialFlushed;
	5053	+ Object3D latestObject;
	5054	+
4449	5055	cGridBag XYZPanel;
	5056	+
4450	5057	JSplitPane gridPanel;
4451	5058	JSplitPane bigPanel;
	5059	+
4452	5060	cGridBag bigThree;
4453	5061	cGridBag scenePanel;
4454	5062	cGridBag centralPanel;
..	..	@@ -4563,8 +5171,13 @@
4563	5171	cNumberSlider fogField;
4564	5172	JLabel opacityPowerLabel;
4565	5173	cNumberSlider opacityPowerField;
4566		- JTree jTree;
	5174	+ cTree jTree;
4567	5175	//ObjectUI parent;
4568	5176
4569	5177	cNumberSlider normalpushField;
	5178	+
	5179	+ private MenuItem importGFDItem;
	5180	+ private MenuItem importVRMLX3DItem;
	5181	+ private MenuItem import3DSItem;
	5182	+ private MenuItem importOBJItem;
4570	5183	}