~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
..	..	@@ -138,34 +203,42 @@
138	203	public void closeUI()
139	204	{
140	205	//new Exception().printStackTrace();
141		- System.out.println("this = " + this);
142		- System.out.println("objEditor = " + objEditor);
	206	+// System.out.println("this = " + this);
	207	+// System.out.println("objEditor = " + objEditor);
143	208	//nameField.removeActionListener(this);
144		- objEditor.ctrlPanel.remove(nameField);
	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		- objEditor.ctrlPanel.remove(liveCB);
150		- objEditor.ctrlPanel.remove(hideCB);
151		- objEditor.ctrlPanel.remove(markCB);
152		-
153		- objEditor.ctrlPanel.remove(randomCB);
154		- objEditor.ctrlPanel.remove(speedupCB);
155		- objEditor.ctrlPanel.remove(rewindCB);
156		-
157		- objEditor.ctrlPanel.remove(resetButton);
158		- objEditor.ctrlPanel.remove(stepButton);
159		-// objEditor.ctrlPanel.remove(stepAllButton);
160		-// objEditor.ctrlPanel.remove(resetAllButton);
161		- objEditor.ctrlPanel.remove(link2masterCB);
162		- //objEditor.ctrlPanel.remove(flipVCB);
163		- //objEditor.ctrlPanel.remove(texresMenu);
164		- objEditor.ctrlPanel.remove(slowerButton);
165		- objEditor.ctrlPanel.remove(fasterButton);
166		- objEditor.ctrlPanel.remove(remarkButton);
	216	+// objEditor.ctrlPanel.remove(liveCB);
	217	+// objEditor.ctrlPanel.remove(hideCB);
	218	+// objEditor.ctrlPanel.remove(markCB);
	219	+//
	220	+// objEditor.ctrlPanel.remove(randomCB);
	221	+// objEditor.ctrlPanel.remove(speedupCB);
	222	+// objEditor.ctrlPanel.remove(rewindCB);
	223	+//
	224	+// objEditor.ctrlPanel.remove(resetButton);
	225	+// objEditor.ctrlPanel.remove(stepButton);
	226	+//// objEditor.ctrlPanel.remove(stepAllButton);
	227	+//// objEditor.ctrlPanel.remove(resetAllButton);
	228	+// objEditor.ctrlPanel.remove(link2masterCB);
	229	+// //objEditor.ctrlPanel.remove(flipVCB);
	230	+// //objEditor.ctrlPanel.remove(texresMenu);
	231	+// objEditor.ctrlPanel.remove(slowerButton);
	232	+// objEditor.ctrlPanel.remove(fasterButton);
	233	+// objEditor.ctrlPanel.remove(remarkButton);
167	234
168		- Remove(normalpushField);
	235	+ objEditor.ctrlPanel.remove(setupPanel);
	236	+ objEditor.ctrlPanel.remove(setupPanel2);
	237	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
	238	+ objEditor.ctrlPanel.remove(pushPanel);
	239	+ //objEditor.ctrlPanel.remove(fillPanel);
	240	+
	241	+ //Remove(normalpushField);
169	242	}
170	243
171	244	public ObjEditor GetEditor()
..	..	@@ -236,6 +309,7 @@
236	309	//localCopy.parent = null;
237	310
238	311	frame = new JFrame();
	312	+ frame.setUndecorated(false);
239	313	objEditor = this;
240	314	this.callee = callee;
241	315
..	..	@@ -266,28 +340,49 @@
266	340	return frame.action(event, obj);
267	341	}
268	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	+
269	348	void SetupMenu()
270	349	{
271	350	frame.setMenuBar(menuBar = new MenuBar());
272		- menuBar.add(windowMenu = new Menu("File"));
273		- windowMenu.add(loadItem = new MenuItem("Load..."));
274		- windowMenu.add("-");
275		- windowMenu.add(saveItem = new MenuItem("Save"));
276		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	351	+ menuBar.add(fileMenu = new Menu("File"));
	352	+ fileMenu.add(newItem = new MenuItem("New"));
	353	+ fileMenu.add(openItem = 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..."));
277	371	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
278		- windowMenu.add("-");
279		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
280		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
281		- windowMenu.add("-");
	372	+ fileMenu.add("-");
	373	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	374	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	375	+ fileMenu.add("-");
282	376	if (client.parent != null)
283	377	{
284		- windowMenu.add(closeItem = new MenuItem("Close"));
	378	+ fileMenu.add(closeItem = new MenuItem("Close"));
285	379	} else
286	380	{
287		- windowMenu.add(closeItem = new MenuItem("Exit"));
	381	+ fileMenu.add(closeItem = new MenuItem("Exit"));
288	382	}
289	383
290		- loadItem.addActionListener(this);
	384	+ newItem.addActionListener(this);
	385	+ openItem.addActionListener(this);
291	386	saveItem.addActionListener(this);
292	387	saveAsItem.addActionListener(this);
293	388	exportAsItem.addActionListener(this);
..	..	@@ -295,81 +390,66 @@
295	390	//povItem.addActionListener(this);
296	391	closeItem.addActionListener(this);
297	392
298		- menuBar.add(cameraMenu = new Menu("View"));
299		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
300		- //zBufferItem.addActionListener(this);
301		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
302		- //normalLensItem.addActionListener(this);
303		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
304		- revertCameraItem.addActionListener(this);
305		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
306		- toggleTimelineItem.addItemListener(this);
307		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
308		- toggleFullScreenItem.addItemListener(this);
309		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
310		- cameraMenu.add("-");
311		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
312		- toggleTextureItem.addItemListener(this);
313		- toggleTextureItem.setState(CameraPane.textureon);
314		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
315		- toggleLiveItem.addItemListener(this);
316		- toggleLiveItem.setState(Globals.isLIVE());
317		- cameraMenu.add(stepItem = new MenuItem("Step"));
318		- stepItem.addActionListener(this);
319		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
320		-// toggleDLItem.addItemListener(this);
321		-// toggleDLItem.setState(false);
322		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
323		- toggleRenderItem.addItemListener(this);
324		- toggleRenderItem.setState(!CameraPane.frozen);
325		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
326		- toggleDebugItem.addItemListener(this);
327		- toggleDebugItem.setState(CameraPane.DEBUG);
328		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
329		- toggleFrustumItem.addItemListener(this);
330		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
331		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
332		- toggleFootContactItem.addItemListener(this);
333		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
334		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
335		- toggleRandomItem.addItemListener(this);
336		- toggleRandomItem.setState(CameraPane.RANDOM);
337		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
338		- toggleHandleItem.addItemListener(this);
339		- toggleHandleItem.setState(CameraPane.HANDLES);
340		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
341		- togglePaintItem.addItemListener(this);
342		- togglePaintItem.setState(CameraPane.PAINTMODE);
343		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
344		-// toggleRootItem.addItemListener(this);
345		-// toggleRootItem.setState(false);
346		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
347		-// animationItem.addItemListener(this);
348		-// animationItem.setState(CameraPane.ANIMATION);
349		- cameraMenu.add("-");
350		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
351		- editCameraItem.addActionListener(this);
352		-
353	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	+
354	420	toolbarPanel = new JPanel();
355	421	toolbarPanel.setName("Toolbar");
356		- treePanel = new JPanel();
	422	+ treePanel = new cGridBag();
357	423	treePanel.setName("Tree");
358		- ctrlPanel = new cGridBag(); // new GridBagLayout());
359		- ctrlPanel.setName("Edit");
	424	+
	425	+ editPanel = new cGridBag().setVertical(true);
	426	+ editPanel.setName("Edit");
	427	+
	428	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	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	+
360	437	materialPanel = new cGridBag().setVertical(true);
361	438	materialPanel.setName("Material");
	439	+
362	440	/JTextPane/
363	441	infoarea = createTextPane();
	442	+ doc = infoarea.getStyledDocument();
	443	+
364	444	infoarea.setEditable(true);
365	445	SetText();
366	446	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367	447	// infoarea.setOpaque(false);
368	448	// //infoarea.setForeground(textcolor);
369		- infoarea.setLineWrap(true);
370		- infoarea.setWrapStyleWord(true);
	449	+// TEXTAREA infoarea.setLineWrap(true);
	450	+// TEXTAREA infoarea.setWrapStyleWord(true);
371	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
372		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ infoPanel.setPreferredSize(new Dimension(1, 1));
373	453	infoPanel.setName("Info");
374	454	//infoPanel.setLayout(new BorderLayout());
375	455	//infoPanel.add(createTextPane());
..	..	@@ -378,15 +458,22 @@
378	458	mainPanel.setName("Main");
379	459	mainPanel.setContinuousLayout(true);
380	460	mainPanel.setOneTouchExpandable(true);
381		- mainPanel.setDividerLocation(1.0);
382	461	mainPanel.setDividerSize(9);
383		- mainPanel.setResizeWeight(0);
384		-
	462	+ mainPanel.setDividerLocation(0.5); //1.0);
	463	+ mainPanel.setResizeWeight(0.5);
	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	+
385	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386	473	//mainPanel.setLayout(new GridBagLayout());
387	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388		- treePanel.setLayout(new GridBagLayout());
389		- ctrlPanel.setLayout(new GridBagLayout());
	475	+// treePanel.setLayout(new GridBagLayout());
	476	+ //ctrlPanel.setLayout(new GridBagLayout());
390	477	//materialPanel.setLayout(new GridBagLayout());
391	478
392	479	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
..	..	@@ -426,7 +513,7 @@
426	513	static String newline = "\n";
427	514	protected static final String buttonString = "JButton";
428	515	StyledDocument doc;
429		- JTextArea infoarea;
	516	+ JTextPane infoarea;
430	517
431	518	void ClearInfo()
432	519	{
..	..	@@ -449,10 +536,10 @@
449	536	e.printStackTrace();
450	537	}
451	538
452		- String selection = infoarea.getText();
453		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
454		- java.awt.datatransfer.Clipboard clipboard =
455		- 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();
456	543	//clipboard.setContents(data, data);
457	544	}
458	545
..	..	@@ -475,13 +562,13 @@
475	562	//SendInfo("Name:", "bold");
476	563	if (sel.GetTextures() != null \|\| debug)
477	564	{
478		- si.SendInfo(sel.toString(), "bold");
	565	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
479	566	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
480	567	if (sel.Size() > 0)
481	568	{
482	569	si.SendInfo("#children = " + sel.Size(), "regular");
483	570	}
484		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	571	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
485	572	if (debug)
486	573	{
487	574	try
..	..	@@ -493,7 +580,10 @@
493	580	}
494	581
495	582	if (full)
496		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	583	+ {
	584	+ si.SendInfo(" BBox min: " + minima, "regular");
	585	+ si.SendInfo(" BBox max: " + maxima, "regular");
	586	+ }
497	587
498	588	if (sel.bRep != null)
499	589	{
..	..	@@ -520,7 +610,7 @@
520	610	}
521	611	if (sel.support != null)
522	612	{
523		- si.SendInfo(" support: " + sel.support, "regular");
	613	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
524	614	}
525	615	if (sel.scriptnode != null)
526	616	{
..	..	@@ -591,6 +681,9 @@
591	681	{
592	682	CameraPane.pointflow = (PointFlow) sel;
593	683	}
	684	+
	685	+ si.SendInfo("_____________________", "regular");
	686	+ si.SendInfo("", "regular");
594	687	}
595	688	}
596	689
..	..	@@ -606,68 +699,169 @@
606	699	}
607	700	}
608	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	+
609	760	void ToggleFullScreen()
610	761	{
611		- if (CameraPane.FULLSCREEN)
	762	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	763	+
	764	+ cameraView.ToggleFullScreen();
	765	+
	766	+ if (!CameraPane.FULLSCREEN)
612	767	{
613		- frame.getContentPane().remove(/"Center",/bigThree);
614		- framePanel.add(bigThree);
615		- 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(46);
	784	+
	785	+ //frame.setVisible(true);
	786	+ radio.layout = keepButton;
	787	+ //theFrame = null;
	788	+ keepButton = null;
	789	+ radio.layout.doClick();
	790	+
616	791	} else
617	792	{
618		- frame.getContentPane().remove(/"Center",/framePanel);
619		- framePanel.remove(bigThree);
620		- 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);
621	815	}
622		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
623	817	}
624	818
625		- private JTextArea createTextPane()
	819	+ private JTextPane createTextPane()
626	820	{
627		- String[] initString =
628		- {
629		- "This is an editable JTextPane, ", //regular
630		- "another ", //italic
631		- "styled ", //bold
632		- "text ", //small
633		- "component, ", //large
634		- "which supports embedded components..." + newline,//regular
635		- " " + newline, //button
636		- "...and embedded icons..." + newline, //regular
637		- " ", //icon
638		- newline + "JTextPane is a subclass of JEditorPane that "
639		- + "uses a StyledEditorKit and StyledDocument, and provides "
640		- + "cover methods for interacting with those objects."
641		- };
	821	+// TEXTAREA String[] initString =
	822	+// {
	823	+// "This is an editable JTextPane, ", //regular
	824	+// "another ", //italic
	825	+// "styled ", //bold
	826	+// "text ", //small
	827	+// "component, ", //large
	828	+// "which supports embedded components..." + newline,//regular
	829	+// " " + newline, //button
	830	+// "...and embedded icons..." + newline, //regular
	831	+// " ", //icon
	832	+// newline + "JTextPane is a subclass of JEditorPane that "
	833	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	834	+// + "cover methods for interacting with those objects."
	835	+// };
	836	+//
	837	+// String[] initStyles =
	838	+// {
	839	+// "regular", "italic", "bold", "small", "large",
	840	+// "regular", "button", "regular", "icon",
	841	+// "regular"
	842	+// };
	843	+//
	844	+// JTextPane textPane = new JTextPane();
	845	+// textPane.setEditable(true);
	846	+// /StyledDocument/ doc = textPane.getStyledDocument();
	847	+// addStylesToDocument(doc);
	848	+//
	849	+// try
	850	+// {
	851	+// for (int j = 0; j < 2; j++)
	852	+// {
	853	+// for (int i = 0; i < initString.length; i++)
	854	+// {
	855	+// doc.insertString(doc.getLength(), initString[i],
	856	+// doc.getStyle(initStyles[i]));
	857	+// }
	858	+// }
	859	+// } catch (BadLocationException ble)
	860	+// {
	861	+// System.err.println("Couldn't insert initial text into text pane.");
	862	+// }
642	863
643		- String[] initStyles =
644		- {
645		- "regular", "italic", "bold", "small", "large",
646		- "regular", "button", "regular", "icon",
647		- "regular"
648		- };
649		-
650		- JTextPane textPane = new JTextPane();
651		- textPane.setEditable(true);
652		- /StyledDocument/ doc = textPane.getStyledDocument();
653		- addStylesToDocument(doc);
654		-
655		- try
656		- {
657		- for (int j = 0; j < 2; j++)
658		- {
659		- for (int i = 0; i < initString.length; i++)
660		- {
661		- doc.insertString(doc.getLength(), initString[i],
662		- doc.getStyle(initStyles[i]));
663		- }
664		- }
665		- } catch (BadLocationException ble)
666		- {
667		- System.err.println("Couldn't insert initial text into text pane.");
668		- }
669		-
670		- return new JTextArea(); // textPane;
	864	+ return new JTextPane(); // textPane;
671	865	}
672	866
673	867	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -720,7 +914,7 @@
720	914	protected static ImageIcon createImageIcon(String path,
721	915	String description)
722	916	{
723		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	917	+ java.net.URL imgURL = Grafreed.class.getResource(path);
724	918	if (imgURL != null)
725	919	{
726	920	return new ImageIcon(imgURL, description);
..	..	@@ -752,6 +946,7 @@
752	946	// NumberSlider vDivsField;
753	947	// JCheckBox endcaps;
754	948	JCheckBox liveCB;
	949	+ JCheckBox selectCB;
755	950	JCheckBox hideCB;
756	951	JCheckBox link2masterCB;
757	952	JCheckBox markCB;
..	..	@@ -759,7 +954,12 @@
759	954	JCheckBox speedupCB;
760	955	JCheckBox rewindCB;
761	956	JCheckBox flipVCB;
	957	+
	958	+ cCheckBox toggleTextureCB;
	959	+ cCheckBox toggleSwitchCB;
	960	+
762	961	JComboBox texresMenu;
	962	+
763	963	JButton resetButton;
764	964	JButton stepButton;
765	965	JButton stepAllButton;
..	..	@@ -767,54 +967,48 @@
767	967	JButton slowerButton;
768	968	JButton fasterButton;
769	969	JButton remarkButton;
	970	+
	971	+ cGridBag editPanel;
	972	+ cGridBag editCommandsPanel;
	973	+
	974	+ cGridBag namePanel;
	975	+ cGridBag setupPanel;
	976	+ cGridBag setupPanel2;
	977	+ cGridBag objectCommandsPanel;
	978	+ cGridBag pushPanel;
	979	+ cGridBag fillPanel;
770	980
771		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	981	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772	982	{
773	983	JCheckBox cb;
774	984
775		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
776		- oe.aConstraints.gridwidth = 1; // 3;
777		-// oe.aConstraints.weightx = 1;
778		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
779		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	985	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
780	986	cb.addItemListener(this);
781		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782		- oe.aConstraints.gridwidth = 1;
783		- oe.aConstraints.gridx += 1;
784	987
785	988	return cb;
786	989	}
787	990
788		- cButton AddButton(ObjEditor oe, String label)
	991	+ cButton AddButton(cGridBag panel, String label)
789	992	{
790	993	cButton cb;
791	994
792		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
793		- oe.aConstraints.gridwidth = 1;
794		-// oe.aConstraints.weightx = 1;
795		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
796		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	995	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
797	996	cb.addActionListener(this);
798		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799		- oe.aConstraints.gridwidth = 1;
800		- oe.aConstraints.gridx += 1;
801	997
802	998	return cb;
803	999	}
804	1000
805		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	1001	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806	1002	{
807	1003	JComboBox combo;
808	1004
809		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
810		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
811		- oe.aConstraints.gridx += 1;
	1005	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812	1006	combo.addActionListener(this);
813	1007
814	1008	return combo;
815	1009	}
816	1010
817		- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, double min, double max, double current, double pow)
	1011	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
818	1012	{
819	1013	cGridBag control = new cGridBag();
820	1014
..	..	@@ -826,12 +1020,12 @@
826	1020	control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827	1021	combo.setFloat(current);
828	1022
829		- ctrlPanel.add(control);
	1023	+ panel.add(control);
830	1024
831		- return combo;
	1025	+ return control;
832	1026	}
833	1027
834		- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, int min, int max, int current)
	1028	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
835	1029	{
836	1030	cGridBag control = new cGridBag();
837	1031
..	..	@@ -839,25 +1033,21 @@
839	1033
840	1034	JLabel jlabel = new JLabel(label);
841	1035	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
842		- ctrlPanel.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
843		- ctrlPanel.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1036	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	1037	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
844	1038	combo.setInteger(current);
845	1039
846		- ctrlPanel.add(control);
	1040	+ panel.add(control);
847	1041
848		- return combo;
	1042	+ return control;
849	1043	}
850	1044
851	1045	JTextArea AddText(cGridBag ctrlPanel, String name)
852	1046	{
853	1047	JTextArea text;
854	1048
855		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
856		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
857	1049	ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858	1050	text.addCaretListener(this);
859		- aConstraints.gridx += 1;
860		- aConstraints.gridwidth = 1;
861	1051
862	1052	return text;
863	1053	}
..	..	@@ -896,7 +1086,7 @@
896	1086
897	1087	/*
898	1088	*/
899		- void Return() // ObjEditor oe)
	1089	+ void Return0() // ObjEditor oe)
900	1090	{
901	1091	aConstraints.gridy += 1;
902	1092	aConstraints.gridx = 0;
..	..	@@ -951,37 +1141,77 @@
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		- SetupName(oe);
	1144	+ //SetupName(oe);
959	1145
960		- if (!GroupEditor.allparams)
	1146	+ namePanel = new cGridBag();
	1147	+
	1148	+ nameField = AddText(namePanel, copy.GetName());
	1149	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
	1150	+ oe.ctrlPanel.add(namePanel);
	1151	+
	1152	+ oe.ctrlPanel.Return();
	1153	+
	1154	+ if (!allparams)
961	1155	return;
962	1156
963		- liveCB = AddCheckBox(oe, "Live", copy.live);
964		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
965		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1157	+ setupPanel = new cGridBag().setVertical(false);
	1158	+
	1159	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1160	+ liveCB.setToolTipText("Animate object");
	1161	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1162	+ selectCB.setToolTipText("Make object selectable");
966	1163	// Return();
967		- markCB = AddCheckBox(oe, "Mark", copy.marked);
968		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
969		- randomCB = AddCheckBox(oe, "Rand", copy.random);
970		- Return();
971		- resetButton = AddButton(oe, "Reset");
972		- stepButton = AddButton(oe, "Step");
	1164	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1165	+ hideCB.setToolTipText("Hide object");
	1166	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	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)");
	1176	+
	1177	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1178	+ link2masterCB.setToolTipText("Attach to support");
	1179	+
	1180	+ if (Globals.ADVANCED)
	1181	+ {
	1182	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1183	+ speedupCB.setToolTipText("Option motion capture");
	1184	+ }
	1185	+
	1186	+ oe.ctrlPanel.add(setupPanel);
	1187	+ oe.ctrlPanel.Return();
	1188	+ oe.ctrlPanel.add(setupPanel2);
	1189	+ oe.ctrlPanel.Return();
	1190	+
	1191	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1192	+
	1193	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1194	+ resetButton.setToolTipText("Jump to frame zero");
	1195	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1196	+ stepButton.setToolTipText("Step one frame");
973	1197	// resetAllButton = AddButton(oe, "Reset All");
974	1198	// stepAllButton = AddButton(oe, "Step All");
975		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
976	1199	// Return();
977		- slowerButton = AddButton(oe, "Slow");
978		- fasterButton = AddButton(oe, "Fast");
979		- remarkButton = AddButton(oe, "Rem");
	1200	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1201	+ slowerButton.setToolTipText("Decrease animation speed");
	1202	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1203	+ fasterButton.setToolTipText("Increase animation speed");
	1204	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1205	+ remarkButton.setToolTipText("Set the current transform as the target");
980	1206
981		- Return();
	1207	+ oe.ctrlPanel.add(objectCommandsPanel);
	1208	+ oe.ctrlPanel.Return();
982	1209
983		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
984		- Return();
	1210	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1211	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1212	+ //Return();
	1213	+
	1214	+ oe.ctrlPanel.Return();
985	1215
986	1216	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987	1217	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1076,7 +1306,7 @@
1076	1306	oe.aConstraints.gridwidth = 1;
1077	1307	/**/
1078	1308	nameField = AddText(oe.ctrlPanel, copy.GetName());
1079		- Return();
	1309	+ oe.ctrlPanel.Return();
1080	1310
1081	1311	//ctrlPanel.add(textureButton = new Button("Texture..."));
1082	1312	//textureButton.setEnabled(false);
..	..	@@ -1180,8 +1410,11 @@
1180	1410	//worldPanel.setName("World");
1181	1411	centralPanel = new cGridBag();
1182	1412	centralPanel.preferredWidth = 20;
1183		- timelinePanel = new JPanel(new BorderLayout());
1184		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1413	+
	1414	+ if (Globals.ADVANCED)
	1415	+ {
	1416	+ timelinePanel = new JPanel(new BorderLayout());
	1417	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1185	1418
1186	1419	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1187	1420	cameraPanel.setContinuousLayout(true);
..	..	@@ -1190,7 +1423,10 @@
1190	1423	// cameraPanel.setDividerSize(9);
1191	1424	cameraPanel.setResizeWeight(1.0);
1192	1425
	1426	+ }
	1427	+
1193	1428	centralPanel.add(cameraView);
	1429	+ centralPanel.setFocusable(true);
1194	1430	//frame.setJMenuBar(timelineMenubar);
1195	1431	//centralPanel.add(timelinePanel);
1196	1432
..	..	@@ -1253,11 +1489,16 @@
1253	1489	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1254	1490	//tmp.setName("Edit");
1255	1491	objectPanel.add(materialPanel);
1256		- JPanel north = new JPanel(new BorderLayout());
1257		- north.setName("Edit");
1258		- north.add(ctrlPanel, BorderLayout.NORTH);
1259		- objectPanel.add(north);
1260		- objectPanel.add(infoPanel);
	1492	+// JPanel north = new JPanel(new BorderLayout());
	1493	+// north.setName("Edit");
	1494	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1495	+// objectPanel.add(north);
	1496	+ objectPanel.add(editPanel);
	1497	+
	1498	+ //if (Globals.ADVANCED)
	1499	+ objectPanel.add(infoPanel);
	1500	+
	1501	+ objectPanel.add(toolboxPanel);
1261	1502
1262	1503	/*
1263	1504	aConstraints.gridx = 0;
..	..	@@ -1266,7 +1507,7 @@
1266	1507	aConstraints.gridy += 1;
1267	1508	aConstraints.gridwidth = 1;
1268	1509	mainPanel.add(objectPanel, aConstraints);
1269		- */
	1510	+ */
1270	1511
1271	1512	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1272	1513	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1278,14 +1519,12 @@
1278	1519	scrollpane.addMouseWheelListener(this); // Default not fast enough
1279	1520
1280	1521	/JTabbedPane/ scenePanel = new cGridBag();
1281		- scenePanel.preferredWidth = 7;
	1522	+ scenePanel.preferredWidth = 6;
1282	1523
1283	1524	JTabbedPane tabbedPane = new JTabbedPane();
1284	1525	tabbedPane.add(scrollpane);
1285	1526
1286		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1287		-
1288		- optionsPanel = new cGridBag().setVertical(true);
	1527	+ optionsPanel = new cGridBag().setVertical(false);
1289	1528
1290	1529	optionsPanel.setName("Options");
1291	1530
..	..	@@ -1293,6 +1532,8 @@
1293	1532
1294	1533	tabbedPane.add(optionsPanel);
1295	1534
	1535	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1536	+
1296	1537	scenePanel.add(tabbedPane);
1297	1538
1298	1539	/*
..	..	@@ -1365,9 +1606,9 @@
1365	1606	// aConstraints.gridheight = 1;
1366	1607
1367	1608	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1368		- framePanel.setContinuousLayout(true);
1369		- framePanel.setOneTouchExpandable(true);
1370		- framePanel.setDividerLocation(0.8);
	1609	+ framePanel.setContinuousLayout(false);
	1610	+ framePanel.setOneTouchExpandable(false);
	1611	+ //.setDividerLocation(0.8);
1371	1612	//framePanel.setDividerSize(15);
1372	1613	//framePanel.setResizeWeight(0.15);
1373	1614	framePanel.setName("Frame");
..	..	@@ -1384,10 +1625,15 @@
1384	1625
1385	1626	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1386	1627
1387		- frame.setSize(1024, 768);
1388		- frame.show();
1389		-
	1628	+ frame.setSize(1280, 860);
	1629	+
	1630	+ cameraView.requestFocusInWindow();
	1631	+
1390	1632	gridPanel.setDividerLocation(1.0);
	1633	+
	1634	+ frame.validate();
	1635	+
	1636	+ frame.setVisible(true);
1391	1637
1392	1638	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1393	1639	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1415,7 +1661,7 @@
1415	1661	ctrlPanel.removeAll();
1416	1662	}
1417	1663
1418		- void SetupMaterial(cGridBag ctrlPanel)
	1664	+ void SetupMaterial(cGridBag panel)
1419	1665	{
1420	1666	/*
1421	1667	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
..	..	@@ -1424,18 +1670,26 @@
1424	1670
1425	1671	cGridBag editBar = new cGridBag().setVertical(false);
1426	1672
1427		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	1673	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1674	+ createMaterialButton.setToolTipText("Create material");
1428	1675
1429	1676	/*
1430	1677	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1431	1678	*/
1432	1679
1433		- editBar.add(clearMaterialButton = new cButton("Clear")); // , aConstraints);
1434		- editBar.add(resetSlidersButton = new cButton("Reset")); // , aConstraints);
1435		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1436		- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1680	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1681	+ clearMaterialButton.setToolTipText("Clear material");
	1682	+
	1683	+ if (Globals.ADVANCED)
	1684	+ {
	1685	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1686	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1687	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1688	+ }
1437	1689
1438		- ctrlPanel.add(editBar);
	1690	+ editBar.preferredHeight = 15;
	1691	+
	1692	+ panel.add(editBar);
1439	1693
1440	1694	/**/
1441	1695	//aConstraints.weighty = 0;
..	..	@@ -1445,17 +1699,13 @@
1445	1699	//aConstraints.gridx += 1;
1446	1700	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1447	1701
1448		- JPanel colorPanel = new JPanel(new BorderLayout());
1449		- colorPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1450		-
1451	1702	cGridBag colorSection = new cGridBag().setVertical(true);
1452		-
1453		- colorPanel.add(colorSection);
1454	1703
1455	1704	cGridBag color = new cGridBag();
1456	1705	color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1457	1706	colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1458	1707	color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1708	+ //colorField.preferredWidth = 200;
1459	1709	colorSection.add(color);
1460	1710
1461	1711	cGridBag modulation = new cGridBag();
..	..	@@ -1470,34 +1720,13 @@
1470	1720	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1471	1721	colorSection.add(texture);
1472	1722
1473		- cGridBag anisoU = new cGridBag();
1474		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1475		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1476		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1477		- colorSection.add(anisoU);
1478		-
1479		- cGridBag anisoV = new cGridBag();
1480		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1481		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1482		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1483		- colorSection.add(anisoV);
1484		-
1485		- cGridBag shadowbias = new cGridBag();
1486		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1487		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1488		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1489		- colorSection.add(shadowbias);
1490		-
1491		- ctrlPanel.add(colorPanel);
	1723	+ panel.add(new JSeparator());
	1724	+
	1725	+ panel.add(colorSection);
1492	1726
1493	1727	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1494	1728
1495		- JPanel diffusePanel = new JPanel(new BorderLayout());
1496		- diffusePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1497		-
1498	1729	cGridBag diffuseSection = new cGridBag().setVertical(true);
1499		-
1500		- diffusePanel.add(diffuseSection);
1501	1730
1502	1731	cGridBag diffuse = new cGridBag();
1503	1732	diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
..	..	@@ -1541,16 +1770,19 @@
1541	1770	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1542	1771	diffuseSection.add(fakedepth);
1543	1772
1544		- ctrlPanel.add(diffusePanel);
	1773	+ cGridBag shadowbias = new cGridBag();
	1774	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1775	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1776	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1777	+ diffuseSection.add(shadowbias);
	1778	+
	1779	+ panel.add(new JSeparator());
	1780	+
	1781	+ panel.add(diffuseSection);
1545	1782
1546	1783	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1547	1784
1548		- JPanel specularPanel = new JPanel(new BorderLayout());
1549		- specularPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1550		-
1551	1785	cGridBag specularSection = new cGridBag().setVertical(true);
1552		-
1553		- specularPanel.add(specularSection);
1554	1786
1555	1787	cGridBag specular = new cGridBag();
1556	1788	specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
..	..	@@ -1582,7 +1814,7 @@
1582	1814	velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1583	1815	specularSection.add(velvet);
1584	1816
1585		- shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
	1817	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
1586	1818	//Return();
1587	1819	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1588	1820	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
..	..	@@ -1594,52 +1826,58 @@
1594	1826	// aConstraints.gridy += 1;
1595	1827	// aConstraints.gridwidth = 1;
1596	1828
	1829	+ cGridBag anisoU = new cGridBag();
	1830	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1831	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1832	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1833	+ specularSection.add(anisoU);
1597	1834
1598		- ctrlPanel.add(specularPanel);
	1835	+ cGridBag anisoV = new cGridBag();
	1836	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1837	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1838	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1839	+ specularSection.add(anisoV);
	1840	+
	1841	+
	1842	+ panel.add(new JSeparator());
	1843	+
	1844	+ panel.add(specularSection);
1599	1845
1600	1846	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1601	1847
1602		- JPanel globalPanel = new JPanel(new BorderLayout());
1603		- globalPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1604		-
1605		- cGridBag globalSection = new cGridBag().setVertical(true);
1606		-
1607		- globalPanel.add(globalSection);
	1848	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1608	1849
1609	1850	cGridBag camera = new cGridBag();
1610	1851	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1611	1852	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612	1853	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613		- globalSection.add(camera);
	1854	+ colorSection.add(camera);
1614	1855
1615	1856	cGridBag ambient = new cGridBag();
1616	1857	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1617	1858	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618	1859	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619		- globalSection.add(ambient);
	1860	+ colorSection.add(ambient);
1620	1861
1621	1862	cGridBag backlit = new cGridBag();
1622	1863	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1623	1864	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624	1865	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1625		- globalSection.add(backlit);
	1866	+ colorSection.add(backlit);
1626	1867
1627	1868	cGridBag opacity = new cGridBag();
1628	1869	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1629	1870	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1630	1871	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1631		- globalSection.add(opacity);
	1872	+ colorSection.add(opacity);
1632	1873
1633		- ctrlPanel.add(globalPanel);
	1874	+ //panel.add(new JSeparator());
	1875	+
	1876	+ //panel.add(globalSection);
1634	1877
1635	1878	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1636	1879
1637		- JPanel texturePanel = new JPanel(new BorderLayout());
1638		- texturePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1639		-
1640	1880	cGridBag textureSection = new cGridBag().setVertical(true);
1641		-
1642		- texturePanel.add(textureSection);
1643	1881
1644	1882	cGridBag bump = new cGridBag();
1645	1883	bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
..	..	@@ -1677,7 +1915,9 @@
1677	1915	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1678	1916	textureSection.add(opacityPower);
1679	1917
1680		- ctrlPanel.add(texturePanel);
	1918	+ panel.add(new JSeparator());
	1919	+
	1920	+ panel.add(textureSection);
1681	1921
1682	1922	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1683	1923
..	..	@@ -1714,12 +1954,15 @@
1714	1954	opacityPowerField.addChangeListener(this);
1715	1955	/**/
1716	1956
1717		- resetSlidersButton.addActionListener(this);
1718	1957	clearMaterialButton.addActionListener(this);
1719	1958	createMaterialButton.addActionListener(this);
1720		-
1721		- propagateToggle.addItemListener(this);
1722		- multiplyToggle.addItemListener(this);
	1959	+
	1960	+ if (Globals.ADVANCED)
	1961	+ {
	1962	+ resetSlidersButton.addActionListener(this);
	1963	+ propagateToggle.addItemListener(this);
	1964	+ multiplyToggle.addItemListener(this);
	1965	+ }
1723	1966	}
1724	1967
1725	1968	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1737,8 +1980,9 @@
1737	1980	// 3D models
1738	1981	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1739	1982	{
1740		- lastConverter = new com.jmex.model.converters.MaxToJme();
1741		- LoadFile(filename, lastConverter);
	1983	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	1984	+ //LoadFile(filename, lastConverter);
	1985	+ LoadObjFile(filename); // New 3ds loader
1742	1986	continue;
1743	1987	}
1744	1988	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1890,7 +2134,7 @@
1890	2134
1891	2135	//? flashIt = false;
1892	2136	CameraPane pane = (CameraPane) cameraView;
1893		- pane.clickStart(location.x, location.y, 0);
	2137	+ pane.clickStart(location.x, location.y, 0, 0);
1894	2138	pane.clickEnd(location.x, location.y, 0, true);
1895	2139
1896	2140	if (group.selection.size() == 1)
..	..	@@ -1939,6 +2183,7 @@
1939	2183	e2.printStackTrace();
1940	2184	}
1941	2185	}
	2186	+
1942	2187	LoadJMEThread loadThread;
1943	2188
1944	2189	class LoadJMEThread extends Thread
..	..	@@ -1996,6 +2241,7 @@
1996	2241	//LoadFile0(filename, converter);
1997	2242	}
1998	2243	}
	2244	+
1999	2245	LoadOBJThread loadObjThread;
2000	2246
2001	2247	class LoadOBJThread extends Thread
..	..	@@ -2074,19 +2320,19 @@
2074	2320
2075	2321	void LoadObjFile(String fullname)
2076	2322	{
2077		- /*
	2323	+ System.out.println("Loading " + fullname);
	2324	+ /**/
2078	2325	//lastFilename = fullname;
2079	2326	if(loadObjThread == null)
2080	2327	{
2081		- loadObjThread = new LoadOBJThread();
2082		- loadObjThread.start();
	2328	+ loadObjThread = new LoadOBJThread();
	2329	+ loadObjThread.start();
2083	2330	}
2084	2331
2085	2332	loadObjThread.add(fullname);
2086		- */
	2333	+ /**/
2087	2334
2088		- System.out.println("Loading " + fullname);
2089		- makeSomething(new FileObject(fullname, true), true);
	2335	+ //makeSomething(new FileObject(fullname, true), true);
2090	2336	}
2091	2337
2092	2338	void LoadGFDFile(String fullname)
..	..	@@ -2347,11 +2593,11 @@
2347	2593
2348	2594	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2349	2595	{
2350		- if (GrafreeD.standAlone)
	2596	+ if (Grafreed.standAlone)
2351	2597	{
2352	2598	/**/
2353	2599	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2354		- browser.show();
	2600	+ browser.setVisible(true);
2355	2601	String filename = browser.getFile();
2356	2602	if (filename != null && filename.length() > 0)
2357	2603	{
..	..	@@ -2462,6 +2708,7 @@
2462	2708	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2463	2709	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2464	2710	}
	2711	+
2465	2712	//cJME.count++;
2466	2713	//cJME.count %= 12;
2467	2714	if (gc)
..	..	@@ -2496,6 +2743,7 @@
2496	2743	}
2497	2744	if (input == null)
2498	2745	{
	2746	+ new Exception().printStackTrace();
2499	2747	System.exit(0);
2500	2748	}
2501	2749
..	..	@@ -2644,6 +2892,7 @@
2644	2892	}
2645	2893	}
2646	2894	}
	2895	+
2647	2896	cFileSystemPane FSPane;
2648	2897
2649	2898	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2697,11 +2946,14 @@
2697	2946	}
2698	2947	}
2699	2948	}
	2949	+
2700	2950	freezematerial = false;
2701	2951	}
2702	2952
2703	2953	void SetMaterial(Object3D object)
2704	2954	{
	2955	+ latestObject = object;
	2956	+
2705	2957	cMaterial mat = object.material;
2706	2958
2707	2959	if (mat == null)
..	..	@@ -2710,7 +2962,8 @@
2710	2962	return;
2711	2963	}
2712	2964
2713		- multiplyToggle.setSelected(mat.multiply);
	2965	+ if (multiplyToggle != null)
	2966	+ multiplyToggle.setSelected(mat.multiply);
2714	2967
2715	2968	assert (object.projectedVertices != null);
2716	2969
..	..	@@ -2812,12 +3065,17 @@
2812	3065	// }
2813	3066
2814	3067	/**/
2815		- if (deselect)
	3068	+ if (deselect \|\| child == null)
2816	3069	{
2817	3070	//group.deselectAll();
2818	3071	//freeze = true;
2819	3072	GetTree().clearSelection();
2820	3073	//freeze = false;
	3074	+
	3075	+ if (child == null)
	3076	+ {
	3077	+ return;
	3078	+ }
2821	3079	}
2822	3080
2823	3081	//group.addSelectee(child);
..	..	@@ -2886,7 +3144,7 @@
2886	3144	cameraView.ToggleDL();
2887	3145	cameraView.repaint();
2888	3146	return;
2889		- } else if (event.getSource() == toggleTextureItem)
	3147	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2890	3148	{
2891	3149	cameraView.ToggleTexture();
2892	3150	// june 2013 copy.HardTouch();
..	..	@@ -2925,9 +3183,9 @@
2925	3183	frame.validate();
2926	3184
2927	3185	return;
2928		- } else if (event.getSource() == toggleRandomItem)
	3186	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2929	3187	{
2930		- cameraView.ToggleRandom();
	3188	+ cameraView.ToggleSwitch();
2931	3189	cameraView.repaint();
2932	3190	return;
2933	3191	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2956,6 +3214,10 @@
2956	3214	{
2957	3215	copy.live ^= true;
2958	3216	return;
	3217	+ } else if (event.getSource() == selectCB)
	3218	+ {
	3219	+ copy.dontselect ^= true;
	3220	+ return;
2959	3221	} else if (event.getSource() == hideCB)
2960	3222	{
2961	3223	copy.hide ^= true;
..	..	@@ -2970,6 +3232,7 @@
2970	3232	if (event.getSource() == randomCB)
2971	3233	{
2972	3234	copy.random ^= true;
	3235	+ objEditor.refreshContents();
2973	3236	return;
2974	3237	}
2975	3238	if (event.getSource() == speedupCB)
..	..	@@ -2993,8 +3256,9 @@
2993	3256
2994	3257	public void actionPerformed(ActionEvent event)
2995	3258	{
	3259	+ Object source = event.getSource();
2996	3260	// SCRIPT DIALOG
2997		- if (event.getSource() == okbutton)
	3261	+ if (source == okbutton)
2998	3262	{
2999	3263	textpanel.setVisible(false);
3000	3264	textpanel.remove(textarea);
..	..	@@ -3006,7 +3270,7 @@
3006	3270	textarea = null;
3007	3271	textpanel = null;
3008	3272	}
3009		- if (event.getSource() == cancelbutton)
	3273	+ if (source == cancelbutton)
3010	3274	{
3011	3275	textpanel.setVisible(false);
3012	3276	textpanel.remove(textarea);
..	..	@@ -3018,50 +3282,50 @@
3018	3282	//applySelf();
3019	3283	//client.refreshEditWindow();
3020	3284	//refreshContents();
3021		- if (event.getSource() == nameField)
	3285	+ if (source == nameField)
3022	3286	{
3023	3287	//System.out.println("ObjEditor " + event);
3024	3288	applySelf0(true);
3025	3289	//parent.applySelf();
3026	3290	objEditor.refreshContents();
3027		- } else if (event.getSource() == resetButton)
	3291	+ } else if (source == resetButton)
3028	3292	{
3029	3293	CameraPane.fullreset = true;
3030	3294	copy.Reset(); // ResetMeshes();
3031	3295	copy.Touch();
3032	3296	objEditor.refreshContents();
3033		- } else if (event.getSource() == stepItem)
	3297	+ } else if (source == stepItem)
3034	3298	{
3035	3299	//cameraView.ONESTEP = true;
3036	3300	Globals.ONESTEP = true;
3037	3301	cameraView.repaint();
3038	3302	return;
3039		- } else if (event.getSource() == stepButton)
	3303	+ } else if (source == stepButton)
3040	3304	{
3041	3305	copy.Step();
3042	3306	copy.Touch();
3043	3307	objEditor.refreshContents();
3044		- } else if (event.getSource() == slowerButton)
	3308	+ } else if (source == slowerButton)
3045	3309	{
3046	3310	copy.Slower();
3047	3311	copy.Touch();
3048	3312	objEditor.refreshContents();
3049		- } else if (event.getSource() == fasterButton)
	3313	+ } else if (source == fasterButton)
3050	3314	{
3051	3315	copy.Faster();
3052	3316	copy.Touch();
3053	3317	objEditor.refreshContents();
3054		- } else if (event.getSource() == remarkButton)
	3318	+ } else if (source == remarkButton)
3055	3319	{
3056	3320	copy.Remark();
3057	3321	copy.Touch();
3058	3322	objEditor.refreshContents();
3059		- } else if (event.getSource() == stepAllButton)
	3323	+ } else if (source == stepAllButton)
3060	3324	{
3061	3325	copy.StepAll();
3062	3326	copy.Touch();
3063	3327	objEditor.refreshContents();
3064		- } else if (event.getSource() == resetAllButton)
	3328	+ } else if (source == resetAllButton)
3065	3329	{
3066	3330	//CameraPane.fullreset = true;
3067	3331	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3094,53 +3358,79 @@
3094	3358	// Close();
3095	3359	// }
3096	3360	// else
3097		- if (event.getSource() == resetSlidersButton)
	3361	+ if (source == resetSlidersButton)
3098	3362	{
3099	3363	ResetSliders();
3100		- } else if (event.getSource() == clearMaterialButton)
	3364	+ } else if (source == clearMaterialButton)
3101	3365	{
3102	3366	ClearMaterial();
3103		- } else if (event.getSource() == createMaterialButton)
	3367	+ } else if (source == createMaterialButton)
3104	3368	{
3105	3369	CreateMaterial();
3106		- } else if (event.getSource() == clearPanelButton)
	3370	+ } else if (source == clearPanelButton)
3107	3371	{
3108	3372	copy.ClearUI();
3109	3373	refreshContents(true);
3110		- } /*
3111		- }
3112		-
3113		- public boolean action(Event event, Object arg)
3114		- {
3115		- */ else if (event.getSource() == closeItem)
	3374	+ } else if (source == importGFDItem)
	3375	+ {
	3376	+ ImportGFD();
	3377	+ } else
	3378	+ if (source == importVRMLX3DItem)
	3379	+ {
	3380	+ ImportVRMLX3D();
	3381	+ } else
	3382	+ if (source == import3DSItem)
	3383	+ {
	3384	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3385	+ } else
	3386	+ if (source == importOBJItem)
	3387	+ {
	3388	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3389	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3390	+ browser.setVisible(true);
	3391	+ String filename = browser.getFile();
	3392	+ if (filename != null && filename.length() > 0)
	3393	+ {
	3394	+ String fullname = browser.getDirectory() + filename;
	3395	+ makeSomething(ReadOBJ(fullname), true);
	3396	+ }
	3397	+ } else
	3398	+ if (source == closeItem)
3116	3399	{
3117	3400	Close();
3118	3401	//return true;
3119		- } else if (event.getSource() == loadItem)
	3402	+ } else if (source == openItem)
3120	3403	{
3121		- load();
	3404	+ Open();
3122	3405	//return true;
3123		- } else if (event.getSource() == saveItem)
	3406	+ } else if (source == newItem)
	3407	+ {
	3408	+ New();
	3409	+ } else if (source == saveItem)
3124	3410	{
3125	3411	save();
3126	3412	//return true;
3127		- } else if (event.getSource() == saveAsItem)
	3413	+ } else if (source == saveAsItem)
3128	3414	{
3129	3415	saveAs();
3130	3416	//return true;
3131		- } else if (event.getSource() == reexportItem)
	3417	+ } else if (source == reexportItem)
3132	3418	{
3133	3419	reexport();
3134	3420	//return true;
3135		- } else if (event.getSource() == exportAsItem)
	3421	+ } else if (source == exportAsItem)
3136	3422	{
3137	3423	export();
3138	3424	//return true;
3139		- } else if (event.getSource() == povItem)
	3425	+ } else if (source == povItem)
3140	3426	{
3141	3427	generatePOV();
3142	3428	//return true;
3143		- } else if (event.getSource() == zBufferItem)
	3429	+ } else if (event.getSource() == archiveItem)
	3430	+ {
	3431	+ cTools.Archive(frame);
	3432	+ return;
	3433	+ } else if (source == zBufferItem)
3144	3434	{
3145	3435	try
3146	3436	{
..	..	@@ -3162,21 +3452,8 @@
3162	3452	cameraView.repaint();
3163	3453	//return true;
3164	3454	}
3165		- */ else if (event.getSource() == editCameraItem)
3166		- {
3167		- cameraView.ProtectCamera();
3168		- cameraView.repaint();
3169		- return;
3170		- } else if (event.getSource() == revertCameraItem)
3171		- {
3172		- cameraView.RevertCamera();
3173		- cameraView.repaint();
3174		- return;
3175		-// } else if (event.getSource() == textureButton)
3176		-// {
3177		-// return; // true;
3178		- } else // combos...
3179		- if (event.getSource() == texresMenu)
	3455	+ */ else // combos...
	3456	+ if (source == texresMenu)
3180	3457	{
3181	3458	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3182	3459	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3188,12 +3465,349 @@
3188	3465	}
3189	3466	}
3190	3467
	3468	+ void New()
	3469	+ {
	3470	+ while (copy.Size() > 1)
	3471	+ {
	3472	+ copy.remove(1);
	3473	+ }
	3474	+
	3475	+ ResetModel();
	3476	+ objEditor.refreshContents();
	3477	+ }
	3478	+
	3479	+ static public byte[] Compress(Object3D o)
	3480	+ {
	3481	+ try
	3482	+ {
	3483	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3484	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3485	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3486	+
	3487	+ Object3D parent = o.parent;
	3488	+ o.parent = null;
	3489	+
	3490	+ out.writeObject(o);
	3491	+
	3492	+ o.parent = parent;
	3493	+
	3494	+ out.flush();
	3495	+
	3496	+ baos //zstream
	3497	+ .close();
	3498	+ out.close();
	3499	+
	3500	+ byte[] bytes = baos.toByteArray();
	3501	+
	3502	+ System.out.println("save #bytes = " + bytes.length);
	3503	+ return bytes;
	3504	+ } catch (Exception e)
	3505	+ {
	3506	+ System.err.println(e);
	3507	+ return null;
	3508	+ }
	3509	+ }
	3510	+
	3511	+ static public Object Uncompress(byte[] bytes)
	3512	+ {
	3513	+ System.out.println("restore #bytes = " + bytes.length);
	3514	+ try
	3515	+ {
	3516	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3517	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3518	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3519	+ Object obj = in.readObject();
	3520	+
	3521	+ bais //istream
	3522	+ .close();
	3523	+ in.close();
	3524	+
	3525	+ return obj;
	3526	+ } catch (Exception e)
	3527	+ {
	3528	+ System.err.println(e);
	3529	+ return null;
	3530	+ }
	3531	+ }
	3532	+
	3533	+ static public Object clone(Object o)
	3534	+ {
	3535	+ try
	3536	+ {
	3537	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3538	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3539	+
	3540	+ out.writeObject(o);
	3541	+
	3542	+ out.flush();
	3543	+ out.close();
	3544	+
	3545	+ byte[] bytes = baos.toByteArray();
	3546	+
	3547	+ System.out.println("clone = " + bytes.length);
	3548	+
	3549	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3550	+ ObjectInputStream in = new ObjectInputStream(bais);
	3551	+ Object obj = in.readObject();
	3552	+ in.close();
	3553	+
	3554	+ return obj;
	3555	+ } catch (Exception e)
	3556	+ {
	3557	+ System.err.println(e);
	3558	+ return null;
	3559	+ }
	3560	+ }
	3561	+
	3562	+ cRadio GetCurrentTab()
	3563	+ {
	3564	+ cRadio ab;
	3565	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3566	+ {
	3567	+ ab = (cRadio)e.nextElement();
	3568	+ if(ab.GetObject() == copy)
	3569	+ {
	3570	+ return ab;
	3571	+ }
	3572	+ }
	3573	+
	3574	+ return null;
	3575	+ }
	3576	+
	3577	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3578	+
	3579	+ public void Save()
	3580	+ {
	3581	+ Save(true);
	3582	+ }
	3583	+
	3584	+ private boolean Equal(byte[] compress, byte[] name)
	3585	+ {
	3586	+ if (compress.length != name.length)
	3587	+ {
	3588	+ return false;
	3589	+ }
	3590	+
	3591	+ for (int i=compress.length; --i>=0;)
	3592	+ {
	3593	+ if (compress[i] != name[i])
	3594	+ return false;
	3595	+ }
	3596	+
	3597	+ return true;
	3598	+ }
	3599	+
	3600	+ public boolean Save(boolean user)
	3601	+ {
	3602	+ System.err.println("Save");
	3603	+
	3604	+ cRadio tab = GetCurrentTab();
	3605	+
	3606	+ boolean temp = CameraPane.SWITCH;
	3607	+ CameraPane.SWITCH = false;
	3608	+
	3609	+ copy.ExtractBigData(hashtable);
	3610	+
	3611	+ byte[] compress = Compress(copy);
	3612	+
	3613	+ CameraPane.SWITCH = temp;
	3614	+
	3615	+ boolean thesame = false;
	3616	+
	3617	+ // Quick heuristic using length. Works only when stream is compressed.
	3618	+ if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
	3619	+ {
	3620	+ thesame = true;
	3621	+ }
	3622	+
	3623	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3624	+ if (!thesame)
	3625	+ {
	3626	+ //tab.user[tab.undoindex] = user;
	3627	+ boolean increment = tab.graphs[tab.undoindex] == null;
	3628	+
	3629	+ tab.graphs[tab.undoindex] = compress;
	3630	+
	3631	+ if (increment)
	3632	+ tab.undoindex++;
	3633	+ }
	3634	+
	3635	+ copy.RestoreBigData(hashtable);
	3636	+
	3637	+ //assert(hashtable.isEmpty());
	3638	+
	3639	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3640	+ {
	3641	+ //tab.user[i] = false;
	3642	+ // tab.graphs[i] = null;
	3643	+ }
	3644	+
	3645	+ SetUndoStates();
	3646	+
	3647	+ // test save
	3648	+ if (false)
	3649	+ {
	3650	+ try
	3651	+ {
	3652	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3653	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3654	+
	3655	+ p.writeObject(copy);
	3656	+
	3657	+ p.flush();
	3658	+
	3659	+ ostream.close();
	3660	+ } catch (Exception e)
	3661	+ {
	3662	+ e.printStackTrace();
	3663	+ }
	3664	+ }
	3665	+
	3666	+ return !thesame;
	3667	+ }
	3668	+
	3669	+ void CopyChanged(Object3D obj)
	3670	+ {
	3671	+ SetUndoStates();
	3672	+
	3673	+ boolean temp = CameraPane.SWITCH;
	3674	+ CameraPane.SWITCH = false;
	3675	+
	3676	+ copy.ExtractBigData(hashtable);
	3677	+
	3678	+ copy.clear();
	3679	+
	3680	+ for (int i=0; i<obj.Size(); i++)
	3681	+ {
	3682	+ copy.add(obj.get(i));
	3683	+ }
	3684	+
	3685	+ copy.RestoreBigData(hashtable);
	3686	+
	3687	+ CameraPane.SWITCH = temp;
	3688	+
	3689	+ //assert(hashtable.isEmpty());
	3690	+
	3691	+ copy.Touch();
	3692	+
	3693	+ ResetModel();
	3694	+ copy.HardTouch(); // recompile?
	3695	+
	3696	+ cRadio ab;
	3697	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3698	+ {
	3699	+ ab = (cRadio)e.nextElement();
	3700	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3701	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3702	+ if (test != null)
	3703	+ {
	3704	+ test.editWindow = ab.object.editWindow;
	3705	+ ab.object = test;
	3706	+ }
	3707	+ }
	3708	+
	3709	+ refreshContents();
	3710	+ }
	3711	+
	3712	+ cButton undoButton;
	3713	+ cButton redoButton;
	3714	+
	3715	+ void SetUndoStates()
	3716	+ {
	3717	+ cRadio tab = GetCurrentTab();
	3718	+
	3719	+ undoButton.setEnabled(tab.undoindex > 0);
	3720	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3721	+ }
	3722	+
	3723	+ public boolean Undo()
	3724	+ {
	3725	+ System.err.println("Undo");
	3726	+
	3727	+ cRadio tab = GetCurrentTab();
	3728	+
	3729	+ if (tab.undoindex == 0)
	3730	+ {
	3731	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3732	+ return false;
	3733	+ }
	3734	+
	3735	+ if (tab.graphs[tab.undoindex] == null) // \|\| !tab.user[tab.undoindex])
	3736	+ {
	3737	+ if (Save(false))
	3738	+ tab.undoindex -= 1;
	3739	+ else
	3740	+ {
	3741	+ if (tab.undoindex <= 0)
	3742	+ return false;
	3743	+ else
	3744	+ tab.undoindex -= 1;
	3745	+ }
	3746	+ }
	3747	+
	3748	+ tab.undoindex -= 1;
	3749	+
	3750	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3751	+
	3752	+ return true;
	3753	+ }
	3754	+
	3755	+ public void Redo()
	3756	+ {
	3757	+ cRadio tab = GetCurrentTab();
	3758	+
	3759	+ if (tab.graphs[tab.undoindex + 1] == null)
	3760	+ {
	3761	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3762	+ return;
	3763	+ }
	3764	+
	3765	+ tab.undoindex += 1;
	3766	+
	3767	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3768	+
	3769	+ //if (!tab.user[tab.undoindex])
	3770	+ // tab.graphs[tab.undoindex] = null;
	3771	+ }
	3772	+
	3773	+ void ImportGFD()
	3774	+ {
	3775	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3776	+ browser.show();
	3777	+ String filename = browser.getFile();
	3778	+ if (filename != null && filename.length() > 0)
	3779	+ {
	3780	+ String fullname = browser.getDirectory() + filename;
	3781	+
	3782	+ //Object3D readobj =
	3783	+ objEditor.ReadGFD(fullname, objEditor);
	3784	+ //makeSomething(readobj);
	3785	+ }
	3786	+ }
	3787	+
	3788	+ void ImportVRMLX3D()
	3789	+ {
	3790	+ if (Grafreed.standAlone)
	3791	+ {
	3792	+ /**/
	3793	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3794	+ browser.show();
	3795	+ String filename = browser.getFile();
	3796	+ if (filename != null && filename.length() > 0)
	3797	+ {
	3798	+ String fullname = browser.getDirectory() + filename;
	3799	+ LoadVRMLX3D(fullname);
	3800	+ }
	3801	+ /**/
	3802	+ }
	3803	+ }
	3804	+
3191	3805	void ToggleAnimation()
3192	3806	{
3193	3807	if (!Globals.ANIMATION)
3194	3808	{
3195	3809	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3196		- browser.show();
	3810	+ browser.setVisible(true);
3197	3811	String filename = browser.getFile();
3198	3812	if (filename != null && filename.length() > 0)
3199	3813	{
..	..	@@ -3203,8 +3817,8 @@
3203	3817
3204	3818	Globals.ANIMATION ^= true;
3205	3819
3206		- GrafreeD.wav.cursor = 0;
3207		- GrafreeD.wav.loop = 0;
	3820	+ Grafreed.wav.cursor = 0;
	3821	+ Grafreed.wav.loop = 0;
3208	3822	}
3209	3823	} else
3210	3824	{
..	..	@@ -3254,7 +3868,7 @@
3254	3868	void CreateMaterial()
3255	3869	{
3256	3870	//copy.ClearMaterial(); // PATCH
3257		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3871	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3258	3872	if (copy.selection.size() > 0)
3259	3873	//SetMaterial(copy);
3260	3874	{
..	..	@@ -3305,7 +3919,7 @@
3305	3919	assert false;
3306	3920	}
3307	3921
3308		- void EditSelection()
	3922	+ void EditSelection(boolean newWindow)
3309	3923	{
3310	3924	}
3311	3925
..	..	@@ -3313,11 +3927,11 @@
3313	3927	{
3314	3928	copy.ResetBlockLoop(); // temporary problem
3315	3929
3316		- boolean random = CameraPane.RANDOM;
3317		- CameraPane.RANDOM = false; // parse everything
	3930	+ boolean random = CameraPane.SWITCH;
	3931	+ CameraPane.SWITCH = false; // parse everything
3318	3932	copy.ResetDisplayList();
3319	3933	copy.HardTouch();
3320		- CameraPane.RANDOM = random;
	3934	+ CameraPane.SWITCH = random;
3321	3935	}
3322	3936
3323	3937	// public void applySelf()
..	..	@@ -3391,6 +4005,36 @@
3391	4005	{
3392	4006	//System.out.println("Propagate = " + propagate);
3393	4007	copy.UpdateMaterial(anchor, current, propagate);
	4008	+
	4009	+ if (copy.material != null)
	4010	+ {
	4011	+ cMaterial mat = copy.material;
	4012	+
	4013	+ colorField.SetToolTipValue((mat.color));
	4014	+ modulationField.SetToolTipValue((mat.modulation));
	4015	+ metalnessField.SetToolTipValue((mat.metalness));
	4016	+ diffuseField.SetToolTipValue((mat.diffuse));
	4017	+ specularField.SetToolTipValue((mat.specular));
	4018	+ shininessField.SetToolTipValue((mat.shininess));
	4019	+ shiftField.SetToolTipValue((mat.shift));
	4020	+ ambientField.SetToolTipValue((mat.ambient));
	4021	+ lightareaField.SetToolTipValue((mat.lightarea));
	4022	+ diffusenessField.SetToolTipValue((mat.factor));
	4023	+ velvetField.SetToolTipValue((mat.velvet));
	4024	+ sheenField.SetToolTipValue((mat.sheen));
	4025	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4026	+ backlitField.SetToolTipValue((mat.bump));
	4027	+ anisoField.SetToolTipValue((mat.aniso));
	4028	+ anisoVField.SetToolTipValue((mat.anisoV));
	4029	+ cameraField.SetToolTipValue((mat.cameralight));
	4030	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4031	+ shadowField.SetToolTipValue((mat.shadow));
	4032	+ textureField.SetToolTipValue((mat.texture));
	4033	+ opacityField.SetToolTipValue((mat.opacity));
	4034	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4035	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4036	+ }
	4037	+
3394	4038	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3395	4039	{
3396	4040	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3435,6 +4079,7 @@
3435	4079	\|\| e.getSource() == apertureField
3436	4080	\|\| e.getSource() == shadowblurField)
3437	4081	{
	4082	+ new Exception().printStackTrace();
3438	4083	System.exit(0);
3439	4084	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3440	4085	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3505,7 +4150,7 @@
3505	4150	}
3506	4151
3507	4152	if (normalpushField != null)
3508		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4153	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3509	4154	}
3510	4155
3511	4156	void SnapObject()
..	..	@@ -3769,6 +4414,8 @@
3769	4414
3770	4415	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3771	4416	{
	4417	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4418	+ Save();
3772	4419	//Tween.set(thing, 0).target(1).start(tweenManager);
3773	4420	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3774	4421	// if (thing instanceof GenericJointDemo)
..	..	@@ -3855,6 +4502,12 @@
3855	4502	{
3856	4503	ResetModel();
3857	4504	Select(thing.GetTreePath(), true, false); // unselect... false);
	4505	+
	4506	+ if (thing.Size() == 0)
	4507	+ {
	4508	+ //EditSelection(false);
	4509	+ }
	4510	+
3858	4511	refreshContents();
3859	4512	}
3860	4513
..	..	@@ -3972,6 +4625,7 @@
3972	4625	}
3973	4626	}
3974	4627	}
	4628	+
3975	4629	LoadGFDThread loadGFDThread;
3976	4630
3977	4631	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3991,8 +4645,10 @@
3991	4645
3992	4646	try
3993	4647	{
	4648	+ // Try compressed version first.
3994	4649	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3995		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4650	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4651	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3996	4652
3997	4653	readobj = (Object3D) p.readObject();
3998	4654	istream.close();
..	..	@@ -4000,7 +4656,20 @@
4000	4656	readobj.ResetDisplayList();
4001	4657	} catch (Exception e)
4002	4658	{
4003		- e.printStackTrace();
	4659	+ //e.printStackTrace();
	4660	+ try
	4661	+ {
	4662	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4663	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4664	+
	4665	+ readobj = (Object3D) p.readObject();
	4666	+ istream.close();
	4667	+
	4668	+ readobj.ResetDisplayList();
	4669	+ } catch (Exception e2)
	4670	+ {
	4671	+ e2.printStackTrace();
	4672	+ }
4004	4673	}
4005	4674	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4006	4675	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4046,6 +4715,12 @@
4046	4715
4047	4716	void LoadIt(Object obj)
4048	4717	{
	4718	+ if (obj == null)
	4719	+ {
	4720	+ // Invalid file
	4721	+ return;
	4722	+ }
	4723	+
4049	4724	System.out.println("Loaded " + obj);
4050	4725	//new Exception().printStackTrace();
4051	4726	Object3D readobj = (Object3D) obj;
..	..	@@ -4055,6 +4730,8 @@
4055	4730
4056	4731	if (readobj != null)
4057	4732	{
	4733	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4734	+ // Save();
4058	4735	try
4059	4736	{
4060	4737	//readobj.deepCopySelf(copy);
..	..	@@ -4115,9 +4792,9 @@
4115	4792	}
4116	4793	}
4117	4794
4118		- void load() // throws ClassNotFoundException
	4795	+ void Open() // throws ClassNotFoundException
4119	4796	{
4120		- if (GrafreeD.standAlone)
	4797	+ if (Grafreed.standAlone)
4121	4798	{
4122	4799	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4123	4800	browser.show();
..	..	@@ -4204,11 +4881,13 @@
4204	4881	try
4205	4882	{
4206	4883	FileOutputStream ostream = new FileOutputStream(lastname);
4207		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4884	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4885	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4208	4886
4209	4887	p.writeObject(copy);
4210	4888	p.flush();
4211	4889
	4890	+ zstream.close();
4212	4891	ostream.close();
4213	4892
4214	4893	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4218,17 +4897,20 @@
4218	4897	{
4219	4898	}
4220	4899	}
	4900	+
4221	4901	String lastname;
4222	4902
4223	4903	void saveAs()
4224	4904	{
4225		- if (GrafreeD.standAlone)
	4905	+ if (Grafreed.standAlone)
4226	4906	{
4227	4907	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4228	4908	browser.setVisible(true);
4229	4909	String filename = browser.getFile();
4230	4910	if (filename != null && filename.length() > 0)
4231	4911	{
	4912	+ if (!filename.endsWith(".gfd"))
	4913	+ filename += ".gfd";
4232	4914	lastname = browser.getDirectory() + filename;
4233	4915	save();
4234	4916	}
..	..	@@ -4327,13 +5009,13 @@
4327	5009	try
4328	5010	{
4329	5011	FileOutputStream ostream = new FileOutputStream(filename);
4330		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4331		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5012	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5013	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4332	5014
4333	5015	Object3D objectparent = obj.parent;
4334	5016	obj.parent = null;
4335	5017
4336		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5018	+ Object3D object = (Object3D) Grafreed.clone(obj);
4337	5019
4338	5020	obj.parent = objectparent;
4339	5021
..	..	@@ -4345,8 +5027,8 @@
4345	5027	p.writeObject(object);
4346	5028	p.flush();
4347	5029
	5030	+ zstream.close();
4348	5031	ostream.close();
4349		- // zstream.close();
4350	5032
4351	5033	// group.selection.get(0).parent = parent;
4352	5034	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4367,7 +5049,7 @@
4367	5049	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4368	5050	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4369	5051	copy.generatePOV(buffer);
4370		- if (GrafreeD.standAlone)
	5052	+ if (Grafreed.standAlone)
4371	5053	{
4372	5054	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4373	5055	browser.show();
..	..	@@ -4393,21 +5075,20 @@
4393	5075	Object3D client;
4394	5076	Object3D copy;
4395	5077	MenuBar menuBar;
4396		- Menu windowMenu;
4397		- MenuItem loadItem;
	5078	+ Menu fileMenu;
	5079	+ MenuItem newItem;
	5080	+ MenuItem openItem;
4398	5081	MenuItem saveItem;
4399	5082	MenuItem saveAsItem;
4400	5083	MenuItem exportAsItem;
4401	5084	MenuItem reexportItem;
4402	5085	MenuItem povItem;
4403	5086	MenuItem closeItem;
4404		- Menu cameraMenu;
	5087	+
4405	5088	CheckboxMenuItem zBufferItem;
4406	5089	//MenuItem normalLensItem;
4407		- MenuItem editCameraItem;
4408		- MenuItem revertCameraItem;
4409		- CheckboxMenuItem toggleLiveItem;
4410	5090	MenuItem stepItem;
	5091	+ CheckboxMenuItem toggleLiveItem;
4411	5092	CheckboxMenuItem toggleFullScreenItem;
4412	5093	CheckboxMenuItem toggleTimelineItem;
4413	5094	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4416,25 +5097,39 @@
4416	5097	CheckboxMenuItem toggleFootContactItem;
4417	5098	CheckboxMenuItem toggleDLItem;
4418	5099	CheckboxMenuItem toggleTextureItem;
4419		- CheckboxMenuItem toggleRandomItem;
	5100	+ CheckboxMenuItem toggleSwitchItem;
4420	5101	CheckboxMenuItem toggleRootItem;
4421	5102	CheckboxMenuItem animationItem;
	5103	+ MenuItem archiveItem;
4422	5104	CheckboxMenuItem toggleHandleItem;
4423	5105	CheckboxMenuItem togglePaintItem;
4424	5106	JSplitPane mainPanel;
4425	5107	JScrollPane scrollpane;
	5108	+
4426	5109	JPanel toolbarPanel;
4427		- JPanel treePanel;
	5110	+
	5111	+ cGridBag treePanel;
	5112	+
4428	5113	JPanel radioPanel;
4429	5114	ButtonGroup buttonGroup;
4430		- cGridBag ctrlPanel;
	5115	+
	5116	+ cGridBag toolboxPanel;
4431	5117	cGridBag materialPanel;
	5118	+ cGridBag ctrlPanel;
	5119	+
4432	5120	JScrollPane infoPanel;
	5121	+
4433	5122	cGridBag optionsPanel;
	5123	+
4434	5124	JTabbedPane objectPanel;
	5125	+ boolean materialFlushed;
	5126	+ Object3D latestObject;
	5127	+
4435	5128	cGridBag XYZPanel;
	5129	+
4436	5130	JSplitPane gridPanel;
4437	5131	JSplitPane bigPanel;
	5132	+
4438	5133	cGridBag bigThree;
4439	5134	cGridBag scenePanel;
4440	5135	cGridBag centralPanel;
..	..	@@ -4549,8 +5244,13 @@
4549	5244	cNumberSlider fogField;
4550	5245	JLabel opacityPowerLabel;
4551	5246	cNumberSlider opacityPowerField;
4552		- JTree jTree;
	5247	+ cTree jTree;
4553	5248	//ObjectUI parent;
4554	5249
4555	5250	cNumberSlider normalpushField;
	5251	+
	5252	+ private MenuItem importGFDItem;
	5253	+ private MenuItem importVRMLX3DItem;
	5254	+ private MenuItem import3DSItem;
	5255	+ private MenuItem importOBJItem;
4556	5256	}