~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -35,6 +39,67 @@
35	39
36	40	GroupEditor callee;
37	41	JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ cButton GetButton(String name, boolean border)
	46	+ {
	47	+ try
	48	+ {
	49	+ ImageIcon icon = GetIcon(name);
	50	+ return new cButton(icon, border);
	51	+ }
	52	+ catch (Exception e)
	53	+ {
	54	+ return new cButton(name, border);
	55	+ }
	56	+ }
	57	+
	58	+ cToggleButton GetToggleButton(String name, boolean border)
	59	+ {
	60	+ try
	61	+ {
	62	+ ImageIcon icon = GetIcon(name);
	63	+ return new cToggleButton(icon, border);
	64	+ }
	65	+ catch (Exception e)
	66	+ {
	67	+ return new cToggleButton(name, border);
	68	+ }
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ try
	74	+ {
	75	+ ImageIcon icon = GetIcon(name);
	76	+ return new cCheckBox(icon, border);
	77	+ }
	78	+ catch (Exception e)
	79	+ {
	80	+ return new cCheckBox(name, border);
	81	+ }
	82	+ }
	83	+
	84	+ private ImageIcon GetIcon(String name) throws IOException
	85	+ {
	86	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	87	+
	88	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	89	+ {
	90	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	91	+ Graphics2D g = resized.createGraphics();
	92	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	93	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	94	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	95	+ g.dispose();
	96	+
	97	+ image = resized;
	98	+ }
	99	+
	100	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	101	+ return icon;
	102	+ }
38	103
39	104	// SCRIPT
40	105
..	..	@@ -145,7 +210,7 @@
145	210
146	211	objEditor.ctrlPanel.remove(namePanel);
147	212
148		- if (!GroupEditor.allparams)
	213	+ if (!allparams)
149	214	return;
150	215
151	216	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -168,7 +233,8 @@
168	233	// objEditor.ctrlPanel.remove(remarkButton);
169	234
170	235	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	236	+ objEditor.ctrlPanel.remove(setupPanel2);
	237	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	238	objEditor.ctrlPanel.remove(pushPanel);
173	239	//objEditor.ctrlPanel.remove(fillPanel);
174	240
..	..	@@ -243,6 +309,7 @@
243	309	//localCopy.parent = null;
244	310
245	311	frame = new JFrame();
	312	+ frame.setUndecorated(false);
246	313	objEditor = this;
247	314	this.callee = callee;
248	315
..	..	@@ -273,28 +340,49 @@
273	340	return frame.action(event, obj);
274	341	}
275	342
	343	+ // Cannot work without static
	344	+ static boolean allparams = true;
	345	+
	346	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	347	+
276	348	void SetupMenu()
277	349	{
278	350	frame.setMenuBar(menuBar = new MenuBar());
279		- menuBar.add(windowMenu = new Menu("File"));
280		- windowMenu.add(loadItem = new MenuItem("Load..."));
281		- windowMenu.add("-");
282		- windowMenu.add(saveItem = new MenuItem("Save"));
283		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	351	+ menuBar.add(fileMenu = new Menu("File"));
	352	+ fileMenu.add(newItem = new MenuItem("New"));
	353	+ fileMenu.add(openItem = new MenuItem("Open..."));
	354	+
	355	+ //oe.menuBar.add(menu = new Menu("Include"));
	356	+ Menu menu = new Menu("Import");
	357	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	358	+ importOBJItem.addActionListener(this);
	359	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	360	+ import3DSItem.addActionListener(this);
	361	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	362	+ importVRMLX3DItem.addActionListener(this);
	363	+ menu.add("-");
	364	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	365	+ importGFDItem.addActionListener(this);
	366	+ fileMenu.add(menu);
	367	+ fileMenu.add("-");
	368	+
	369	+ fileMenu.add(saveItem = new MenuItem("Save"));
	370	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284	371	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
285		- windowMenu.add("-");
286		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
287		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
288		- windowMenu.add("-");
	372	+ fileMenu.add("-");
	373	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	374	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	375	+ fileMenu.add("-");
289	376	if (client.parent != null)
290	377	{
291		- windowMenu.add(closeItem = new MenuItem("Close"));
	378	+ fileMenu.add(closeItem = new MenuItem("Close"));
292	379	} else
293	380	{
294		- windowMenu.add(closeItem = new MenuItem("Exit"));
	381	+ fileMenu.add(closeItem = new MenuItem("Exit"));
295	382	}
296	383
297		- loadItem.addActionListener(this);
	384	+ newItem.addActionListener(this);
	385	+ openItem.addActionListener(this);
298	386	saveItem.addActionListener(this);
299	387	saveAsItem.addActionListener(this);
300	388	exportAsItem.addActionListener(this);
..	..	@@ -302,87 +390,53 @@
302	390	//povItem.addActionListener(this);
303	391	closeItem.addActionListener(this);
304	392
305		- menuBar.add(cameraMenu = new Menu("View"));
306		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
307		- //zBufferItem.addActionListener(this);
308		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
309		- //normalLensItem.addActionListener(this);
310		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
311		- revertCameraItem.addActionListener(this);
312		-
313		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314		- toggleFullScreenItem.addItemListener(this);
315		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316		- cameraMenu.add("-");
317		-
318		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
319		- toggleTextureItem.addItemListener(this);
320		- toggleTextureItem.setState(CameraPane.textureon);
321		-
322		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
323		- toggleSwitchItem.addItemListener(this);
324		- toggleSwitchItem.setState(CameraPane.SWITCH);
325		-
326		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
327		- toggleHandleItem.addItemListener(this);
328		- toggleHandleItem.setState(CameraPane.HANDLES);
329		-
330		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
331		- togglePaintItem.addItemListener(this);
332		- togglePaintItem.setState(CameraPane.PAINTMODE);
333		-
334		- if (Globals.ADVANCED)
335		- {
336		- cameraMenu.add("-");
337		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
338		- toggleLiveItem.addItemListener(this);
339		- toggleLiveItem.setState(Globals.isLIVE());
340		-
341		- cameraMenu.add(stepItem = new MenuItem("Step"));
342		- stepItem.addActionListener(this);
343		- // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
344		- // toggleDLItem.addItemListener(this);
345		- // toggleDLItem.setState(false);
346		-
347		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
348		- toggleRenderItem.addItemListener(this);
349		- toggleRenderItem.setState(!CameraPane.frozen);
350		-
351		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
352		- toggleDebugItem.addItemListener(this);
353		- toggleDebugItem.setState(CameraPane.DEBUG);
354		-
355		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
356		- toggleFrustumItem.addItemListener(this);
357		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
358		-
359		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
360		- toggleFootContactItem.addItemListener(this);
361		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
362		-
363		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
364		- toggleTimelineItem.addItemListener(this);
365		- }
366		-
367		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
368		-// toggleRootItem.addItemListener(this);
369		-// toggleRootItem.setState(false);
370		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
371		-// animationItem.addItemListener(this);
372		-// animationItem.setState(CameraPane.ANIMATION);
373		- cameraMenu.add("-");
374		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
375		- editCameraItem.addActionListener(this);
376		-
377	393	objectPanel = new JTabbedPane();
	394	+
	395	+ ChangeListener changeListener = new ChangeListener()
	396	+ {
	397	+ public void stateChanged(ChangeEvent changeEvent)
	398	+ {
	399	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	400	+// {
	401	+// if (latestObject != null)
	402	+// {
	403	+// refreshContents(true);
	404	+// SetMaterial(latestObject);
	405	+// }
	406	+//
	407	+// materialFlushed = true;
	408	+// }
	409	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	410	+// {
	411	+// if (listUI.size() == 0)
	412	+// EditSelection(false);
	413	+// }
	414	+
	415	+ refreshContents(false); // To refresh Info tab
	416	+ }
	417	+ };
	418	+ objectPanel.addChangeListener(changeListener);
	419	+
378	420	toolbarPanel = new JPanel();
379	421	toolbarPanel.setName("Toolbar");
380	422	treePanel = new cGridBag();
381	423	treePanel.setName("Tree");
	424	+
	425	+ editPanel = new cGridBag().setVertical(true);
	426	+ editPanel.setName("Edit");
	427	+
382	428	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
383		- ctrlPanel.setName("Edit");
	429	+
	430	+ editCommandsPanel = new cGridBag();
	431	+ editPanel.add(editCommandsPanel);
	432	+ editPanel.add(ctrlPanel);
	433	+
	434	+ toolboxPanel = new cGridBag().setVertical(false);
	435	+ toolboxPanel.setName("Toolbox");
	436	+
384	437	materialPanel = new cGridBag().setVertical(true);
385	438	materialPanel.setName("Material");
	439	+
386	440	/JTextPane/
387	441	infoarea = createTextPane();
388	442	doc = infoarea.getStyledDocument();
..	..	@@ -395,7 +449,7 @@
395	449	// TEXTAREA infoarea.setLineWrap(true);
396	450	// TEXTAREA infoarea.setWrapStyleWord(true);
397	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
398		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ infoPanel.setPreferredSize(new Dimension(1, 1));
399	453	infoPanel.setName("Info");
400	454	//infoPanel.setLayout(new BorderLayout());
401	455	//infoPanel.add(createTextPane());
..	..	@@ -407,7 +461,14 @@
407	461	mainPanel.setDividerSize(9);
408	462	mainPanel.setDividerLocation(0.5); //1.0);
409	463	mainPanel.setResizeWeight(0.5);
410		-
	464	+
	465	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	466	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	467	+ divider.setDividerSize(15);
	468	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	469	+
	470	+ mainPanel.setUI(new BasicSplitPaneUI());
	471	+
411	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
412	473	//mainPanel.setLayout(new GridBagLayout());
413	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -475,10 +536,10 @@
475	536	e.printStackTrace();
476	537	}
477	538
478		- String selection = infoarea.getText();
479		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
480		- java.awt.datatransfer.Clipboard clipboard =
481		- Toolkit.getDefaultToolkit().getSystemClipboard();
	539	+// String selection = infoarea.getText();
	540	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	541	+// java.awt.datatransfer.Clipboard clipboard =
	542	+// Toolkit.getDefaultToolkit().getSystemClipboard();
482	543	//clipboard.setContents(data, data);
483	544	}
484	545
..	..	@@ -638,20 +699,121 @@
638	699	}
639	700	}
640	701
	702	+//static GraphicsDevice device = GraphicsEnvironment
	703	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	704	+
	705	+ Rectangle keeprect;
	706	+ cRadio radio;
	707	+
	708	+cButton keepButton;
	709	+ cButton twoButton; // Full 3D
	710	+ cButton sixButton;
	711	+ cButton threeButton;
	712	+ cButton sevenButton;
	713	+ cButton fourButton; // full panel
	714	+ cButton oneButton; // full XYZ
	715	+ //cButton currentLayout;
	716	+
	717	+ boolean maximized;
	718	+
	719	+ cButton fullscreenLayout;
	720	+
	721	+ void Minimize()
	722	+ {
	723	+ frame.setState(Frame.ICONIFIED);
	724	+ frame.validate();
	725	+ }
	726	+
	727	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	728	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	729	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	730	+ void Maximize()
	731	+ {
	732	+ if (CameraPane.FULLSCREEN)
	733	+ {
	734	+ ToggleFullScreen();
	735	+ }
	736	+
	737	+ if (maximized)
	738	+ {
	739	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	740	+ }
	741	+ else
	742	+ {
	743	+ keeprect = frame.getBounds();
	744	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	745	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	746	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	747	+// frame.setState(Frame.MAXIMIZED_BOTH);
	748	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	749	+ }
	750	+
	751	+ maximized ^= true;
	752	+
	753	+ frame.validate();
	754	+ }
	755	+
	756	+ cButton minButton;
	757	+ cButton maxButton;
	758	+ cButton fullButton;
	759	+
641	760	void ToggleFullScreen()
642	761	{
643		- if (CameraPane.FULLSCREEN)
	762	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	763	+
	764	+ cameraView.ToggleFullScreen();
	765	+
	766	+ if (!CameraPane.FULLSCREEN)
644	767	{
645		- frame.getContentPane().remove(/"Center",/bigThree);
646		- framePanel.add(bigThree);
647		- frame.getContentPane().add(/"Center",/framePanel);
	768	+ device.setFullScreenWindow(null);
	769	+ frame.dispose();
	770	+ frame.setUndecorated(false);
	771	+ frame.validate();
	772	+ frame.setVisible(true);
	773	+
	774	+ //frame.setVisible(false);
	775	+// frame.removeNotify();
	776	+// frame.setUndecorated(false);
	777	+// frame.addNotify();
	778	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	779	+
	780	+// X frame.getContentPane().remove(/"Center",/bigThree);
	781	+// X framePanel.add(bigThree);
	782	+// X frame.getContentPane().add(/"Center",/framePanel);
	783	+ framePanel.setDividerLocation(46);
	784	+
	785	+ //frame.setVisible(true);
	786	+ radio.layout = keepButton;
	787	+ //theFrame = null;
	788	+ keepButton = null;
	789	+ radio.layout.doClick();
	790	+
648	791	} else
649	792	{
650		- frame.getContentPane().remove(/"Center",/framePanel);
651		- framePanel.remove(bigThree);
652		- frame.getContentPane().add(/"Center",/bigThree);
	793	+ keepButton = radio.layout;
	794	+ //keeprect = frame.getBounds();
	795	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	796	+// frame.getToolkit().getScreenSize().height);
	797	+ //frame.setVisible(false);
	798	+
	799	+ frame.dispose();
	800	+ frame.setUndecorated(true);
	801	+ device.setFullScreenWindow(frame);
	802	+ frame.validate();
	803	+ frame.setVisible(true);
	804	+// frame.removeNotify();
	805	+// frame.setUndecorated(true);
	806	+// frame.addNotify();
	807	+// X frame.getContentPane().remove(/"Center",/framePanel);
	808	+// X framePanel.remove(bigThree);
	809	+// X frame.getContentPane().add(/"Center",/bigThree);
	810	+ framePanel.setDividerLocation(0);
	811	+
	812	+ radio.layout = fullscreenLayout;
	813	+ radio.layout.doClick();
	814	+ //frame.setVisible(true);
653	815	}
654		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
655	817	}
656	818
657	819	private JTextPane createTextPane()
..	..	@@ -792,7 +954,12 @@
792	954	JCheckBox speedupCB;
793	955	JCheckBox rewindCB;
794	956	JCheckBox flipVCB;
	957	+
	958	+ cCheckBox toggleTextureCB;
	959	+ cCheckBox toggleSwitchCB;
	960	+
795	961	JComboBox texresMenu;
	962	+
796	963	JButton resetButton;
797	964	JButton stepButton;
798	965	JButton stepAllButton;
..	..	@@ -801,9 +968,13 @@
801	968	JButton fasterButton;
802	969	JButton remarkButton;
803	970
	971	+ cGridBag editPanel;
	972	+ cGridBag editCommandsPanel;
	973	+
804	974	cGridBag namePanel;
805	975	cGridBag setupPanel;
806		- cGridBag commandsPanel;
	976	+ cGridBag setupPanel2;
	977	+ cGridBag objectCommandsPanel;
807	978	cGridBag pushPanel;
808	979	cGridBag fillPanel;
809	980
..	..	@@ -975,12 +1146,12 @@
975	1146	namePanel = new cGridBag();
976	1147
977	1148	nameField = AddText(namePanel, copy.GetName());
978		- namePanel.add(nameField);
	1149	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
979	1150	oe.ctrlPanel.add(namePanel);
980	1151
981	1152	oe.ctrlPanel.Return();
982	1153
983		- if (!GroupEditor.allparams)
	1154	+ if (!allparams)
984	1155	return;
985	1156
986	1157	setupPanel = new cGridBag().setVertical(false);
..	..	@@ -993,42 +1164,46 @@
993	1164	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
994	1165	hideCB.setToolTipText("Hide object");
995	1166	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
996		- markCB.setToolTipText("Set the animation target transform");
	1167	+ markCB.setToolTipText("As animation target transform");
997	1168
998		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1169	+ setupPanel2 = new cGridBag().setVertical(false);
	1170	+
	1171	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
999	1172	rewindCB.setToolTipText("Rewind animation");
1000	1173
1001		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
1002		- randomCB.setToolTipText("Option for switch node");
	1174	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1175	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1003	1176
1004	1177	if (Globals.ADVANCED)
1005	1178	{
1006		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	1179	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1007	1180	link2masterCB.setToolTipText("Attach to support");
1008		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1181	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1009	1182	speedupCB.setToolTipText("Option motion capture");
1010	1183	}
1011	1184
1012	1185	oe.ctrlPanel.add(setupPanel);
1013	1186	oe.ctrlPanel.Return();
	1187	+ oe.ctrlPanel.add(setupPanel2);
	1188	+ oe.ctrlPanel.Return();
1014	1189
1015		- commandsPanel = new cGridBag().setVertical(false);
	1190	+ objectCommandsPanel = new cGridBag().setVertical(false);
1016	1191
1017		- resetButton = AddButton(commandsPanel, "Reset");
	1192	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1018	1193	resetButton.setToolTipText("Jump to frame zero");
1019		- stepButton = AddButton(commandsPanel, "Step");
	1194	+ stepButton = AddButton(objectCommandsPanel, "Step");
1020	1195	stepButton.setToolTipText("Step one frame");
1021	1196	// resetAllButton = AddButton(oe, "Reset All");
1022	1197	// stepAllButton = AddButton(oe, "Step All");
1023	1198	// Return();
1024		- slowerButton = AddButton(commandsPanel, "Slow");
	1199	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1025	1200	slowerButton.setToolTipText("Decrease animation speed");
1026		- fasterButton = AddButton(commandsPanel, "Fast");
	1201	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1027	1202	fasterButton.setToolTipText("Increase animation speed");
1028		- remarkButton = AddButton(commandsPanel, "Remark");
	1203	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1029	1204	remarkButton.setToolTipText("Set the current transform as the target");
1030	1205
1031		- oe.ctrlPanel.add(commandsPanel);
	1206	+ oe.ctrlPanel.add(objectCommandsPanel);
1032	1207	oe.ctrlPanel.Return();
1033	1208
1034	1209	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1234,8 +1409,11 @@
1234	1409	//worldPanel.setName("World");
1235	1410	centralPanel = new cGridBag();
1236	1411	centralPanel.preferredWidth = 20;
1237		- timelinePanel = new JPanel(new BorderLayout());
1238		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1412	+
	1413	+ if (Globals.ADVANCED)
	1414	+ {
	1415	+ timelinePanel = new JPanel(new BorderLayout());
	1416	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1239	1417
1240	1418	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1241	1419	cameraPanel.setContinuousLayout(true);
..	..	@@ -1244,7 +1422,10 @@
1244	1422	// cameraPanel.setDividerSize(9);
1245	1423	cameraPanel.setResizeWeight(1.0);
1246	1424
	1425	+ }
	1426	+
1247	1427	centralPanel.add(cameraView);
	1428	+ centralPanel.setFocusable(true);
1248	1429	//frame.setJMenuBar(timelineMenubar);
1249	1430	//centralPanel.add(timelinePanel);
1250	1431
..	..	@@ -1311,8 +1492,12 @@
1311	1492	// north.setName("Edit");
1312	1493	// north.add(ctrlPanel, BorderLayout.NORTH);
1313	1494	// objectPanel.add(north);
1314		- objectPanel.add(ctrlPanel);
1315		- objectPanel.add(infoPanel);
	1495	+ objectPanel.add(editPanel);
	1496	+
	1497	+ //if (Globals.ADVANCED)
	1498	+ objectPanel.add(infoPanel);
	1499	+
	1500	+ objectPanel.add(toolboxPanel);
1316	1501
1317	1502	/*
1318	1503	aConstraints.gridx = 0;
..	..	@@ -1321,7 +1506,7 @@
1321	1506	aConstraints.gridy += 1;
1322	1507	aConstraints.gridwidth = 1;
1323	1508	mainPanel.add(objectPanel, aConstraints);
1324		- */
	1509	+ */
1325	1510
1326	1511	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1327	1512	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1338,9 +1523,7 @@
1338	1523	JTabbedPane tabbedPane = new JTabbedPane();
1339	1524	tabbedPane.add(scrollpane);
1340	1525
1341		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1342		-
1343		- optionsPanel = new cGridBag().setVertical(true);
	1526	+ optionsPanel = new cGridBag().setVertical(false);
1344	1527
1345	1528	optionsPanel.setName("Options");
1346	1529
..	..	@@ -1348,6 +1531,8 @@
1348	1531
1349	1532	tabbedPane.add(optionsPanel);
1350	1533
	1534	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1535	+
1351	1536	scenePanel.add(tabbedPane);
1352	1537
1353	1538	/*
..	..	@@ -1420,9 +1605,9 @@
1420	1605	// aConstraints.gridheight = 1;
1421	1606
1422	1607	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1423		- framePanel.setContinuousLayout(true);
1424		- framePanel.setOneTouchExpandable(true);
1425		- framePanel.setDividerLocation(0.8);
	1608	+ framePanel.setContinuousLayout(false);
	1609	+ framePanel.setOneTouchExpandable(false);
	1610	+ //.setDividerLocation(0.8);
1426	1611	//framePanel.setDividerSize(15);
1427	1612	//framePanel.setResizeWeight(0.15);
1428	1613	framePanel.setName("Frame");
..	..	@@ -1440,9 +1625,14 @@
1440	1625	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1441	1626
1442	1627	frame.setSize(1280, 860);
1443		- frame.setVisible(true);
1444		-
	1628	+
	1629	+ cameraView.requestFocusInWindow();
	1630	+
1445	1631	gridPanel.setDividerLocation(1.0);
	1632	+
	1633	+ frame.validate();
	1634	+
	1635	+ frame.setVisible(true);
1446	1636
1447	1637	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1448	1638	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1529,24 +1719,6 @@
1529	1719	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1530	1720	colorSection.add(texture);
1531	1721
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	1722	panel.add(new JSeparator());
1551	1723
1552	1724	panel.add(colorSection);
..	..	@@ -1596,6 +1768,12 @@
1596	1768	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1597	1769	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1598	1770	diffuseSection.add(fakedepth);
	1771	+
	1772	+ cGridBag shadowbias = new cGridBag();
	1773	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1774	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1775	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1776	+ diffuseSection.add(shadowbias);
1599	1777
1600	1778	panel.add(new JSeparator());
1601	1779
..	..	@@ -1647,6 +1825,18 @@
1647	1825	// aConstraints.gridy += 1;
1648	1826	// aConstraints.gridwidth = 1;
1649	1827
	1828	+ cGridBag anisoU = new cGridBag();
	1829	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1830	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1831	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1832	+ specularSection.add(anisoU);
	1833	+
	1834	+ cGridBag anisoV = new cGridBag();
	1835	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1836	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1837	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1838	+ specularSection.add(anisoV);
	1839	+
1650	1840
1651	1841	panel.add(new JSeparator());
1652	1842
..	..	@@ -1654,35 +1844,35 @@
1654	1844
1655	1845	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1656	1846
1657		- cGridBag globalSection = new cGridBag().setVertical(true);
	1847	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1658	1848
1659	1849	cGridBag camera = new cGridBag();
1660	1850	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1661	1851	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1662	1852	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1663		- globalSection.add(camera);
	1853	+ colorSection.add(camera);
1664	1854
1665	1855	cGridBag ambient = new cGridBag();
1666	1856	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1667	1857	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1668	1858	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1669		- globalSection.add(ambient);
	1859	+ colorSection.add(ambient);
1670	1860
1671	1861	cGridBag backlit = new cGridBag();
1672	1862	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1673	1863	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1674	1864	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1675		- globalSection.add(backlit);
	1865	+ colorSection.add(backlit);
1676	1866
1677	1867	cGridBag opacity = new cGridBag();
1678	1868	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1679	1869	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1680	1870	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1681		- globalSection.add(opacity);
	1871	+ colorSection.add(opacity);
1682	1872
1683		- panel.add(new JSeparator());
	1873	+ //panel.add(new JSeparator());
1684	1874
1685		- panel.add(globalSection);
	1875	+ //panel.add(globalSection);
1686	1876
1687	1877	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1688	1878
..	..	@@ -1991,6 +2181,7 @@
1991	2181	e2.printStackTrace();
1992	2182	}
1993	2183	}
	2184	+
1994	2185	LoadJMEThread loadThread;
1995	2186
1996	2187	class LoadJMEThread extends Thread
..	..	@@ -2048,6 +2239,7 @@
2048	2239	//LoadFile0(filename, converter);
2049	2240	}
2050	2241	}
	2242	+
2051	2243	LoadOBJThread loadObjThread;
2052	2244
2053	2245	class LoadOBJThread extends Thread
..	..	@@ -2126,19 +2318,19 @@
2126	2318
2127	2319	void LoadObjFile(String fullname)
2128	2320	{
2129		- /*
	2321	+ System.out.println("Loading " + fullname);
	2322	+ /**/
2130	2323	//lastFilename = fullname;
2131	2324	if(loadObjThread == null)
2132	2325	{
2133		- loadObjThread = new LoadOBJThread();
2134		- loadObjThread.start();
	2326	+ loadObjThread = new LoadOBJThread();
	2327	+ loadObjThread.start();
2135	2328	}
2136	2329
2137	2330	loadObjThread.add(fullname);
2138		- */
	2331	+ /**/
2139	2332
2140		- System.out.println("Loading " + fullname);
2141		- makeSomething(new FileObject(fullname, true), true);
	2333	+ //makeSomething(new FileObject(fullname, true), true);
2142	2334	}
2143	2335
2144	2336	void LoadGFDFile(String fullname)
..	..	@@ -2755,6 +2947,8 @@
2755	2947
2756	2948	void SetMaterial(Object3D object)
2757	2949	{
	2950	+ latestObject = object;
	2951	+
2758	2952	cMaterial mat = object.material;
2759	2953
2760	2954	if (mat == null)
..	..	@@ -2866,12 +3060,17 @@
2866	3060	// }
2867	3061
2868	3062	/**/
2869		- if (deselect)
	3063	+ if (deselect \|\| child == null)
2870	3064	{
2871	3065	//group.deselectAll();
2872	3066	//freeze = true;
2873	3067	GetTree().clearSelection();
2874	3068	//freeze = false;
	3069	+
	3070	+ if (child == null)
	3071	+ {
	3072	+ return;
	3073	+ }
2875	3074	}
2876	3075
2877	3076	//group.addSelectee(child);
..	..	@@ -2940,7 +3139,7 @@
2940	3139	cameraView.ToggleDL();
2941	3140	cameraView.repaint();
2942	3141	return;
2943		- } else if (event.getSource() == toggleTextureItem)
	3142	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2944	3143	{
2945	3144	cameraView.ToggleTexture();
2946	3145	// june 2013 copy.HardTouch();
..	..	@@ -2979,9 +3178,9 @@
2979	3178	frame.validate();
2980	3179
2981	3180	return;
2982		- } else if (event.getSource() == toggleSwitchItem)
	3181	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2983	3182	{
2984		- cameraView.ToggleRandom();
	3183	+ cameraView.ToggleSwitch();
2985	3184	cameraView.repaint();
2986	3185	return;
2987	3186	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3052,8 +3251,9 @@
3052	3251
3053	3252	public void actionPerformed(ActionEvent event)
3054	3253	{
	3254	+ Object source = event.getSource();
3055	3255	// SCRIPT DIALOG
3056		- if (event.getSource() == okbutton)
	3256	+ if (source == okbutton)
3057	3257	{
3058	3258	textpanel.setVisible(false);
3059	3259	textpanel.remove(textarea);
..	..	@@ -3065,7 +3265,7 @@
3065	3265	textarea = null;
3066	3266	textpanel = null;
3067	3267	}
3068		- if (event.getSource() == cancelbutton)
	3268	+ if (source == cancelbutton)
3069	3269	{
3070	3270	textpanel.setVisible(false);
3071	3271	textpanel.remove(textarea);
..	..	@@ -3077,50 +3277,50 @@
3077	3277	//applySelf();
3078	3278	//client.refreshEditWindow();
3079	3279	//refreshContents();
3080		- if (event.getSource() == nameField)
	3280	+ if (source == nameField)
3081	3281	{
3082	3282	//System.out.println("ObjEditor " + event);
3083	3283	applySelf0(true);
3084	3284	//parent.applySelf();
3085	3285	objEditor.refreshContents();
3086		- } else if (event.getSource() == resetButton)
	3286	+ } else if (source == resetButton)
3087	3287	{
3088	3288	CameraPane.fullreset = true;
3089	3289	copy.Reset(); // ResetMeshes();
3090	3290	copy.Touch();
3091	3291	objEditor.refreshContents();
3092		- } else if (event.getSource() == stepItem)
	3292	+ } else if (source == stepItem)
3093	3293	{
3094	3294	//cameraView.ONESTEP = true;
3095	3295	Globals.ONESTEP = true;
3096	3296	cameraView.repaint();
3097	3297	return;
3098		- } else if (event.getSource() == stepButton)
	3298	+ } else if (source == stepButton)
3099	3299	{
3100	3300	copy.Step();
3101	3301	copy.Touch();
3102	3302	objEditor.refreshContents();
3103		- } else if (event.getSource() == slowerButton)
	3303	+ } else if (source == slowerButton)
3104	3304	{
3105	3305	copy.Slower();
3106	3306	copy.Touch();
3107	3307	objEditor.refreshContents();
3108		- } else if (event.getSource() == fasterButton)
	3308	+ } else if (source == fasterButton)
3109	3309	{
3110	3310	copy.Faster();
3111	3311	copy.Touch();
3112	3312	objEditor.refreshContents();
3113		- } else if (event.getSource() == remarkButton)
	3313	+ } else if (source == remarkButton)
3114	3314	{
3115	3315	copy.Remark();
3116	3316	copy.Touch();
3117	3317	objEditor.refreshContents();
3118		- } else if (event.getSource() == stepAllButton)
	3318	+ } else if (source == stepAllButton)
3119	3319	{
3120	3320	copy.StepAll();
3121	3321	copy.Touch();
3122	3322	objEditor.refreshContents();
3123		- } else if (event.getSource() == resetAllButton)
	3323	+ } else if (source == resetAllButton)
3124	3324	{
3125	3325	//CameraPane.fullreset = true;
3126	3326	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3153,53 +3353,79 @@
3153	3353	// Close();
3154	3354	// }
3155	3355	// else
3156		- if (event.getSource() == resetSlidersButton)
	3356	+ if (source == resetSlidersButton)
3157	3357	{
3158	3358	ResetSliders();
3159		- } else if (event.getSource() == clearMaterialButton)
	3359	+ } else if (source == clearMaterialButton)
3160	3360	{
3161	3361	ClearMaterial();
3162		- } else if (event.getSource() == createMaterialButton)
	3362	+ } else if (source == createMaterialButton)
3163	3363	{
3164	3364	CreateMaterial();
3165		- } else if (event.getSource() == clearPanelButton)
	3365	+ } else if (source == clearPanelButton)
3166	3366	{
3167	3367	copy.ClearUI();
3168	3368	refreshContents(true);
3169		- } /*
3170		- }
3171		-
3172		- public boolean action(Event event, Object arg)
3173		- {
3174		- */ else if (event.getSource() == closeItem)
	3369	+ } else if (source == importGFDItem)
	3370	+ {
	3371	+ ImportGFD();
	3372	+ } else
	3373	+ if (source == importVRMLX3DItem)
	3374	+ {
	3375	+ ImportVRMLX3D();
	3376	+ } else
	3377	+ if (source == import3DSItem)
	3378	+ {
	3379	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3380	+ } else
	3381	+ if (source == importOBJItem)
	3382	+ {
	3383	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3384	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3385	+ browser.setVisible(true);
	3386	+ String filename = browser.getFile();
	3387	+ if (filename != null && filename.length() > 0)
	3388	+ {
	3389	+ String fullname = browser.getDirectory() + filename;
	3390	+ makeSomething(ReadOBJ(fullname), true);
	3391	+ }
	3392	+ } else
	3393	+ if (source == closeItem)
3175	3394	{
3176	3395	Close();
3177	3396	//return true;
3178		- } else if (event.getSource() == loadItem)
	3397	+ } else if (source == openItem)
3179	3398	{
3180		- load();
	3399	+ Open();
3181	3400	//return true;
3182		- } else if (event.getSource() == saveItem)
	3401	+ } else if (source == newItem)
	3402	+ {
	3403	+ New();
	3404	+ } else if (source == saveItem)
3183	3405	{
3184	3406	save();
3185	3407	//return true;
3186		- } else if (event.getSource() == saveAsItem)
	3408	+ } else if (source == saveAsItem)
3187	3409	{
3188	3410	saveAs();
3189	3411	//return true;
3190		- } else if (event.getSource() == reexportItem)
	3412	+ } else if (source == reexportItem)
3191	3413	{
3192	3414	reexport();
3193	3415	//return true;
3194		- } else if (event.getSource() == exportAsItem)
	3416	+ } else if (source == exportAsItem)
3195	3417	{
3196	3418	export();
3197	3419	//return true;
3198		- } else if (event.getSource() == povItem)
	3420	+ } else if (source == povItem)
3199	3421	{
3200	3422	generatePOV();
3201	3423	//return true;
3202		- } else if (event.getSource() == zBufferItem)
	3424	+ } else if (event.getSource() == archiveItem)
	3425	+ {
	3426	+ cTools.Archive(frame);
	3427	+ return;
	3428	+ } else if (source == zBufferItem)
3203	3429	{
3204	3430	try
3205	3431	{
..	..	@@ -3221,21 +3447,8 @@
3221	3447	cameraView.repaint();
3222	3448	//return true;
3223	3449	}
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)
	3450	+ */ else // combos...
	3451	+ if (source == texresMenu)
3239	3452	{
3240	3453	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3241	3454	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3247,6 +3460,283 @@
3247	3460	}
3248	3461	}
3249	3462
	3463	+ void New()
	3464	+ {
	3465	+ while (copy.Size() > 1)
	3466	+ {
	3467	+ copy.remove(1);
	3468	+ }
	3469	+
	3470	+ ResetModel();
	3471	+ objEditor.refreshContents();
	3472	+ }
	3473	+
	3474	+ static public byte[] Compress(Object3D o)
	3475	+ {
	3476	+ try
	3477	+ {
	3478	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3479	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3480	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3481	+
	3482	+ Object3D parent = o.parent;
	3483	+ o.parent = null;
	3484	+
	3485	+ out.writeObject(o);
	3486	+
	3487	+ o.parent = parent;
	3488	+
	3489	+ out.flush();
	3490	+
	3491	+ zstream.close();
	3492	+ out.close();
	3493	+
	3494	+ return baos.toByteArray();
	3495	+ } catch (Exception e)
	3496	+ {
	3497	+ System.err.println(e);
	3498	+ return null;
	3499	+ }
	3500	+ }
	3501	+
	3502	+ static public Object Uncompress(byte[] bytes)
	3503	+ {
	3504	+ System.out.println("#bytes = " + bytes.length);
	3505	+ try
	3506	+ {
	3507	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3508	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3509	+ ObjectInputStream in = new ObjectInputStream(istream);
	3510	+ Object obj = in.readObject();
	3511	+ in.close();
	3512	+
	3513	+ return obj;
	3514	+ } catch (Exception e)
	3515	+ {
	3516	+ System.err.println(e);
	3517	+ return null;
	3518	+ }
	3519	+ }
	3520	+
	3521	+ static public Object clone(Object o)
	3522	+ {
	3523	+ try
	3524	+ {
	3525	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3526	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3527	+
	3528	+ out.writeObject(o);
	3529	+
	3530	+ out.flush();
	3531	+ out.close();
	3532	+
	3533	+ byte[] bytes = baos.toByteArray();
	3534	+
	3535	+ System.out.println("clone = " + bytes.length);
	3536	+
	3537	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3538	+ ObjectInputStream in = new ObjectInputStream(bais);
	3539	+ Object obj = in.readObject();
	3540	+ in.close();
	3541	+
	3542	+ return obj;
	3543	+ } catch (Exception e)
	3544	+ {
	3545	+ System.err.println(e);
	3546	+ return null;
	3547	+ }
	3548	+ }
	3549	+
	3550	+ cRadio GetCurrentTab()
	3551	+ {
	3552	+ cRadio ab;
	3553	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3554	+ {
	3555	+ ab = (cRadio)e.nextElement();
	3556	+ if(ab.GetObject() == copy)
	3557	+ {
	3558	+ return ab;
	3559	+ }
	3560	+ }
	3561	+
	3562	+ return null;
	3563	+ }
	3564	+
	3565	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3566	+
	3567	+ public void Save()
	3568	+ {
	3569	+ System.err.println("Save");
	3570	+
	3571	+ cRadio tab = GetCurrentTab();
	3572	+
	3573	+ boolean temp = CameraPane.SWITCH;
	3574	+ CameraPane.SWITCH = false;
	3575	+
	3576	+ copy.ExtractBigData(hashtable);
	3577	+
	3578	+ byte[] compress = Compress(copy);
	3579	+
	3580	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3581	+ tab.graphs[tab.undoindex++] = compress;
	3582	+
	3583	+ copy.RestoreBigData(hashtable);
	3584	+
	3585	+ CameraPane.SWITCH = temp;
	3586	+
	3587	+ //assert(hashtable.isEmpty());
	3588	+
	3589	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3590	+ {
	3591	+ tab.graphs[i] = null;
	3592	+ }
	3593	+
	3594	+ SetUndoStates();
	3595	+
	3596	+ // test save
	3597	+ if (false)
	3598	+ {
	3599	+ try
	3600	+ {
	3601	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3602	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3603	+
	3604	+ p.writeObject(copy);
	3605	+
	3606	+ p.flush();
	3607	+
	3608	+ ostream.close();
	3609	+ } catch (Exception e)
	3610	+ {
	3611	+ e.printStackTrace();
	3612	+ }
	3613	+ }
	3614	+ }
	3615	+
	3616	+ void CopyChanged(Object3D obj)
	3617	+ {
	3618	+ SetUndoStates();
	3619	+
	3620	+ boolean temp = CameraPane.SWITCH;
	3621	+ CameraPane.SWITCH = false;
	3622	+
	3623	+ copy.ExtractBigData(hashtable);
	3624	+
	3625	+ copy.clear();
	3626	+
	3627	+ for (int i=0; i<obj.Size(); i++)
	3628	+ {
	3629	+ copy.add(obj.get(i));
	3630	+ }
	3631	+
	3632	+ copy.RestoreBigData(hashtable);
	3633	+
	3634	+ CameraPane.SWITCH = temp;
	3635	+
	3636	+ //assert(hashtable.isEmpty());
	3637	+
	3638	+ copy.Touch();
	3639	+
	3640	+ ResetModel();
	3641	+ copy.HardTouch(); // recompile?
	3642	+
	3643	+ cRadio ab;
	3644	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3645	+ {
	3646	+ ab = (cRadio)e.nextElement();
	3647	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3648	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3649	+ if (test != null)
	3650	+ {
	3651	+ test.editWindow = ab.object.editWindow;
	3652	+ ab.object = test;
	3653	+ }
	3654	+ }
	3655	+
	3656	+ refreshContents();
	3657	+ }
	3658	+
	3659	+ cButton undoButton;
	3660	+ cButton redoButton;
	3661	+
	3662	+ void SetUndoStates()
	3663	+ {
	3664	+ cRadio tab = GetCurrentTab();
	3665	+
	3666	+ undoButton.setEnabled(tab.undoindex > 0);
	3667	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3668	+ }
	3669	+
	3670	+ public void Undo()
	3671	+ {
	3672	+ System.err.println("Undo");
	3673	+
	3674	+ cRadio tab = GetCurrentTab();
	3675	+
	3676	+ if (tab.undoindex == 0)
	3677	+ {
	3678	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3679	+ return;
	3680	+ }
	3681	+
	3682	+ if (tab.graphs[tab.undoindex] == null)
	3683	+ {
	3684	+ Save();
	3685	+ tab.undoindex -= 1;
	3686	+ }
	3687	+
	3688	+ tab.undoindex -= 1;
	3689	+
	3690	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3691	+ }
	3692	+
	3693	+ public void Redo()
	3694	+ {
	3695	+ cRadio tab = GetCurrentTab();
	3696	+
	3697	+ if (tab.graphs[tab.undoindex + 1] == null)
	3698	+ {
	3699	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3700	+ return;
	3701	+ }
	3702	+
	3703	+ tab.undoindex += 1;
	3704	+
	3705	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3706	+ }
	3707	+
	3708	+ void ImportGFD()
	3709	+ {
	3710	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", 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	+
	3717	+ //Object3D readobj =
	3718	+ objEditor.ReadGFD(fullname, objEditor);
	3719	+ //makeSomething(readobj);
	3720	+ }
	3721	+ }
	3722	+
	3723	+ void ImportVRMLX3D()
	3724	+ {
	3725	+ if (Grafreed.standAlone)
	3726	+ {
	3727	+ /**/
	3728	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3729	+ browser.show();
	3730	+ String filename = browser.getFile();
	3731	+ if (filename != null && filename.length() > 0)
	3732	+ {
	3733	+ String fullname = browser.getDirectory() + filename;
	3734	+ LoadVRMLX3D(fullname);
	3735	+ }
	3736	+ /**/
	3737	+ }
	3738	+ }
	3739	+
3250	3740	void ToggleAnimation()
3251	3741	{
3252	3742	if (!Globals.ANIMATION)
..	..	@@ -3364,7 +3854,7 @@
3364	3854	assert false;
3365	3855	}
3366	3856
3367		- void EditSelection()
	3857	+ void EditSelection(boolean newWindow)
3368	3858	{
3369	3859	}
3370	3860
..	..	@@ -3859,6 +4349,8 @@
3859	4349
3860	4350	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3861	4351	{
	4352	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4353	+ Save();
3862	4354	//Tween.set(thing, 0).target(1).start(tweenManager);
3863	4355	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3864	4356	// if (thing instanceof GenericJointDemo)
..	..	@@ -3945,6 +4437,12 @@
3945	4437	{
3946	4438	ResetModel();
3947	4439	Select(thing.GetTreePath(), true, false); // unselect... false);
	4440	+
	4441	+ if (thing.Size() == 0)
	4442	+ {
	4443	+ //EditSelection(false);
	4444	+ }
	4445	+
3948	4446	refreshContents();
3949	4447	}
3950	4448
..	..	@@ -4082,6 +4580,7 @@
4082	4580
4083	4581	try
4084	4582	{
	4583	+ // Try compressed version first.
4085	4584	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4086	4585	java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4087	4586	java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
..	..	@@ -4151,6 +4650,12 @@
4151	4650
4152	4651	void LoadIt(Object obj)
4153	4652	{
	4653	+ if (obj == null)
	4654	+ {
	4655	+ // Invalid file
	4656	+ return;
	4657	+ }
	4658	+
4154	4659	System.out.println("Loaded " + obj);
4155	4660	//new Exception().printStackTrace();
4156	4661	Object3D readobj = (Object3D) obj;
..	..	@@ -4160,6 +4665,8 @@
4160	4665
4161	4666	if (readobj != null)
4162	4667	{
	4668	+ if (Globals.SAVEONMAKE)
	4669	+ Save();
4163	4670	try
4164	4671	{
4165	4672	//readobj.deepCopySelf(copy);
..	..	@@ -4220,7 +4727,7 @@
4220	4727	}
4221	4728	}
4222	4729
4223		- void load() // throws ClassNotFoundException
	4730	+ void Open() // throws ClassNotFoundException
4224	4731	{
4225	4732	if (Grafreed.standAlone)
4226	4733	{
..	..	@@ -4337,6 +4844,8 @@
4337	4844	String filename = browser.getFile();
4338	4845	if (filename != null && filename.length() > 0)
4339	4846	{
	4847	+ if (!filename.endsWith(".gfd"))
	4848	+ filename += ".gfd";
4340	4849	lastname = browser.getDirectory() + filename;
4341	4850	save();
4342	4851	}
..	..	@@ -4501,19 +5010,18 @@
4501	5010	Object3D client;
4502	5011	Object3D copy;
4503	5012	MenuBar menuBar;
4504		- Menu windowMenu;
4505		- MenuItem loadItem;
	5013	+ Menu fileMenu;
	5014	+ MenuItem newItem;
	5015	+ MenuItem openItem;
4506	5016	MenuItem saveItem;
4507	5017	MenuItem saveAsItem;
4508	5018	MenuItem exportAsItem;
4509	5019	MenuItem reexportItem;
4510	5020	MenuItem povItem;
4511	5021	MenuItem closeItem;
4512		- Menu cameraMenu;
	5022	+
4513	5023	CheckboxMenuItem zBufferItem;
4514	5024	//MenuItem normalLensItem;
4515		- MenuItem editCameraItem;
4516		- MenuItem revertCameraItem;
4517	5025	MenuItem stepItem;
4518	5026	CheckboxMenuItem toggleLiveItem;
4519	5027	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4527,22 +5035,36 @@
4527	5035	CheckboxMenuItem toggleSwitchItem;
4528	5036	CheckboxMenuItem toggleRootItem;
4529	5037	CheckboxMenuItem animationItem;
	5038	+ MenuItem archiveItem;
4530	5039	CheckboxMenuItem toggleHandleItem;
4531	5040	CheckboxMenuItem togglePaintItem;
4532	5041	JSplitPane mainPanel;
4533	5042	JScrollPane scrollpane;
	5043	+
4534	5044	JPanel toolbarPanel;
	5045	+
4535	5046	cGridBag treePanel;
	5047	+
4536	5048	JPanel radioPanel;
4537	5049	ButtonGroup buttonGroup;
4538		- cGridBag ctrlPanel;
	5050	+
	5051	+ cGridBag toolboxPanel;
4539	5052	cGridBag materialPanel;
	5053	+ cGridBag ctrlPanel;
	5054	+
4540	5055	JScrollPane infoPanel;
	5056	+
4541	5057	cGridBag optionsPanel;
	5058	+
4542	5059	JTabbedPane objectPanel;
	5060	+ boolean materialFlushed;
	5061	+ Object3D latestObject;
	5062	+
4543	5063	cGridBag XYZPanel;
	5064	+
4544	5065	JSplitPane gridPanel;
4545	5066	JSplitPane bigPanel;
	5067	+
4546	5068	cGridBag bigThree;
4547	5069	cGridBag scenePanel;
4548	5070	cGridBag centralPanel;
..	..	@@ -4657,8 +5179,13 @@
4657	5179	cNumberSlider fogField;
4658	5180	JLabel opacityPowerLabel;
4659	5181	cNumberSlider opacityPowerField;
4660		- JTree jTree;
	5182	+ cTree jTree;
4661	5183	//ObjectUI parent;
4662	5184
4663	5185	cNumberSlider normalpushField;
	5186	+
	5187	+ private MenuItem importGFDItem;
	5188	+ private MenuItem importVRMLX3DItem;
	5189	+ private MenuItem import3DSItem;
	5190	+ private MenuItem importOBJItem;
4664	5191	}