~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(true);
246	313	objEditor = this;
247	314	this.callee = callee;
248	315
..	..	@@ -273,27 +340,48 @@
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(loadItem = new MenuItem("Open..."));
	354	+
	355	+ //oe.menuBar.add(menu = new Menu("Include"));
	356	+ Menu menu = new Menu("Import");
	357	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	358	+ importOBJItem.addActionListener(this);
	359	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	360	+ import3DSItem.addActionListener(this);
	361	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	362	+ importVRMLX3DItem.addActionListener(this);
	363	+ menu.add("-");
	364	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	365	+ importGFDItem.addActionListener(this);
	366	+ fileMenu.add(menu);
	367	+ fileMenu.add("-");
	368	+
	369	+ fileMenu.add(saveItem = new MenuItem("Save"));
	370	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
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
	384	+ newItem.addActionListener(this);
297	385	loadItem.addActionListener(this);
298	386	saveItem.addActionListener(this);
299	387	saveAsItem.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(50, 200));
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,20 +699,111 @@
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	+ }
	749	+
	750	+ maximized ^= true;
	751	+
	752	+ frame.validate();
	753	+ }
	754	+
	755	+ cButton minButton;
	756	+ cButton maxButton;
	757	+ cButton fullButton;
	758	+
641	759	void ToggleFullScreen()
642	760	{
643		- if (CameraPane.FULLSCREEN)
	761	+ cameraView.ToggleFullScreen();
	762	+
	763	+ if (!CameraPane.FULLSCREEN)
644	764	{
645		- frame.getContentPane().remove(/"Center",/bigThree);
646		- framePanel.add(bigThree);
647		- frame.getContentPane().add(/"Center",/framePanel);
	765	+ device.setFullScreenWindow(null);
	766	+ frame.validate();
	767	+
	768	+ //frame.setVisible(false);
	769	+// frame.removeNotify();
	770	+// frame.setUndecorated(false);
	771	+// frame.addNotify();
	772	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	773	+
	774	+// X frame.getContentPane().remove(/"Center",/bigThree);
	775	+// X framePanel.add(bigThree);
	776	+// X frame.getContentPane().add(/"Center",/framePanel);
	777	+ framePanel.setDividerLocation(1);
	778	+
	779	+ //frame.setVisible(true);
	780	+ radio.layout = keepButton;
	781	+ //theFrame = null;
	782	+ keepButton = null;
	783	+ radio.layout.doClick();
	784	+
648	785	} else
649	786	{
650		- frame.getContentPane().remove(/"Center",/framePanel);
651		- framePanel.remove(bigThree);
652		- frame.getContentPane().add(/"Center",/bigThree);
	787	+ keepButton = radio.layout;
	788	+ //keeprect = frame.getBounds();
	789	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	790	+// frame.getToolkit().getScreenSize().height);
	791	+ //frame.setVisible(false);
	792	+ device.setFullScreenWindow(frame);
	793	+ frame.validate();
	794	+// frame.removeNotify();
	795	+// frame.setUndecorated(true);
	796	+// frame.addNotify();
	797	+// X frame.getContentPane().remove(/"Center",/framePanel);
	798	+// X framePanel.remove(bigThree);
	799	+// X frame.getContentPane().add(/"Center",/bigThree);
	800	+ framePanel.setDividerLocation(0);
	801	+
	802	+ radio.layout = fullscreenLayout;
	803	+ radio.layout.doClick();
	804	+ //frame.setVisible(true);
653	805	}
654		- cameraView.ToggleFullScreen();
	806	+ frame.validate();
655	807	}
656	808
657	809	private JTextPane createTextPane()
..	..	@@ -792,7 +944,12 @@
792	944	JCheckBox speedupCB;
793	945	JCheckBox rewindCB;
794	946	JCheckBox flipVCB;
	947	+
	948	+ cCheckBox toggleTextureCB;
	949	+ cCheckBox toggleSwitchCB;
	950	+
795	951	JComboBox texresMenu;
	952	+
796	953	JButton resetButton;
797	954	JButton stepButton;
798	955	JButton stepAllButton;
..	..	@@ -801,9 +958,13 @@
801	958	JButton fasterButton;
802	959	JButton remarkButton;
803	960
	961	+ cGridBag editPanel;
	962	+ cGridBag editCommandsPanel;
	963	+
804	964	cGridBag namePanel;
805	965	cGridBag setupPanel;
806		- cGridBag commandsPanel;
	966	+ cGridBag setupPanel2;
	967	+ cGridBag objectCommandsPanel;
807	968	cGridBag pushPanel;
808	969	cGridBag fillPanel;
809	970
..	..	@@ -975,12 +1136,12 @@
975	1136	namePanel = new cGridBag();
976	1137
977	1138	nameField = AddText(namePanel, copy.GetName());
978		- namePanel.add(nameField);
	1139	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
979	1140	oe.ctrlPanel.add(namePanel);
980	1141
981	1142	oe.ctrlPanel.Return();
982	1143
983		- if (!GroupEditor.allparams)
	1144	+ if (!allparams)
984	1145	return;
985	1146
986	1147	setupPanel = new cGridBag().setVertical(false);
..	..	@@ -993,42 +1154,46 @@
993	1154	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
994	1155	hideCB.setToolTipText("Hide object");
995	1156	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
996		- markCB.setToolTipText("Set the animation target transform");
	1157	+ markCB.setToolTipText("As animation target transform");
997	1158
998		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1159	+ setupPanel2 = new cGridBag().setVertical(false);
	1160	+
	1161	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
999	1162	rewindCB.setToolTipText("Rewind animation");
1000	1163
1001		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
1002		- randomCB.setToolTipText("Option for switch node");
	1164	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1165	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1003	1166
1004	1167	if (Globals.ADVANCED)
1005	1168	{
1006		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	1169	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1007	1170	link2masterCB.setToolTipText("Attach to support");
1008		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1171	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1009	1172	speedupCB.setToolTipText("Option motion capture");
1010	1173	}
1011	1174
1012	1175	oe.ctrlPanel.add(setupPanel);
1013	1176	oe.ctrlPanel.Return();
	1177	+ oe.ctrlPanel.add(setupPanel2);
	1178	+ oe.ctrlPanel.Return();
1014	1179
1015		- commandsPanel = new cGridBag().setVertical(false);
	1180	+ objectCommandsPanel = new cGridBag().setVertical(false);
1016	1181
1017		- resetButton = AddButton(commandsPanel, "Reset");
	1182	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1018	1183	resetButton.setToolTipText("Jump to frame zero");
1019		- stepButton = AddButton(commandsPanel, "Step");
	1184	+ stepButton = AddButton(objectCommandsPanel, "Step");
1020	1185	stepButton.setToolTipText("Step one frame");
1021	1186	// resetAllButton = AddButton(oe, "Reset All");
1022	1187	// stepAllButton = AddButton(oe, "Step All");
1023	1188	// Return();
1024		- slowerButton = AddButton(commandsPanel, "Slow");
	1189	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1025	1190	slowerButton.setToolTipText("Decrease animation speed");
1026		- fasterButton = AddButton(commandsPanel, "Fast");
	1191	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1027	1192	fasterButton.setToolTipText("Increase animation speed");
1028		- remarkButton = AddButton(commandsPanel, "Remark");
	1193	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1029	1194	remarkButton.setToolTipText("Set the current transform as the target");
1030	1195
1031		- oe.ctrlPanel.add(commandsPanel);
	1196	+ oe.ctrlPanel.add(objectCommandsPanel);
1032	1197	oe.ctrlPanel.Return();
1033	1198
1034	1199	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1234,8 +1399,11 @@
1234	1399	//worldPanel.setName("World");
1235	1400	centralPanel = new cGridBag();
1236	1401	centralPanel.preferredWidth = 20;
1237		- timelinePanel = new JPanel(new BorderLayout());
1238		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1402	+
	1403	+ if (Globals.ADVANCED)
	1404	+ {
	1405	+ timelinePanel = new JPanel(new BorderLayout());
	1406	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1239	1407
1240	1408	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1241	1409	cameraPanel.setContinuousLayout(true);
..	..	@@ -1244,7 +1412,10 @@
1244	1412	// cameraPanel.setDividerSize(9);
1245	1413	cameraPanel.setResizeWeight(1.0);
1246	1414
	1415	+ }
	1416	+
1247	1417	centralPanel.add(cameraView);
	1418	+ centralPanel.setFocusable(true);
1248	1419	//frame.setJMenuBar(timelineMenubar);
1249	1420	//centralPanel.add(timelinePanel);
1250	1421
..	..	@@ -1311,8 +1482,9 @@
1311	1482	// north.setName("Edit");
1312	1483	// north.add(ctrlPanel, BorderLayout.NORTH);
1313	1484	// objectPanel.add(north);
1314		- objectPanel.add(ctrlPanel);
	1485	+ objectPanel.add(editPanel);
1315	1486	objectPanel.add(infoPanel);
	1487	+ objectPanel.add(toolboxPanel);
1316	1488
1317	1489	/*
1318	1490	aConstraints.gridx = 0;
..	..	@@ -1321,7 +1493,7 @@
1321	1493	aConstraints.gridy += 1;
1322	1494	aConstraints.gridwidth = 1;
1323	1495	mainPanel.add(objectPanel, aConstraints);
1324		- */
	1496	+ */
1325	1497
1326	1498	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1327	1499	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1338,9 +1510,7 @@
1338	1510	JTabbedPane tabbedPane = new JTabbedPane();
1339	1511	tabbedPane.add(scrollpane);
1340	1512
1341		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1342		-
1343		- optionsPanel = new cGridBag().setVertical(true);
	1513	+ optionsPanel = new cGridBag().setVertical(false);
1344	1514
1345	1515	optionsPanel.setName("Options");
1346	1516
..	..	@@ -1348,6 +1518,8 @@
1348	1518
1349	1519	tabbedPane.add(optionsPanel);
1350	1520
	1521	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1522	+
1351	1523	scenePanel.add(tabbedPane);
1352	1524
1353	1525	/*
..	..	@@ -1440,8 +1612,12 @@
1440	1612	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1441	1613
1442	1614	frame.setSize(1280, 860);
	1615	+
	1616	+ frame.validate();
1443	1617	frame.setVisible(true);
1444	1618
	1619	+ cameraView.requestFocusInWindow();
	1620	+
1445	1621	gridPanel.setDividerLocation(1.0);
1446	1622
1447	1623	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1529,24 +1705,6 @@
1529	1705	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1530	1706	colorSection.add(texture);
1531	1707
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	1708	panel.add(new JSeparator());
1551	1709
1552	1710	panel.add(colorSection);
..	..	@@ -1596,6 +1754,12 @@
1596	1754	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1597	1755	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1598	1756	diffuseSection.add(fakedepth);
	1757	+
	1758	+ cGridBag shadowbias = new cGridBag();
	1759	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1760	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1761	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1762	+ diffuseSection.add(shadowbias);
1599	1763
1600	1764	panel.add(new JSeparator());
1601	1765
..	..	@@ -1647,6 +1811,18 @@
1647	1811	// aConstraints.gridy += 1;
1648	1812	// aConstraints.gridwidth = 1;
1649	1813
	1814	+ cGridBag anisoU = new cGridBag();
	1815	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1816	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1817	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1818	+ specularSection.add(anisoU);
	1819	+
	1820	+ cGridBag anisoV = new cGridBag();
	1821	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1822	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1823	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1824	+ specularSection.add(anisoV);
	1825	+
1650	1826
1651	1827	panel.add(new JSeparator());
1652	1828
..	..	@@ -1654,35 +1830,35 @@
1654	1830
1655	1831	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1656	1832
1657		- cGridBag globalSection = new cGridBag().setVertical(true);
	1833	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1658	1834
1659	1835	cGridBag camera = new cGridBag();
1660	1836	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1661	1837	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1662	1838	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1663		- globalSection.add(camera);
	1839	+ colorSection.add(camera);
1664	1840
1665	1841	cGridBag ambient = new cGridBag();
1666	1842	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1667	1843	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1668	1844	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1669		- globalSection.add(ambient);
	1845	+ colorSection.add(ambient);
1670	1846
1671	1847	cGridBag backlit = new cGridBag();
1672	1848	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1673	1849	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1674	1850	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1675		- globalSection.add(backlit);
	1851	+ colorSection.add(backlit);
1676	1852
1677	1853	cGridBag opacity = new cGridBag();
1678	1854	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1679	1855	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1680	1856	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1681		- globalSection.add(opacity);
	1857	+ colorSection.add(opacity);
1682	1858
1683		- panel.add(new JSeparator());
	1859	+ //panel.add(new JSeparator());
1684	1860
1685		- panel.add(globalSection);
	1861	+ //panel.add(globalSection);
1686	1862
1687	1863	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1688	1864
..	..	@@ -1991,6 +2167,7 @@
1991	2167	e2.printStackTrace();
1992	2168	}
1993	2169	}
	2170	+
1994	2171	LoadJMEThread loadThread;
1995	2172
1996	2173	class LoadJMEThread extends Thread
..	..	@@ -2048,6 +2225,7 @@
2048	2225	//LoadFile0(filename, converter);
2049	2226	}
2050	2227	}
	2228	+
2051	2229	LoadOBJThread loadObjThread;
2052	2230
2053	2231	class LoadOBJThread extends Thread
..	..	@@ -2126,19 +2304,19 @@
2126	2304
2127	2305	void LoadObjFile(String fullname)
2128	2306	{
2129		- /*
	2307	+ System.out.println("Loading " + fullname);
	2308	+ /**/
2130	2309	//lastFilename = fullname;
2131	2310	if(loadObjThread == null)
2132	2311	{
2133		- loadObjThread = new LoadOBJThread();
2134		- loadObjThread.start();
	2312	+ loadObjThread = new LoadOBJThread();
	2313	+ loadObjThread.start();
2135	2314	}
2136	2315
2137	2316	loadObjThread.add(fullname);
2138		- */
	2317	+ /**/
2139	2318
2140		- System.out.println("Loading " + fullname);
2141		- makeSomething(new FileObject(fullname, true), true);
	2319	+ //makeSomething(new FileObject(fullname, true), true);
2142	2320	}
2143	2321
2144	2322	void LoadGFDFile(String fullname)
..	..	@@ -2755,6 +2933,8 @@
2755	2933
2756	2934	void SetMaterial(Object3D object)
2757	2935	{
	2936	+ latestObject = object;
	2937	+
2758	2938	cMaterial mat = object.material;
2759	2939
2760	2940	if (mat == null)
..	..	@@ -2866,12 +3046,17 @@
2866	3046	// }
2867	3047
2868	3048	/**/
2869		- if (deselect)
	3049	+ if (deselect \|\| child == null)
2870	3050	{
2871	3051	//group.deselectAll();
2872	3052	//freeze = true;
2873	3053	GetTree().clearSelection();
2874	3054	//freeze = false;
	3055	+
	3056	+ if (child == null)
	3057	+ {
	3058	+ return;
	3059	+ }
2875	3060	}
2876	3061
2877	3062	//group.addSelectee(child);
..	..	@@ -2940,7 +3125,7 @@
2940	3125	cameraView.ToggleDL();
2941	3126	cameraView.repaint();
2942	3127	return;
2943		- } else if (event.getSource() == toggleTextureItem)
	3128	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2944	3129	{
2945	3130	cameraView.ToggleTexture();
2946	3131	// june 2013 copy.HardTouch();
..	..	@@ -2979,9 +3164,9 @@
2979	3164	frame.validate();
2980	3165
2981	3166	return;
2982		- } else if (event.getSource() == toggleSwitchItem)
	3167	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2983	3168	{
2984		- cameraView.ToggleRandom();
	3169	+ cameraView.ToggleSwitch();
2985	3170	cameraView.repaint();
2986	3171	return;
2987	3172	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3052,8 +3237,9 @@
3052	3237
3053	3238	public void actionPerformed(ActionEvent event)
3054	3239	{
	3240	+ Object source = event.getSource();
3055	3241	// SCRIPT DIALOG
3056		- if (event.getSource() == okbutton)
	3242	+ if (source == okbutton)
3057	3243	{
3058	3244	textpanel.setVisible(false);
3059	3245	textpanel.remove(textarea);
..	..	@@ -3065,7 +3251,7 @@
3065	3251	textarea = null;
3066	3252	textpanel = null;
3067	3253	}
3068		- if (event.getSource() == cancelbutton)
	3254	+ if (source == cancelbutton)
3069	3255	{
3070	3256	textpanel.setVisible(false);
3071	3257	textpanel.remove(textarea);
..	..	@@ -3077,50 +3263,50 @@
3077	3263	//applySelf();
3078	3264	//client.refreshEditWindow();
3079	3265	//refreshContents();
3080		- if (event.getSource() == nameField)
	3266	+ if (source == nameField)
3081	3267	{
3082	3268	//System.out.println("ObjEditor " + event);
3083	3269	applySelf0(true);
3084	3270	//parent.applySelf();
3085	3271	objEditor.refreshContents();
3086		- } else if (event.getSource() == resetButton)
	3272	+ } else if (source == resetButton)
3087	3273	{
3088	3274	CameraPane.fullreset = true;
3089	3275	copy.Reset(); // ResetMeshes();
3090	3276	copy.Touch();
3091	3277	objEditor.refreshContents();
3092		- } else if (event.getSource() == stepItem)
	3278	+ } else if (source == stepItem)
3093	3279	{
3094	3280	//cameraView.ONESTEP = true;
3095	3281	Globals.ONESTEP = true;
3096	3282	cameraView.repaint();
3097	3283	return;
3098		- } else if (event.getSource() == stepButton)
	3284	+ } else if (source == stepButton)
3099	3285	{
3100	3286	copy.Step();
3101	3287	copy.Touch();
3102	3288	objEditor.refreshContents();
3103		- } else if (event.getSource() == slowerButton)
	3289	+ } else if (source == slowerButton)
3104	3290	{
3105	3291	copy.Slower();
3106	3292	copy.Touch();
3107	3293	objEditor.refreshContents();
3108		- } else if (event.getSource() == fasterButton)
	3294	+ } else if (source == fasterButton)
3109	3295	{
3110	3296	copy.Faster();
3111	3297	copy.Touch();
3112	3298	objEditor.refreshContents();
3113		- } else if (event.getSource() == remarkButton)
	3299	+ } else if (source == remarkButton)
3114	3300	{
3115	3301	copy.Remark();
3116	3302	copy.Touch();
3117	3303	objEditor.refreshContents();
3118		- } else if (event.getSource() == stepAllButton)
	3304	+ } else if (source == stepAllButton)
3119	3305	{
3120	3306	copy.StepAll();
3121	3307	copy.Touch();
3122	3308	objEditor.refreshContents();
3123		- } else if (event.getSource() == resetAllButton)
	3309	+ } else if (source == resetAllButton)
3124	3310	{
3125	3311	//CameraPane.fullreset = true;
3126	3312	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3153,53 +3339,75 @@
3153	3339	// Close();
3154	3340	// }
3155	3341	// else
3156		- if (event.getSource() == resetSlidersButton)
	3342	+ if (source == resetSlidersButton)
3157	3343	{
3158	3344	ResetSliders();
3159		- } else if (event.getSource() == clearMaterialButton)
	3345	+ } else if (source == clearMaterialButton)
3160	3346	{
3161	3347	ClearMaterial();
3162		- } else if (event.getSource() == createMaterialButton)
	3348	+ } else if (source == createMaterialButton)
3163	3349	{
3164	3350	CreateMaterial();
3165		- } else if (event.getSource() == clearPanelButton)
	3351	+ } else if (source == clearPanelButton)
3166	3352	{
3167	3353	copy.ClearUI();
3168	3354	refreshContents(true);
3169		- } /*
3170		- }
3171		-
3172		- public boolean action(Event event, Object arg)
3173		- {
3174		- */ else if (event.getSource() == closeItem)
	3355	+ } else if (source == importGFDItem)
	3356	+ {
	3357	+ ImportGFD();
	3358	+ } else
	3359	+ if (source == importVRMLX3DItem)
	3360	+ {
	3361	+ ImportVRMLX3D();
	3362	+ } else
	3363	+ if (source == import3DSItem)
	3364	+ {
	3365	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3366	+ } else
	3367	+ if (source == importOBJItem)
	3368	+ {
	3369	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3370	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3371	+ browser.setVisible(true);
	3372	+ String filename = browser.getFile();
	3373	+ if (filename != null && filename.length() > 0)
	3374	+ {
	3375	+ String fullname = browser.getDirectory() + filename;
	3376	+ makeSomething(ReadOBJ(fullname), true);
	3377	+ }
	3378	+ } else
	3379	+ if (source == closeItem)
3175	3380	{
3176	3381	Close();
3177	3382	//return true;
3178		- } else if (event.getSource() == loadItem)
	3383	+ } else if (source == loadItem)
3179	3384	{
3180	3385	load();
3181	3386	//return true;
3182		- } else if (event.getSource() == saveItem)
	3387	+ } else if (source == newItem)
	3388	+ {
	3389	+ New();
	3390	+ } else if (source == saveItem)
3183	3391	{
3184	3392	save();
3185	3393	//return true;
3186		- } else if (event.getSource() == saveAsItem)
	3394	+ } else if (source == saveAsItem)
3187	3395	{
3188	3396	saveAs();
3189	3397	//return true;
3190		- } else if (event.getSource() == reexportItem)
	3398	+ } else if (source == reexportItem)
3191	3399	{
3192	3400	reexport();
3193	3401	//return true;
3194		- } else if (event.getSource() == exportAsItem)
	3402	+ } else if (source == exportAsItem)
3195	3403	{
3196	3404	export();
3197	3405	//return true;
3198		- } else if (event.getSource() == povItem)
	3406	+ } else if (source == povItem)
3199	3407	{
3200	3408	generatePOV();
3201	3409	//return true;
3202		- } else if (event.getSource() == zBufferItem)
	3410	+ } else if (source == zBufferItem)
3203	3411	{
3204	3412	try
3205	3413	{
..	..	@@ -3221,21 +3429,8 @@
3221	3429	cameraView.repaint();
3222	3430	//return true;
3223	3431	}
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)
	3432	+ */ else // combos...
	3433	+ if (source == texresMenu)
3239	3434	{
3240	3435	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3241	3436	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3247,6 +3442,283 @@
3247	3442	}
3248	3443	}
3249	3444
	3445	+ void New()
	3446	+ {
	3447	+ while (copy.Size() > 1)
	3448	+ {
	3449	+ copy.remove(1);
	3450	+ }
	3451	+
	3452	+ ResetModel();
	3453	+ objEditor.refreshContents();
	3454	+ }
	3455	+
	3456	+ static public byte[] Compress(Object3D o)
	3457	+ {
	3458	+ try
	3459	+ {
	3460	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3461	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3462	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3463	+
	3464	+ Object3D parent = o.parent;
	3465	+ o.parent = null;
	3466	+
	3467	+ out.writeObject(o);
	3468	+
	3469	+ o.parent = parent;
	3470	+
	3471	+ out.flush();
	3472	+
	3473	+ zstream.close();
	3474	+ out.close();
	3475	+
	3476	+ return baos.toByteArray();
	3477	+ } catch (Exception e)
	3478	+ {
	3479	+ System.err.println(e);
	3480	+ return null;
	3481	+ }
	3482	+ }
	3483	+
	3484	+ static public Object Uncompress(byte[] bytes)
	3485	+ {
	3486	+ System.out.println("#bytes = " + bytes.length);
	3487	+ try
	3488	+ {
	3489	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3490	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3491	+ ObjectInputStream in = new ObjectInputStream(istream);
	3492	+ Object obj = in.readObject();
	3493	+ in.close();
	3494	+
	3495	+ return obj;
	3496	+ } catch (Exception e)
	3497	+ {
	3498	+ System.err.println(e);
	3499	+ return null;
	3500	+ }
	3501	+ }
	3502	+
	3503	+ static public Object clone(Object o)
	3504	+ {
	3505	+ try
	3506	+ {
	3507	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3508	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3509	+
	3510	+ out.writeObject(o);
	3511	+
	3512	+ out.flush();
	3513	+ out.close();
	3514	+
	3515	+ byte[] bytes = baos.toByteArray();
	3516	+
	3517	+ System.out.println("clone = " + bytes.length);
	3518	+
	3519	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3520	+ ObjectInputStream in = new ObjectInputStream(bais);
	3521	+ Object obj = in.readObject();
	3522	+ in.close();
	3523	+
	3524	+ return obj;
	3525	+ } catch (Exception e)
	3526	+ {
	3527	+ System.err.println(e);
	3528	+ return null;
	3529	+ }
	3530	+ }
	3531	+
	3532	+ cRadio GetCurrentTab()
	3533	+ {
	3534	+ cRadio ab;
	3535	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3536	+ {
	3537	+ ab = (cRadio)e.nextElement();
	3538	+ if(ab.GetObject() == copy)
	3539	+ {
	3540	+ return ab;
	3541	+ }
	3542	+ }
	3543	+
	3544	+ return null;
	3545	+ }
	3546	+
	3547	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3548	+
	3549	+ public void Save()
	3550	+ {
	3551	+ System.err.println("Save");
	3552	+
	3553	+ cRadio tab = GetCurrentTab();
	3554	+
	3555	+ boolean temp = CameraPane.SWITCH;
	3556	+ CameraPane.SWITCH = false;
	3557	+
	3558	+ copy.ExtractBigData(hashtable);
	3559	+
	3560	+ byte[] compress = Compress(copy);
	3561	+
	3562	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3563	+ tab.graphs[tab.undoindex++] = compress;
	3564	+
	3565	+ copy.RestoreBigData(hashtable);
	3566	+
	3567	+ CameraPane.SWITCH = temp;
	3568	+
	3569	+ //assert(hashtable.isEmpty());
	3570	+
	3571	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3572	+ {
	3573	+ tab.graphs[i] = null;
	3574	+ }
	3575	+
	3576	+ SetUndoStates();
	3577	+
	3578	+ // test save
	3579	+ if (false)
	3580	+ {
	3581	+ try
	3582	+ {
	3583	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3584	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3585	+
	3586	+ p.writeObject(copy);
	3587	+
	3588	+ p.flush();
	3589	+
	3590	+ ostream.close();
	3591	+ } catch (Exception e)
	3592	+ {
	3593	+ e.printStackTrace();
	3594	+ }
	3595	+ }
	3596	+ }
	3597	+
	3598	+ void CopyChanged(Object3D obj)
	3599	+ {
	3600	+ SetUndoStates();
	3601	+
	3602	+ boolean temp = CameraPane.SWITCH;
	3603	+ CameraPane.SWITCH = false;
	3604	+
	3605	+ copy.ExtractBigData(hashtable);
	3606	+
	3607	+ copy.clear();
	3608	+
	3609	+ for (int i=0; i<obj.Size(); i++)
	3610	+ {
	3611	+ copy.add(obj.get(i));
	3612	+ }
	3613	+
	3614	+ copy.RestoreBigData(hashtable);
	3615	+
	3616	+ CameraPane.SWITCH = temp;
	3617	+
	3618	+ //assert(hashtable.isEmpty());
	3619	+
	3620	+ copy.Touch();
	3621	+
	3622	+ ResetModel();
	3623	+ copy.HardTouch(); // recompile?
	3624	+
	3625	+ cRadio ab;
	3626	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3627	+ {
	3628	+ ab = (cRadio)e.nextElement();
	3629	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3630	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3631	+ if (test != null)
	3632	+ {
	3633	+ test.editWindow = ab.object.editWindow;
	3634	+ ab.object = test;
	3635	+ }
	3636	+ }
	3637	+
	3638	+ refreshContents();
	3639	+ }
	3640	+
	3641	+ cButton undoButton;
	3642	+ cButton redoButton;
	3643	+
	3644	+ void SetUndoStates()
	3645	+ {
	3646	+ cRadio tab = GetCurrentTab();
	3647	+
	3648	+ undoButton.setEnabled(tab.undoindex > 0);
	3649	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3650	+ }
	3651	+
	3652	+ public void Undo()
	3653	+ {
	3654	+ System.err.println("Undo");
	3655	+
	3656	+ cRadio tab = GetCurrentTab();
	3657	+
	3658	+ if (tab.undoindex == 0)
	3659	+ {
	3660	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3661	+ return;
	3662	+ }
	3663	+
	3664	+ if (tab.graphs[tab.undoindex] == null)
	3665	+ {
	3666	+ Save();
	3667	+ tab.undoindex -= 1;
	3668	+ }
	3669	+
	3670	+ tab.undoindex -= 1;
	3671	+
	3672	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3673	+ }
	3674	+
	3675	+ public void Redo()
	3676	+ {
	3677	+ cRadio tab = GetCurrentTab();
	3678	+
	3679	+ if (tab.graphs[tab.undoindex + 1] == null)
	3680	+ {
	3681	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3682	+ return;
	3683	+ }
	3684	+
	3685	+ tab.undoindex += 1;
	3686	+
	3687	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3688	+ }
	3689	+
	3690	+ void ImportGFD()
	3691	+ {
	3692	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3693	+ browser.show();
	3694	+ String filename = browser.getFile();
	3695	+ if (filename != null && filename.length() > 0)
	3696	+ {
	3697	+ String fullname = browser.getDirectory() + filename;
	3698	+
	3699	+ //Object3D readobj =
	3700	+ objEditor.ReadGFD(fullname, objEditor);
	3701	+ //makeSomething(readobj);
	3702	+ }
	3703	+ }
	3704	+
	3705	+ void ImportVRMLX3D()
	3706	+ {
	3707	+ if (Grafreed.standAlone)
	3708	+ {
	3709	+ /**/
	3710	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3711	+ browser.show();
	3712	+ String filename = browser.getFile();
	3713	+ if (filename != null && filename.length() > 0)
	3714	+ {
	3715	+ String fullname = browser.getDirectory() + filename;
	3716	+ LoadVRMLX3D(fullname);
	3717	+ }
	3718	+ /**/
	3719	+ }
	3720	+ }
	3721	+
3250	3722	void ToggleAnimation()
3251	3723	{
3252	3724	if (!Globals.ANIMATION)
..	..	@@ -3364,7 +3836,7 @@
3364	3836	assert false;
3365	3837	}
3366	3838
3367		- void EditSelection()
	3839	+ void EditSelection(boolean newWindow)
3368	3840	{
3369	3841	}
3370	3842
..	..	@@ -3859,6 +4331,8 @@
3859	4331
3860	4332	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3861	4333	{
	4334	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4335	+ Save();
3862	4336	//Tween.set(thing, 0).target(1).start(tweenManager);
3863	4337	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3864	4338	// if (thing instanceof GenericJointDemo)
..	..	@@ -3945,6 +4419,12 @@
3945	4419	{
3946	4420	ResetModel();
3947	4421	Select(thing.GetTreePath(), true, false); // unselect... false);
	4422	+
	4423	+ if (thing.Size() == 0)
	4424	+ {
	4425	+ //EditSelection(false);
	4426	+ }
	4427	+
3948	4428	refreshContents();
3949	4429	}
3950	4430
..	..	@@ -4082,6 +4562,7 @@
4082	4562
4083	4563	try
4084	4564	{
	4565	+ // Try compressed version first.
4085	4566	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4086	4567	java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4087	4568	java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
..	..	@@ -4151,6 +4632,12 @@
4151	4632
4152	4633	void LoadIt(Object obj)
4153	4634	{
	4635	+ if (obj == null)
	4636	+ {
	4637	+ // Invalid file
	4638	+ return;
	4639	+ }
	4640	+
4154	4641	System.out.println("Loaded " + obj);
4155	4642	//new Exception().printStackTrace();
4156	4643	Object3D readobj = (Object3D) obj;
..	..	@@ -4160,6 +4647,8 @@
4160	4647
4161	4648	if (readobj != null)
4162	4649	{
	4650	+ if (Globals.SAVEONMAKE)
	4651	+ Save();
4163	4652	try
4164	4653	{
4165	4654	//readobj.deepCopySelf(copy);
..	..	@@ -4337,6 +4826,8 @@
4337	4826	String filename = browser.getFile();
4338	4827	if (filename != null && filename.length() > 0)
4339	4828	{
	4829	+ if (!filename.endsWith(".gfd"))
	4830	+ filename += ".gfd";
4340	4831	lastname = browser.getDirectory() + filename;
4341	4832	save();
4342	4833	}
..	..	@@ -4501,7 +4992,8 @@
4501	4992	Object3D client;
4502	4993	Object3D copy;
4503	4994	MenuBar menuBar;
4504		- Menu windowMenu;
	4995	+ Menu fileMenu;
	4996	+ MenuItem newItem;
4505	4997	MenuItem loadItem;
4506	4998	MenuItem saveItem;
4507	4999	MenuItem saveAsItem;
..	..	@@ -4509,11 +5001,9 @@
4509	5001	MenuItem reexportItem;
4510	5002	MenuItem povItem;
4511	5003	MenuItem closeItem;
4512		- Menu cameraMenu;
	5004	+
4513	5005	CheckboxMenuItem zBufferItem;
4514	5006	//MenuItem normalLensItem;
4515		- MenuItem editCameraItem;
4516		- MenuItem revertCameraItem;
4517	5007	MenuItem stepItem;
4518	5008	CheckboxMenuItem toggleLiveItem;
4519	5009	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4531,18 +5021,31 @@
4531	5021	CheckboxMenuItem togglePaintItem;
4532	5022	JSplitPane mainPanel;
4533	5023	JScrollPane scrollpane;
	5024	+
4534	5025	JPanel toolbarPanel;
	5026	+
4535	5027	cGridBag treePanel;
	5028	+
4536	5029	JPanel radioPanel;
4537	5030	ButtonGroup buttonGroup;
4538		- cGridBag ctrlPanel;
	5031	+
	5032	+ cGridBag toolboxPanel;
4539	5033	cGridBag materialPanel;
	5034	+ cGridBag ctrlPanel;
	5035	+
4540	5036	JScrollPane infoPanel;
	5037	+
4541	5038	cGridBag optionsPanel;
	5039	+
4542	5040	JTabbedPane objectPanel;
	5041	+ boolean materialFlushed;
	5042	+ Object3D latestObject;
	5043	+
4543	5044	cGridBag XYZPanel;
	5045	+
4544	5046	JSplitPane gridPanel;
4545	5047	JSplitPane bigPanel;
	5048	+
4546	5049	cGridBag bigThree;
4547	5050	cGridBag scenePanel;
4548	5051	cGridBag centralPanel;
..	..	@@ -4657,8 +5160,13 @@
4657	5160	cNumberSlider fogField;
4658	5161	JLabel opacityPowerLabel;
4659	5162	cNumberSlider opacityPowerField;
4660		- JTree jTree;
	5163	+ cTree jTree;
4661	5164	//ObjectUI parent;
4662	5165
4663	5166	cNumberSlider normalpushField;
	5167	+
	5168	+ private MenuItem importGFDItem;
	5169	+ private MenuItem importVRMLX3DItem;
	5170	+ private MenuItem import3DSItem;
	5171	+ private MenuItem importOBJItem;
4664	5172	}