~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(true);
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,79 +390,64 @@
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		- treePanel = new JPanel();
	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();
	442	+ doc = infoarea.getStyledDocument();
	443	+
370	444	infoarea.setEditable(true);
371	445	SetText();
372	446	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
373	447	// infoarea.setOpaque(false);
374	448	// //infoarea.setForeground(textcolor);
375		- infoarea.setLineWrap(true);
376		- infoarea.setWrapStyleWord(true);
	449	+// TEXTAREA infoarea.setLineWrap(true);
	450	+// TEXTAREA infoarea.setWrapStyleWord(true);
377	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
378	452	infoPanel.setPreferredSize(new Dimension(50, 200));
379	453	infoPanel.setName("Info");
..	..	@@ -384,14 +458,21 @@
384	458	mainPanel.setName("Main");
385	459	mainPanel.setContinuousLayout(true);
386	460	mainPanel.setOneTouchExpandable(true);
387		- mainPanel.setDividerLocation(1.0);
388	461	mainPanel.setDividerSize(9);
389		- mainPanel.setResizeWeight(0);
390		-
	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	+
391	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
392	473	//mainPanel.setLayout(new GridBagLayout());
393	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
394		- treePanel.setLayout(new GridBagLayout());
	475	+// treePanel.setLayout(new GridBagLayout());
395	476	//ctrlPanel.setLayout(new GridBagLayout());
396	477	//materialPanel.setLayout(new GridBagLayout());
397	478
..	..	@@ -432,7 +513,7 @@
432	513	static String newline = "\n";
433	514	protected static final String buttonString = "JButton";
434	515	StyledDocument doc;
435		- JTextArea infoarea;
	516	+ JTextPane infoarea;
436	517
437	518	void ClearInfo()
438	519	{
..	..	@@ -455,10 +536,10 @@
455	536	e.printStackTrace();
456	537	}
457	538
458		- String selection = infoarea.getText();
459		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
460		- java.awt.datatransfer.Clipboard clipboard =
461		- 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();
462	543	//clipboard.setContents(data, data);
463	544	}
464	545
..	..	@@ -481,13 +562,13 @@
481	562	//SendInfo("Name:", "bold");
482	563	if (sel.GetTextures() != null \|\| debug)
483	564	{
484		- si.SendInfo(sel.toString(), "bold");
	565	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
485	566	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
486	567	if (sel.Size() > 0)
487	568	{
488	569	si.SendInfo("#children = " + sel.Size(), "regular");
489	570	}
490		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	571	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
491	572	if (debug)
492	573	{
493	574	try
..	..	@@ -499,7 +580,10 @@
499	580	}
500	581
501	582	if (full)
502		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	583	+ {
	584	+ si.SendInfo(" BBox min: " + minima, "regular");
	585	+ si.SendInfo(" BBox max: " + maxima, "regular");
	586	+ }
503	587
504	588	if (sel.bRep != null)
505	589	{
..	..	@@ -526,7 +610,7 @@
526	610	}
527	611	if (sel.support != null)
528	612	{
529		- si.SendInfo(" support: " + sel.support, "regular");
	613	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
530	614	}
531	615	if (sel.scriptnode != null)
532	616	{
..	..	@@ -597,6 +681,9 @@
597	681	{
598	682	CameraPane.pointflow = (PointFlow) sel;
599	683	}
	684	+
	685	+ si.SendInfo("_____________________", "regular");
	686	+ si.SendInfo("", "regular");
600	687	}
601	688	}
602	689
..	..	@@ -612,68 +699,140 @@
612	699	}
613	700	}
614	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	+ }
	725	+
	726	+ void Maximize()
	727	+ {
	728	+ if (maximized)
	729	+ {
	730	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	731	+ }
	732	+ else
	733	+ {
	734	+ keeprect = frame.getBounds();
	735	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	736	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	737	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	738	+// frame.setState(Frame.MAXIMIZED_BOTH);
	739	+ }
	740	+
	741	+ maximized ^= true;
	742	+ }
	743	+
615	744	void ToggleFullScreen()
616	745	{
617		- if (CameraPane.FULLSCREEN)
	746	+ cameraView.ToggleFullScreen();
	747	+
	748	+ if (!CameraPane.FULLSCREEN)
618	749	{
619		- frame.getContentPane().remove(/"Center",/bigThree);
620		- framePanel.add(bigThree);
621		- frame.getContentPane().add(/"Center",/framePanel);
	750	+ device.setFullScreenWindow(null);
	751	+ //frame.setVisible(false);
	752	+// frame.removeNotify();
	753	+// frame.setUndecorated(false);
	754	+// frame.addNotify();
	755	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	756	+
	757	+// X frame.getContentPane().remove(/"Center",/bigThree);
	758	+// X framePanel.add(bigThree);
	759	+// X frame.getContentPane().add(/"Center",/framePanel);
	760	+ framePanel.setDividerLocation(1);
	761	+
	762	+ //frame.setVisible(true);
	763	+ radio.layout = keepButton;
	764	+ //theFrame = null;
	765	+ keepButton = null;
	766	+ radio.layout.doClick();
	767	+
622	768	} else
623	769	{
624		- frame.getContentPane().remove(/"Center",/framePanel);
625		- framePanel.remove(bigThree);
626		- frame.getContentPane().add(/"Center",/bigThree);
	770	+ keepButton = radio.layout;
	771	+ //keeprect = frame.getBounds();
	772	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	773	+// frame.getToolkit().getScreenSize().height);
	774	+ //frame.setVisible(false);
	775	+ device.setFullScreenWindow(frame);
	776	+// frame.removeNotify();
	777	+// frame.setUndecorated(true);
	778	+// frame.addNotify();
	779	+// X frame.getContentPane().remove(/"Center",/framePanel);
	780	+// X framePanel.remove(bigThree);
	781	+// X frame.getContentPane().add(/"Center",/bigThree);
	782	+ framePanel.setDividerLocation(0);
	783	+
	784	+ radio.layout = fullscreenLayout;
	785	+ radio.layout.doClick();
	786	+ //frame.setVisible(true);
627	787	}
628		- cameraView.ToggleFullScreen();
629	788	}
630	789
631		- private JTextArea createTextPane()
	790	+ private JTextPane createTextPane()
632	791	{
633		- String[] initString =
634		- {
635		- "This is an editable JTextPane, ", //regular
636		- "another ", //italic
637		- "styled ", //bold
638		- "text ", //small
639		- "component, ", //large
640		- "which supports embedded components..." + newline,//regular
641		- " " + newline, //button
642		- "...and embedded icons..." + newline, //regular
643		- " ", //icon
644		- newline + "JTextPane is a subclass of JEditorPane that "
645		- + "uses a StyledEditorKit and StyledDocument, and provides "
646		- + "cover methods for interacting with those objects."
647		- };
	792	+// TEXTAREA String[] initString =
	793	+// {
	794	+// "This is an editable JTextPane, ", //regular
	795	+// "another ", //italic
	796	+// "styled ", //bold
	797	+// "text ", //small
	798	+// "component, ", //large
	799	+// "which supports embedded components..." + newline,//regular
	800	+// " " + newline, //button
	801	+// "...and embedded icons..." + newline, //regular
	802	+// " ", //icon
	803	+// newline + "JTextPane is a subclass of JEditorPane that "
	804	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	805	+// + "cover methods for interacting with those objects."
	806	+// };
	807	+//
	808	+// String[] initStyles =
	809	+// {
	810	+// "regular", "italic", "bold", "small", "large",
	811	+// "regular", "button", "regular", "icon",
	812	+// "regular"
	813	+// };
	814	+//
	815	+// JTextPane textPane = new JTextPane();
	816	+// textPane.setEditable(true);
	817	+// /StyledDocument/ doc = textPane.getStyledDocument();
	818	+// addStylesToDocument(doc);
	819	+//
	820	+// try
	821	+// {
	822	+// for (int j = 0; j < 2; j++)
	823	+// {
	824	+// for (int i = 0; i < initString.length; i++)
	825	+// {
	826	+// doc.insertString(doc.getLength(), initString[i],
	827	+// doc.getStyle(initStyles[i]));
	828	+// }
	829	+// }
	830	+// } catch (BadLocationException ble)
	831	+// {
	832	+// System.err.println("Couldn't insert initial text into text pane.");
	833	+// }
648	834
649		- String[] initStyles =
650		- {
651		- "regular", "italic", "bold", "small", "large",
652		- "regular", "button", "regular", "icon",
653		- "regular"
654		- };
655		-
656		- JTextPane textPane = new JTextPane();
657		- textPane.setEditable(true);
658		- /StyledDocument/ doc = textPane.getStyledDocument();
659		- addStylesToDocument(doc);
660		-
661		- try
662		- {
663		- for (int j = 0; j < 2; j++)
664		- {
665		- for (int i = 0; i < initString.length; i++)
666		- {
667		- doc.insertString(doc.getLength(), initString[i],
668		- doc.getStyle(initStyles[i]));
669		- }
670		- }
671		- } catch (BadLocationException ble)
672		- {
673		- System.err.println("Couldn't insert initial text into text pane.");
674		- }
675		-
676		- return new JTextArea(); // textPane;
	835	+ return new JTextPane(); // textPane;
677	836	}
678	837
679	838	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -726,7 +885,7 @@
726	885	protected static ImageIcon createImageIcon(String path,
727	886	String description)
728	887	{
729		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	888	+ java.net.URL imgURL = Grafreed.class.getResource(path);
730	889	if (imgURL != null)
731	890	{
732	891	return new ImageIcon(imgURL, description);
..	..	@@ -758,6 +917,7 @@
758	917	// NumberSlider vDivsField;
759	918	// JCheckBox endcaps;
760	919	JCheckBox liveCB;
	920	+ JCheckBox selectCB;
761	921	JCheckBox hideCB;
762	922	JCheckBox link2masterCB;
763	923	JCheckBox markCB;
..	..	@@ -765,7 +925,12 @@
765	925	JCheckBox speedupCB;
766	926	JCheckBox rewindCB;
767	927	JCheckBox flipVCB;
	928	+
	929	+ cCheckBox toggleTextureCB;
	930	+ cCheckBox toggleSwitchCB;
	931	+
768	932	JComboBox texresMenu;
	933	+
769	934	JButton resetButton;
770	935	JButton stepButton;
771	936	JButton stepAllButton;
..	..	@@ -774,9 +939,13 @@
774	939	JButton fasterButton;
775	940	JButton remarkButton;
776	941
	942	+ cGridBag editPanel;
	943	+ cGridBag editCommandsPanel;
	944	+
777	945	cGridBag namePanel;
778	946	cGridBag setupPanel;
779		- cGridBag commandsPanel;
	947	+ cGridBag setupPanel2;
	948	+ cGridBag objectCommandsPanel;
780	949	cGridBag pushPanel;
781	950	cGridBag fillPanel;
782	951
..	..	@@ -943,10 +1112,6 @@
943	1112
944	1113	void SetupUI2(ObjEditor oe)
945	1114	{
946		-// oe.aConstraints.weightx = 0;
947		-// oe.aConstraints.weighty = 0;
948		-// oe.aConstraints.gridx = 0;
949		-// oe.aConstraints.gridy = 0;
950	1115	//SetupName(oe);
951	1116
952	1117	namePanel = new cGridBag();
..	..	@@ -957,38 +1122,62 @@
957	1122
958	1123	oe.ctrlPanel.Return();
959	1124
960		- if (!GroupEditor.allparams)
	1125	+ if (!allparams)
961	1126	return;
962	1127
963	1128	setupPanel = new cGridBag().setVertical(false);
964	1129
965	1130	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
966		- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
967		- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1131	+ liveCB.setToolTipText("Animate object");
	1132	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1133	+ selectCB.setToolTipText("Make object selectable");
968	1134	// Return();
	1135	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1136	+ hideCB.setToolTipText("Hide object");
969	1137	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
970		- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
971		- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	1138	+ markCB.setToolTipText("As animation target transform");
	1139	+
	1140	+ setupPanel2 = new cGridBag().setVertical(false);
	1141	+
	1142	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1143	+ rewindCB.setToolTipText("Rewind animation");
	1144	+
	1145	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1146	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
972	1147
	1148	+ if (Globals.ADVANCED)
	1149	+ {
	1150	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1151	+ link2masterCB.setToolTipText("Attach to support");
	1152	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1153	+ speedupCB.setToolTipText("Option motion capture");
	1154	+ }
	1155	+
973	1156	oe.ctrlPanel.add(setupPanel);
974	1157	oe.ctrlPanel.Return();
	1158	+ oe.ctrlPanel.add(setupPanel2);
	1159	+ oe.ctrlPanel.Return();
975	1160
976		- commandsPanel = new cGridBag().setVertical(false);
	1161	+ objectCommandsPanel = new cGridBag().setVertical(false);
977	1162
978		- resetButton = AddButton(commandsPanel, "Reset");
979		- stepButton = AddButton(commandsPanel, "Step");
	1163	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1164	+ resetButton.setToolTipText("Jump to frame zero");
	1165	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1166	+ stepButton.setToolTipText("Step one frame");
980	1167	// resetAllButton = AddButton(oe, "Reset All");
981	1168	// stepAllButton = AddButton(oe, "Step All");
982		- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
983	1169	// Return();
984		- slowerButton = AddButton(commandsPanel, "Slow");
985		- fasterButton = AddButton(commandsPanel, "Fast");
986		- remarkButton = AddButton(commandsPanel, "Remark");
	1170	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1171	+ slowerButton.setToolTipText("Decrease animation speed");
	1172	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1173	+ fasterButton.setToolTipText("Increase animation speed");
	1174	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1175	+ remarkButton.setToolTipText("Set the current transform as the target");
987	1176
988		- oe.ctrlPanel.add(commandsPanel);
	1177	+ oe.ctrlPanel.add(objectCommandsPanel);
989	1178	oe.ctrlPanel.Return();
990	1179
991		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1180	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
992	1181	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
993	1182	//Return();
994	1183
..	..	@@ -1191,8 +1380,11 @@
1191	1380	//worldPanel.setName("World");
1192	1381	centralPanel = new cGridBag();
1193	1382	centralPanel.preferredWidth = 20;
1194		- timelinePanel = new JPanel(new BorderLayout());
1195		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1383	+
	1384	+ if (Globals.ADVANCED)
	1385	+ {
	1386	+ timelinePanel = new JPanel(new BorderLayout());
	1387	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1196	1388
1197	1389	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1198	1390	cameraPanel.setContinuousLayout(true);
..	..	@@ -1201,7 +1393,10 @@
1201	1393	// cameraPanel.setDividerSize(9);
1202	1394	cameraPanel.setResizeWeight(1.0);
1203	1395
	1396	+ }
	1397	+
1204	1398	centralPanel.add(cameraView);
	1399	+ centralPanel.setFocusable(true);
1205	1400	//frame.setJMenuBar(timelineMenubar);
1206	1401	//centralPanel.add(timelinePanel);
1207	1402
..	..	@@ -1268,8 +1463,9 @@
1268	1463	// north.setName("Edit");
1269	1464	// north.add(ctrlPanel, BorderLayout.NORTH);
1270	1465	// objectPanel.add(north);
1271		- objectPanel.add(ctrlPanel);
	1466	+ objectPanel.add(editPanel);
1272	1467	objectPanel.add(infoPanel);
	1468	+ objectPanel.add(toolboxPanel);
1273	1469
1274	1470	/*
1275	1471	aConstraints.gridx = 0;
..	..	@@ -1278,7 +1474,7 @@
1278	1474	aConstraints.gridy += 1;
1279	1475	aConstraints.gridwidth = 1;
1280	1476	mainPanel.add(objectPanel, aConstraints);
1281		- */
	1477	+ */
1282	1478
1283	1479	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1284	1480	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1290,14 +1486,12 @@
1290	1486	scrollpane.addMouseWheelListener(this); // Default not fast enough
1291	1487
1292	1488	/JTabbedPane/ scenePanel = new cGridBag();
1293		- scenePanel.preferredWidth = 7;
	1489	+ scenePanel.preferredWidth = 6;
1294	1490
1295	1491	JTabbedPane tabbedPane = new JTabbedPane();
1296	1492	tabbedPane.add(scrollpane);
1297	1493
1298		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1299		-
1300		- optionsPanel = new cGridBag().setVertical(true);
	1494	+ optionsPanel = new cGridBag().setVertical(false);
1301	1495
1302	1496	optionsPanel.setName("Options");
1303	1497
..	..	@@ -1305,6 +1499,8 @@
1305	1499
1306	1500	tabbedPane.add(optionsPanel);
1307	1501
	1502	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1503	+
1308	1504	scenePanel.add(tabbedPane);
1309	1505
1310	1506	/*
..	..	@@ -1396,9 +1592,13 @@
1396	1592
1397	1593	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1398	1594
1399		- frame.setSize(1024, 768);
1400		- frame.show();
	1595	+ frame.setSize(1280, 860);
	1596	+
	1597	+ frame.validate();
	1598	+ frame.setVisible(true);
1401	1599
	1600	+ cameraView.requestFocusInWindow();
	1601	+
1402	1602	gridPanel.setDividerLocation(1.0);
1403	1603
1404	1604	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1436,17 +1636,25 @@
1436	1636
1437	1637	cGridBag editBar = new cGridBag().setVertical(false);
1438	1638
1439		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	1639	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1640	+ createMaterialButton.setToolTipText("Create material");
1440	1641
1441	1642	/*
1442	1643	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1443	1644	*/
1444	1645
1445		- editBar.add(clearMaterialButton = new cButton("Clear")); // , aConstraints);
1446		- editBar.add(resetSlidersButton = new cButton("Reset")); // , aConstraints);
1447		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1448		- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1646	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1647	+ clearMaterialButton.setToolTipText("Clear material");
	1648	+
	1649	+ if (Globals.ADVANCED)
	1650	+ {
	1651	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1652	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1653	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1654	+ }
1449	1655
	1656	+ editBar.preferredHeight = 15;
	1657	+
1450	1658	panel.add(editBar);
1451	1659
1452	1660	/**/
..	..	@@ -1712,12 +1920,15 @@
1712	1920	opacityPowerField.addChangeListener(this);
1713	1921	/**/
1714	1922
1715		- resetSlidersButton.addActionListener(this);
1716	1923	clearMaterialButton.addActionListener(this);
1717	1924	createMaterialButton.addActionListener(this);
1718		-
1719		- propagateToggle.addItemListener(this);
1720		- multiplyToggle.addItemListener(this);
	1925	+
	1926	+ if (Globals.ADVANCED)
	1927	+ {
	1928	+ resetSlidersButton.addActionListener(this);
	1929	+ propagateToggle.addItemListener(this);
	1930	+ multiplyToggle.addItemListener(this);
	1931	+ }
1721	1932	}
1722	1933
1723	1934	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1888,7 +2099,7 @@
1888	2099
1889	2100	//? flashIt = false;
1890	2101	CameraPane pane = (CameraPane) cameraView;
1891		- pane.clickStart(location.x, location.y, 0);
	2102	+ pane.clickStart(location.x, location.y, 0, 0);
1892	2103	pane.clickEnd(location.x, location.y, 0, true);
1893	2104
1894	2105	if (group.selection.size() == 1)
..	..	@@ -1937,6 +2148,7 @@
1937	2148	e2.printStackTrace();
1938	2149	}
1939	2150	}
	2151	+
1940	2152	LoadJMEThread loadThread;
1941	2153
1942	2154	class LoadJMEThread extends Thread
..	..	@@ -1994,6 +2206,7 @@
1994	2206	//LoadFile0(filename, converter);
1995	2207	}
1996	2208	}
	2209	+
1997	2210	LoadOBJThread loadObjThread;
1998	2211
1999	2212	class LoadOBJThread extends Thread
..	..	@@ -2072,19 +2285,19 @@
2072	2285
2073	2286	void LoadObjFile(String fullname)
2074	2287	{
2075		- /*
	2288	+ System.out.println("Loading " + fullname);
	2289	+ /**/
2076	2290	//lastFilename = fullname;
2077	2291	if(loadObjThread == null)
2078	2292	{
2079		- loadObjThread = new LoadOBJThread();
2080		- loadObjThread.start();
	2293	+ loadObjThread = new LoadOBJThread();
	2294	+ loadObjThread.start();
2081	2295	}
2082	2296
2083	2297	loadObjThread.add(fullname);
2084		- */
	2298	+ /**/
2085	2299
2086		- System.out.println("Loading " + fullname);
2087		- makeSomething(new FileObject(fullname, true), true);
	2300	+ //makeSomething(new FileObject(fullname, true), true);
2088	2301	}
2089	2302
2090	2303	void LoadGFDFile(String fullname)
..	..	@@ -2345,11 +2558,11 @@
2345	2558
2346	2559	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2347	2560	{
2348		- if (GrafreeD.standAlone)
	2561	+ if (Grafreed.standAlone)
2349	2562	{
2350	2563	/**/
2351	2564	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2352		- browser.show();
	2565	+ browser.setVisible(true);
2353	2566	String filename = browser.getFile();
2354	2567	if (filename != null && filename.length() > 0)
2355	2568	{
..	..	@@ -2701,6 +2914,8 @@
2701	2914
2702	2915	void SetMaterial(Object3D object)
2703	2916	{
	2917	+ latestObject = object;
	2918	+
2704	2919	cMaterial mat = object.material;
2705	2920
2706	2921	if (mat == null)
..	..	@@ -2709,7 +2924,8 @@
2709	2924	return;
2710	2925	}
2711	2926
2712		- multiplyToggle.setSelected(mat.multiply);
	2927	+ if (multiplyToggle != null)
	2928	+ multiplyToggle.setSelected(mat.multiply);
2713	2929
2714	2930	assert (object.projectedVertices != null);
2715	2931
..	..	@@ -2811,12 +3027,17 @@
2811	3027	// }
2812	3028
2813	3029	/**/
2814		- if (deselect)
	3030	+ if (deselect \|\| child == null)
2815	3031	{
2816	3032	//group.deselectAll();
2817	3033	//freeze = true;
2818	3034	GetTree().clearSelection();
2819	3035	//freeze = false;
	3036	+
	3037	+ if (child == null)
	3038	+ {
	3039	+ return;
	3040	+ }
2820	3041	}
2821	3042
2822	3043	//group.addSelectee(child);
..	..	@@ -2885,7 +3106,7 @@
2885	3106	cameraView.ToggleDL();
2886	3107	cameraView.repaint();
2887	3108	return;
2888		- } else if (event.getSource() == toggleTextureItem)
	3109	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2889	3110	{
2890	3111	cameraView.ToggleTexture();
2891	3112	// june 2013 copy.HardTouch();
..	..	@@ -2924,9 +3145,9 @@
2924	3145	frame.validate();
2925	3146
2926	3147	return;
2927		- } else if (event.getSource() == toggleRandomItem)
	3148	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2928	3149	{
2929		- cameraView.ToggleRandom();
	3150	+ cameraView.ToggleSwitch();
2930	3151	cameraView.repaint();
2931	3152	return;
2932	3153	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2955,6 +3176,10 @@
2955	3176	{
2956	3177	copy.live ^= true;
2957	3178	return;
	3179	+ } else if (event.getSource() == selectCB)
	3180	+ {
	3181	+ copy.dontselect ^= true;
	3182	+ return;
2958	3183	} else if (event.getSource() == hideCB)
2959	3184	{
2960	3185	copy.hide ^= true;
..	..	@@ -2969,6 +3194,7 @@
2969	3194	if (event.getSource() == randomCB)
2970	3195	{
2971	3196	copy.random ^= true;
	3197	+ objEditor.refreshContents();
2972	3198	return;
2973	3199	}
2974	3200	if (event.getSource() == speedupCB)
..	..	@@ -2992,8 +3218,9 @@
2992	3218
2993	3219	public void actionPerformed(ActionEvent event)
2994	3220	{
	3221	+ Object source = event.getSource();
2995	3222	// SCRIPT DIALOG
2996		- if (event.getSource() == okbutton)
	3223	+ if (source == okbutton)
2997	3224	{
2998	3225	textpanel.setVisible(false);
2999	3226	textpanel.remove(textarea);
..	..	@@ -3005,7 +3232,7 @@
3005	3232	textarea = null;
3006	3233	textpanel = null;
3007	3234	}
3008		- if (event.getSource() == cancelbutton)
	3235	+ if (source == cancelbutton)
3009	3236	{
3010	3237	textpanel.setVisible(false);
3011	3238	textpanel.remove(textarea);
..	..	@@ -3017,50 +3244,50 @@
3017	3244	//applySelf();
3018	3245	//client.refreshEditWindow();
3019	3246	//refreshContents();
3020		- if (event.getSource() == nameField)
	3247	+ if (source == nameField)
3021	3248	{
3022	3249	//System.out.println("ObjEditor " + event);
3023	3250	applySelf0(true);
3024	3251	//parent.applySelf();
3025	3252	objEditor.refreshContents();
3026		- } else if (event.getSource() == resetButton)
	3253	+ } else if (source == resetButton)
3027	3254	{
3028	3255	CameraPane.fullreset = true;
3029	3256	copy.Reset(); // ResetMeshes();
3030	3257	copy.Touch();
3031	3258	objEditor.refreshContents();
3032		- } else if (event.getSource() == stepItem)
	3259	+ } else if (source == stepItem)
3033	3260	{
3034	3261	//cameraView.ONESTEP = true;
3035	3262	Globals.ONESTEP = true;
3036	3263	cameraView.repaint();
3037	3264	return;
3038		- } else if (event.getSource() == stepButton)
	3265	+ } else if (source == stepButton)
3039	3266	{
3040	3267	copy.Step();
3041	3268	copy.Touch();
3042	3269	objEditor.refreshContents();
3043		- } else if (event.getSource() == slowerButton)
	3270	+ } else if (source == slowerButton)
3044	3271	{
3045	3272	copy.Slower();
3046	3273	copy.Touch();
3047	3274	objEditor.refreshContents();
3048		- } else if (event.getSource() == fasterButton)
	3275	+ } else if (source == fasterButton)
3049	3276	{
3050	3277	copy.Faster();
3051	3278	copy.Touch();
3052	3279	objEditor.refreshContents();
3053		- } else if (event.getSource() == remarkButton)
	3280	+ } else if (source == remarkButton)
3054	3281	{
3055	3282	copy.Remark();
3056	3283	copy.Touch();
3057	3284	objEditor.refreshContents();
3058		- } else if (event.getSource() == stepAllButton)
	3285	+ } else if (source == stepAllButton)
3059	3286	{
3060	3287	copy.StepAll();
3061	3288	copy.Touch();
3062	3289	objEditor.refreshContents();
3063		- } else if (event.getSource() == resetAllButton)
	3290	+ } else if (source == resetAllButton)
3064	3291	{
3065	3292	//CameraPane.fullreset = true;
3066	3293	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3093,53 +3320,75 @@
3093	3320	// Close();
3094	3321	// }
3095	3322	// else
3096		- if (event.getSource() == resetSlidersButton)
	3323	+ if (source == resetSlidersButton)
3097	3324	{
3098	3325	ResetSliders();
3099		- } else if (event.getSource() == clearMaterialButton)
	3326	+ } else if (source == clearMaterialButton)
3100	3327	{
3101	3328	ClearMaterial();
3102		- } else if (event.getSource() == createMaterialButton)
	3329	+ } else if (source == createMaterialButton)
3103	3330	{
3104	3331	CreateMaterial();
3105		- } else if (event.getSource() == clearPanelButton)
	3332	+ } else if (source == clearPanelButton)
3106	3333	{
3107	3334	copy.ClearUI();
3108	3335	refreshContents(true);
3109		- } /*
3110		- }
3111		-
3112		- public boolean action(Event event, Object arg)
3113		- {
3114		- */ else if (event.getSource() == closeItem)
	3336	+ } else if (source == importGFDItem)
	3337	+ {
	3338	+ ImportGFD();
	3339	+ } else
	3340	+ if (source == importVRMLX3DItem)
	3341	+ {
	3342	+ ImportVRMLX3D();
	3343	+ } else
	3344	+ if (source == import3DSItem)
	3345	+ {
	3346	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3347	+ } else
	3348	+ if (source == importOBJItem)
	3349	+ {
	3350	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3351	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3352	+ browser.setVisible(true);
	3353	+ String filename = browser.getFile();
	3354	+ if (filename != null && filename.length() > 0)
	3355	+ {
	3356	+ String fullname = browser.getDirectory() + filename;
	3357	+ makeSomething(ReadOBJ(fullname), true);
	3358	+ }
	3359	+ } else
	3360	+ if (source == closeItem)
3115	3361	{
3116	3362	Close();
3117	3363	//return true;
3118		- } else if (event.getSource() == loadItem)
	3364	+ } else if (source == loadItem)
3119	3365	{
3120	3366	load();
3121	3367	//return true;
3122		- } else if (event.getSource() == saveItem)
	3368	+ } else if (source == newItem)
	3369	+ {
	3370	+ New();
	3371	+ } else if (source == saveItem)
3123	3372	{
3124	3373	save();
3125	3374	//return true;
3126		- } else if (event.getSource() == saveAsItem)
	3375	+ } else if (source == saveAsItem)
3127	3376	{
3128	3377	saveAs();
3129	3378	//return true;
3130		- } else if (event.getSource() == reexportItem)
	3379	+ } else if (source == reexportItem)
3131	3380	{
3132	3381	reexport();
3133	3382	//return true;
3134		- } else if (event.getSource() == exportAsItem)
	3383	+ } else if (source == exportAsItem)
3135	3384	{
3136	3385	export();
3137	3386	//return true;
3138		- } else if (event.getSource() == povItem)
	3387	+ } else if (source == povItem)
3139	3388	{
3140	3389	generatePOV();
3141	3390	//return true;
3142		- } else if (event.getSource() == zBufferItem)
	3391	+ } else if (source == zBufferItem)
3143	3392	{
3144	3393	try
3145	3394	{
..	..	@@ -3161,21 +3410,8 @@
3161	3410	cameraView.repaint();
3162	3411	//return true;
3163	3412	}
3164		- */ else if (event.getSource() == editCameraItem)
3165		- {
3166		- cameraView.ProtectCamera();
3167		- cameraView.repaint();
3168		- return;
3169		- } else if (event.getSource() == revertCameraItem)
3170		- {
3171		- cameraView.RevertCamera();
3172		- cameraView.repaint();
3173		- return;
3174		-// } else if (event.getSource() == textureButton)
3175		-// {
3176		-// return; // true;
3177		- } else // combos...
3178		- if (event.getSource() == texresMenu)
	3413	+ */ else // combos...
	3414	+ if (source == texresMenu)
3179	3415	{
3180	3416	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3181	3417	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3187,12 +3423,287 @@
3187	3423	}
3188	3424	}
3189	3425
	3426	+ void New()
	3427	+ {
	3428	+ while (copy.Size() > 1)
	3429	+ {
	3430	+ copy.remove(1);
	3431	+ }
	3432	+
	3433	+ ResetModel();
	3434	+ objEditor.refreshContents();
	3435	+ }
	3436	+
	3437	+ static public byte[] Compress(Object3D o)
	3438	+ {
	3439	+ try
	3440	+ {
	3441	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3442	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3443	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3444	+
	3445	+ Object3D parent = o.parent;
	3446	+ o.parent = null;
	3447	+
	3448	+ out.writeObject(o);
	3449	+
	3450	+ o.parent = parent;
	3451	+
	3452	+ out.flush();
	3453	+
	3454	+ zstream.close();
	3455	+ out.close();
	3456	+
	3457	+ return baos.toByteArray();
	3458	+ } catch (Exception e)
	3459	+ {
	3460	+ System.err.println(e);
	3461	+ return null;
	3462	+ }
	3463	+ }
	3464	+
	3465	+ static public Object Uncompress(byte[] bytes)
	3466	+ {
	3467	+ System.out.println("#bytes = " + bytes.length);
	3468	+ try
	3469	+ {
	3470	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3471	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3472	+ ObjectInputStream in = new ObjectInputStream(istream);
	3473	+ Object obj = in.readObject();
	3474	+ in.close();
	3475	+
	3476	+ return obj;
	3477	+ } catch (Exception e)
	3478	+ {
	3479	+ System.err.println(e);
	3480	+ return null;
	3481	+ }
	3482	+ }
	3483	+
	3484	+ static public Object clone(Object o)
	3485	+ {
	3486	+ try
	3487	+ {
	3488	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3489	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3490	+
	3491	+ out.writeObject(o);
	3492	+
	3493	+ out.flush();
	3494	+ out.close();
	3495	+
	3496	+ byte[] bytes = baos.toByteArray();
	3497	+
	3498	+ System.out.println("clone = " + bytes.length);
	3499	+
	3500	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3501	+ ObjectInputStream in = new ObjectInputStream(bais);
	3502	+ Object obj = in.readObject();
	3503	+ in.close();
	3504	+
	3505	+ return obj;
	3506	+ } catch (Exception e)
	3507	+ {
	3508	+ System.err.println(e);
	3509	+ return null;
	3510	+ }
	3511	+ }
	3512	+
	3513	+ cRadio GetCurrentTab()
	3514	+ {
	3515	+ cRadio ab;
	3516	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3517	+ {
	3518	+ ab = (cRadio)e.nextElement();
	3519	+ if(ab.GetObject() == copy)
	3520	+ {
	3521	+ return ab;
	3522	+ }
	3523	+ }
	3524	+
	3525	+ return null;
	3526	+ }
	3527	+
	3528	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3529	+
	3530	+ public void Save()
	3531	+ {
	3532	+ System.err.println("Save");
	3533	+
	3534	+ cRadio tab = GetCurrentTab();
	3535	+
	3536	+ boolean temp = CameraPane.SWITCH;
	3537	+ CameraPane.SWITCH = false;
	3538	+
	3539	+ copy.ExtractBigData(hashtable);
	3540	+
	3541	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3542	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3543	+
	3544	+ copy.RestoreBigData(hashtable);
	3545	+
	3546	+ CameraPane.SWITCH = temp;
	3547	+
	3548	+ //assert(hashtable.isEmpty());
	3549	+
	3550	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3551	+ {
	3552	+ tab.graphs[i] = null;
	3553	+ }
	3554	+
	3555	+ SetUndoStates();
	3556	+
	3557	+ // test save
	3558	+ if (false)
	3559	+ {
	3560	+ try
	3561	+ {
	3562	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3563	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3564	+
	3565	+ p.writeObject(copy);
	3566	+
	3567	+ p.flush();
	3568	+
	3569	+ ostream.close();
	3570	+ } catch (Exception e)
	3571	+ {
	3572	+ e.printStackTrace();
	3573	+ }
	3574	+ }
	3575	+ }
	3576	+
	3577	+ void CopyChanged(Object3D obj)
	3578	+ {
	3579	+ SetUndoStates();
	3580	+
	3581	+ boolean temp = CameraPane.SWITCH;
	3582	+ CameraPane.SWITCH = false;
	3583	+
	3584	+ copy.ExtractBigData(hashtable);
	3585	+
	3586	+ copy.clear();
	3587	+
	3588	+ for (int i=0; i<obj.Size(); i++)
	3589	+ {
	3590	+ copy.add(obj.get(i));
	3591	+ }
	3592	+
	3593	+ copy.RestoreBigData(hashtable);
	3594	+
	3595	+ CameraPane.SWITCH = temp;
	3596	+
	3597	+ //assert(hashtable.isEmpty());
	3598	+
	3599	+ copy.Touch();
	3600	+
	3601	+ ResetModel();
	3602	+ copy.HardTouch(); // recompile?
	3603	+
	3604	+ cRadio ab;
	3605	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3606	+ {
	3607	+ ab = (cRadio)e.nextElement();
	3608	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3609	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3610	+ if (test != null)
	3611	+ {
	3612	+ test.editWindow = ab.object.editWindow;
	3613	+ ab.object = test;
	3614	+ }
	3615	+ }
	3616	+
	3617	+ refreshContents();
	3618	+ }
	3619	+
	3620	+ cButton undoButton;
	3621	+ cButton redoButton;
	3622	+
	3623	+ void SetUndoStates()
	3624	+ {
	3625	+ cRadio tab = GetCurrentTab();
	3626	+
	3627	+ undoButton.setEnabled(tab.undoindex > 0);
	3628	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3629	+ }
	3630	+
	3631	+ public void Undo()
	3632	+ {
	3633	+ System.err.println("Undo");
	3634	+
	3635	+ cRadio tab = GetCurrentTab();
	3636	+
	3637	+ if (tab.undoindex == 0)
	3638	+ {
	3639	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3640	+ return;
	3641	+ }
	3642	+
	3643	+ if (tab.graphs[tab.undoindex] == null)
	3644	+ {
	3645	+ Save();
	3646	+ tab.undoindex -= 1;
	3647	+ }
	3648	+
	3649	+ tab.undoindex -= 1;
	3650	+
	3651	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3652	+ }
	3653	+
	3654	+ public void Redo()
	3655	+ {
	3656	+ cRadio tab = GetCurrentTab();
	3657	+
	3658	+ if (tab.graphs[tab.undoindex + 1] == null)
	3659	+ {
	3660	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3661	+ return;
	3662	+ }
	3663	+
	3664	+ tab.undoindex += 1;
	3665	+
	3666	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3667	+ }
	3668	+
	3669	+ void ImportGFD()
	3670	+ {
	3671	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3672	+ browser.show();
	3673	+ String filename = browser.getFile();
	3674	+ if (filename != null && filename.length() > 0)
	3675	+ {
	3676	+ String fullname = browser.getDirectory() + filename;
	3677	+
	3678	+ //Object3D readobj =
	3679	+ objEditor.ReadGFD(fullname, objEditor);
	3680	+ //makeSomething(readobj);
	3681	+ }
	3682	+ }
	3683	+
	3684	+ void ImportVRMLX3D()
	3685	+ {
	3686	+ if (Grafreed.standAlone)
	3687	+ {
	3688	+ /**/
	3689	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3690	+ browser.show();
	3691	+ String filename = browser.getFile();
	3692	+ if (filename != null && filename.length() > 0)
	3693	+ {
	3694	+ String fullname = browser.getDirectory() + filename;
	3695	+ LoadVRMLX3D(fullname);
	3696	+ }
	3697	+ /**/
	3698	+ }
	3699	+ }
	3700	+
3190	3701	void ToggleAnimation()
3191	3702	{
3192	3703	if (!Globals.ANIMATION)
3193	3704	{
3194	3705	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3195		- browser.show();
	3706	+ browser.setVisible(true);
3196	3707	String filename = browser.getFile();
3197	3708	if (filename != null && filename.length() > 0)
3198	3709	{
..	..	@@ -3202,8 +3713,8 @@
3202	3713
3203	3714	Globals.ANIMATION ^= true;
3204	3715
3205		- GrafreeD.wav.cursor = 0;
3206		- GrafreeD.wav.loop = 0;
	3716	+ Grafreed.wav.cursor = 0;
	3717	+ Grafreed.wav.loop = 0;
3207	3718	}
3208	3719	} else
3209	3720	{
..	..	@@ -3224,7 +3735,6 @@
3224	3735	callee.refreshContents();
3225	3736	} else
3226	3737	{
3227		- new Exception().printStackTrace();
3228	3738	System.exit(0);
3229	3739	}
3230	3740	}
..	..	@@ -3254,7 +3764,7 @@
3254	3764	void CreateMaterial()
3255	3765	{
3256	3766	//copy.ClearMaterial(); // PATCH
3257		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3767	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3258	3768	if (copy.selection.size() > 0)
3259	3769	//SetMaterial(copy);
3260	3770	{
..	..	@@ -3305,7 +3815,7 @@
3305	3815	assert false;
3306	3816	}
3307	3817
3308		- void EditSelection()
	3818	+ void EditSelection(boolean newWindow)
3309	3819	{
3310	3820	}
3311	3821
..	..	@@ -3313,11 +3823,11 @@
3313	3823	{
3314	3824	copy.ResetBlockLoop(); // temporary problem
3315	3825
3316		- boolean random = CameraPane.RANDOM;
3317		- CameraPane.RANDOM = false; // parse everything
	3826	+ boolean random = CameraPane.SWITCH;
	3827	+ CameraPane.SWITCH = false; // parse everything
3318	3828	copy.ResetDisplayList();
3319	3829	copy.HardTouch();
3320		- CameraPane.RANDOM = random;
	3830	+ CameraPane.SWITCH = random;
3321	3831	}
3322	3832
3323	3833	// public void applySelf()
..	..	@@ -3391,6 +3901,36 @@
3391	3901	{
3392	3902	//System.out.println("Propagate = " + propagate);
3393	3903	copy.UpdateMaterial(anchor, current, propagate);
	3904	+
	3905	+ if (copy.material != null)
	3906	+ {
	3907	+ cMaterial mat = copy.material;
	3908	+
	3909	+ colorField.SetToolTipValue((mat.color));
	3910	+ modulationField.SetToolTipValue((mat.modulation));
	3911	+ metalnessField.SetToolTipValue((mat.metalness));
	3912	+ diffuseField.SetToolTipValue((mat.diffuse));
	3913	+ specularField.SetToolTipValue((mat.specular));
	3914	+ shininessField.SetToolTipValue((mat.shininess));
	3915	+ shiftField.SetToolTipValue((mat.shift));
	3916	+ ambientField.SetToolTipValue((mat.ambient));
	3917	+ lightareaField.SetToolTipValue((mat.lightarea));
	3918	+ diffusenessField.SetToolTipValue((mat.factor));
	3919	+ velvetField.SetToolTipValue((mat.velvet));
	3920	+ sheenField.SetToolTipValue((mat.sheen));
	3921	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3922	+ backlitField.SetToolTipValue((mat.bump));
	3923	+ anisoField.SetToolTipValue((mat.aniso));
	3924	+ anisoVField.SetToolTipValue((mat.anisoV));
	3925	+ cameraField.SetToolTipValue((mat.cameralight));
	3926	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3927	+ shadowField.SetToolTipValue((mat.shadow));
	3928	+ textureField.SetToolTipValue((mat.texture));
	3929	+ opacityField.SetToolTipValue((mat.opacity));
	3930	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3931	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3932	+ }
	3933	+
3394	3934	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3395	3935	{
3396	3936	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3506,7 +4046,7 @@
3506	4046	}
3507	4047
3508	4048	if (normalpushField != null)
3509		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4049	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3510	4050	}
3511	4051
3512	4052	void SnapObject()
..	..	@@ -3770,6 +4310,8 @@
3770	4310
3771	4311	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3772	4312	{
	4313	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4314	+ Save();
3773	4315	//Tween.set(thing, 0).target(1).start(tweenManager);
3774	4316	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3775	4317	// if (thing instanceof GenericJointDemo)
..	..	@@ -3856,6 +4398,12 @@
3856	4398	{
3857	4399	ResetModel();
3858	4400	Select(thing.GetTreePath(), true, false); // unselect... false);
	4401	+
	4402	+ if (thing.Size() == 0)
	4403	+ {
	4404	+ //EditSelection(false);
	4405	+ }
	4406	+
3859	4407	refreshContents();
3860	4408	}
3861	4409
..	..	@@ -3973,6 +4521,7 @@
3973	4521	}
3974	4522	}
3975	4523	}
	4524	+
3976	4525	LoadGFDThread loadGFDThread;
3977	4526
3978	4527	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3992,8 +4541,10 @@
3992	4541
3993	4542	try
3994	4543	{
	4544	+ // Try compressed version first.
3995	4545	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3996		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4546	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4547	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3997	4548
3998	4549	readobj = (Object3D) p.readObject();
3999	4550	istream.close();
..	..	@@ -4001,7 +4552,20 @@
4001	4552	readobj.ResetDisplayList();
4002	4553	} catch (Exception e)
4003	4554	{
4004		- e.printStackTrace();
	4555	+ //e.printStackTrace();
	4556	+ try
	4557	+ {
	4558	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4559	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4560	+
	4561	+ readobj = (Object3D) p.readObject();
	4562	+ istream.close();
	4563	+
	4564	+ readobj.ResetDisplayList();
	4565	+ } catch (Exception e2)
	4566	+ {
	4567	+ e2.printStackTrace();
	4568	+ }
4005	4569	}
4006	4570	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4007	4571	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4047,6 +4611,12 @@
4047	4611
4048	4612	void LoadIt(Object obj)
4049	4613	{
	4614	+ if (obj == null)
	4615	+ {
	4616	+ // Invalid file
	4617	+ return;
	4618	+ }
	4619	+
4050	4620	System.out.println("Loaded " + obj);
4051	4621	//new Exception().printStackTrace();
4052	4622	Object3D readobj = (Object3D) obj;
..	..	@@ -4056,6 +4626,8 @@
4056	4626
4057	4627	if (readobj != null)
4058	4628	{
	4629	+ if (Globals.SAVEONMAKE)
	4630	+ Save();
4059	4631	try
4060	4632	{
4061	4633	//readobj.deepCopySelf(copy);
..	..	@@ -4118,7 +4690,7 @@
4118	4690
4119	4691	void load() // throws ClassNotFoundException
4120	4692	{
4121		- if (GrafreeD.standAlone)
	4693	+ if (Grafreed.standAlone)
4122	4694	{
4123	4695	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4124	4696	browser.show();
..	..	@@ -4205,11 +4777,13 @@
4205	4777	try
4206	4778	{
4207	4779	FileOutputStream ostream = new FileOutputStream(lastname);
4208		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4780	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4781	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4209	4782
4210	4783	p.writeObject(copy);
4211	4784	p.flush();
4212	4785
	4786	+ zstream.close();
4213	4787	ostream.close();
4214	4788
4215	4789	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4219,17 +4793,20 @@
4219	4793	{
4220	4794	}
4221	4795	}
	4796	+
4222	4797	String lastname;
4223	4798
4224	4799	void saveAs()
4225	4800	{
4226		- if (GrafreeD.standAlone)
	4801	+ if (Grafreed.standAlone)
4227	4802	{
4228	4803	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4229	4804	browser.setVisible(true);
4230	4805	String filename = browser.getFile();
4231	4806	if (filename != null && filename.length() > 0)
4232	4807	{
	4808	+ if (!filename.endsWith(".gfd"))
	4809	+ filename += ".gfd";
4233	4810	lastname = browser.getDirectory() + filename;
4234	4811	save();
4235	4812	}
..	..	@@ -4328,13 +4905,13 @@
4328	4905	try
4329	4906	{
4330	4907	FileOutputStream ostream = new FileOutputStream(filename);
4331		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4332		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4908	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4909	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4333	4910
4334	4911	Object3D objectparent = obj.parent;
4335	4912	obj.parent = null;
4336	4913
4337		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4914	+ Object3D object = (Object3D) Grafreed.clone(obj);
4338	4915
4339	4916	obj.parent = objectparent;
4340	4917
..	..	@@ -4346,8 +4923,8 @@
4346	4923	p.writeObject(object);
4347	4924	p.flush();
4348	4925
	4926	+ zstream.close();
4349	4927	ostream.close();
4350		- // zstream.close();
4351	4928
4352	4929	// group.selection.get(0).parent = parent;
4353	4930	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4368,7 +4945,7 @@
4368	4945	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4369	4946	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4370	4947	copy.generatePOV(buffer);
4371		- if (GrafreeD.standAlone)
	4948	+ if (Grafreed.standAlone)
4372	4949	{
4373	4950	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4374	4951	browser.show();
..	..	@@ -4394,7 +4971,8 @@
4394	4971	Object3D client;
4395	4972	Object3D copy;
4396	4973	MenuBar menuBar;
4397		- Menu windowMenu;
	4974	+ Menu fileMenu;
	4975	+ MenuItem newItem;
4398	4976	MenuItem loadItem;
4399	4977	MenuItem saveItem;
4400	4978	MenuItem saveAsItem;
..	..	@@ -4402,11 +4980,9 @@
4402	4980	MenuItem reexportItem;
4403	4981	MenuItem povItem;
4404	4982	MenuItem closeItem;
4405		- Menu cameraMenu;
	4983	+
4406	4984	CheckboxMenuItem zBufferItem;
4407	4985	//MenuItem normalLensItem;
4408		- MenuItem editCameraItem;
4409		- MenuItem revertCameraItem;
4410	4986	MenuItem stepItem;
4411	4987	CheckboxMenuItem toggleLiveItem;
4412	4988	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4417,25 +4993,38 @@
4417	4993	CheckboxMenuItem toggleFootContactItem;
4418	4994	CheckboxMenuItem toggleDLItem;
4419	4995	CheckboxMenuItem toggleTextureItem;
4420		- CheckboxMenuItem toggleRandomItem;
	4996	+ CheckboxMenuItem toggleSwitchItem;
4421	4997	CheckboxMenuItem toggleRootItem;
4422	4998	CheckboxMenuItem animationItem;
4423	4999	CheckboxMenuItem toggleHandleItem;
4424	5000	CheckboxMenuItem togglePaintItem;
4425	5001	JSplitPane mainPanel;
4426	5002	JScrollPane scrollpane;
	5003	+
4427	5004	JPanel toolbarPanel;
4428		- JPanel treePanel;
	5005	+
	5006	+ cGridBag treePanel;
	5007	+
4429	5008	JPanel radioPanel;
4430	5009	ButtonGroup buttonGroup;
4431		- cGridBag ctrlPanel;
	5010	+
	5011	+ cGridBag toolboxPanel;
4432	5012	cGridBag materialPanel;
	5013	+ cGridBag ctrlPanel;
	5014	+
4433	5015	JScrollPane infoPanel;
	5016	+
4434	5017	cGridBag optionsPanel;
	5018	+
4435	5019	JTabbedPane objectPanel;
	5020	+ boolean materialFlushed;
	5021	+ Object3D latestObject;
	5022	+
4436	5023	cGridBag XYZPanel;
	5024	+
4437	5025	JSplitPane gridPanel;
4438	5026	JSplitPane bigPanel;
	5027	+
4439	5028	cGridBag bigThree;
4440	5029	cGridBag scenePanel;
4441	5030	cGridBag centralPanel;
..	..	@@ -4550,8 +5139,13 @@
4550	5139	cNumberSlider fogField;
4551	5140	JLabel opacityPowerLabel;
4552	5141	cNumberSlider opacityPowerField;
4553		- JTree jTree;
	5142	+ cTree jTree;
4554	5143	//ObjectUI parent;
4555	5144
4556	5145	cNumberSlider normalpushField;
	5146	+
	5147	+ private MenuItem importGFDItem;
	5148	+ private MenuItem importVRMLX3DItem;
	5149	+ private MenuItem import3DSItem;
	5150	+ private MenuItem importOBJItem;
4557	5151	}