~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -138,34 +138,42 @@
138	138	public void closeUI()
139	139	{
140	140	//new Exception().printStackTrace();
141		- System.out.println("this = " + this);
142		- System.out.println("objEditor = " + objEditor);
	141	+// System.out.println("this = " + this);
	142	+// System.out.println("objEditor = " + objEditor);
143	143	//nameField.removeActionListener(this);
144		- objEditor.ctrlPanel.remove(nameField);
	144	+// objEditor.ctrlPanel.remove(nameField);
	145	+
	146	+ objEditor.ctrlPanel.remove(namePanel);
145	147
146	148	if (!GroupEditor.allparams)
147	149	return;
148	150
149		- objEditor.ctrlPanel.remove(liveCB);
150		- objEditor.ctrlPanel.remove(hideCB);
151		- objEditor.ctrlPanel.remove(markCB);
152		-
153		- objEditor.ctrlPanel.remove(randomCB);
154		- objEditor.ctrlPanel.remove(speedupCB);
155		- objEditor.ctrlPanel.remove(rewindCB);
156		-
157		- objEditor.ctrlPanel.remove(resetButton);
158		- objEditor.ctrlPanel.remove(stepButton);
159		-// objEditor.ctrlPanel.remove(stepAllButton);
160		-// objEditor.ctrlPanel.remove(resetAllButton);
161		- objEditor.ctrlPanel.remove(link2masterCB);
162		- //objEditor.ctrlPanel.remove(flipVCB);
163		- //objEditor.ctrlPanel.remove(texresMenu);
164		- objEditor.ctrlPanel.remove(slowerButton);
165		- objEditor.ctrlPanel.remove(fasterButton);
166		- objEditor.ctrlPanel.remove(remarkButton);
	151	+// objEditor.ctrlPanel.remove(liveCB);
	152	+// objEditor.ctrlPanel.remove(hideCB);
	153	+// objEditor.ctrlPanel.remove(markCB);
	154	+//
	155	+// objEditor.ctrlPanel.remove(randomCB);
	156	+// objEditor.ctrlPanel.remove(speedupCB);
	157	+// objEditor.ctrlPanel.remove(rewindCB);
	158	+//
	159	+// objEditor.ctrlPanel.remove(resetButton);
	160	+// objEditor.ctrlPanel.remove(stepButton);
	161	+//// objEditor.ctrlPanel.remove(stepAllButton);
	162	+//// objEditor.ctrlPanel.remove(resetAllButton);
	163	+// objEditor.ctrlPanel.remove(link2masterCB);
	164	+// //objEditor.ctrlPanel.remove(flipVCB);
	165	+// //objEditor.ctrlPanel.remove(texresMenu);
	166	+// objEditor.ctrlPanel.remove(slowerButton);
	167	+// objEditor.ctrlPanel.remove(fasterButton);
	168	+// objEditor.ctrlPanel.remove(remarkButton);
167	169
168		- Remove(normalpushField);
	170	+ objEditor.ctrlPanel.remove(setupPanel);
	171	+ objEditor.ctrlPanel.remove(setupPanel2);
	172	+ objEditor.ctrlPanel.remove(commandsPanel);
	173	+ objEditor.ctrlPanel.remove(pushPanel);
	174	+ //objEditor.ctrlPanel.remove(fillPanel);
	175	+
	176	+ //Remove(normalpushField);
169	177	}
170	178
171	179	public ObjEditor GetEditor()
..	..	@@ -269,24 +277,40 @@
269	277	void SetupMenu()
270	278	{
271	279	frame.setMenuBar(menuBar = new MenuBar());
272		- menuBar.add(windowMenu = new Menu("File"));
273		- windowMenu.add(loadItem = new MenuItem("Load..."));
274		- windowMenu.add("-");
275		- windowMenu.add(saveItem = new MenuItem("Save"));
276		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	280	+ menuBar.add(fileMenu = new Menu("File"));
	281	+ fileMenu.add(newItem = new MenuItem("New"));
	282	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	283	+
	284	+ //oe.menuBar.add(menu = new Menu("Include"));
	285	+ Menu menu = new Menu("Import");
	286	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	287	+ importOBJItem.addActionListener(this);
	288	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	289	+ import3DSItem.addActionListener(this);
	290	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	291	+ importVRMLX3DItem.addActionListener(this);
	292	+ menu.add("-");
	293	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	294	+ importGFDItem.addActionListener(this);
	295	+ fileMenu.add(menu);
	296	+ fileMenu.add("-");
	297	+
	298	+ fileMenu.add(saveItem = new MenuItem("Save"));
	299	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
277	300	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
278		- windowMenu.add("-");
279		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
280		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
281		- windowMenu.add("-");
	301	+ fileMenu.add("-");
	302	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	303	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	304	+ fileMenu.add("-");
282	305	if (client.parent != null)
283	306	{
284		- windowMenu.add(closeItem = new MenuItem("Close"));
	307	+ fileMenu.add(closeItem = new MenuItem("Close"));
285	308	} else
286	309	{
287		- windowMenu.add(closeItem = new MenuItem("Exit"));
	310	+ fileMenu.add(closeItem = new MenuItem("Exit"));
288	311	}
289	312
	313	+ newItem.addActionListener(this);
290	314	loadItem.addActionListener(this);
291	315	saveItem.addActionListener(this);
292	316	saveAsItem.addActionListener(this);
..	..	@@ -295,79 +319,26 @@
295	319	//povItem.addActionListener(this);
296	320	closeItem.addActionListener(this);
297	321
298		- menuBar.add(cameraMenu = new Menu("View"));
299		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
300		- //zBufferItem.addActionListener(this);
301		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
302		- //normalLensItem.addActionListener(this);
303		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
304		- revertCameraItem.addActionListener(this);
305		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
306		- toggleTimelineItem.addItemListener(this);
307		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
308		- toggleFullScreenItem.addItemListener(this);
309		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
310		- cameraMenu.add("-");
311		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
312		- toggleTextureItem.addItemListener(this);
313		- toggleTextureItem.setState(CameraPane.textureon);
314		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
315		- toggleLiveItem.addItemListener(this);
316		- toggleLiveItem.setState(Globals.isLIVE());
317		- cameraMenu.add(stepItem = new MenuItem("Step"));
318		- stepItem.addActionListener(this);
319		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
320		-// toggleDLItem.addItemListener(this);
321		-// toggleDLItem.setState(false);
322		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
323		- toggleRenderItem.addItemListener(this);
324		- toggleRenderItem.setState(!CameraPane.frozen);
325		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
326		- toggleDebugItem.addItemListener(this);
327		- toggleDebugItem.setState(CameraPane.DEBUG);
328		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
329		- toggleFrustumItem.addItemListener(this);
330		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
331		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
332		- toggleFootContactItem.addItemListener(this);
333		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
334		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
335		- toggleRandomItem.addItemListener(this);
336		- toggleRandomItem.setState(CameraPane.RANDOM);
337		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
338		- toggleHandleItem.addItemListener(this);
339		- toggleHandleItem.setState(CameraPane.HANDLES);
340		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
341		- togglePaintItem.addItemListener(this);
342		- togglePaintItem.setState(CameraPane.PAINTMODE);
343		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
344		-// toggleRootItem.addItemListener(this);
345		-// toggleRootItem.setState(false);
346		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
347		-// animationItem.addItemListener(this);
348		-// animationItem.setState(CameraPane.ANIMATION);
349		- cameraMenu.add("-");
350		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
351		- editCameraItem.addActionListener(this);
352		-
353	322	objectPanel = new JTabbedPane();
354	323	toolbarPanel = new JPanel();
355	324	toolbarPanel.setName("Toolbar");
356		- treePanel = new JPanel();
	325	+ treePanel = new cGridBag();
357	326	treePanel.setName("Tree");
358		- ctrlPanel = new cGridBag(); // new GridBagLayout());
	327	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
359	328	ctrlPanel.setName("Edit");
360	329	materialPanel = new cGridBag().setVertical(true);
361	330	materialPanel.setName("Material");
362	331	/JTextPane/
363	332	infoarea = createTextPane();
	333	+ doc = infoarea.getStyledDocument();
	334	+
364	335	infoarea.setEditable(true);
365	336	SetText();
366	337	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367	338	// infoarea.setOpaque(false);
368	339	// //infoarea.setForeground(textcolor);
369		- infoarea.setLineWrap(true);
370		- infoarea.setWrapStyleWord(true);
	340	+// TEXTAREA infoarea.setLineWrap(true);
	341	+// TEXTAREA infoarea.setWrapStyleWord(true);
371	342	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
372	343	infoPanel.setPreferredSize(new Dimension(50, 200));
373	344	infoPanel.setName("Info");
..	..	@@ -378,15 +349,15 @@
378	349	mainPanel.setName("Main");
379	350	mainPanel.setContinuousLayout(true);
380	351	mainPanel.setOneTouchExpandable(true);
381		- mainPanel.setDividerLocation(1.0);
382	352	mainPanel.setDividerSize(9);
383		- mainPanel.setResizeWeight(0);
	353	+ mainPanel.setDividerLocation(0.5); //1.0);
	354	+ mainPanel.setResizeWeight(0.5);
384	355
385	356	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386	357	//mainPanel.setLayout(new GridBagLayout());
387	358	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388		- treePanel.setLayout(new GridBagLayout());
389		- ctrlPanel.setLayout(new GridBagLayout());
	359	+// treePanel.setLayout(new GridBagLayout());
	360	+ //ctrlPanel.setLayout(new GridBagLayout());
390	361	//materialPanel.setLayout(new GridBagLayout());
391	362
392	363	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
..	..	@@ -426,7 +397,7 @@
426	397	static String newline = "\n";
427	398	protected static final String buttonString = "JButton";
428	399	StyledDocument doc;
429		- JTextArea infoarea;
	400	+ JTextPane infoarea;
430	401
431	402	void ClearInfo()
432	403	{
..	..	@@ -449,10 +420,10 @@
449	420	e.printStackTrace();
450	421	}
451	422
452		- String selection = infoarea.getText();
453		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
454		- java.awt.datatransfer.Clipboard clipboard =
455		- Toolkit.getDefaultToolkit().getSystemClipboard();
	423	+// String selection = infoarea.getText();
	424	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	425	+// java.awt.datatransfer.Clipboard clipboard =
	426	+// Toolkit.getDefaultToolkit().getSystemClipboard();
456	427	//clipboard.setContents(data, data);
457	428	}
458	429
..	..	@@ -475,13 +446,13 @@
475	446	//SendInfo("Name:", "bold");
476	447	if (sel.GetTextures() != null \|\| debug)
477	448	{
478		- si.SendInfo(sel.toString(), "bold");
	449	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
479	450	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
480	451	if (sel.Size() > 0)
481	452	{
482	453	si.SendInfo("#children = " + sel.Size(), "regular");
483	454	}
484		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	455	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
485	456	if (debug)
486	457	{
487	458	try
..	..	@@ -493,7 +464,10 @@
493	464	}
494	465
495	466	if (full)
496		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	467	+ {
	468	+ si.SendInfo(" BBox min: " + minima, "regular");
	469	+ si.SendInfo(" BBox max: " + maxima, "regular");
	470	+ }
497	471
498	472	if (sel.bRep != null)
499	473	{
..	..	@@ -520,7 +494,7 @@
520	494	}
521	495	if (sel.support != null)
522	496	{
523		- si.SendInfo(" support: " + sel.support, "regular");
	497	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
524	498	}
525	499	if (sel.scriptnode != null)
526	500	{
..	..	@@ -591,6 +565,9 @@
591	565	{
592	566	CameraPane.pointflow = (PointFlow) sel;
593	567	}
	568	+
	569	+ si.SendInfo("_____________________", "regular");
	570	+ si.SendInfo("", "regular");
594	571	}
595	572	}
596	573
..	..	@@ -622,52 +599,52 @@
622	599	cameraView.ToggleFullScreen();
623	600	}
624	601
625		- private JTextArea createTextPane()
	602	+ private JTextPane createTextPane()
626	603	{
627		- String[] initString =
628		- {
629		- "This is an editable JTextPane, ", //regular
630		- "another ", //italic
631		- "styled ", //bold
632		- "text ", //small
633		- "component, ", //large
634		- "which supports embedded components..." + newline,//regular
635		- " " + newline, //button
636		- "...and embedded icons..." + newline, //regular
637		- " ", //icon
638		- newline + "JTextPane is a subclass of JEditorPane that "
639		- + "uses a StyledEditorKit and StyledDocument, and provides "
640		- + "cover methods for interacting with those objects."
641		- };
	604	+// TEXTAREA String[] initString =
	605	+// {
	606	+// "This is an editable JTextPane, ", //regular
	607	+// "another ", //italic
	608	+// "styled ", //bold
	609	+// "text ", //small
	610	+// "component, ", //large
	611	+// "which supports embedded components..." + newline,//regular
	612	+// " " + newline, //button
	613	+// "...and embedded icons..." + newline, //regular
	614	+// " ", //icon
	615	+// newline + "JTextPane is a subclass of JEditorPane that "
	616	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	617	+// + "cover methods for interacting with those objects."
	618	+// };
	619	+//
	620	+// String[] initStyles =
	621	+// {
	622	+// "regular", "italic", "bold", "small", "large",
	623	+// "regular", "button", "regular", "icon",
	624	+// "regular"
	625	+// };
	626	+//
	627	+// JTextPane textPane = new JTextPane();
	628	+// textPane.setEditable(true);
	629	+// /StyledDocument/ doc = textPane.getStyledDocument();
	630	+// addStylesToDocument(doc);
	631	+//
	632	+// try
	633	+// {
	634	+// for (int j = 0; j < 2; j++)
	635	+// {
	636	+// for (int i = 0; i < initString.length; i++)
	637	+// {
	638	+// doc.insertString(doc.getLength(), initString[i],
	639	+// doc.getStyle(initStyles[i]));
	640	+// }
	641	+// }
	642	+// } catch (BadLocationException ble)
	643	+// {
	644	+// System.err.println("Couldn't insert initial text into text pane.");
	645	+// }
642	646
643		- String[] initStyles =
644		- {
645		- "regular", "italic", "bold", "small", "large",
646		- "regular", "button", "regular", "icon",
647		- "regular"
648		- };
649		-
650		- JTextPane textPane = new JTextPane();
651		- textPane.setEditable(true);
652		- /StyledDocument/ doc = textPane.getStyledDocument();
653		- addStylesToDocument(doc);
654		-
655		- try
656		- {
657		- for (int j = 0; j < 2; j++)
658		- {
659		- for (int i = 0; i < initString.length; i++)
660		- {
661		- doc.insertString(doc.getLength(), initString[i],
662		- doc.getStyle(initStyles[i]));
663		- }
664		- }
665		- } catch (BadLocationException ble)
666		- {
667		- System.err.println("Couldn't insert initial text into text pane.");
668		- }
669		-
670		- return new JTextArea(); // textPane;
	647	+ return new JTextPane(); // textPane;
671	648	}
672	649
673	650	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -720,7 +697,7 @@
720	697	protected static ImageIcon createImageIcon(String path,
721	698	String description)
722	699	{
723		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	700	+ java.net.URL imgURL = Grafreed.class.getResource(path);
724	701	if (imgURL != null)
725	702	{
726	703	return new ImageIcon(imgURL, description);
..	..	@@ -752,6 +729,7 @@
752	729	// NumberSlider vDivsField;
753	730	// JCheckBox endcaps;
754	731	JCheckBox liveCB;
	732	+ JCheckBox selectCB;
755	733	JCheckBox hideCB;
756	734	JCheckBox link2masterCB;
757	735	JCheckBox markCB;
..	..	@@ -767,54 +745,45 @@
767	745	JButton slowerButton;
768	746	JButton fasterButton;
769	747	JButton remarkButton;
	748	+
	749	+ cGridBag namePanel;
	750	+ cGridBag setupPanel;
	751	+ cGridBag setupPanel2;
	752	+ cGridBag commandsPanel;
	753	+ cGridBag pushPanel;
	754	+ cGridBag fillPanel;
770	755
771		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	756	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772	757	{
773	758	JCheckBox cb;
774	759
775		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
776		- oe.aConstraints.gridwidth = 1; // 3;
777		-// oe.aConstraints.weightx = 1;
778		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
779		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	760	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
780	761	cb.addItemListener(this);
781		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782		- oe.aConstraints.gridwidth = 1;
783		- oe.aConstraints.gridx += 1;
784	762
785	763	return cb;
786	764	}
787	765
788		- cButton AddButton(ObjEditor oe, String label)
	766	+ cButton AddButton(cGridBag panel, String label)
789	767	{
790	768	cButton cb;
791	769
792		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
793		- oe.aConstraints.gridwidth = 1;
794		-// oe.aConstraints.weightx = 1;
795		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
796		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	770	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
797	771	cb.addActionListener(this);
798		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799		- oe.aConstraints.gridwidth = 1;
800		- oe.aConstraints.gridx += 1;
801	772
802	773	return cb;
803	774	}
804	775
805		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	776	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806	777	{
807	778	JComboBox combo;
808	779
809		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
810		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
811		- oe.aConstraints.gridx += 1;
	780	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812	781	combo.addActionListener(this);
813	782
814	783	return combo;
815	784	}
816	785
817		- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, double min, double max, double current, double pow)
	786	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
818	787	{
819	788	cGridBag control = new cGridBag();
820	789
..	..	@@ -826,12 +795,12 @@
826	795	control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827	796	combo.setFloat(current);
828	797
829		- ctrlPanel.add(control);
	798	+ panel.add(control);
830	799
831		- return combo;
	800	+ return control;
832	801	}
833	802
834		- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, int min, int max, int current)
	803	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
835	804	{
836	805	cGridBag control = new cGridBag();
837	806
..	..	@@ -839,25 +808,21 @@
839	808
840	809	JLabel jlabel = new JLabel(label);
841	810	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
842		- ctrlPanel.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
843		- ctrlPanel.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	811	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	812	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
844	813	combo.setInteger(current);
845	814
846		- ctrlPanel.add(control);
	815	+ panel.add(control);
847	816
848		- return combo;
	817	+ return control;
849	818	}
850	819
851	820	JTextArea AddText(cGridBag ctrlPanel, String name)
852	821	{
853	822	JTextArea text;
854	823
855		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
856		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
857	824	ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
858	825	text.addCaretListener(this);
859		- aConstraints.gridx += 1;
860		- aConstraints.gridwidth = 1;
861	826
862	827	return text;
863	828	}
..	..	@@ -896,7 +861,7 @@
896	861
897	862	/*
898	863	*/
899		- void Return() // ObjEditor oe)
	864	+ void Return0() // ObjEditor oe)
900	865	{
901	866	aConstraints.gridy += 1;
902	867	aConstraints.gridx = 0;
..	..	@@ -951,37 +916,76 @@
951	916
952	917	void SetupUI2(ObjEditor oe)
953	918	{
954		-// oe.aConstraints.weightx = 0;
955		-// oe.aConstraints.weighty = 0;
956		-// oe.aConstraints.gridx = 0;
957		-// oe.aConstraints.gridy = 0;
958		- SetupName(oe);
	919	+ //SetupName(oe);
	920	+
	921	+ namePanel = new cGridBag();
	922	+
	923	+ nameField = AddText(namePanel, copy.GetName());
	924	+ namePanel.add(nameField);
	925	+ oe.ctrlPanel.add(namePanel);
	926	+
	927	+ oe.ctrlPanel.Return();
959	928
960	929	if (!GroupEditor.allparams)
961	930	return;
962	931
963		- liveCB = AddCheckBox(oe, "Live", copy.live);
964		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
965		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	932	+ setupPanel = new cGridBag().setVertical(false);
	933	+
	934	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	935	+ liveCB.setToolTipText("Animate object");
	936	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	937	+ selectCB.setToolTipText("Make object selectable");
966	938	// Return();
967		- markCB = AddCheckBox(oe, "Mark", copy.marked);
968		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
969		- randomCB = AddCheckBox(oe, "Rand", copy.random);
970		- Return();
971		- resetButton = AddButton(oe, "Reset");
972		- stepButton = AddButton(oe, "Step");
	939	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	940	+ hideCB.setToolTipText("Hide object");
	941	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	942	+ markCB.setToolTipText("Set the animation target transform");
	943	+
	944	+ setupPanel2 = new cGridBag().setVertical(false);
	945	+
	946	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	947	+ rewindCB.setToolTipText("Rewind animation");
	948	+
	949	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	950	+ randomCB.setToolTipText("Rewind or Go back and forth randomly");
	951	+
	952	+ if (Globals.ADVANCED)
	953	+ {
	954	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	955	+ link2masterCB.setToolTipText("Attach to support");
	956	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	957	+ speedupCB.setToolTipText("Option motion capture");
	958	+ }
	959	+
	960	+ oe.ctrlPanel.add(setupPanel);
	961	+ oe.ctrlPanel.Return();
	962	+ oe.ctrlPanel.add(setupPanel2);
	963	+ oe.ctrlPanel.Return();
	964	+
	965	+ commandsPanel = new cGridBag().setVertical(false);
	966	+
	967	+ resetButton = AddButton(commandsPanel, "Reset");
	968	+ resetButton.setToolTipText("Jump to frame zero");
	969	+ stepButton = AddButton(commandsPanel, "Step");
	970	+ stepButton.setToolTipText("Step one frame");
973	971	// resetAllButton = AddButton(oe, "Reset All");
974	972	// stepAllButton = AddButton(oe, "Step All");
975		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
976	973	// Return();
977		- slowerButton = AddButton(oe, "Slow");
978		- fasterButton = AddButton(oe, "Fast");
979		- remarkButton = AddButton(oe, "Rem");
	974	+ slowerButton = AddButton(commandsPanel, "Slow");
	975	+ slowerButton.setToolTipText("Decrease animation speed");
	976	+ fasterButton = AddButton(commandsPanel, "Fast");
	977	+ fasterButton.setToolTipText("Increase animation speed");
	978	+ remarkButton = AddButton(commandsPanel, "Remark");
	979	+ remarkButton.setToolTipText("Set the current transform as the target");
980	980
981		- //Return();
	981	+ oe.ctrlPanel.add(commandsPanel);
	982	+ oe.ctrlPanel.Return();
982	983
983		- //normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
	984	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	985	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
984	986	//Return();
	987	+
	988	+ oe.ctrlPanel.Return();
985	989
986	990	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987	991	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1076,7 +1080,7 @@
1076	1080	oe.aConstraints.gridwidth = 1;
1077	1081	/**/
1078	1082	nameField = AddText(oe.ctrlPanel, copy.GetName());
1079		- Return();
	1083	+ oe.ctrlPanel.Return();
1080	1084
1081	1085	//ctrlPanel.add(textureButton = new Button("Texture..."));
1082	1086	//textureButton.setEnabled(false);
..	..	@@ -1253,10 +1257,11 @@
1253	1257	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1254	1258	//tmp.setName("Edit");
1255	1259	objectPanel.add(materialPanel);
1256		- JPanel north = new JPanel(new BorderLayout());
1257		- north.setName("Edit");
1258		- north.add(ctrlPanel, BorderLayout.NORTH);
1259		- objectPanel.add(north);
	1260	+// JPanel north = new JPanel(new BorderLayout());
	1261	+// north.setName("Edit");
	1262	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1263	+// objectPanel.add(north);
	1264	+ objectPanel.add(ctrlPanel);
1260	1265	objectPanel.add(infoPanel);
1261	1266
1262	1267	/*
..	..	@@ -1278,7 +1283,7 @@
1278	1283	scrollpane.addMouseWheelListener(this); // Default not fast enough
1279	1284
1280	1285	/JTabbedPane/ scenePanel = new cGridBag();
1281		- scenePanel.preferredWidth = 7;
	1286	+ scenePanel.preferredWidth = 6;
1282	1287
1283	1288	JTabbedPane tabbedPane = new JTabbedPane();
1284	1289	tabbedPane.add(scrollpane);
..	..	@@ -1384,8 +1389,8 @@
1384	1389
1385	1390	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1386	1391
1387		- frame.setSize(1024, 768);
1388		- frame.show();
	1392	+ frame.setSize(1280, 860);
	1393	+ frame.setVisible(true);
1389	1394
1390	1395	gridPanel.setDividerLocation(1.0);
1391	1396
..	..	@@ -1415,7 +1420,7 @@
1415	1420	ctrlPanel.removeAll();
1416	1421	}
1417	1422
1418		- void SetupMaterial(cGridBag ctrlPanel)
	1423	+ void SetupMaterial(cGridBag panel)
1419	1424	{
1420	1425	/*
1421	1426	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
..	..	@@ -1424,18 +1429,26 @@
1424	1429
1425	1430	cGridBag editBar = new cGridBag().setVertical(false);
1426	1431
1427		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	1432	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1433	+ createMaterialButton.setToolTipText("Create material");
1428	1434
1429	1435	/*
1430	1436	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1431	1437	*/
1432	1438
1433		- editBar.add(clearMaterialButton = new cButton("Clear")); // , aConstraints);
1434		- editBar.add(resetSlidersButton = new cButton("Reset")); // , aConstraints);
1435		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1436		- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1439	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1440	+ clearMaterialButton.setToolTipText("Clear material");
	1441	+
	1442	+ if (Globals.ADVANCED)
	1443	+ {
	1444	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1445	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1446	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1447	+ }
1437	1448
1438		- ctrlPanel.add(editBar);
	1449	+ editBar.preferredHeight = 15;
	1450	+
	1451	+ panel.add(editBar);
1439	1452
1440	1453	/**/
1441	1454	//aConstraints.weighty = 0;
..	..	@@ -1484,9 +1497,9 @@
1484	1497	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1485	1498	colorSection.add(shadowbias);
1486	1499
1487		- ctrlPanel.add(new JSeparator());
	1500	+ panel.add(new JSeparator());
1488	1501
1489		- ctrlPanel.add(colorSection);
	1502	+ panel.add(colorSection);
1490	1503
1491	1504	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1492	1505
..	..	@@ -1534,9 +1547,9 @@
1534	1547	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1535	1548	diffuseSection.add(fakedepth);
1536	1549
1537		- ctrlPanel.add(new JSeparator());
	1550	+ panel.add(new JSeparator());
1538	1551
1539		- ctrlPanel.add(diffuseSection);
	1552	+ panel.add(diffuseSection);
1540	1553
1541	1554	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1542	1555
..	..	@@ -1572,7 +1585,7 @@
1572	1585	velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1573	1586	specularSection.add(velvet);
1574	1587
1575		- shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
	1588	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
1576	1589	//Return();
1577	1590	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1578	1591	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
..	..	@@ -1585,9 +1598,9 @@
1585	1598	// aConstraints.gridwidth = 1;
1586	1599
1587	1600
1588		- ctrlPanel.add(new JSeparator());
	1601	+ panel.add(new JSeparator());
1589	1602
1590		- ctrlPanel.add(specularSection);
	1603	+ panel.add(specularSection);
1591	1604
1592	1605	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1593	1606
..	..	@@ -1617,9 +1630,9 @@
1617	1630	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1618	1631	globalSection.add(opacity);
1619	1632
1620		- ctrlPanel.add(new JSeparator());
	1633	+ panel.add(new JSeparator());
1621	1634
1622		- ctrlPanel.add(globalSection);
	1635	+ panel.add(globalSection);
1623	1636
1624	1637	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1625	1638
..	..	@@ -1661,9 +1674,9 @@
1661	1674	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1662	1675	textureSection.add(opacityPower);
1663	1676
1664		- ctrlPanel.add(new JSeparator());
	1677	+ panel.add(new JSeparator());
1665	1678
1666		- ctrlPanel.add(textureSection);
	1679	+ panel.add(textureSection);
1667	1680
1668	1681	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1669	1682
..	..	@@ -1700,12 +1713,15 @@
1700	1713	opacityPowerField.addChangeListener(this);
1701	1714	/**/
1702	1715
1703		- resetSlidersButton.addActionListener(this);
1704	1716	clearMaterialButton.addActionListener(this);
1705	1717	createMaterialButton.addActionListener(this);
1706		-
1707		- propagateToggle.addItemListener(this);
1708		- multiplyToggle.addItemListener(this);
	1718	+
	1719	+ if (Globals.ADVANCED)
	1720	+ {
	1721	+ resetSlidersButton.addActionListener(this);
	1722	+ propagateToggle.addItemListener(this);
	1723	+ multiplyToggle.addItemListener(this);
	1724	+ }
1709	1725	}
1710	1726
1711	1727	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1876,7 +1892,7 @@
1876	1892
1877	1893	//? flashIt = false;
1878	1894	CameraPane pane = (CameraPane) cameraView;
1879		- pane.clickStart(location.x, location.y, 0);
	1895	+ pane.clickStart(location.x, location.y, 0, 0);
1880	1896	pane.clickEnd(location.x, location.y, 0, true);
1881	1897
1882	1898	if (group.selection.size() == 1)
..	..	@@ -1925,6 +1941,7 @@
1925	1941	e2.printStackTrace();
1926	1942	}
1927	1943	}
	1944	+
1928	1945	LoadJMEThread loadThread;
1929	1946
1930	1947	class LoadJMEThread extends Thread
..	..	@@ -1982,6 +1999,7 @@
1982	1999	//LoadFile0(filename, converter);
1983	2000	}
1984	2001	}
	2002	+
1985	2003	LoadOBJThread loadObjThread;
1986	2004
1987	2005	class LoadOBJThread extends Thread
..	..	@@ -2060,19 +2078,19 @@
2060	2078
2061	2079	void LoadObjFile(String fullname)
2062	2080	{
2063		- /*
	2081	+ System.out.println("Loading " + fullname);
	2082	+ /**/
2064	2083	//lastFilename = fullname;
2065	2084	if(loadObjThread == null)
2066	2085	{
2067		- loadObjThread = new LoadOBJThread();
2068		- loadObjThread.start();
	2086	+ loadObjThread = new LoadOBJThread();
	2087	+ loadObjThread.start();
2069	2088	}
2070	2089
2071	2090	loadObjThread.add(fullname);
2072		- */
	2091	+ /**/
2073	2092
2074		- System.out.println("Loading " + fullname);
2075		- makeSomething(new FileObject(fullname, true), true);
	2093	+ //makeSomething(new FileObject(fullname, true), true);
2076	2094	}
2077	2095
2078	2096	void LoadGFDFile(String fullname)
..	..	@@ -2333,11 +2351,11 @@
2333	2351
2334	2352	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2335	2353	{
2336		- if (GrafreeD.standAlone)
	2354	+ if (Grafreed.standAlone)
2337	2355	{
2338	2356	/**/
2339	2357	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2340		- browser.show();
	2358	+ browser.setVisible(true);
2341	2359	String filename = browser.getFile();
2342	2360	if (filename != null && filename.length() > 0)
2343	2361	{
..	..	@@ -2482,6 +2500,7 @@
2482	2500	}
2483	2501	if (input == null)
2484	2502	{
	2503	+ new Exception().printStackTrace();
2485	2504	System.exit(0);
2486	2505	}
2487	2506
..	..	@@ -2696,7 +2715,8 @@
2696	2715	return;
2697	2716	}
2698	2717
2699		- multiplyToggle.setSelected(mat.multiply);
	2718	+ if (multiplyToggle != null)
	2719	+ multiplyToggle.setSelected(mat.multiply);
2700	2720
2701	2721	assert (object.projectedVertices != null);
2702	2722
..	..	@@ -2911,9 +2931,9 @@
2911	2931	frame.validate();
2912	2932
2913	2933	return;
2914		- } else if (event.getSource() == toggleRandomItem)
	2934	+ } else if (event.getSource() == toggleSwitchItem)
2915	2935	{
2916		- cameraView.ToggleRandom();
	2936	+ cameraView.ToggleSwitch();
2917	2937	cameraView.repaint();
2918	2938	return;
2919	2939	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2942,6 +2962,10 @@
2942	2962	{
2943	2963	copy.live ^= true;
2944	2964	return;
	2965	+ } else if (event.getSource() == selectCB)
	2966	+ {
	2967	+ copy.dontselect ^= true;
	2968	+ return;
2945	2969	} else if (event.getSource() == hideCB)
2946	2970	{
2947	2971	copy.hide ^= true;
..	..	@@ -2956,6 +2980,7 @@
2956	2980	if (event.getSource() == randomCB)
2957	2981	{
2958	2982	copy.random ^= true;
	2983	+ objEditor.refreshContents();
2959	2984	return;
2960	2985	}
2961	2986	if (event.getSource() == speedupCB)
..	..	@@ -2979,8 +3004,9 @@
2979	3004
2980	3005	public void actionPerformed(ActionEvent event)
2981	3006	{
	3007	+ Object source = event.getSource();
2982	3008	// SCRIPT DIALOG
2983		- if (event.getSource() == okbutton)
	3009	+ if (source == okbutton)
2984	3010	{
2985	3011	textpanel.setVisible(false);
2986	3012	textpanel.remove(textarea);
..	..	@@ -2992,7 +3018,7 @@
2992	3018	textarea = null;
2993	3019	textpanel = null;
2994	3020	}
2995		- if (event.getSource() == cancelbutton)
	3021	+ if (source == cancelbutton)
2996	3022	{
2997	3023	textpanel.setVisible(false);
2998	3024	textpanel.remove(textarea);
..	..	@@ -3004,50 +3030,50 @@
3004	3030	//applySelf();
3005	3031	//client.refreshEditWindow();
3006	3032	//refreshContents();
3007		- if (event.getSource() == nameField)
	3033	+ if (source == nameField)
3008	3034	{
3009	3035	//System.out.println("ObjEditor " + event);
3010	3036	applySelf0(true);
3011	3037	//parent.applySelf();
3012	3038	objEditor.refreshContents();
3013		- } else if (event.getSource() == resetButton)
	3039	+ } else if (source == resetButton)
3014	3040	{
3015	3041	CameraPane.fullreset = true;
3016	3042	copy.Reset(); // ResetMeshes();
3017	3043	copy.Touch();
3018	3044	objEditor.refreshContents();
3019		- } else if (event.getSource() == stepItem)
	3045	+ } else if (source == stepItem)
3020	3046	{
3021	3047	//cameraView.ONESTEP = true;
3022	3048	Globals.ONESTEP = true;
3023	3049	cameraView.repaint();
3024	3050	return;
3025		- } else if (event.getSource() == stepButton)
	3051	+ } else if (source == stepButton)
3026	3052	{
3027	3053	copy.Step();
3028	3054	copy.Touch();
3029	3055	objEditor.refreshContents();
3030		- } else if (event.getSource() == slowerButton)
	3056	+ } else if (source == slowerButton)
3031	3057	{
3032	3058	copy.Slower();
3033	3059	copy.Touch();
3034	3060	objEditor.refreshContents();
3035		- } else if (event.getSource() == fasterButton)
	3061	+ } else if (source == fasterButton)
3036	3062	{
3037	3063	copy.Faster();
3038	3064	copy.Touch();
3039	3065	objEditor.refreshContents();
3040		- } else if (event.getSource() == remarkButton)
	3066	+ } else if (source == remarkButton)
3041	3067	{
3042	3068	copy.Remark();
3043	3069	copy.Touch();
3044	3070	objEditor.refreshContents();
3045		- } else if (event.getSource() == stepAllButton)
	3071	+ } else if (source == stepAllButton)
3046	3072	{
3047	3073	copy.StepAll();
3048	3074	copy.Touch();
3049	3075	objEditor.refreshContents();
3050		- } else if (event.getSource() == resetAllButton)
	3076	+ } else if (source == resetAllButton)
3051	3077	{
3052	3078	//CameraPane.fullreset = true;
3053	3079	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3080,53 +3106,75 @@
3080	3106	// Close();
3081	3107	// }
3082	3108	// else
3083		- if (event.getSource() == resetSlidersButton)
	3109	+ if (source == resetSlidersButton)
3084	3110	{
3085	3111	ResetSliders();
3086		- } else if (event.getSource() == clearMaterialButton)
	3112	+ } else if (source == clearMaterialButton)
3087	3113	{
3088	3114	ClearMaterial();
3089		- } else if (event.getSource() == createMaterialButton)
	3115	+ } else if (source == createMaterialButton)
3090	3116	{
3091	3117	CreateMaterial();
3092		- } else if (event.getSource() == clearPanelButton)
	3118	+ } else if (source == clearPanelButton)
3093	3119	{
3094	3120	copy.ClearUI();
3095	3121	refreshContents(true);
3096		- } /*
3097		- }
3098		-
3099		- public boolean action(Event event, Object arg)
3100		- {
3101		- */ else if (event.getSource() == closeItem)
	3122	+ } else if (source == importGFDItem)
	3123	+ {
	3124	+ ImportGFD();
	3125	+ } else
	3126	+ if (source == importVRMLX3DItem)
	3127	+ {
	3128	+ ImportVRMLX3D();
	3129	+ } else
	3130	+ if (source == import3DSItem)
	3131	+ {
	3132	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3133	+ } else
	3134	+ if (source == importOBJItem)
	3135	+ {
	3136	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3137	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3138	+ browser.setVisible(true);
	3139	+ String filename = browser.getFile();
	3140	+ if (filename != null && filename.length() > 0)
	3141	+ {
	3142	+ String fullname = browser.getDirectory() + filename;
	3143	+ makeSomething(ReadOBJ(fullname), true);
	3144	+ }
	3145	+ } else
	3146	+ if (source == closeItem)
3102	3147	{
3103	3148	Close();
3104	3149	//return true;
3105		- } else if (event.getSource() == loadItem)
	3150	+ } else if (source == loadItem)
3106	3151	{
3107	3152	load();
3108	3153	//return true;
3109		- } else if (event.getSource() == saveItem)
	3154	+ } else if (source == newItem)
	3155	+ {
	3156	+ New();
	3157	+ } else if (source == saveItem)
3110	3158	{
3111	3159	save();
3112	3160	//return true;
3113		- } else if (event.getSource() == saveAsItem)
	3161	+ } else if (source == saveAsItem)
3114	3162	{
3115	3163	saveAs();
3116	3164	//return true;
3117		- } else if (event.getSource() == reexportItem)
	3165	+ } else if (source == reexportItem)
3118	3166	{
3119	3167	reexport();
3120	3168	//return true;
3121		- } else if (event.getSource() == exportAsItem)
	3169	+ } else if (source == exportAsItem)
3122	3170	{
3123	3171	export();
3124	3172	//return true;
3125		- } else if (event.getSource() == povItem)
	3173	+ } else if (source == povItem)
3126	3174	{
3127	3175	generatePOV();
3128	3176	//return true;
3129		- } else if (event.getSource() == zBufferItem)
	3177	+ } else if (source == zBufferItem)
3130	3178	{
3131	3179	try
3132	3180	{
..	..	@@ -3148,21 +3196,8 @@
3148	3196	cameraView.repaint();
3149	3197	//return true;
3150	3198	}
3151		- */ else if (event.getSource() == editCameraItem)
3152		- {
3153		- cameraView.ProtectCamera();
3154		- cameraView.repaint();
3155		- return;
3156		- } else if (event.getSource() == revertCameraItem)
3157		- {
3158		- cameraView.RevertCamera();
3159		- cameraView.repaint();
3160		- return;
3161		-// } else if (event.getSource() == textureButton)
3162		-// {
3163		-// return; // true;
3164		- } else // combos...
3165		- if (event.getSource() == texresMenu)
	3199	+ */ else // combos...
	3200	+ if (source == texresMenu)
3166	3201	{
3167	3202	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3168	3203	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3174,12 +3209,268 @@
3174	3209	}
3175	3210	}
3176	3211
	3212	+ void New()
	3213	+ {
	3214	+ while (copy.Size() > 1)
	3215	+ {
	3216	+ copy.remove(1);
	3217	+ }
	3218	+
	3219	+ ResetModel();
	3220	+ objEditor.refreshContents();
	3221	+ }
	3222	+
	3223	+ static public byte[] Compress(Object3D o)
	3224	+ {
	3225	+ try
	3226	+ {
	3227	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3228	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3229	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3230	+
	3231	+ Object3D parent = o.parent;
	3232	+ o.parent = null;
	3233	+
	3234	+ out.writeObject(o);
	3235	+
	3236	+ o.parent = parent;
	3237	+
	3238	+ out.flush();
	3239	+
	3240	+ zstream.close();
	3241	+ out.close();
	3242	+
	3243	+ return baos.toByteArray();
	3244	+ } catch (Exception e)
	3245	+ {
	3246	+ System.err.println(e);
	3247	+ return null;
	3248	+ }
	3249	+ }
	3250	+
	3251	+ static public Object Uncompress(byte[] bytes)
	3252	+ {
	3253	+ System.out.println("#bytes = " + bytes.length);
	3254	+ try
	3255	+ {
	3256	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3257	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3258	+ ObjectInputStream in = new ObjectInputStream(istream);
	3259	+ Object obj = in.readObject();
	3260	+ in.close();
	3261	+
	3262	+ return obj;
	3263	+ } catch (Exception e)
	3264	+ {
	3265	+ System.err.println(e);
	3266	+ return null;
	3267	+ }
	3268	+ }
	3269	+
	3270	+ static public Object clone(Object o)
	3271	+ {
	3272	+ try
	3273	+ {
	3274	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3275	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3276	+
	3277	+ out.writeObject(o);
	3278	+
	3279	+ out.flush();
	3280	+ out.close();
	3281	+
	3282	+ byte[] bytes = baos.toByteArray();
	3283	+
	3284	+ System.out.println("clone = " + bytes.length);
	3285	+
	3286	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3287	+ ObjectInputStream in = new ObjectInputStream(bais);
	3288	+ Object obj = in.readObject();
	3289	+ in.close();
	3290	+
	3291	+ return obj;
	3292	+ } catch (Exception e)
	3293	+ {
	3294	+ System.err.println(e);
	3295	+ return null;
	3296	+ }
	3297	+ }
	3298	+
	3299	+ cRadio GetCurrentTab()
	3300	+ {
	3301	+ cRadio ab;
	3302	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3303	+ {
	3304	+ ab = (cRadio)e.nextElement();
	3305	+ if(ab.GetObject() == copy)
	3306	+ {
	3307	+ return ab;
	3308	+ }
	3309	+ }
	3310	+
	3311	+ return null;
	3312	+ }
	3313	+
	3314	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3315	+
	3316	+ public void Save()
	3317	+ {
	3318	+ cRadio tab = GetCurrentTab();
	3319	+
	3320	+ boolean temp = CameraPane.SWITCH;
	3321	+ CameraPane.SWITCH = false;
	3322	+
	3323	+ copy.ExtractBigData(hashtable);
	3324	+
	3325	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3326	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3327	+
	3328	+ copy.RestoreBigData(hashtable);
	3329	+
	3330	+ CameraPane.SWITCH = temp;
	3331	+
	3332	+ //assert(hashtable.isEmpty());
	3333	+
	3334	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3335	+ {
	3336	+ tab.graphs[i] = null;
	3337	+ }
	3338	+
	3339	+ // test save
	3340	+ if (false)
	3341	+ {
	3342	+ try
	3343	+ {
	3344	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3345	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3346	+
	3347	+ p.writeObject(copy);
	3348	+
	3349	+ p.flush();
	3350	+
	3351	+ ostream.close();
	3352	+ } catch (Exception e)
	3353	+ {
	3354	+ e.printStackTrace();
	3355	+ }
	3356	+ }
	3357	+ }
	3358	+
	3359	+ void CopyChanged(Object3D obj)
	3360	+ {
	3361	+ boolean temp = CameraPane.SWITCH;
	3362	+ CameraPane.SWITCH = false;
	3363	+
	3364	+ copy.ExtractBigData(hashtable);
	3365	+
	3366	+ copy.clear();
	3367	+
	3368	+ for (int i=0; i<obj.Size(); i++)
	3369	+ {
	3370	+ copy.add(obj.get(i));
	3371	+ }
	3372	+
	3373	+ copy.RestoreBigData(hashtable);
	3374	+
	3375	+ CameraPane.SWITCH = temp;
	3376	+
	3377	+ //assert(hashtable.isEmpty());
	3378	+
	3379	+ copy.Touch();
	3380	+
	3381	+ ResetModel();
	3382	+ copy.HardTouch(); // recompile?
	3383	+
	3384	+ cRadio ab;
	3385	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3386	+ {
	3387	+ ab = (cRadio)e.nextElement();
	3388	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3389	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3390	+ if (test != null)
	3391	+ {
	3392	+ test.editWindow = ab.object.editWindow;
	3393	+ ab.object = test;
	3394	+ }
	3395	+ }
	3396	+
	3397	+ refreshContents();
	3398	+ }
	3399	+
	3400	+ public void Undo()
	3401	+ {
	3402	+ cRadio tab = GetCurrentTab();
	3403	+
	3404	+ if (tab.undoindex == 0)
	3405	+ {
	3406	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3407	+ return;
	3408	+ }
	3409	+
	3410	+ if (tab.graphs[tab.undoindex] == null)
	3411	+ {
	3412	+ Save();
	3413	+ tab.undoindex -= 1;
	3414	+ }
	3415	+
	3416	+ tab.undoindex -= 1;
	3417	+
	3418	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3419	+ }
	3420	+
	3421	+ public void Redo()
	3422	+ {
	3423	+ cRadio tab = GetCurrentTab();
	3424	+
	3425	+ if (tab.graphs[tab.undoindex + 1] == null)
	3426	+ {
	3427	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3428	+ return;
	3429	+ }
	3430	+
	3431	+ tab.undoindex += 1;
	3432	+
	3433	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3434	+ }
	3435	+
	3436	+ void ImportGFD()
	3437	+ {
	3438	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3439	+ browser.show();
	3440	+ String filename = browser.getFile();
	3441	+ if (filename != null && filename.length() > 0)
	3442	+ {
	3443	+ String fullname = browser.getDirectory() + filename;
	3444	+
	3445	+ //Object3D readobj =
	3446	+ objEditor.ReadGFD(fullname, objEditor);
	3447	+ //makeSomething(readobj);
	3448	+ }
	3449	+ }
	3450	+
	3451	+ void ImportVRMLX3D()
	3452	+ {
	3453	+ if (Grafreed.standAlone)
	3454	+ {
	3455	+ /**/
	3456	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3457	+ browser.show();
	3458	+ String filename = browser.getFile();
	3459	+ if (filename != null && filename.length() > 0)
	3460	+ {
	3461	+ String fullname = browser.getDirectory() + filename;
	3462	+ LoadVRMLX3D(fullname);
	3463	+ }
	3464	+ /**/
	3465	+ }
	3466	+ }
	3467	+
3177	3468	void ToggleAnimation()
3178	3469	{
3179	3470	if (!Globals.ANIMATION)
3180	3471	{
3181	3472	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3182		- browser.show();
	3473	+ browser.setVisible(true);
3183	3474	String filename = browser.getFile();
3184	3475	if (filename != null && filename.length() > 0)
3185	3476	{
..	..	@@ -3189,8 +3480,8 @@
3189	3480
3190	3481	Globals.ANIMATION ^= true;
3191	3482
3192		- GrafreeD.wav.cursor = 0;
3193		- GrafreeD.wav.loop = 0;
	3483	+ Grafreed.wav.cursor = 0;
	3484	+ Grafreed.wav.loop = 0;
3194	3485	}
3195	3486	} else
3196	3487	{
..	..	@@ -3240,7 +3531,7 @@
3240	3531	void CreateMaterial()
3241	3532	{
3242	3533	//copy.ClearMaterial(); // PATCH
3243		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3534	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3244	3535	if (copy.selection.size() > 0)
3245	3536	//SetMaterial(copy);
3246	3537	{
..	..	@@ -3299,11 +3590,11 @@
3299	3590	{
3300	3591	copy.ResetBlockLoop(); // temporary problem
3301	3592
3302		- boolean random = CameraPane.RANDOM;
3303		- CameraPane.RANDOM = false; // parse everything
	3593	+ boolean random = CameraPane.SWITCH;
	3594	+ CameraPane.SWITCH = false; // parse everything
3304	3595	copy.ResetDisplayList();
3305	3596	copy.HardTouch();
3306		- CameraPane.RANDOM = random;
	3597	+ CameraPane.SWITCH = random;
3307	3598	}
3308	3599
3309	3600	// public void applySelf()
..	..	@@ -3377,6 +3668,36 @@
3377	3668	{
3378	3669	//System.out.println("Propagate = " + propagate);
3379	3670	copy.UpdateMaterial(anchor, current, propagate);
	3671	+
	3672	+ if (copy.material != null)
	3673	+ {
	3674	+ cMaterial mat = copy.material;
	3675	+
	3676	+ colorField.SetToolTipValue((mat.color));
	3677	+ modulationField.SetToolTipValue((mat.modulation));
	3678	+ metalnessField.SetToolTipValue((mat.metalness));
	3679	+ diffuseField.SetToolTipValue((mat.diffuse));
	3680	+ specularField.SetToolTipValue((mat.specular));
	3681	+ shininessField.SetToolTipValue((mat.shininess));
	3682	+ shiftField.SetToolTipValue((mat.shift));
	3683	+ ambientField.SetToolTipValue((mat.ambient));
	3684	+ lightareaField.SetToolTipValue((mat.lightarea));
	3685	+ diffusenessField.SetToolTipValue((mat.factor));
	3686	+ velvetField.SetToolTipValue((mat.velvet));
	3687	+ sheenField.SetToolTipValue((mat.sheen));
	3688	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3689	+ backlitField.SetToolTipValue((mat.bump));
	3690	+ anisoField.SetToolTipValue((mat.aniso));
	3691	+ anisoVField.SetToolTipValue((mat.anisoV));
	3692	+ cameraField.SetToolTipValue((mat.cameralight));
	3693	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3694	+ shadowField.SetToolTipValue((mat.shadow));
	3695	+ textureField.SetToolTipValue((mat.texture));
	3696	+ opacityField.SetToolTipValue((mat.opacity));
	3697	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3698	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3699	+ }
	3700	+
3380	3701	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3381	3702	{
3382	3703	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3421,6 +3742,7 @@
3421	3742	\|\| e.getSource() == apertureField
3422	3743	\|\| e.getSource() == shadowblurField)
3423	3744	{
	3745	+ new Exception().printStackTrace();
3424	3746	System.exit(0);
3425	3747	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3426	3748	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3491,7 +3813,7 @@
3491	3813	}
3492	3814
3493	3815	if (normalpushField != null)
3494		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3816	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3495	3817	}
3496	3818
3497	3819	void SnapObject()
..	..	@@ -3755,6 +4077,7 @@
3755	4077
3756	4078	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3757	4079	{
	4080	+ Save();
3758	4081	//Tween.set(thing, 0).target(1).start(tweenManager);
3759	4082	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3760	4083	// if (thing instanceof GenericJointDemo)
..	..	@@ -3958,6 +4281,7 @@
3958	4281	}
3959	4282	}
3960	4283	}
	4284	+
3961	4285	LoadGFDThread loadGFDThread;
3962	4286
3963	4287	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3977,8 +4301,10 @@
3977	4301
3978	4302	try
3979	4303	{
	4304	+ // Try compressed version first.
3980	4305	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3981		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4306	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4307	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3982	4308
3983	4309	readobj = (Object3D) p.readObject();
3984	4310	istream.close();
..	..	@@ -3986,7 +4312,20 @@
3986	4312	readobj.ResetDisplayList();
3987	4313	} catch (Exception e)
3988	4314	{
3989		- e.printStackTrace();
	4315	+ //e.printStackTrace();
	4316	+ try
	4317	+ {
	4318	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4319	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4320	+
	4321	+ readobj = (Object3D) p.readObject();
	4322	+ istream.close();
	4323	+
	4324	+ readobj.ResetDisplayList();
	4325	+ } catch (Exception e2)
	4326	+ {
	4327	+ e2.printStackTrace();
	4328	+ }
3990	4329	}
3991	4330	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
3992	4331	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4032,6 +4371,12 @@
4032	4371
4033	4372	void LoadIt(Object obj)
4034	4373	{
	4374	+ if (obj == null)
	4375	+ {
	4376	+ // Invalid file
	4377	+ return;
	4378	+ }
	4379	+
4035	4380	System.out.println("Loaded " + obj);
4036	4381	//new Exception().printStackTrace();
4037	4382	Object3D readobj = (Object3D) obj;
..	..	@@ -4041,6 +4386,7 @@
4041	4386
4042	4387	if (readobj != null)
4043	4388	{
	4389	+ Save();
4044	4390	try
4045	4391	{
4046	4392	//readobj.deepCopySelf(copy);
..	..	@@ -4103,7 +4449,7 @@
4103	4449
4104	4450	void load() // throws ClassNotFoundException
4105	4451	{
4106		- if (GrafreeD.standAlone)
	4452	+ if (Grafreed.standAlone)
4107	4453	{
4108	4454	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4109	4455	browser.show();
..	..	@@ -4190,11 +4536,13 @@
4190	4536	try
4191	4537	{
4192	4538	FileOutputStream ostream = new FileOutputStream(lastname);
4193		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4539	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4540	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4194	4541
4195	4542	p.writeObject(copy);
4196	4543	p.flush();
4197	4544
	4545	+ zstream.close();
4198	4546	ostream.close();
4199	4547
4200	4548	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4204,11 +4552,12 @@
4204	4552	{
4205	4553	}
4206	4554	}
	4555	+
4207	4556	String lastname;
4208	4557
4209	4558	void saveAs()
4210	4559	{
4211		- if (GrafreeD.standAlone)
	4560	+ if (Grafreed.standAlone)
4212	4561	{
4213	4562	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4214	4563	browser.setVisible(true);
..	..	@@ -4313,13 +4662,13 @@
4313	4662	try
4314	4663	{
4315	4664	FileOutputStream ostream = new FileOutputStream(filename);
4316		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4317		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4665	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4666	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4318	4667
4319	4668	Object3D objectparent = obj.parent;
4320	4669	obj.parent = null;
4321	4670
4322		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4671	+ Object3D object = (Object3D) Grafreed.clone(obj);
4323	4672
4324	4673	obj.parent = objectparent;
4325	4674
..	..	@@ -4331,8 +4680,8 @@
4331	4680	p.writeObject(object);
4332	4681	p.flush();
4333	4682
	4683	+ zstream.close();
4334	4684	ostream.close();
4335		- // zstream.close();
4336	4685
4337	4686	// group.selection.get(0).parent = parent;
4338	4687	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4353,7 +4702,7 @@
4353	4702	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4354	4703	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4355	4704	copy.generatePOV(buffer);
4356		- if (GrafreeD.standAlone)
	4705	+ if (Grafreed.standAlone)
4357	4706	{
4358	4707	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4359	4708	browser.show();
..	..	@@ -4379,7 +4728,8 @@
4379	4728	Object3D client;
4380	4729	Object3D copy;
4381	4730	MenuBar menuBar;
4382		- Menu windowMenu;
	4731	+ Menu fileMenu;
	4732	+ MenuItem newItem;
4383	4733	MenuItem loadItem;
4384	4734	MenuItem saveItem;
4385	4735	MenuItem saveAsItem;
..	..	@@ -4387,13 +4737,11 @@
4387	4737	MenuItem reexportItem;
4388	4738	MenuItem povItem;
4389	4739	MenuItem closeItem;
4390		- Menu cameraMenu;
	4740	+
4391	4741	CheckboxMenuItem zBufferItem;
4392	4742	//MenuItem normalLensItem;
4393		- MenuItem editCameraItem;
4394		- MenuItem revertCameraItem;
4395		- CheckboxMenuItem toggleLiveItem;
4396	4743	MenuItem stepItem;
	4744	+ CheckboxMenuItem toggleLiveItem;
4397	4745	CheckboxMenuItem toggleFullScreenItem;
4398	4746	CheckboxMenuItem toggleTimelineItem;
4399	4747	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4402,7 +4750,7 @@
4402	4750	CheckboxMenuItem toggleFootContactItem;
4403	4751	CheckboxMenuItem toggleDLItem;
4404	4752	CheckboxMenuItem toggleTextureItem;
4405		- CheckboxMenuItem toggleRandomItem;
	4753	+ CheckboxMenuItem toggleSwitchItem;
4406	4754	CheckboxMenuItem toggleRootItem;
4407	4755	CheckboxMenuItem animationItem;
4408	4756	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4410,7 +4758,7 @@
4410	4758	JSplitPane mainPanel;
4411	4759	JScrollPane scrollpane;
4412	4760	JPanel toolbarPanel;
4413		- JPanel treePanel;
	4761	+ cGridBag treePanel;
4414	4762	JPanel radioPanel;
4415	4763	ButtonGroup buttonGroup;
4416	4764	cGridBag ctrlPanel;
..	..	@@ -4539,4 +4887,9 @@
4539	4887	//ObjectUI parent;
4540	4888
4541	4889	cNumberSlider normalpushField;
	4890	+
	4891	+ private MenuItem importGFDItem;
	4892	+ private MenuItem importVRMLX3DItem;
	4893	+ private MenuItem import3DSItem;
	4894	+ private MenuItem importOBJItem;
4542	4895	}