~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -35,6 +39,67 @@
35	39
36	40	GroupEditor callee;
37	41	JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ cButton GetButton(String name, boolean border)
	46	+ {
	47	+ try
	48	+ {
	49	+ ImageIcon icon = GetIcon(name);
	50	+ return new cButton(icon, border);
	51	+ }
	52	+ catch (Exception e)
	53	+ {
	54	+ return new cButton(name, border);
	55	+ }
	56	+ }
	57	+
	58	+ cToggleButton GetToggleButton(String name, boolean border)
	59	+ {
	60	+ try
	61	+ {
	62	+ ImageIcon icon = GetIcon(name);
	63	+ return new cToggleButton(icon, border);
	64	+ }
	65	+ catch (Exception e)
	66	+ {
	67	+ return new cToggleButton(name, border);
	68	+ }
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ try
	74	+ {
	75	+ ImageIcon icon = GetIcon(name);
	76	+ return new cCheckBox(icon, border);
	77	+ }
	78	+ catch (Exception e)
	79	+ {
	80	+ return new cCheckBox(name, border);
	81	+ }
	82	+ }
	83	+
	84	+ private ImageIcon GetIcon(String name) throws IOException
	85	+ {
	86	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	87	+
	88	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	89	+ {
	90	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	91	+ Graphics2D g = resized.createGraphics();
	92	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	93	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	94	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	95	+ g.dispose();
	96	+
	97	+ image = resized;
	98	+ }
	99	+
	100	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	101	+ return icon;
	102	+ }
38	103
39	104	// SCRIPT
40	105
..	..	@@ -145,7 +210,7 @@
145	210
146	211	objEditor.ctrlPanel.remove(namePanel);
147	212
148		- if (!GroupEditor.allparams)
	213	+ if (!allparams)
149	214	return;
150	215
151	216	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -168,7 +233,8 @@
168	233	// objEditor.ctrlPanel.remove(remarkButton);
169	234
170	235	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	236	+ objEditor.ctrlPanel.remove(setupPanel2);
	237	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	238	objEditor.ctrlPanel.remove(pushPanel);
173	239	//objEditor.ctrlPanel.remove(fillPanel);
174	240
..	..	@@ -243,6 +309,7 @@
243	309	//localCopy.parent = null;
244	310
245	311	frame = new JFrame();
	312	+ frame.setUndecorated(false);
246	313	objEditor = this;
247	314	this.callee = callee;
248	315
..	..	@@ -273,28 +340,49 @@
273	340	return frame.action(event, obj);
274	341	}
275	342
	343	+ // Cannot work without static
	344	+ static boolean allparams = true;
	345	+
	346	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	347	+
276	348	void SetupMenu()
277	349	{
278	350	frame.setMenuBar(menuBar = new MenuBar());
279		- menuBar.add(windowMenu = new Menu("File"));
280		- windowMenu.add(loadItem = new MenuItem("Load..."));
281		- windowMenu.add("-");
282		- windowMenu.add(saveItem = new MenuItem("Save"));
283		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	351	+ menuBar.add(fileMenu = new Menu("File"));
	352	+ fileMenu.add(newItem = new MenuItem("New"));
	353	+ fileMenu.add(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..."));
284	371	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
285		- windowMenu.add("-");
286		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
287		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
288		- windowMenu.add("-");
	372	+ fileMenu.add("-");
	373	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	374	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	375	+ fileMenu.add("-");
289	376	if (client.parent != null)
290	377	{
291		- windowMenu.add(closeItem = new MenuItem("Close"));
	378	+ fileMenu.add(closeItem = new MenuItem("Close"));
292	379	} else
293	380	{
294		- windowMenu.add(closeItem = new MenuItem("Exit"));
	381	+ fileMenu.add(closeItem = new MenuItem("Exit"));
295	382	}
296	383
297		- loadItem.addActionListener(this);
	384	+ newItem.addActionListener(this);
	385	+ openItem.addActionListener(this);
298	386	saveItem.addActionListener(this);
299	387	saveAsItem.addActionListener(this);
300	388	exportAsItem.addActionListener(this);
..	..	@@ -302,87 +390,53 @@
302	390	//povItem.addActionListener(this);
303	391	closeItem.addActionListener(this);
304	392
305		- menuBar.add(cameraMenu = new Menu("View"));
306		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
307		- //zBufferItem.addActionListener(this);
308		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
309		- //normalLensItem.addActionListener(this);
310		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
311		- revertCameraItem.addActionListener(this);
312		-
313		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314		- toggleFullScreenItem.addItemListener(this);
315		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316		- cameraMenu.add("-");
317		-
318		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
319		- toggleTextureItem.addItemListener(this);
320		- toggleTextureItem.setState(CameraPane.textureon);
321		-
322		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
323		- toggleSwitchItem.addItemListener(this);
324		- toggleSwitchItem.setState(CameraPane.SWITCH);
325		-
326		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
327		- toggleHandleItem.addItemListener(this);
328		- toggleHandleItem.setState(CameraPane.HANDLES);
329		-
330		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
331		- togglePaintItem.addItemListener(this);
332		- togglePaintItem.setState(CameraPane.PAINTMODE);
333		-
334		- if (Globals.ADVANCED)
335		- {
336		- cameraMenu.add("-");
337		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
338		- toggleLiveItem.addItemListener(this);
339		- toggleLiveItem.setState(Globals.isLIVE());
340		-
341		- cameraMenu.add(stepItem = new MenuItem("Step"));
342		- stepItem.addActionListener(this);
343		- // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
344		- // toggleDLItem.addItemListener(this);
345		- // toggleDLItem.setState(false);
346		-
347		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
348		- toggleRenderItem.addItemListener(this);
349		- toggleRenderItem.setState(!CameraPane.frozen);
350		-
351		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
352		- toggleDebugItem.addItemListener(this);
353		- toggleDebugItem.setState(CameraPane.DEBUG);
354		-
355		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
356		- toggleFrustumItem.addItemListener(this);
357		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
358		-
359		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
360		- toggleFootContactItem.addItemListener(this);
361		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
362		-
363		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
364		- toggleTimelineItem.addItemListener(this);
365		- }
366		-
367		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
368		-// toggleRootItem.addItemListener(this);
369		-// toggleRootItem.setState(false);
370		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
371		-// animationItem.addItemListener(this);
372		-// animationItem.setState(CameraPane.ANIMATION);
373		- cameraMenu.add("-");
374		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
375		- editCameraItem.addActionListener(this);
376		-
377	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	+
378	420	toolbarPanel = new JPanel();
379	421	toolbarPanel.setName("Toolbar");
380	422	treePanel = new cGridBag();
381	423	treePanel.setName("Tree");
	424	+
	425	+ editPanel = new cGridBag().setVertical(true);
	426	+ editPanel.setName("Edit");
	427	+
382	428	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
383		- 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	+
384	437	materialPanel = new cGridBag().setVertical(true);
385	438	materialPanel.setName("Material");
	439	+
386	440	/JTextPane/
387	441	infoarea = createTextPane();
388	442	doc = infoarea.getStyledDocument();
..	..	@@ -395,7 +449,7 @@
395	449	// TEXTAREA infoarea.setLineWrap(true);
396	450	// TEXTAREA infoarea.setWrapStyleWord(true);
397	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
398		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ infoPanel.setPreferredSize(new Dimension(1, 1));
399	453	infoPanel.setName("Info");
400	454	//infoPanel.setLayout(new BorderLayout());
401	455	//infoPanel.add(createTextPane());
..	..	@@ -407,7 +461,14 @@
407	461	mainPanel.setDividerSize(9);
408	462	mainPanel.setDividerLocation(0.5); //1.0);
409	463	mainPanel.setResizeWeight(0.5);
410		-
	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	+
411	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
412	473	//mainPanel.setLayout(new GridBagLayout());
413	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -475,10 +536,10 @@
475	536	e.printStackTrace();
476	537	}
477	538
478		- String selection = infoarea.getText();
479		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
480		- java.awt.datatransfer.Clipboard clipboard =
481		- 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();
482	543	//clipboard.setContents(data, data);
483	544	}
484	545
..	..	@@ -638,21 +699,144 @@
638	699	}
639	700	}
640	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	+
641	760	void ToggleFullScreen()
642	761	{
643		- if (CameraPane.FULLSCREEN)
	762	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	763	+
	764	+ cameraView.ToggleFullScreen();
	765	+
	766	+ if (!CameraPane.FULLSCREEN)
644	767	{
645		- frame.getContentPane().remove(/"Center",/bigThree);
646		- framePanel.add(bigThree);
647		- 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	+
648	791	} else
649	792	{
650		- frame.getContentPane().remove(/"Center",/framePanel);
651		- framePanel.remove(bigThree);
652		- 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);
653	815	}
654		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
655	817	}
	818	+
	819	+ private byte[] CompressCopy()
	820	+ {
	821	+ boolean temp = CameraPane.SWITCH;
	822	+ CameraPane.SWITCH = false;
	823	+
	824	+ copy.ExtractBigData(versiontable);
	825	+ // if (copy == client)
	826	+
	827	+ byte[] versions[] = copy.versions;
	828	+ copy.versions = null;
	829	+
	830	+ byte[] compress = Compress(copy);
	831	+
	832	+ copy.versions = versions;
	833	+
	834	+ copy.RestoreBigData(versiontable);
	835	+
	836	+ CameraPane.SWITCH = temp;
	837	+
	838	+ return compress;
	839	+ }
656	840
657	841	private JTextPane createTextPane()
658	842	{
..	..	@@ -792,7 +976,12 @@
792	976	JCheckBox speedupCB;
793	977	JCheckBox rewindCB;
794	978	JCheckBox flipVCB;
	979	+
	980	+ cCheckBox toggleTextureCB;
	981	+ cCheckBox toggleSwitchCB;
	982	+
795	983	JComboBox texresMenu;
	984	+
796	985	JButton resetButton;
797	986	JButton stepButton;
798	987	JButton stepAllButton;
..	..	@@ -801,9 +990,13 @@
801	990	JButton fasterButton;
802	991	JButton remarkButton;
803	992
	993	+ cGridBag editPanel;
	994	+ cGridBag editCommandsPanel;
	995	+
804	996	cGridBag namePanel;
805	997	cGridBag setupPanel;
806		- cGridBag commandsPanel;
	998	+ cGridBag setupPanel2;
	999	+ cGridBag objectCommandsPanel;
807	1000	cGridBag pushPanel;
808	1001	cGridBag fillPanel;
809	1002
..	..	@@ -975,12 +1168,12 @@
975	1168	namePanel = new cGridBag();
976	1169
977	1170	nameField = AddText(namePanel, copy.GetName());
978		- namePanel.add(nameField);
	1171	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
979	1172	oe.ctrlPanel.add(namePanel);
980	1173
981	1174	oe.ctrlPanel.Return();
982	1175
983		- if (!GroupEditor.allparams)
	1176	+ if (!allparams)
984	1177	return;
985	1178
986	1179	setupPanel = new cGridBag().setVertical(false);
..	..	@@ -993,42 +1186,47 @@
993	1186	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
994	1187	hideCB.setToolTipText("Hide object");
995	1188	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
996		- markCB.setToolTipText("Set the animation target transform");
	1189	+ markCB.setToolTipText("As animation target transform");
997	1190
998		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1191	+ setupPanel2 = new cGridBag().setVertical(false);
	1192	+
	1193	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
999	1194	rewindCB.setToolTipText("Rewind animation");
1000	1195
1001		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
1002		- randomCB.setToolTipText("Option for switch node");
	1196	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1197	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1003	1198
	1199	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1200	+ link2masterCB.setToolTipText("Attach to support");
	1201	+
1004	1202	if (Globals.ADVANCED)
1005	1203	{
1006		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1007		- link2masterCB.setToolTipText("Attach to support");
1008		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1204	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1009	1205	speedupCB.setToolTipText("Option motion capture");
1010	1206	}
1011	1207
1012	1208	oe.ctrlPanel.add(setupPanel);
1013	1209	oe.ctrlPanel.Return();
	1210	+ oe.ctrlPanel.add(setupPanel2);
	1211	+ oe.ctrlPanel.Return();
1014	1212
1015		- commandsPanel = new cGridBag().setVertical(false);
	1213	+ objectCommandsPanel = new cGridBag().setVertical(false);
1016	1214
1017		- resetButton = AddButton(commandsPanel, "Reset");
	1215	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1018	1216	resetButton.setToolTipText("Jump to frame zero");
1019		- stepButton = AddButton(commandsPanel, "Step");
	1217	+ stepButton = AddButton(objectCommandsPanel, "Step");
1020	1218	stepButton.setToolTipText("Step one frame");
1021	1219	// resetAllButton = AddButton(oe, "Reset All");
1022	1220	// stepAllButton = AddButton(oe, "Step All");
1023	1221	// Return();
1024		- slowerButton = AddButton(commandsPanel, "Slow");
	1222	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1025	1223	slowerButton.setToolTipText("Decrease animation speed");
1026		- fasterButton = AddButton(commandsPanel, "Fast");
	1224	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1027	1225	fasterButton.setToolTipText("Increase animation speed");
1028		- remarkButton = AddButton(commandsPanel, "Remark");
	1226	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1029	1227	remarkButton.setToolTipText("Set the current transform as the target");
1030	1228
1031		- oe.ctrlPanel.add(commandsPanel);
	1229	+ oe.ctrlPanel.add(objectCommandsPanel);
1032	1230	oe.ctrlPanel.Return();
1033	1231
1034	1232	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1234,8 +1432,11 @@
1234	1432	//worldPanel.setName("World");
1235	1433	centralPanel = new cGridBag();
1236	1434	centralPanel.preferredWidth = 20;
1237		- timelinePanel = new JPanel(new BorderLayout());
1238		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1435	+
	1436	+ if (Globals.ADVANCED)
	1437	+ {
	1438	+ timelinePanel = new JPanel(new BorderLayout());
	1439	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1239	1440
1240	1441	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1241	1442	cameraPanel.setContinuousLayout(true);
..	..	@@ -1244,7 +1445,10 @@
1244	1445	// cameraPanel.setDividerSize(9);
1245	1446	cameraPanel.setResizeWeight(1.0);
1246	1447
	1448	+ }
	1449	+
1247	1450	centralPanel.add(cameraView);
	1451	+ centralPanel.setFocusable(true);
1248	1452	//frame.setJMenuBar(timelineMenubar);
1249	1453	//centralPanel.add(timelinePanel);
1250	1454
..	..	@@ -1311,8 +1515,12 @@
1311	1515	// north.setName("Edit");
1312	1516	// north.add(ctrlPanel, BorderLayout.NORTH);
1313	1517	// objectPanel.add(north);
1314		- objectPanel.add(ctrlPanel);
1315		- objectPanel.add(infoPanel);
	1518	+ objectPanel.add(editPanel);
	1519	+
	1520	+ //if (Globals.ADVANCED)
	1521	+ objectPanel.add(infoPanel);
	1522	+
	1523	+ objectPanel.add(toolboxPanel);
1316	1524
1317	1525	/*
1318	1526	aConstraints.gridx = 0;
..	..	@@ -1321,7 +1529,7 @@
1321	1529	aConstraints.gridy += 1;
1322	1530	aConstraints.gridwidth = 1;
1323	1531	mainPanel.add(objectPanel, aConstraints);
1324		- */
	1532	+ */
1325	1533
1326	1534	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1327	1535	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1338,9 +1546,7 @@
1338	1546	JTabbedPane tabbedPane = new JTabbedPane();
1339	1547	tabbedPane.add(scrollpane);
1340	1548
1341		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1342		-
1343		- optionsPanel = new cGridBag().setVertical(true);
	1549	+ optionsPanel = new cGridBag().setVertical(false);
1344	1550
1345	1551	optionsPanel.setName("Options");
1346	1552
..	..	@@ -1348,6 +1554,8 @@
1348	1554
1349	1555	tabbedPane.add(optionsPanel);
1350	1556
	1557	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1558	+
1351	1559	scenePanel.add(tabbedPane);
1352	1560
1353	1561	/*
..	..	@@ -1420,9 +1628,9 @@
1420	1628	// aConstraints.gridheight = 1;
1421	1629
1422	1630	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1423		- framePanel.setContinuousLayout(true);
1424		- framePanel.setOneTouchExpandable(true);
1425		- framePanel.setDividerLocation(0.8);
	1631	+ framePanel.setContinuousLayout(false);
	1632	+ framePanel.setOneTouchExpandable(false);
	1633	+ //.setDividerLocation(0.8);
1426	1634	//framePanel.setDividerSize(15);
1427	1635	//framePanel.setResizeWeight(0.15);
1428	1636	framePanel.setName("Frame");
..	..	@@ -1440,9 +1648,14 @@
1440	1648	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1441	1649
1442	1650	frame.setSize(1280, 860);
1443		- frame.setVisible(true);
1444		-
	1651	+
	1652	+ cameraView.requestFocusInWindow();
	1653	+
1445	1654	gridPanel.setDividerLocation(1.0);
	1655	+
	1656	+ frame.validate();
	1657	+
	1658	+ frame.setVisible(true);
1446	1659
1447	1660	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1448	1661	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1529,24 +1742,6 @@
1529	1742	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1530	1743	colorSection.add(texture);
1531	1744
1532		- cGridBag anisoU = new cGridBag();
1533		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1534		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1536		- colorSection.add(anisoU);
1537		-
1538		- cGridBag anisoV = new cGridBag();
1539		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1540		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1542		- colorSection.add(anisoV);
1543		-
1544		- cGridBag shadowbias = new cGridBag();
1545		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1546		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1547		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1548		- colorSection.add(shadowbias);
1549		-
1550	1745	panel.add(new JSeparator());
1551	1746
1552	1747	panel.add(colorSection);
..	..	@@ -1596,6 +1791,12 @@
1596	1791	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1597	1792	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1598	1793	diffuseSection.add(fakedepth);
	1794	+
	1795	+ cGridBag shadowbias = new cGridBag();
	1796	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1797	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1798	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1799	+ diffuseSection.add(shadowbias);
1599	1800
1600	1801	panel.add(new JSeparator());
1601	1802
..	..	@@ -1647,6 +1848,18 @@
1647	1848	// aConstraints.gridy += 1;
1648	1849	// aConstraints.gridwidth = 1;
1649	1850
	1851	+ cGridBag anisoU = new cGridBag();
	1852	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1853	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1854	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1855	+ specularSection.add(anisoU);
	1856	+
	1857	+ cGridBag anisoV = new cGridBag();
	1858	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1859	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1860	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1861	+ specularSection.add(anisoV);
	1862	+
1650	1863
1651	1864	panel.add(new JSeparator());
1652	1865
..	..	@@ -1654,35 +1867,35 @@
1654	1867
1655	1868	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1656	1869
1657		- cGridBag globalSection = new cGridBag().setVertical(true);
	1870	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1658	1871
1659	1872	cGridBag camera = new cGridBag();
1660	1873	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1661	1874	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1662	1875	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1663		- globalSection.add(camera);
	1876	+ colorSection.add(camera);
1664	1877
1665	1878	cGridBag ambient = new cGridBag();
1666	1879	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1667	1880	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1668	1881	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1669		- globalSection.add(ambient);
	1882	+ colorSection.add(ambient);
1670	1883
1671	1884	cGridBag backlit = new cGridBag();
1672	1885	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1673	1886	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1674	1887	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1675		- globalSection.add(backlit);
	1888	+ colorSection.add(backlit);
1676	1889
1677	1890	cGridBag opacity = new cGridBag();
1678	1891	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1679	1892	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1680	1893	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1681		- globalSection.add(opacity);
	1894	+ colorSection.add(opacity);
1682	1895
1683		- panel.add(new JSeparator());
	1896	+ //panel.add(new JSeparator());
1684	1897
1685		- panel.add(globalSection);
	1898	+ //panel.add(globalSection);
1686	1899
1687	1900	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1688	1901
..	..	@@ -1789,8 +2002,9 @@
1789	2002	// 3D models
1790	2003	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1791	2004	{
1792		- lastConverter = new com.jmex.model.converters.MaxToJme();
1793		- LoadFile(filename, lastConverter);
	2005	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2006	+ //LoadFile(filename, lastConverter);
	2007	+ LoadObjFile(filename); // New 3ds loader
1794	2008	continue;
1795	2009	}
1796	2010	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1991,6 +2205,7 @@
1991	2205	e2.printStackTrace();
1992	2206	}
1993	2207	}
	2208	+
1994	2209	LoadJMEThread loadThread;
1995	2210
1996	2211	class LoadJMEThread extends Thread
..	..	@@ -2048,6 +2263,7 @@
2048	2263	//LoadFile0(filename, converter);
2049	2264	}
2050	2265	}
	2266	+
2051	2267	LoadOBJThread loadObjThread;
2052	2268
2053	2269	class LoadOBJThread extends Thread
..	..	@@ -2126,19 +2342,19 @@
2126	2342
2127	2343	void LoadObjFile(String fullname)
2128	2344	{
2129		- /*
	2345	+ System.out.println("Loading " + fullname);
	2346	+ /**/
2130	2347	//lastFilename = fullname;
2131	2348	if(loadObjThread == null)
2132	2349	{
2133		- loadObjThread = new LoadOBJThread();
2134		- loadObjThread.start();
	2350	+ loadObjThread = new LoadOBJThread();
	2351	+ loadObjThread.start();
2135	2352	}
2136	2353
2137	2354	loadObjThread.add(fullname);
2138		- */
	2355	+ /**/
2139	2356
2140		- System.out.println("Loading " + fullname);
2141		- makeSomething(new FileObject(fullname, true), true);
	2357	+ //makeSomething(new FileObject(fullname, true), true);
2142	2358	}
2143	2359
2144	2360	void LoadGFDFile(String fullname)
..	..	@@ -2514,6 +2730,7 @@
2514	2730	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2515	2731	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2516	2732	}
	2733	+
2517	2734	//cJME.count++;
2518	2735	//cJME.count %= 12;
2519	2736	if (gc)
..	..	@@ -2697,6 +2914,7 @@
2697	2914	}
2698	2915	}
2699	2916	}
	2917	+
2700	2918	cFileSystemPane FSPane;
2701	2919
2702	2920	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2750,11 +2968,14 @@
2750	2968	}
2751	2969	}
2752	2970	}
	2971	+
2753	2972	freezematerial = false;
2754	2973	}
2755	2974
2756	2975	void SetMaterial(Object3D object)
2757	2976	{
	2977	+ latestObject = object;
	2978	+
2758	2979	cMaterial mat = object.material;
2759	2980
2760	2981	if (mat == null)
..	..	@@ -2866,12 +3087,17 @@
2866	3087	// }
2867	3088
2868	3089	/**/
2869		- if (deselect)
	3090	+ if (deselect \|\| child == null)
2870	3091	{
2871	3092	//group.deselectAll();
2872	3093	//freeze = true;
2873	3094	GetTree().clearSelection();
2874	3095	//freeze = false;
	3096	+
	3097	+ if (child == null)
	3098	+ {
	3099	+ return;
	3100	+ }
2875	3101	}
2876	3102
2877	3103	//group.addSelectee(child);
..	..	@@ -2940,7 +3166,7 @@
2940	3166	cameraView.ToggleDL();
2941	3167	cameraView.repaint();
2942	3168	return;
2943		- } else if (event.getSource() == toggleTextureItem)
	3169	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2944	3170	{
2945	3171	cameraView.ToggleTexture();
2946	3172	// june 2013 copy.HardTouch();
..	..	@@ -2979,9 +3205,9 @@
2979	3205	frame.validate();
2980	3206
2981	3207	return;
2982		- } else if (event.getSource() == toggleSwitchItem)
	3208	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2983	3209	{
2984		- cameraView.ToggleRandom();
	3210	+ cameraView.ToggleSwitch();
2985	3211	cameraView.repaint();
2986	3212	return;
2987	3213	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3052,8 +3278,9 @@
3052	3278
3053	3279	public void actionPerformed(ActionEvent event)
3054	3280	{
	3281	+ Object source = event.getSource();
3055	3282	// SCRIPT DIALOG
3056		- if (event.getSource() == okbutton)
	3283	+ if (source == okbutton)
3057	3284	{
3058	3285	textpanel.setVisible(false);
3059	3286	textpanel.remove(textarea);
..	..	@@ -3065,7 +3292,7 @@
3065	3292	textarea = null;
3066	3293	textpanel = null;
3067	3294	}
3068		- if (event.getSource() == cancelbutton)
	3295	+ if (source == cancelbutton)
3069	3296	{
3070	3297	textpanel.setVisible(false);
3071	3298	textpanel.remove(textarea);
..	..	@@ -3077,50 +3304,50 @@
3077	3304	//applySelf();
3078	3305	//client.refreshEditWindow();
3079	3306	//refreshContents();
3080		- if (event.getSource() == nameField)
	3307	+ if (source == nameField)
3081	3308	{
3082	3309	//System.out.println("ObjEditor " + event);
3083	3310	applySelf0(true);
3084	3311	//parent.applySelf();
3085	3312	objEditor.refreshContents();
3086		- } else if (event.getSource() == resetButton)
	3313	+ } else if (source == resetButton)
3087	3314	{
3088	3315	CameraPane.fullreset = true;
3089	3316	copy.Reset(); // ResetMeshes();
3090	3317	copy.Touch();
3091	3318	objEditor.refreshContents();
3092		- } else if (event.getSource() == stepItem)
	3319	+ } else if (source == stepItem)
3093	3320	{
3094	3321	//cameraView.ONESTEP = true;
3095	3322	Globals.ONESTEP = true;
3096	3323	cameraView.repaint();
3097	3324	return;
3098		- } else if (event.getSource() == stepButton)
	3325	+ } else if (source == stepButton)
3099	3326	{
3100	3327	copy.Step();
3101	3328	copy.Touch();
3102	3329	objEditor.refreshContents();
3103		- } else if (event.getSource() == slowerButton)
	3330	+ } else if (source == slowerButton)
3104	3331	{
3105	3332	copy.Slower();
3106	3333	copy.Touch();
3107	3334	objEditor.refreshContents();
3108		- } else if (event.getSource() == fasterButton)
	3335	+ } else if (source == fasterButton)
3109	3336	{
3110	3337	copy.Faster();
3111	3338	copy.Touch();
3112	3339	objEditor.refreshContents();
3113		- } else if (event.getSource() == remarkButton)
	3340	+ } else if (source == remarkButton)
3114	3341	{
3115	3342	copy.Remark();
3116	3343	copy.Touch();
3117	3344	objEditor.refreshContents();
3118		- } else if (event.getSource() == stepAllButton)
	3345	+ } else if (source == stepAllButton)
3119	3346	{
3120	3347	copy.StepAll();
3121	3348	copy.Touch();
3122	3349	objEditor.refreshContents();
3123		- } else if (event.getSource() == resetAllButton)
	3350	+ } else if (source == resetAllButton)
3124	3351	{
3125	3352	//CameraPane.fullreset = true;
3126	3353	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3153,53 +3380,79 @@
3153	3380	// Close();
3154	3381	// }
3155	3382	// else
3156		- if (event.getSource() == resetSlidersButton)
	3383	+ if (source == resetSlidersButton)
3157	3384	{
3158	3385	ResetSliders();
3159		- } else if (event.getSource() == clearMaterialButton)
	3386	+ } else if (source == clearMaterialButton)
3160	3387	{
3161	3388	ClearMaterial();
3162		- } else if (event.getSource() == createMaterialButton)
	3389	+ } else if (source == createMaterialButton)
3163	3390	{
3164	3391	CreateMaterial();
3165		- } else if (event.getSource() == clearPanelButton)
	3392	+ } else if (source == clearPanelButton)
3166	3393	{
3167	3394	copy.ClearUI();
3168	3395	refreshContents(true);
3169		- } /*
3170		- }
3171		-
3172		- public boolean action(Event event, Object arg)
3173		- {
3174		- */ else if (event.getSource() == closeItem)
	3396	+ } else if (source == importGFDItem)
	3397	+ {
	3398	+ ImportGFD();
	3399	+ } else
	3400	+ if (source == importVRMLX3DItem)
	3401	+ {
	3402	+ ImportVRMLX3D();
	3403	+ } else
	3404	+ if (source == import3DSItem)
	3405	+ {
	3406	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3407	+ } else
	3408	+ if (source == importOBJItem)
	3409	+ {
	3410	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3411	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3412	+ browser.setVisible(true);
	3413	+ String filename = browser.getFile();
	3414	+ if (filename != null && filename.length() > 0)
	3415	+ {
	3416	+ String fullname = browser.getDirectory() + filename;
	3417	+ makeSomething(ReadOBJ(fullname), true);
	3418	+ }
	3419	+ } else
	3420	+ if (source == closeItem)
3175	3421	{
3176	3422	Close();
3177	3423	//return true;
3178		- } else if (event.getSource() == loadItem)
	3424	+ } else if (source == openItem)
3179	3425	{
3180		- load();
	3426	+ Open();
3181	3427	//return true;
3182		- } else if (event.getSource() == saveItem)
	3428	+ } else if (source == newItem)
	3429	+ {
	3430	+ New();
	3431	+ } else if (source == saveItem)
3183	3432	{
3184	3433	save();
3185	3434	//return true;
3186		- } else if (event.getSource() == saveAsItem)
	3435	+ } else if (source == saveAsItem)
3187	3436	{
3188	3437	saveAs();
3189	3438	//return true;
3190		- } else if (event.getSource() == reexportItem)
	3439	+ } else if (source == reexportItem)
3191	3440	{
3192	3441	reexport();
3193	3442	//return true;
3194		- } else if (event.getSource() == exportAsItem)
	3443	+ } else if (source == exportAsItem)
3195	3444	{
3196	3445	export();
3197	3446	//return true;
3198		- } else if (event.getSource() == povItem)
	3447	+ } else if (source == povItem)
3199	3448	{
3200	3449	generatePOV();
3201	3450	//return true;
3202		- } else if (event.getSource() == zBufferItem)
	3451	+ } else if (event.getSource() == archiveItem)
	3452	+ {
	3453	+ cTools.Archive(frame);
	3454	+ return;
	3455	+ } else if (source == zBufferItem)
3203	3456	{
3204	3457	try
3205	3458	{
..	..	@@ -3221,21 +3474,8 @@
3221	3474	cameraView.repaint();
3222	3475	//return true;
3223	3476	}
3224		- */ else if (event.getSource() == editCameraItem)
3225		- {
3226		- cameraView.ProtectCamera();
3227		- cameraView.repaint();
3228		- return;
3229		- } else if (event.getSource() == revertCameraItem)
3230		- {
3231		- cameraView.RevertCamera();
3232		- cameraView.repaint();
3233		- return;
3234		-// } else if (event.getSource() == textureButton)
3235		-// {
3236		-// return; // true;
3237		- } else // combos...
3238		- if (event.getSource() == texresMenu)
	3477	+ */ else // combos...
	3478	+ if (source == texresMenu)
3239	3479	{
3240	3480	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3241	3481	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3247,6 +3487,376 @@
3247	3487	}
3248	3488	}
3249	3489
	3490	+ void New()
	3491	+ {
	3492	+ while (copy.Size() > 1)
	3493	+ {
	3494	+ copy.remove(1);
	3495	+ }
	3496	+
	3497	+ ResetModel();
	3498	+ objEditor.refreshContents();
	3499	+ }
	3500	+
	3501	+ static public byte[] Compress(Object3D o)
	3502	+ {
	3503	+ try
	3504	+ {
	3505	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3506	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3507	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3508	+
	3509	+ Object3D parent = o.parent;
	3510	+ o.parent = null;
	3511	+
	3512	+ out.writeObject(o);
	3513	+
	3514	+ o.parent = parent;
	3515	+
	3516	+ out.flush();
	3517	+
	3518	+ baos //zstream
	3519	+ .close();
	3520	+ out.close();
	3521	+
	3522	+ byte[] bytes = baos.toByteArray();
	3523	+
	3524	+ System.out.println("save #bytes = " + bytes.length);
	3525	+ return bytes;
	3526	+ } catch (Exception e)
	3527	+ {
	3528	+ System.err.println(e);
	3529	+ return null;
	3530	+ }
	3531	+ }
	3532	+
	3533	+ static public Object Uncompress(byte[] bytes)
	3534	+ {
	3535	+ System.out.println("restore #bytes = " + bytes.length);
	3536	+ try
	3537	+ {
	3538	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3539	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3540	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3541	+ Object obj = in.readObject();
	3542	+
	3543	+ bais //istream
	3544	+ .close();
	3545	+ in.close();
	3546	+
	3547	+ return obj;
	3548	+ } catch (Exception e)
	3549	+ {
	3550	+ System.err.println(e);
	3551	+ return null;
	3552	+ }
	3553	+ }
	3554	+
	3555	+ static public Object clone(Object o)
	3556	+ {
	3557	+ try
	3558	+ {
	3559	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3560	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3561	+
	3562	+ out.writeObject(o);
	3563	+
	3564	+ out.flush();
	3565	+ out.close();
	3566	+
	3567	+ byte[] bytes = baos.toByteArray();
	3568	+
	3569	+ System.out.println("clone = " + bytes.length);
	3570	+
	3571	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3572	+ ObjectInputStream in = new ObjectInputStream(bais);
	3573	+ Object obj = in.readObject();
	3574	+ in.close();
	3575	+
	3576	+ return obj;
	3577	+ } catch (Exception e)
	3578	+ {
	3579	+ System.err.println(e);
	3580	+ return null;
	3581	+ }
	3582	+ }
	3583	+
	3584	+ cRadio GetCurrentTab()
	3585	+ {
	3586	+ cRadio ab;
	3587	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3588	+ {
	3589	+ ab = (cRadio)e.nextElement();
	3590	+ if(ab.GetObject() == copy)
	3591	+ {
	3592	+ return ab;
	3593	+ }
	3594	+ }
	3595	+
	3596	+ return null;
	3597	+ }
	3598	+
	3599	+
	3600	+ public void Save()
	3601	+ {
	3602	+ //Save(true);
	3603	+ Replace();
	3604	+ }
	3605	+
	3606	+ private boolean Equal(byte[] compress, byte[] name)
	3607	+ {
	3608	+ if (compress.length != name.length)
	3609	+ {
	3610	+ return false;
	3611	+ }
	3612	+
	3613	+ for (int i=compress.length; --i>=0;)
	3614	+ {
	3615	+ if (compress[i] != name[i])
	3616	+ return false;
	3617	+ }
	3618	+
	3619	+ return true;
	3620	+ }
	3621	+
	3622	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3623	+
	3624	+ public boolean Save(boolean user)
	3625	+ {
	3626	+ System.err.println("Save");
	3627	+
	3628	+ cRadio tab = GetCurrentTab();
	3629	+
	3630	+ byte[] compress = CompressCopy();
	3631	+
	3632	+ boolean thesame = false;
	3633	+
	3634	+ // Quick heuristic using length. Works only when stream is compressed.
	3635	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3636	+ {
	3637	+ thesame = true;
	3638	+ }
	3639	+
	3640	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3641	+ if (!thesame)
	3642	+ {
	3643	+ //tab.user[tab.versionindex] = user;
	3644	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3645	+
	3646	+ copy.versions[++copy.versionindex] = compress;
	3647	+
	3648	+ // if (increment)
	3649	+ // tab.versionindex++;
	3650	+ }
	3651	+
	3652	+ //copy.RestoreBigData(versiontable);
	3653	+
	3654	+ //assert(hashtable.isEmpty());
	3655	+
	3656	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3657	+ {
	3658	+ //tab.user[i] = false;
	3659	+ copy.versions[i] = null;
	3660	+ }
	3661	+
	3662	+ SetUndoStates();
	3663	+
	3664	+ // test save
	3665	+ if (false)
	3666	+ {
	3667	+ try
	3668	+ {
	3669	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	3670	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3671	+
	3672	+ p.writeObject(copy);
	3673	+
	3674	+ p.flush();
	3675	+
	3676	+ ostream.close();
	3677	+ } catch (Exception e)
	3678	+ {
	3679	+ e.printStackTrace();
	3680	+ }
	3681	+ }
	3682	+
	3683	+ return !thesame;
	3684	+ }
	3685	+
	3686	+ void CopyChanged(Object3D obj)
	3687	+ {
	3688	+ SetUndoStates();
	3689	+
	3690	+ boolean temp = CameraPane.SWITCH;
	3691	+ CameraPane.SWITCH = false;
	3692	+
	3693	+ copy.ExtractBigData(versiontable);
	3694	+
	3695	+ copy.clear();
	3696	+
	3697	+ for (int i=0; i<obj.Size(); i++)
	3698	+ {
	3699	+ copy.add(obj.get(i));
	3700	+ }
	3701	+
	3702	+ copy.RestoreBigData(versiontable);
	3703	+
	3704	+ CameraPane.SWITCH = temp;
	3705	+
	3706	+ //assert(hashtable.isEmpty());
	3707	+
	3708	+ copy.Touch();
	3709	+
	3710	+ ResetModel();
	3711	+ copy.HardTouch(); // recompile?
	3712	+
	3713	+ cRadio ab;
	3714	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3715	+ {
	3716	+ ab = (cRadio)e.nextElement();
	3717	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3718	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3719	+ if (test != null)
	3720	+ {
	3721	+ test.editWindow = ab.object.editWindow;
	3722	+ ab.object = test;
	3723	+ }
	3724	+ }
	3725	+
	3726	+ refreshContents();
	3727	+ }
	3728	+
	3729	+ cButton undoButton;
	3730	+ cButton restoreButton;
	3731	+ cButton replaceButton;
	3732	+ cButton redoButton;
	3733	+
	3734	+ void SetUndoStates()
	3735	+ {
	3736	+ cRadio tab = GetCurrentTab();
	3737	+
	3738	+ restoreButton.setEnabled(copy.versionindex != -1);
	3739	+ replaceButton.setEnabled(copy.versionindex != -1);
	3740	+ undoButton.setEnabled(copy.versionindex > 0);
	3741	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3742	+ }
	3743	+
	3744	+ public boolean Undo()
	3745	+ {
	3746	+ System.err.println("Undo");
	3747	+
	3748	+ cRadio tab = GetCurrentTab();
	3749	+
	3750	+ if (copy.versionindex == 0)
	3751	+ {
	3752	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3753	+ return false;
	3754	+ }
	3755	+
	3756	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3757	+// {
	3758	+// if (Save(false))
	3759	+// tab.versionindex -= 1;
	3760	+// else
	3761	+// {
	3762	+// if (tab.versionindex <= 0)
	3763	+// return false;
	3764	+// else
	3765	+// tab.versionindex -= 1;
	3766	+// }
	3767	+// }
	3768	+
	3769	+ copy.versionindex -= 1;
	3770	+
	3771	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3772	+
	3773	+ return true;
	3774	+ }
	3775	+
	3776	+ public boolean Restore()
	3777	+ {
	3778	+ System.err.println("Restore");
	3779	+
	3780	+ cRadio tab = GetCurrentTab();
	3781	+
	3782	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3783	+ {
	3784	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3785	+ return false;
	3786	+ }
	3787	+
	3788	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3789	+
	3790	+ return true;
	3791	+ }
	3792	+
	3793	+ public boolean Replace()
	3794	+ {
	3795	+ System.err.println("Replace");
	3796	+
	3797	+ cRadio tab = GetCurrentTab();
	3798	+
	3799	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3800	+ {
	3801	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3802	+ return false;
	3803	+ }
	3804	+
	3805	+ copy.versions[copy.versionindex] = CompressCopy();
	3806	+
	3807	+ return true;
	3808	+ }
	3809	+
	3810	+ public void Redo()
	3811	+ {
	3812	+ cRadio tab = GetCurrentTab();
	3813	+
	3814	+ if (copy.versions[copy.versionindex + 1] == null)
	3815	+ {
	3816	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3817	+ return;
	3818	+ }
	3819	+
	3820	+ copy.versionindex += 1;
	3821	+
	3822	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3823	+
	3824	+ //if (!tab.user[tab.versionindex])
	3825	+ // tab.graphs[tab.versionindex] = null;
	3826	+ }
	3827	+
	3828	+ void ImportGFD()
	3829	+ {
	3830	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3831	+ browser.show();
	3832	+ String filename = browser.getFile();
	3833	+ if (filename != null && filename.length() > 0)
	3834	+ {
	3835	+ String fullname = browser.getDirectory() + filename;
	3836	+
	3837	+ //Object3D readobj =
	3838	+ objEditor.ReadGFD(fullname, objEditor);
	3839	+ //makeSomething(readobj);
	3840	+ }
	3841	+ }
	3842	+
	3843	+ void ImportVRMLX3D()
	3844	+ {
	3845	+ if (Grafreed.standAlone)
	3846	+ {
	3847	+ /**/
	3848	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3849	+ browser.show();
	3850	+ String filename = browser.getFile();
	3851	+ if (filename != null && filename.length() > 0)
	3852	+ {
	3853	+ String fullname = browser.getDirectory() + filename;
	3854	+ LoadVRMLX3D(fullname);
	3855	+ }
	3856	+ /**/
	3857	+ }
	3858	+ }
	3859	+
3250	3860	void ToggleAnimation()
3251	3861	{
3252	3862	if (!Globals.ANIMATION)
..	..	@@ -3364,7 +3974,7 @@
3364	3974	assert false;
3365	3975	}
3366	3976
3367		- void EditSelection()
	3977	+ void EditSelection(boolean newWindow)
3368	3978	{
3369	3979	}
3370	3980
..	..	@@ -3508,9 +4118,22 @@
3508	4118	//copy.Touch();
3509	4119	}
3510	4120
	4121	+ cNumberSlider versionField;
	4122	+
3511	4123	public void stateChanged(ChangeEvent e)
3512	4124	{
3513	4125	// assert(false);
	4126	+ if (e.getSource() == versionField)
	4127	+ {
	4128	+ int version = versionField.getInteger();
	4129	+
	4130	+ if (copy.versions[version] != null)
	4131	+ {
	4132	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4133	+ }
	4134	+
	4135	+ return;
	4136	+ }
3514	4137
3515	4138	if (freezematerial)
3516	4139	{
..	..	@@ -3859,6 +4482,8 @@
3859	4482
3860	4483	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3861	4484	{
	4485	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4486	+ Save();
3862	4487	//Tween.set(thing, 0).target(1).start(tweenManager);
3863	4488	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3864	4489	// if (thing instanceof GenericJointDemo)
..	..	@@ -3945,6 +4570,12 @@
3945	4570	{
3946	4571	ResetModel();
3947	4572	Select(thing.GetTreePath(), true, false); // unselect... false);
	4573	+
	4574	+ if (thing.Size() == 0)
	4575	+ {
	4576	+ //EditSelection(false);
	4577	+ }
	4578	+
3948	4579	refreshContents();
3949	4580	}
3950	4581
..	..	@@ -4062,6 +4693,7 @@
4062	4693	}
4063	4694	}
4064	4695	}
	4696	+
4065	4697	LoadGFDThread loadGFDThread;
4066	4698
4067	4699	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4081,8 +4713,10 @@
4081	4713
4082	4714	try
4083	4715	{
	4716	+ // Try compressed version first.
4084	4717	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4085		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4718	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4719	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4086	4720
4087	4721	readobj = (Object3D) p.readObject();
4088	4722	istream.close();
..	..	@@ -4090,7 +4724,20 @@
4090	4724	readobj.ResetDisplayList();
4091	4725	} catch (Exception e)
4092	4726	{
4093		- e.printStackTrace();
	4727	+ //e.printStackTrace();
	4728	+ try
	4729	+ {
	4730	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4731	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4732	+
	4733	+ readobj = (Object3D) p.readObject();
	4734	+ istream.close();
	4735	+
	4736	+ readobj.ResetDisplayList();
	4737	+ } catch (Exception e2)
	4738	+ {
	4739	+ e2.printStackTrace();
	4740	+ }
4094	4741	}
4095	4742	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4096	4743	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4136,6 +4783,12 @@
4136	4783
4137	4784	void LoadIt(Object obj)
4138	4785	{
	4786	+ if (obj == null)
	4787	+ {
	4788	+ // Invalid file
	4789	+ return;
	4790	+ }
	4791	+
4139	4792	System.out.println("Loaded " + obj);
4140	4793	//new Exception().printStackTrace();
4141	4794	Object3D readobj = (Object3D) obj;
..	..	@@ -4145,6 +4798,8 @@
4145	4798
4146	4799	if (readobj != null)
4147	4800	{
	4801	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4802	+ // Save();
4148	4803	try
4149	4804	{
4150	4805	//readobj.deepCopySelf(copy);
..	..	@@ -4199,13 +4854,18 @@
4199	4854	c.addChild(csg);
4200	4855	}
4201	4856
	4857	+ copy.versions = readobj.versions;
	4858	+ copy.versionindex = readobj.versionindex;
	4859	+
	4860	+ SetUndoStates();
	4861	+
4202	4862	ResetModel();
4203	4863	copy.HardTouch(); // recompile?
4204	4864	refreshContents();
4205	4865	}
4206	4866	}
4207	4867
4208		- void load() // throws ClassNotFoundException
	4868	+ void Open() // throws ClassNotFoundException
4209	4869	{
4210	4870	if (Grafreed.standAlone)
4211	4871	{
..	..	@@ -4294,11 +4954,13 @@
4294	4954	try
4295	4955	{
4296	4956	FileOutputStream ostream = new FileOutputStream(lastname);
4297		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4957	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4958	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4298	4959
4299	4960	p.writeObject(copy);
4300	4961	p.flush();
4301	4962
	4963	+ zstream.close();
4302	4964	ostream.close();
4303	4965
4304	4966	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4308,6 +4970,7 @@
4308	4970	{
4309	4971	}
4310	4972	}
	4973	+
4311	4974	String lastname;
4312	4975
4313	4976	void saveAs()
..	..	@@ -4319,6 +4982,8 @@
4319	4982	String filename = browser.getFile();
4320	4983	if (filename != null && filename.length() > 0)
4321	4984	{
	4985	+ if (!filename.endsWith(".gfd"))
	4986	+ filename += ".gfd";
4322	4987	lastname = browser.getDirectory() + filename;
4323	4988	save();
4324	4989	}
..	..	@@ -4417,8 +5082,8 @@
4417	5082	try
4418	5083	{
4419	5084	FileOutputStream ostream = new FileOutputStream(filename);
4420		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4421		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5085	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5086	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4422	5087
4423	5088	Object3D objectparent = obj.parent;
4424	5089	obj.parent = null;
..	..	@@ -4435,8 +5100,8 @@
4435	5100	p.writeObject(object);
4436	5101	p.flush();
4437	5102
	5103	+ zstream.close();
4438	5104	ostream.close();
4439		- // zstream.close();
4440	5105
4441	5106	// group.selection.get(0).parent = parent;
4442	5107	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4483,19 +5148,18 @@
4483	5148	Object3D client;
4484	5149	Object3D copy;
4485	5150	MenuBar menuBar;
4486		- Menu windowMenu;
4487		- MenuItem loadItem;
	5151	+ Menu fileMenu;
	5152	+ MenuItem newItem;
	5153	+ MenuItem openItem;
4488	5154	MenuItem saveItem;
4489	5155	MenuItem saveAsItem;
4490	5156	MenuItem exportAsItem;
4491	5157	MenuItem reexportItem;
4492	5158	MenuItem povItem;
4493	5159	MenuItem closeItem;
4494		- Menu cameraMenu;
	5160	+
4495	5161	CheckboxMenuItem zBufferItem;
4496	5162	//MenuItem normalLensItem;
4497		- MenuItem editCameraItem;
4498		- MenuItem revertCameraItem;
4499	5163	MenuItem stepItem;
4500	5164	CheckboxMenuItem toggleLiveItem;
4501	5165	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4509,22 +5173,36 @@
4509	5173	CheckboxMenuItem toggleSwitchItem;
4510	5174	CheckboxMenuItem toggleRootItem;
4511	5175	CheckboxMenuItem animationItem;
	5176	+ MenuItem archiveItem;
4512	5177	CheckboxMenuItem toggleHandleItem;
4513	5178	CheckboxMenuItem togglePaintItem;
4514	5179	JSplitPane mainPanel;
4515	5180	JScrollPane scrollpane;
	5181	+
4516	5182	JPanel toolbarPanel;
	5183	+
4517	5184	cGridBag treePanel;
	5185	+
4518	5186	JPanel radioPanel;
4519	5187	ButtonGroup buttonGroup;
4520		- cGridBag ctrlPanel;
	5188	+
	5189	+ cGridBag toolboxPanel;
4521	5190	cGridBag materialPanel;
	5191	+ cGridBag ctrlPanel;
	5192	+
4522	5193	JScrollPane infoPanel;
	5194	+
4523	5195	cGridBag optionsPanel;
	5196	+
4524	5197	JTabbedPane objectPanel;
	5198	+ boolean materialFlushed;
	5199	+ Object3D latestObject;
	5200	+
4525	5201	cGridBag XYZPanel;
	5202	+
4526	5203	JSplitPane gridPanel;
4527	5204	JSplitPane bigPanel;
	5205	+
4528	5206	cGridBag bigThree;
4529	5207	cGridBag scenePanel;
4530	5208	cGridBag centralPanel;
..	..	@@ -4639,8 +5317,13 @@
4639	5317	cNumberSlider fogField;
4640	5318	JLabel opacityPowerLabel;
4641	5319	cNumberSlider opacityPowerField;
4642		- JTree jTree;
	5320	+ cTree jTree;
4643	5321	//ObjectUI parent;
4644	5322
4645	5323	cNumberSlider normalpushField;
	5324	+
	5325	+ private MenuItem importGFDItem;
	5326	+ private MenuItem importVRMLX3DItem;
	5327	+ private MenuItem import3DSItem;
	5328	+ private MenuItem importOBJItem;
4646	5329	}