~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -35,6 +39,67 @@
35	39
36	40	GroupEditor callee;
37	41	JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ cButton GetButton(String name, boolean border)
	46	+ {
	47	+ try
	48	+ {
	49	+ ImageIcon icon = GetIcon(name);
	50	+ return new cButton(icon, border);
	51	+ }
	52	+ catch (Exception e)
	53	+ {
	54	+ return new cButton(name, border);
	55	+ }
	56	+ }
	57	+
	58	+ cToggleButton GetToggleButton(String name, boolean border)
	59	+ {
	60	+ try
	61	+ {
	62	+ ImageIcon icon = GetIcon(name);
	63	+ return new cToggleButton(icon, border);
	64	+ }
	65	+ catch (Exception e)
	66	+ {
	67	+ return new cToggleButton(name, border);
	68	+ }
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ try
	74	+ {
	75	+ ImageIcon icon = GetIcon(name);
	76	+ return new cCheckBox(icon, border);
	77	+ }
	78	+ catch (Exception e)
	79	+ {
	80	+ return new cCheckBox(name, border);
	81	+ }
	82	+ }
	83	+
	84	+ private ImageIcon GetIcon(String name) throws IOException
	85	+ {
	86	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	87	+
	88	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	89	+ {
	90	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	91	+ Graphics2D g = resized.createGraphics();
	92	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	93	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	94	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	95	+ g.dispose();
	96	+
	97	+ image = resized;
	98	+ }
	99	+
	100	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	101	+ return icon;
	102	+ }
38	103
39	104	// SCRIPT
40	105
..	..	@@ -143,7 +208,9 @@
143	208	//nameField.removeActionListener(this);
144	209	// objEditor.ctrlPanel.remove(nameField);
145	210
146		- if (!GroupEditor.allparams)
	211	+ objEditor.ctrlPanel.remove(namePanel);
	212	+
	213	+ if (!allparams)
147	214	return;
148	215
149	216	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -165,9 +232,9 @@
165	232	// objEditor.ctrlPanel.remove(fasterButton);
166	233	// objEditor.ctrlPanel.remove(remarkButton);
167	234
168		- objEditor.ctrlPanel.remove(namePanel);
169	235	objEditor.ctrlPanel.remove(setupPanel);
170		- objEditor.ctrlPanel.remove(commandsPanel);
	236	+ objEditor.ctrlPanel.remove(setupPanel2);
	237	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
171	238	objEditor.ctrlPanel.remove(pushPanel);
172	239	//objEditor.ctrlPanel.remove(fillPanel);
173	240
..	..	@@ -242,6 +309,7 @@
242	309	//localCopy.parent = null;
243	310
244	311	frame = new JFrame();
	312	+ frame.setUndecorated(true);
245	313	objEditor = this;
246	314	this.callee = callee;
247	315
..	..	@@ -272,27 +340,48 @@
272	340	return frame.action(event, obj);
273	341	}
274	342
	343	+ // Cannot work without static
	344	+ static boolean allparams = true;
	345	+
	346	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	347	+
275	348	void SetupMenu()
276	349	{
277	350	frame.setMenuBar(menuBar = new MenuBar());
278		- menuBar.add(windowMenu = new Menu("File"));
279		- windowMenu.add(loadItem = new MenuItem("Load..."));
280		- windowMenu.add("-");
281		- windowMenu.add(saveItem = new MenuItem("Save"));
282		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	351	+ menuBar.add(fileMenu = new Menu("File"));
	352	+ fileMenu.add(newItem = new MenuItem("New"));
	353	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	354	+
	355	+ //oe.menuBar.add(menu = new Menu("Include"));
	356	+ Menu menu = new Menu("Import");
	357	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	358	+ importOBJItem.addActionListener(this);
	359	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	360	+ import3DSItem.addActionListener(this);
	361	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	362	+ importVRMLX3DItem.addActionListener(this);
	363	+ menu.add("-");
	364	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	365	+ importGFDItem.addActionListener(this);
	366	+ fileMenu.add(menu);
	367	+ fileMenu.add("-");
	368	+
	369	+ fileMenu.add(saveItem = new MenuItem("Save"));
	370	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
283	371	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
284		- windowMenu.add("-");
285		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
286		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
287		- windowMenu.add("-");
	372	+ fileMenu.add("-");
	373	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	374	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	375	+ fileMenu.add("-");
288	376	if (client.parent != null)
289	377	{
290		- windowMenu.add(closeItem = new MenuItem("Close"));
	378	+ fileMenu.add(closeItem = new MenuItem("Close"));
291	379	} else
292	380	{
293		- windowMenu.add(closeItem = new MenuItem("Exit"));
	381	+ fileMenu.add(closeItem = new MenuItem("Exit"));
294	382	}
295	383
	384	+ newItem.addActionListener(this);
296	385	loadItem.addActionListener(this);
297	386	saveItem.addActionListener(this);
298	387	saveAsItem.addActionListener(this);
..	..	@@ -301,70 +390,53 @@
301	390	//povItem.addActionListener(this);
302	391	closeItem.addActionListener(this);
303	392
304		- menuBar.add(cameraMenu = new Menu("View"));
305		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
306		- //zBufferItem.addActionListener(this);
307		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
308		- //normalLensItem.addActionListener(this);
309		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
310		- revertCameraItem.addActionListener(this);
311		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
312		- toggleTimelineItem.addItemListener(this);
313		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314		- toggleFullScreenItem.addItemListener(this);
315		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316		- cameraMenu.add("-");
317		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
318		- toggleTextureItem.addItemListener(this);
319		- toggleTextureItem.setState(CameraPane.textureon);
320		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
321		- toggleLiveItem.addItemListener(this);
322		- toggleLiveItem.setState(Globals.isLIVE());
323		- cameraMenu.add(stepItem = new MenuItem("Step"));
324		- stepItem.addActionListener(this);
325		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
326		-// toggleDLItem.addItemListener(this);
327		-// toggleDLItem.setState(false);
328		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
329		- toggleRenderItem.addItemListener(this);
330		- toggleRenderItem.setState(!CameraPane.frozen);
331		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
332		- toggleDebugItem.addItemListener(this);
333		- toggleDebugItem.setState(CameraPane.DEBUG);
334		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
335		- toggleFrustumItem.addItemListener(this);
336		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
337		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
338		- toggleFootContactItem.addItemListener(this);
339		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
340		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
341		- toggleRandomItem.addItemListener(this);
342		- toggleRandomItem.setState(CameraPane.RANDOM);
343		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
344		- toggleHandleItem.addItemListener(this);
345		- toggleHandleItem.setState(CameraPane.HANDLES);
346		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
347		- togglePaintItem.addItemListener(this);
348		- togglePaintItem.setState(CameraPane.PAINTMODE);
349		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
350		-// toggleRootItem.addItemListener(this);
351		-// toggleRootItem.setState(false);
352		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
353		-// animationItem.addItemListener(this);
354		-// animationItem.setState(CameraPane.ANIMATION);
355		- cameraMenu.add("-");
356		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
357		- editCameraItem.addActionListener(this);
358		-
359	393	objectPanel = new JTabbedPane();
	394	+
	395	+ ChangeListener changeListener = new ChangeListener()
	396	+ {
	397	+ public void stateChanged(ChangeEvent changeEvent)
	398	+ {
	399	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	400	+// {
	401	+// if (latestObject != null)
	402	+// {
	403	+// refreshContents(true);
	404	+// SetMaterial(latestObject);
	405	+// }
	406	+//
	407	+// materialFlushed = true;
	408	+// }
	409	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	410	+// {
	411	+// if (listUI.size() == 0)
	412	+// EditSelection(false);
	413	+// }
	414	+
	415	+ refreshContents(false); // To refresh Info tab
	416	+ }
	417	+ };
	418	+ objectPanel.addChangeListener(changeListener);
	419	+
360	420	toolbarPanel = new JPanel();
361	421	toolbarPanel.setName("Toolbar");
362	422	treePanel = new cGridBag();
363	423	treePanel.setName("Tree");
	424	+
	425	+ editPanel = new cGridBag().setVertical(true);
	426	+ editPanel.setName("Edit");
	427	+
364	428	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
365		- ctrlPanel.setName("Edit");
	429	+
	430	+ editCommandsPanel = new cGridBag();
	431	+ editPanel.add(editCommandsPanel);
	432	+ editPanel.add(ctrlPanel);
	433	+
	434	+ toolboxPanel = new cGridBag().setVertical(false);
	435	+ toolboxPanel.setName("Toolbox");
	436	+
366	437	materialPanel = new cGridBag().setVertical(true);
367	438	materialPanel.setName("Material");
	439	+
368	440	/JTextPane/
369	441	infoarea = createTextPane();
370	442	doc = infoarea.getStyledDocument();
..	..	@@ -389,7 +461,13 @@
389	461	mainPanel.setDividerSize(9);
390	462	mainPanel.setDividerLocation(0.5); //1.0);
391	463	mainPanel.setResizeWeight(0.5);
392		-
	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	+
393	471	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
394	472	//mainPanel.setLayout(new GridBagLayout());
395	473	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -457,10 +535,10 @@
457	535	e.printStackTrace();
458	536	}
459	537
460		- String selection = infoarea.getText();
461		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
462		- java.awt.datatransfer.Clipboard clipboard =
463		- Toolkit.getDefaultToolkit().getSystemClipboard();
	538	+// String selection = infoarea.getText();
	539	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	540	+// java.awt.datatransfer.Clipboard clipboard =
	541	+// Toolkit.getDefaultToolkit().getSystemClipboard();
464	542	//clipboard.setContents(data, data);
465	543	}
466	544
..	..	@@ -483,13 +561,13 @@
483	561	//SendInfo("Name:", "bold");
484	562	if (sel.GetTextures() != null \|\| debug)
485	563	{
486		- si.SendInfo(sel.toString(), "bold");
	564	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
487	565	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
488	566	if (sel.Size() > 0)
489	567	{
490	568	si.SendInfo("#children = " + sel.Size(), "regular");
491	569	}
492		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	570	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
493	571	if (debug)
494	572	{
495	573	try
..	..	@@ -531,7 +609,7 @@
531	609	}
532	610	if (sel.support != null)
533	611	{
534		- si.SendInfo(" support: " + sel.support, "regular");
	612	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
535	613	}
536	614	if (sel.scriptnode != null)
537	615	{
..	..	@@ -620,20 +698,92 @@
620	698	}
621	699	}
622	700
	701	+static GraphicsDevice device = GraphicsEnvironment
	702	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	703	+
	704	+ Rectangle keeprect;
	705	+ cRadio radio;
	706	+
	707	+cButton keepButton;
	708	+ cButton twoButton; // Full 3D
	709	+ cButton sixButton;
	710	+ cButton threeButton;
	711	+ cButton sevenButton;
	712	+ cButton fourButton; // full panel
	713	+ cButton oneButton; // full XYZ
	714	+ //cButton currentLayout;
	715	+
	716	+ boolean maximized;
	717	+
	718	+ cButton fullscreenLayout;
	719	+
	720	+ void Minimize()
	721	+ {
	722	+ frame.setState(Frame.ICONIFIED);
	723	+ }
	724	+
	725	+ void Maximize()
	726	+ {
	727	+ if (maximized)
	728	+ {
	729	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	730	+ }
	731	+ else
	732	+ {
	733	+ keeprect = frame.getBounds();
	734	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	735	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	736	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	737	+// frame.setState(Frame.MAXIMIZED_BOTH);
	738	+ }
	739	+
	740	+ maximized ^= true;
	741	+ }
	742	+
623	743	void ToggleFullScreen()
624	744	{
625		- if (CameraPane.FULLSCREEN)
	745	+ cameraView.ToggleFullScreen();
	746	+
	747	+ if (!CameraPane.FULLSCREEN)
626	748	{
627		- frame.getContentPane().remove(/"Center",/bigThree);
628		- framePanel.add(bigThree);
629		- frame.getContentPane().add(/"Center",/framePanel);
	749	+ device.setFullScreenWindow(null);
	750	+ //frame.setVisible(false);
	751	+// frame.removeNotify();
	752	+// frame.setUndecorated(false);
	753	+// frame.addNotify();
	754	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	755	+
	756	+// X frame.getContentPane().remove(/"Center",/bigThree);
	757	+// X framePanel.add(bigThree);
	758	+// X frame.getContentPane().add(/"Center",/framePanel);
	759	+ framePanel.setDividerLocation(1);
	760	+
	761	+ //frame.setVisible(true);
	762	+ radio.layout = keepButton;
	763	+ //theFrame = null;
	764	+ keepButton = null;
	765	+ radio.layout.doClick();
	766	+
630	767	} else
631	768	{
632		- frame.getContentPane().remove(/"Center",/framePanel);
633		- framePanel.remove(bigThree);
634		- frame.getContentPane().add(/"Center",/bigThree);
	769	+ keepButton = radio.layout;
	770	+ //keeprect = frame.getBounds();
	771	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	772	+// frame.getToolkit().getScreenSize().height);
	773	+ //frame.setVisible(false);
	774	+ device.setFullScreenWindow(frame);
	775	+// frame.removeNotify();
	776	+// frame.setUndecorated(true);
	777	+// frame.addNotify();
	778	+// X frame.getContentPane().remove(/"Center",/framePanel);
	779	+// X framePanel.remove(bigThree);
	780	+// X frame.getContentPane().add(/"Center",/bigThree);
	781	+ framePanel.setDividerLocation(0);
	782	+
	783	+ radio.layout = fullscreenLayout;
	784	+ radio.layout.doClick();
	785	+ //frame.setVisible(true);
635	786	}
636		- cameraView.ToggleFullScreen();
637	787	}
638	788
639	789	private JTextPane createTextPane()
..	..	@@ -734,7 +884,7 @@
734	884	protected static ImageIcon createImageIcon(String path,
735	885	String description)
736	886	{
737		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	887	+ java.net.URL imgURL = Grafreed.class.getResource(path);
738	888	if (imgURL != null)
739	889	{
740	890	return new ImageIcon(imgURL, description);
..	..	@@ -766,6 +916,7 @@
766	916	// NumberSlider vDivsField;
767	917	// JCheckBox endcaps;
768	918	JCheckBox liveCB;
	919	+ JCheckBox selectCB;
769	920	JCheckBox hideCB;
770	921	JCheckBox link2masterCB;
771	922	JCheckBox markCB;
..	..	@@ -773,7 +924,12 @@
773	924	JCheckBox speedupCB;
774	925	JCheckBox rewindCB;
775	926	JCheckBox flipVCB;
	927	+
	928	+ cCheckBox toggleTextureCB;
	929	+ cCheckBox toggleSwitchCB;
	930	+
776	931	JComboBox texresMenu;
	932	+
777	933	JButton resetButton;
778	934	JButton stepButton;
779	935	JButton stepAllButton;
..	..	@@ -782,9 +938,13 @@
782	938	JButton fasterButton;
783	939	JButton remarkButton;
784	940
	941	+ cGridBag editPanel;
	942	+ cGridBag editCommandsPanel;
	943	+
785	944	cGridBag namePanel;
786	945	cGridBag setupPanel;
787		- cGridBag commandsPanel;
	946	+ cGridBag setupPanel2;
	947	+ cGridBag objectCommandsPanel;
788	948	cGridBag pushPanel;
789	949	cGridBag fillPanel;
790	950
..	..	@@ -951,10 +1111,6 @@
951	1111
952	1112	void SetupUI2(ObjEditor oe)
953	1113	{
954		-// oe.aConstraints.weightx = 0;
955		-// oe.aConstraints.weighty = 0;
956		-// oe.aConstraints.gridx = 0;
957		-// oe.aConstraints.gridy = 0;
958	1114	//SetupName(oe);
959	1115
960	1116	namePanel = new cGridBag();
..	..	@@ -965,38 +1121,62 @@
965	1121
966	1122	oe.ctrlPanel.Return();
967	1123
968		- if (!GroupEditor.allparams)
	1124	+ if (!allparams)
969	1125	return;
970	1126
971	1127	setupPanel = new cGridBag().setVertical(false);
972	1128
973	1129	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
974		- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
975		- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1130	+ liveCB.setToolTipText("Animate object");
	1131	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1132	+ selectCB.setToolTipText("Make object selectable");
976	1133	// Return();
	1134	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1135	+ hideCB.setToolTipText("Hide object");
977	1136	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
978		- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
979		- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	1137	+ markCB.setToolTipText("As animation target transform");
	1138	+
	1139	+ setupPanel2 = new cGridBag().setVertical(false);
	1140	+
	1141	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1142	+ rewindCB.setToolTipText("Rewind animation");
	1143	+
	1144	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1145	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
980	1146
	1147	+ if (Globals.ADVANCED)
	1148	+ {
	1149	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1150	+ link2masterCB.setToolTipText("Attach to support");
	1151	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1152	+ speedupCB.setToolTipText("Option motion capture");
	1153	+ }
	1154	+
981	1155	oe.ctrlPanel.add(setupPanel);
982	1156	oe.ctrlPanel.Return();
	1157	+ oe.ctrlPanel.add(setupPanel2);
	1158	+ oe.ctrlPanel.Return();
983	1159
984		- commandsPanel = new cGridBag().setVertical(false);
	1160	+ objectCommandsPanel = new cGridBag().setVertical(false);
985	1161
986		- resetButton = AddButton(commandsPanel, "Reset");
987		- stepButton = AddButton(commandsPanel, "Step");
	1162	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1163	+ resetButton.setToolTipText("Jump to frame zero");
	1164	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1165	+ stepButton.setToolTipText("Step one frame");
988	1166	// resetAllButton = AddButton(oe, "Reset All");
989	1167	// stepAllButton = AddButton(oe, "Step All");
990		- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
991	1168	// Return();
992		- slowerButton = AddButton(commandsPanel, "Slow");
993		- fasterButton = AddButton(commandsPanel, "Fast");
994		- remarkButton = AddButton(commandsPanel, "Remark");
	1169	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1170	+ slowerButton.setToolTipText("Decrease animation speed");
	1171	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1172	+ fasterButton.setToolTipText("Increase animation speed");
	1173	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1174	+ remarkButton.setToolTipText("Set the current transform as the target");
995	1175
996		- oe.ctrlPanel.add(commandsPanel);
	1176	+ oe.ctrlPanel.add(objectCommandsPanel);
997	1177	oe.ctrlPanel.Return();
998	1178
999		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1179	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1000	1180	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1001	1181	//Return();
1002	1182
..	..	@@ -1199,8 +1379,11 @@
1199	1379	//worldPanel.setName("World");
1200	1380	centralPanel = new cGridBag();
1201	1381	centralPanel.preferredWidth = 20;
1202		- timelinePanel = new JPanel(new BorderLayout());
1203		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1382	+
	1383	+ if (Globals.ADVANCED)
	1384	+ {
	1385	+ timelinePanel = new JPanel(new BorderLayout());
	1386	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1204	1387
1205	1388	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1206	1389	cameraPanel.setContinuousLayout(true);
..	..	@@ -1209,7 +1392,10 @@
1209	1392	// cameraPanel.setDividerSize(9);
1210	1393	cameraPanel.setResizeWeight(1.0);
1211	1394
	1395	+ }
	1396	+
1212	1397	centralPanel.add(cameraView);
	1398	+ centralPanel.setFocusable(true);
1213	1399	//frame.setJMenuBar(timelineMenubar);
1214	1400	//centralPanel.add(timelinePanel);
1215	1401
..	..	@@ -1276,8 +1462,9 @@
1276	1462	// north.setName("Edit");
1277	1463	// north.add(ctrlPanel, BorderLayout.NORTH);
1278	1464	// objectPanel.add(north);
1279		- objectPanel.add(ctrlPanel);
	1465	+ objectPanel.add(editPanel);
1280	1466	objectPanel.add(infoPanel);
	1467	+ objectPanel.add(toolboxPanel);
1281	1468
1282	1469	/*
1283	1470	aConstraints.gridx = 0;
..	..	@@ -1286,7 +1473,7 @@
1286	1473	aConstraints.gridy += 1;
1287	1474	aConstraints.gridwidth = 1;
1288	1475	mainPanel.add(objectPanel, aConstraints);
1289		- */
	1476	+ */
1290	1477
1291	1478	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1292	1479	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1298,14 +1485,12 @@
1298	1485	scrollpane.addMouseWheelListener(this); // Default not fast enough
1299	1486
1300	1487	/JTabbedPane/ scenePanel = new cGridBag();
1301		- scenePanel.preferredWidth = 7;
	1488	+ scenePanel.preferredWidth = 6;
1302	1489
1303	1490	JTabbedPane tabbedPane = new JTabbedPane();
1304	1491	tabbedPane.add(scrollpane);
1305	1492
1306		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1307		-
1308		- optionsPanel = new cGridBag().setVertical(true);
	1493	+ optionsPanel = new cGridBag().setVertical(false);
1309	1494
1310	1495	optionsPanel.setName("Options");
1311	1496
..	..	@@ -1313,6 +1498,8 @@
1313	1498
1314	1499	tabbedPane.add(optionsPanel);
1315	1500
	1501	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1502	+
1316	1503	scenePanel.add(tabbedPane);
1317	1504
1318	1505	/*
..	..	@@ -1404,9 +1591,13 @@
1404	1591
1405	1592	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1406	1593
1407		- frame.setSize(1024, 768);
1408		- frame.show();
	1594	+ frame.setSize(1280, 860);
	1595	+
	1596	+ frame.validate();
	1597	+ frame.setVisible(true);
1409	1598
	1599	+ cameraView.requestFocusInWindow();
	1600	+
1410	1601	gridPanel.setDividerLocation(1.0);
1411	1602
1412	1603	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1444,19 +1635,22 @@
1444	1635
1445	1636	cGridBag editBar = new cGridBag().setVertical(false);
1446	1637
1447		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1638	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1448	1639	createMaterialButton.setToolTipText("Create material");
1449	1640
1450	1641	/*
1451	1642	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1452	1643	*/
1453	1644
1454		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1645	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1455	1646	clearMaterialButton.setToolTipText("Clear material");
1456	1647
1457		- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1458		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1459		- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1648	+ if (Globals.ADVANCED)
	1649	+ {
	1650	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1651	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1652	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1653	+ }
1460	1654
1461	1655	editBar.preferredHeight = 15;
1462	1656
..	..	@@ -1725,12 +1919,15 @@
1725	1919	opacityPowerField.addChangeListener(this);
1726	1920	/**/
1727	1921
1728		- resetSlidersButton.addActionListener(this);
1729	1922	clearMaterialButton.addActionListener(this);
1730	1923	createMaterialButton.addActionListener(this);
1731		-
1732		- propagateToggle.addItemListener(this);
1733		- multiplyToggle.addItemListener(this);
	1924	+
	1925	+ if (Globals.ADVANCED)
	1926	+ {
	1927	+ resetSlidersButton.addActionListener(this);
	1928	+ propagateToggle.addItemListener(this);
	1929	+ multiplyToggle.addItemListener(this);
	1930	+ }
1734	1931	}
1735	1932
1736	1933	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1901,7 +2098,7 @@
1901	2098
1902	2099	//? flashIt = false;
1903	2100	CameraPane pane = (CameraPane) cameraView;
1904		- pane.clickStart(location.x, location.y, 0);
	2101	+ pane.clickStart(location.x, location.y, 0, 0);
1905	2102	pane.clickEnd(location.x, location.y, 0, true);
1906	2103
1907	2104	if (group.selection.size() == 1)
..	..	@@ -1950,6 +2147,7 @@
1950	2147	e2.printStackTrace();
1951	2148	}
1952	2149	}
	2150	+
1953	2151	LoadJMEThread loadThread;
1954	2152
1955	2153	class LoadJMEThread extends Thread
..	..	@@ -2007,6 +2205,7 @@
2007	2205	//LoadFile0(filename, converter);
2008	2206	}
2009	2207	}
	2208	+
2010	2209	LoadOBJThread loadObjThread;
2011	2210
2012	2211	class LoadOBJThread extends Thread
..	..	@@ -2085,19 +2284,19 @@
2085	2284
2086	2285	void LoadObjFile(String fullname)
2087	2286	{
2088		- /*
	2287	+ System.out.println("Loading " + fullname);
	2288	+ /**/
2089	2289	//lastFilename = fullname;
2090	2290	if(loadObjThread == null)
2091	2291	{
2092		- loadObjThread = new LoadOBJThread();
2093		- loadObjThread.start();
	2292	+ loadObjThread = new LoadOBJThread();
	2293	+ loadObjThread.start();
2094	2294	}
2095	2295
2096	2296	loadObjThread.add(fullname);
2097		- */
	2297	+ /**/
2098	2298
2099		- System.out.println("Loading " + fullname);
2100		- makeSomething(new FileObject(fullname, true), true);
	2299	+ //makeSomething(new FileObject(fullname, true), true);
2101	2300	}
2102	2301
2103	2302	void LoadGFDFile(String fullname)
..	..	@@ -2358,11 +2557,11 @@
2358	2557
2359	2558	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2360	2559	{
2361		- if (GrafreeD.standAlone)
	2560	+ if (Grafreed.standAlone)
2362	2561	{
2363	2562	/**/
2364	2563	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2365		- browser.show();
	2564	+ browser.setVisible(true);
2366	2565	String filename = browser.getFile();
2367	2566	if (filename != null && filename.length() > 0)
2368	2567	{
..	..	@@ -2714,6 +2913,8 @@
2714	2913
2715	2914	void SetMaterial(Object3D object)
2716	2915	{
	2916	+ latestObject = object;
	2917	+
2717	2918	cMaterial mat = object.material;
2718	2919
2719	2920	if (mat == null)
..	..	@@ -2722,7 +2923,8 @@
2722	2923	return;
2723	2924	}
2724	2925
2725		- multiplyToggle.setSelected(mat.multiply);
	2926	+ if (multiplyToggle != null)
	2927	+ multiplyToggle.setSelected(mat.multiply);
2726	2928
2727	2929	assert (object.projectedVertices != null);
2728	2930
..	..	@@ -2824,12 +3026,17 @@
2824	3026	// }
2825	3027
2826	3028	/**/
2827		- if (deselect)
	3029	+ if (deselect \|\| child == null)
2828	3030	{
2829	3031	//group.deselectAll();
2830	3032	//freeze = true;
2831	3033	GetTree().clearSelection();
2832	3034	//freeze = false;
	3035	+
	3036	+ if (child == null)
	3037	+ {
	3038	+ return;
	3039	+ }
2833	3040	}
2834	3041
2835	3042	//group.addSelectee(child);
..	..	@@ -2898,7 +3105,7 @@
2898	3105	cameraView.ToggleDL();
2899	3106	cameraView.repaint();
2900	3107	return;
2901		- } else if (event.getSource() == toggleTextureItem)
	3108	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2902	3109	{
2903	3110	cameraView.ToggleTexture();
2904	3111	// june 2013 copy.HardTouch();
..	..	@@ -2937,9 +3144,9 @@
2937	3144	frame.validate();
2938	3145
2939	3146	return;
2940		- } else if (event.getSource() == toggleRandomItem)
	3147	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2941	3148	{
2942		- cameraView.ToggleRandom();
	3149	+ cameraView.ToggleSwitch();
2943	3150	cameraView.repaint();
2944	3151	return;
2945	3152	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2968,6 +3175,10 @@
2968	3175	{
2969	3176	copy.live ^= true;
2970	3177	return;
	3178	+ } else if (event.getSource() == selectCB)
	3179	+ {
	3180	+ copy.dontselect ^= true;
	3181	+ return;
2971	3182	} else if (event.getSource() == hideCB)
2972	3183	{
2973	3184	copy.hide ^= true;
..	..	@@ -2982,6 +3193,7 @@
2982	3193	if (event.getSource() == randomCB)
2983	3194	{
2984	3195	copy.random ^= true;
	3196	+ objEditor.refreshContents();
2985	3197	return;
2986	3198	}
2987	3199	if (event.getSource() == speedupCB)
..	..	@@ -3005,8 +3217,9 @@
3005	3217
3006	3218	public void actionPerformed(ActionEvent event)
3007	3219	{
	3220	+ Object source = event.getSource();
3008	3221	// SCRIPT DIALOG
3009		- if (event.getSource() == okbutton)
	3222	+ if (source == okbutton)
3010	3223	{
3011	3224	textpanel.setVisible(false);
3012	3225	textpanel.remove(textarea);
..	..	@@ -3018,7 +3231,7 @@
3018	3231	textarea = null;
3019	3232	textpanel = null;
3020	3233	}
3021		- if (event.getSource() == cancelbutton)
	3234	+ if (source == cancelbutton)
3022	3235	{
3023	3236	textpanel.setVisible(false);
3024	3237	textpanel.remove(textarea);
..	..	@@ -3030,50 +3243,50 @@
3030	3243	//applySelf();
3031	3244	//client.refreshEditWindow();
3032	3245	//refreshContents();
3033		- if (event.getSource() == nameField)
	3246	+ if (source == nameField)
3034	3247	{
3035	3248	//System.out.println("ObjEditor " + event);
3036	3249	applySelf0(true);
3037	3250	//parent.applySelf();
3038	3251	objEditor.refreshContents();
3039		- } else if (event.getSource() == resetButton)
	3252	+ } else if (source == resetButton)
3040	3253	{
3041	3254	CameraPane.fullreset = true;
3042	3255	copy.Reset(); // ResetMeshes();
3043	3256	copy.Touch();
3044	3257	objEditor.refreshContents();
3045		- } else if (event.getSource() == stepItem)
	3258	+ } else if (source == stepItem)
3046	3259	{
3047	3260	//cameraView.ONESTEP = true;
3048	3261	Globals.ONESTEP = true;
3049	3262	cameraView.repaint();
3050	3263	return;
3051		- } else if (event.getSource() == stepButton)
	3264	+ } else if (source == stepButton)
3052	3265	{
3053	3266	copy.Step();
3054	3267	copy.Touch();
3055	3268	objEditor.refreshContents();
3056		- } else if (event.getSource() == slowerButton)
	3269	+ } else if (source == slowerButton)
3057	3270	{
3058	3271	copy.Slower();
3059	3272	copy.Touch();
3060	3273	objEditor.refreshContents();
3061		- } else if (event.getSource() == fasterButton)
	3274	+ } else if (source == fasterButton)
3062	3275	{
3063	3276	copy.Faster();
3064	3277	copy.Touch();
3065	3278	objEditor.refreshContents();
3066		- } else if (event.getSource() == remarkButton)
	3279	+ } else if (source == remarkButton)
3067	3280	{
3068	3281	copy.Remark();
3069	3282	copy.Touch();
3070	3283	objEditor.refreshContents();
3071		- } else if (event.getSource() == stepAllButton)
	3284	+ } else if (source == stepAllButton)
3072	3285	{
3073	3286	copy.StepAll();
3074	3287	copy.Touch();
3075	3288	objEditor.refreshContents();
3076		- } else if (event.getSource() == resetAllButton)
	3289	+ } else if (source == resetAllButton)
3077	3290	{
3078	3291	//CameraPane.fullreset = true;
3079	3292	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3106,53 +3319,75 @@
3106	3319	// Close();
3107	3320	// }
3108	3321	// else
3109		- if (event.getSource() == resetSlidersButton)
	3322	+ if (source == resetSlidersButton)
3110	3323	{
3111	3324	ResetSliders();
3112		- } else if (event.getSource() == clearMaterialButton)
	3325	+ } else if (source == clearMaterialButton)
3113	3326	{
3114	3327	ClearMaterial();
3115		- } else if (event.getSource() == createMaterialButton)
	3328	+ } else if (source == createMaterialButton)
3116	3329	{
3117	3330	CreateMaterial();
3118		- } else if (event.getSource() == clearPanelButton)
	3331	+ } else if (source == clearPanelButton)
3119	3332	{
3120	3333	copy.ClearUI();
3121	3334	refreshContents(true);
3122		- } /*
3123		- }
3124		-
3125		- public boolean action(Event event, Object arg)
3126		- {
3127		- */ else if (event.getSource() == closeItem)
	3335	+ } else if (source == importGFDItem)
	3336	+ {
	3337	+ ImportGFD();
	3338	+ } else
	3339	+ if (source == importVRMLX3DItem)
	3340	+ {
	3341	+ ImportVRMLX3D();
	3342	+ } else
	3343	+ if (source == import3DSItem)
	3344	+ {
	3345	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3346	+ } else
	3347	+ if (source == importOBJItem)
	3348	+ {
	3349	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3350	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3351	+ browser.setVisible(true);
	3352	+ String filename = browser.getFile();
	3353	+ if (filename != null && filename.length() > 0)
	3354	+ {
	3355	+ String fullname = browser.getDirectory() + filename;
	3356	+ makeSomething(ReadOBJ(fullname), true);
	3357	+ }
	3358	+ } else
	3359	+ if (source == closeItem)
3128	3360	{
3129	3361	Close();
3130	3362	//return true;
3131		- } else if (event.getSource() == loadItem)
	3363	+ } else if (source == loadItem)
3132	3364	{
3133	3365	load();
3134	3366	//return true;
3135		- } else if (event.getSource() == saveItem)
	3367	+ } else if (source == newItem)
	3368	+ {
	3369	+ New();
	3370	+ } else if (source == saveItem)
3136	3371	{
3137	3372	save();
3138	3373	//return true;
3139		- } else if (event.getSource() == saveAsItem)
	3374	+ } else if (source == saveAsItem)
3140	3375	{
3141	3376	saveAs();
3142	3377	//return true;
3143		- } else if (event.getSource() == reexportItem)
	3378	+ } else if (source == reexportItem)
3144	3379	{
3145	3380	reexport();
3146	3381	//return true;
3147		- } else if (event.getSource() == exportAsItem)
	3382	+ } else if (source == exportAsItem)
3148	3383	{
3149	3384	export();
3150	3385	//return true;
3151		- } else if (event.getSource() == povItem)
	3386	+ } else if (source == povItem)
3152	3387	{
3153	3388	generatePOV();
3154	3389	//return true;
3155		- } else if (event.getSource() == zBufferItem)
	3390	+ } else if (source == zBufferItem)
3156	3391	{
3157	3392	try
3158	3393	{
..	..	@@ -3174,21 +3409,8 @@
3174	3409	cameraView.repaint();
3175	3410	//return true;
3176	3411	}
3177		- */ else if (event.getSource() == editCameraItem)
3178		- {
3179		- cameraView.ProtectCamera();
3180		- cameraView.repaint();
3181		- return;
3182		- } else if (event.getSource() == revertCameraItem)
3183		- {
3184		- cameraView.RevertCamera();
3185		- cameraView.repaint();
3186		- return;
3187		-// } else if (event.getSource() == textureButton)
3188		-// {
3189		-// return; // true;
3190		- } else // combos...
3191		- if (event.getSource() == texresMenu)
	3412	+ */ else // combos...
	3413	+ if (source == texresMenu)
3192	3414	{
3193	3415	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3194	3416	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3200,12 +3422,287 @@
3200	3422	}
3201	3423	}
3202	3424
	3425	+ void New()
	3426	+ {
	3427	+ while (copy.Size() > 1)
	3428	+ {
	3429	+ copy.remove(1);
	3430	+ }
	3431	+
	3432	+ ResetModel();
	3433	+ objEditor.refreshContents();
	3434	+ }
	3435	+
	3436	+ static public byte[] Compress(Object3D o)
	3437	+ {
	3438	+ try
	3439	+ {
	3440	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3441	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3442	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3443	+
	3444	+ Object3D parent = o.parent;
	3445	+ o.parent = null;
	3446	+
	3447	+ out.writeObject(o);
	3448	+
	3449	+ o.parent = parent;
	3450	+
	3451	+ out.flush();
	3452	+
	3453	+ zstream.close();
	3454	+ out.close();
	3455	+
	3456	+ return baos.toByteArray();
	3457	+ } catch (Exception e)
	3458	+ {
	3459	+ System.err.println(e);
	3460	+ return null;
	3461	+ }
	3462	+ }
	3463	+
	3464	+ static public Object Uncompress(byte[] bytes)
	3465	+ {
	3466	+ System.out.println("#bytes = " + bytes.length);
	3467	+ try
	3468	+ {
	3469	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3470	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3471	+ ObjectInputStream in = new ObjectInputStream(istream);
	3472	+ Object obj = in.readObject();
	3473	+ in.close();
	3474	+
	3475	+ return obj;
	3476	+ } catch (Exception e)
	3477	+ {
	3478	+ System.err.println(e);
	3479	+ return null;
	3480	+ }
	3481	+ }
	3482	+
	3483	+ static public Object clone(Object o)
	3484	+ {
	3485	+ try
	3486	+ {
	3487	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3488	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3489	+
	3490	+ out.writeObject(o);
	3491	+
	3492	+ out.flush();
	3493	+ out.close();
	3494	+
	3495	+ byte[] bytes = baos.toByteArray();
	3496	+
	3497	+ System.out.println("clone = " + bytes.length);
	3498	+
	3499	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3500	+ ObjectInputStream in = new ObjectInputStream(bais);
	3501	+ Object obj = in.readObject();
	3502	+ in.close();
	3503	+
	3504	+ return obj;
	3505	+ } catch (Exception e)
	3506	+ {
	3507	+ System.err.println(e);
	3508	+ return null;
	3509	+ }
	3510	+ }
	3511	+
	3512	+ cRadio GetCurrentTab()
	3513	+ {
	3514	+ cRadio ab;
	3515	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3516	+ {
	3517	+ ab = (cRadio)e.nextElement();
	3518	+ if(ab.GetObject() == copy)
	3519	+ {
	3520	+ return ab;
	3521	+ }
	3522	+ }
	3523	+
	3524	+ return null;
	3525	+ }
	3526	+
	3527	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3528	+
	3529	+ public void Save()
	3530	+ {
	3531	+ System.err.println("Save");
	3532	+
	3533	+ cRadio tab = GetCurrentTab();
	3534	+
	3535	+ boolean temp = CameraPane.SWITCH;
	3536	+ CameraPane.SWITCH = false;
	3537	+
	3538	+ copy.ExtractBigData(hashtable);
	3539	+
	3540	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3541	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3542	+
	3543	+ copy.RestoreBigData(hashtable);
	3544	+
	3545	+ CameraPane.SWITCH = temp;
	3546	+
	3547	+ //assert(hashtable.isEmpty());
	3548	+
	3549	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3550	+ {
	3551	+ tab.graphs[i] = null;
	3552	+ }
	3553	+
	3554	+ SetUndoStates();
	3555	+
	3556	+ // test save
	3557	+ if (false)
	3558	+ {
	3559	+ try
	3560	+ {
	3561	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3562	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3563	+
	3564	+ p.writeObject(copy);
	3565	+
	3566	+ p.flush();
	3567	+
	3568	+ ostream.close();
	3569	+ } catch (Exception e)
	3570	+ {
	3571	+ e.printStackTrace();
	3572	+ }
	3573	+ }
	3574	+ }
	3575	+
	3576	+ void CopyChanged(Object3D obj)
	3577	+ {
	3578	+ SetUndoStates();
	3579	+
	3580	+ boolean temp = CameraPane.SWITCH;
	3581	+ CameraPane.SWITCH = false;
	3582	+
	3583	+ copy.ExtractBigData(hashtable);
	3584	+
	3585	+ copy.clear();
	3586	+
	3587	+ for (int i=0; i<obj.Size(); i++)
	3588	+ {
	3589	+ copy.add(obj.get(i));
	3590	+ }
	3591	+
	3592	+ copy.RestoreBigData(hashtable);
	3593	+
	3594	+ CameraPane.SWITCH = temp;
	3595	+
	3596	+ //assert(hashtable.isEmpty());
	3597	+
	3598	+ copy.Touch();
	3599	+
	3600	+ ResetModel();
	3601	+ copy.HardTouch(); // recompile?
	3602	+
	3603	+ cRadio ab;
	3604	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3605	+ {
	3606	+ ab = (cRadio)e.nextElement();
	3607	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3608	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3609	+ if (test != null)
	3610	+ {
	3611	+ test.editWindow = ab.object.editWindow;
	3612	+ ab.object = test;
	3613	+ }
	3614	+ }
	3615	+
	3616	+ refreshContents();
	3617	+ }
	3618	+
	3619	+ cButton undoButton;
	3620	+ cButton redoButton;
	3621	+
	3622	+ void SetUndoStates()
	3623	+ {
	3624	+ cRadio tab = GetCurrentTab();
	3625	+
	3626	+ undoButton.setEnabled(tab.undoindex > 0);
	3627	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3628	+ }
	3629	+
	3630	+ public void Undo()
	3631	+ {
	3632	+ System.err.println("Undo");
	3633	+
	3634	+ cRadio tab = GetCurrentTab();
	3635	+
	3636	+ if (tab.undoindex == 0)
	3637	+ {
	3638	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3639	+ return;
	3640	+ }
	3641	+
	3642	+ if (tab.graphs[tab.undoindex] == null)
	3643	+ {
	3644	+ Save();
	3645	+ tab.undoindex -= 1;
	3646	+ }
	3647	+
	3648	+ tab.undoindex -= 1;
	3649	+
	3650	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3651	+ }
	3652	+
	3653	+ public void Redo()
	3654	+ {
	3655	+ cRadio tab = GetCurrentTab();
	3656	+
	3657	+ if (tab.graphs[tab.undoindex + 1] == null)
	3658	+ {
	3659	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3660	+ return;
	3661	+ }
	3662	+
	3663	+ tab.undoindex += 1;
	3664	+
	3665	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3666	+ }
	3667	+
	3668	+ void ImportGFD()
	3669	+ {
	3670	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3671	+ browser.show();
	3672	+ String filename = browser.getFile();
	3673	+ if (filename != null && filename.length() > 0)
	3674	+ {
	3675	+ String fullname = browser.getDirectory() + filename;
	3676	+
	3677	+ //Object3D readobj =
	3678	+ objEditor.ReadGFD(fullname, objEditor);
	3679	+ //makeSomething(readobj);
	3680	+ }
	3681	+ }
	3682	+
	3683	+ void ImportVRMLX3D()
	3684	+ {
	3685	+ if (Grafreed.standAlone)
	3686	+ {
	3687	+ /**/
	3688	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3689	+ browser.show();
	3690	+ String filename = browser.getFile();
	3691	+ if (filename != null && filename.length() > 0)
	3692	+ {
	3693	+ String fullname = browser.getDirectory() + filename;
	3694	+ LoadVRMLX3D(fullname);
	3695	+ }
	3696	+ /**/
	3697	+ }
	3698	+ }
	3699	+
3203	3700	void ToggleAnimation()
3204	3701	{
3205	3702	if (!Globals.ANIMATION)
3206	3703	{
3207	3704	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3208		- browser.show();
	3705	+ browser.setVisible(true);
3209	3706	String filename = browser.getFile();
3210	3707	if (filename != null && filename.length() > 0)
3211	3708	{
..	..	@@ -3215,8 +3712,8 @@
3215	3712
3216	3713	Globals.ANIMATION ^= true;
3217	3714
3218		- GrafreeD.wav.cursor = 0;
3219		- GrafreeD.wav.loop = 0;
	3715	+ Grafreed.wav.cursor = 0;
	3716	+ Grafreed.wav.loop = 0;
3220	3717	}
3221	3718	} else
3222	3719	{
..	..	@@ -3237,7 +3734,6 @@
3237	3734	callee.refreshContents();
3238	3735	} else
3239	3736	{
3240		- new Exception().printStackTrace();
3241	3737	System.exit(0);
3242	3738	}
3243	3739	}
..	..	@@ -3267,7 +3763,7 @@
3267	3763	void CreateMaterial()
3268	3764	{
3269	3765	//copy.ClearMaterial(); // PATCH
3270		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3766	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3271	3767	if (copy.selection.size() > 0)
3272	3768	//SetMaterial(copy);
3273	3769	{
..	..	@@ -3318,7 +3814,7 @@
3318	3814	assert false;
3319	3815	}
3320	3816
3321		- void EditSelection()
	3817	+ void EditSelection(boolean newWindow)
3322	3818	{
3323	3819	}
3324	3820
..	..	@@ -3326,11 +3822,11 @@
3326	3822	{
3327	3823	copy.ResetBlockLoop(); // temporary problem
3328	3824
3329		- boolean random = CameraPane.RANDOM;
3330		- CameraPane.RANDOM = false; // parse everything
	3825	+ boolean random = CameraPane.SWITCH;
	3826	+ CameraPane.SWITCH = false; // parse everything
3331	3827	copy.ResetDisplayList();
3332	3828	copy.HardTouch();
3333		- CameraPane.RANDOM = random;
	3829	+ CameraPane.SWITCH = random;
3334	3830	}
3335	3831
3336	3832	// public void applySelf()
..	..	@@ -3404,6 +3900,36 @@
3404	3900	{
3405	3901	//System.out.println("Propagate = " + propagate);
3406	3902	copy.UpdateMaterial(anchor, current, propagate);
	3903	+
	3904	+ if (copy.material != null)
	3905	+ {
	3906	+ cMaterial mat = copy.material;
	3907	+
	3908	+ colorField.SetToolTipValue((mat.color));
	3909	+ modulationField.SetToolTipValue((mat.modulation));
	3910	+ metalnessField.SetToolTipValue((mat.metalness));
	3911	+ diffuseField.SetToolTipValue((mat.diffuse));
	3912	+ specularField.SetToolTipValue((mat.specular));
	3913	+ shininessField.SetToolTipValue((mat.shininess));
	3914	+ shiftField.SetToolTipValue((mat.shift));
	3915	+ ambientField.SetToolTipValue((mat.ambient));
	3916	+ lightareaField.SetToolTipValue((mat.lightarea));
	3917	+ diffusenessField.SetToolTipValue((mat.factor));
	3918	+ velvetField.SetToolTipValue((mat.velvet));
	3919	+ sheenField.SetToolTipValue((mat.sheen));
	3920	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3921	+ backlitField.SetToolTipValue((mat.bump));
	3922	+ anisoField.SetToolTipValue((mat.aniso));
	3923	+ anisoVField.SetToolTipValue((mat.anisoV));
	3924	+ cameraField.SetToolTipValue((mat.cameralight));
	3925	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3926	+ shadowField.SetToolTipValue((mat.shadow));
	3927	+ textureField.SetToolTipValue((mat.texture));
	3928	+ opacityField.SetToolTipValue((mat.opacity));
	3929	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3930	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3931	+ }
	3932	+
3407	3933	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3408	3934	{
3409	3935	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3519,7 +4045,7 @@
3519	4045	}
3520	4046
3521	4047	if (normalpushField != null)
3522		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4048	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3523	4049	}
3524	4050
3525	4051	void SnapObject()
..	..	@@ -3783,6 +4309,8 @@
3783	4309
3784	4310	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3785	4311	{
	4312	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4313	+ Save();
3786	4314	//Tween.set(thing, 0).target(1).start(tweenManager);
3787	4315	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3788	4316	// if (thing instanceof GenericJointDemo)
..	..	@@ -3869,6 +4397,12 @@
3869	4397	{
3870	4398	ResetModel();
3871	4399	Select(thing.GetTreePath(), true, false); // unselect... false);
	4400	+
	4401	+ if (thing.Size() == 0)
	4402	+ {
	4403	+ //EditSelection(false);
	4404	+ }
	4405	+
3872	4406	refreshContents();
3873	4407	}
3874	4408
..	..	@@ -3986,6 +4520,7 @@
3986	4520	}
3987	4521	}
3988	4522	}
	4523	+
3989	4524	LoadGFDThread loadGFDThread;
3990	4525
3991	4526	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4005,8 +4540,10 @@
4005	4540
4006	4541	try
4007	4542	{
	4543	+ // Try compressed version first.
4008	4544	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4009		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4545	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4546	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4010	4547
4011	4548	readobj = (Object3D) p.readObject();
4012	4549	istream.close();
..	..	@@ -4014,7 +4551,20 @@
4014	4551	readobj.ResetDisplayList();
4015	4552	} catch (Exception e)
4016	4553	{
4017		- e.printStackTrace();
	4554	+ //e.printStackTrace();
	4555	+ try
	4556	+ {
	4557	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4558	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4559	+
	4560	+ readobj = (Object3D) p.readObject();
	4561	+ istream.close();
	4562	+
	4563	+ readobj.ResetDisplayList();
	4564	+ } catch (Exception e2)
	4565	+ {
	4566	+ e2.printStackTrace();
	4567	+ }
4018	4568	}
4019	4569	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4020	4570	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4060,6 +4610,12 @@
4060	4610
4061	4611	void LoadIt(Object obj)
4062	4612	{
	4613	+ if (obj == null)
	4614	+ {
	4615	+ // Invalid file
	4616	+ return;
	4617	+ }
	4618	+
4063	4619	System.out.println("Loaded " + obj);
4064	4620	//new Exception().printStackTrace();
4065	4621	Object3D readobj = (Object3D) obj;
..	..	@@ -4069,6 +4625,8 @@
4069	4625
4070	4626	if (readobj != null)
4071	4627	{
	4628	+ if (Globals.SAVEONMAKE)
	4629	+ Save();
4072	4630	try
4073	4631	{
4074	4632	//readobj.deepCopySelf(copy);
..	..	@@ -4131,7 +4689,7 @@
4131	4689
4132	4690	void load() // throws ClassNotFoundException
4133	4691	{
4134		- if (GrafreeD.standAlone)
	4692	+ if (Grafreed.standAlone)
4135	4693	{
4136	4694	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4137	4695	browser.show();
..	..	@@ -4218,11 +4776,13 @@
4218	4776	try
4219	4777	{
4220	4778	FileOutputStream ostream = new FileOutputStream(lastname);
4221		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4779	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4780	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4222	4781
4223	4782	p.writeObject(copy);
4224	4783	p.flush();
4225	4784
	4785	+ zstream.close();
4226	4786	ostream.close();
4227	4787
4228	4788	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4232,17 +4792,20 @@
4232	4792	{
4233	4793	}
4234	4794	}
	4795	+
4235	4796	String lastname;
4236	4797
4237	4798	void saveAs()
4238	4799	{
4239		- if (GrafreeD.standAlone)
	4800	+ if (Grafreed.standAlone)
4240	4801	{
4241	4802	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4242	4803	browser.setVisible(true);
4243	4804	String filename = browser.getFile();
4244	4805	if (filename != null && filename.length() > 0)
4245	4806	{
	4807	+ if (!filename.endsWith(".gfd"))
	4808	+ filename += ".gfd";
4246	4809	lastname = browser.getDirectory() + filename;
4247	4810	save();
4248	4811	}
..	..	@@ -4341,13 +4904,13 @@
4341	4904	try
4342	4905	{
4343	4906	FileOutputStream ostream = new FileOutputStream(filename);
4344		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4345		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4907	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4908	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4346	4909
4347	4910	Object3D objectparent = obj.parent;
4348	4911	obj.parent = null;
4349	4912
4350		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4913	+ Object3D object = (Object3D) Grafreed.clone(obj);
4351	4914
4352	4915	obj.parent = objectparent;
4353	4916
..	..	@@ -4359,8 +4922,8 @@
4359	4922	p.writeObject(object);
4360	4923	p.flush();
4361	4924
	4925	+ zstream.close();
4362	4926	ostream.close();
4363		- // zstream.close();
4364	4927
4365	4928	// group.selection.get(0).parent = parent;
4366	4929	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4381,7 +4944,7 @@
4381	4944	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4382	4945	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4383	4946	copy.generatePOV(buffer);
4384		- if (GrafreeD.standAlone)
	4947	+ if (Grafreed.standAlone)
4385	4948	{
4386	4949	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4387	4950	browser.show();
..	..	@@ -4407,7 +4970,8 @@
4407	4970	Object3D client;
4408	4971	Object3D copy;
4409	4972	MenuBar menuBar;
4410		- Menu windowMenu;
	4973	+ Menu fileMenu;
	4974	+ MenuItem newItem;
4411	4975	MenuItem loadItem;
4412	4976	MenuItem saveItem;
4413	4977	MenuItem saveAsItem;
..	..	@@ -4415,11 +4979,9 @@
4415	4979	MenuItem reexportItem;
4416	4980	MenuItem povItem;
4417	4981	MenuItem closeItem;
4418		- Menu cameraMenu;
	4982	+
4419	4983	CheckboxMenuItem zBufferItem;
4420	4984	//MenuItem normalLensItem;
4421		- MenuItem editCameraItem;
4422		- MenuItem revertCameraItem;
4423	4985	MenuItem stepItem;
4424	4986	CheckboxMenuItem toggleLiveItem;
4425	4987	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4430,25 +4992,38 @@
4430	4992	CheckboxMenuItem toggleFootContactItem;
4431	4993	CheckboxMenuItem toggleDLItem;
4432	4994	CheckboxMenuItem toggleTextureItem;
4433		- CheckboxMenuItem toggleRandomItem;
	4995	+ CheckboxMenuItem toggleSwitchItem;
4434	4996	CheckboxMenuItem toggleRootItem;
4435	4997	CheckboxMenuItem animationItem;
4436	4998	CheckboxMenuItem toggleHandleItem;
4437	4999	CheckboxMenuItem togglePaintItem;
4438	5000	JSplitPane mainPanel;
4439	5001	JScrollPane scrollpane;
	5002	+
4440	5003	JPanel toolbarPanel;
	5004	+
4441	5005	cGridBag treePanel;
	5006	+
4442	5007	JPanel radioPanel;
4443	5008	ButtonGroup buttonGroup;
4444		- cGridBag ctrlPanel;
	5009	+
	5010	+ cGridBag toolboxPanel;
4445	5011	cGridBag materialPanel;
	5012	+ cGridBag ctrlPanel;
	5013	+
4446	5014	JScrollPane infoPanel;
	5015	+
4447	5016	cGridBag optionsPanel;
	5017	+
4448	5018	JTabbedPane objectPanel;
	5019	+ boolean materialFlushed;
	5020	+ Object3D latestObject;
	5021	+
4449	5022	cGridBag XYZPanel;
	5023	+
4450	5024	JSplitPane gridPanel;
4451	5025	JSplitPane bigPanel;
	5026	+
4452	5027	cGridBag bigThree;
4453	5028	cGridBag scenePanel;
4454	5029	cGridBag centralPanel;
..	..	@@ -4563,8 +5138,13 @@
4563	5138	cNumberSlider fogField;
4564	5139	JLabel opacityPowerLabel;
4565	5140	cNumberSlider opacityPowerField;
4566		- JTree jTree;
	5141	+ cTree jTree;
4567	5142	//ObjectUI parent;
4568	5143
4569	5144	cNumberSlider normalpushField;
	5145	+
	5146	+ private MenuItem importGFDItem;
	5147	+ private MenuItem importVRMLX3DItem;
	5148	+ private MenuItem import3DSItem;
	5149	+ private MenuItem importOBJItem;
4570	5150	}