~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.*;
..	..	@@ -35,6 +36,67 @@
35	36
36	37	GroupEditor callee;
37	38	JFrame frame;
	39	+
	40	+ static ObjEditor theFrame;
	41	+
	42	+ cButton GetButton(String name, boolean border)
	43	+ {
	44	+ try
	45	+ {
	46	+ ImageIcon icon = GetIcon(name);
	47	+ return new cButton(icon, border);
	48	+ }
	49	+ catch (Exception e)
	50	+ {
	51	+ return new cButton(name, border);
	52	+ }
	53	+ }
	54	+
	55	+ cToggleButton GetToggleButton(String name, boolean border)
	56	+ {
	57	+ try
	58	+ {
	59	+ ImageIcon icon = GetIcon(name);
	60	+ return new cToggleButton(icon, border);
	61	+ }
	62	+ catch (Exception e)
	63	+ {
	64	+ return new cToggleButton(name, border);
	65	+ }
	66	+ }
	67	+
	68	+ cCheckBox GetCheckBox(String name, boolean border)
	69	+ {
	70	+ try
	71	+ {
	72	+ ImageIcon icon = GetIcon(name);
	73	+ return new cCheckBox(icon, border);
	74	+ }
	75	+ catch (Exception e)
	76	+ {
	77	+ return new cCheckBox(name, border);
	78	+ }
	79	+ }
	80	+
	81	+ private ImageIcon GetIcon(String name) throws IOException
	82	+ {
	83	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	84	+
	85	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	86	+ {
	87	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	88	+ Graphics2D g = resized.createGraphics();
	89	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	90	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	91	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	92	+ g.dispose();
	93	+
	94	+ image = resized;
	95	+ }
	96	+
	97	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	98	+ return icon;
	99	+ }
38	100
39	101	// SCRIPT
40	102
..	..	@@ -143,6 +205,8 @@
143	205	//nameField.removeActionListener(this);
144	206	// objEditor.ctrlPanel.remove(nameField);
145	207
	208	+ objEditor.ctrlPanel.remove(namePanel);
	209	+
146	210	if (!GroupEditor.allparams)
147	211	return;
148	212
..	..	@@ -165,9 +229,9 @@
165	229	// objEditor.ctrlPanel.remove(fasterButton);
166	230	// objEditor.ctrlPanel.remove(remarkButton);
167	231
168		- objEditor.ctrlPanel.remove(namePanel);
169	232	objEditor.ctrlPanel.remove(setupPanel);
170		- objEditor.ctrlPanel.remove(commandsPanel);
	233	+ objEditor.ctrlPanel.remove(setupPanel2);
	234	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
171	235	objEditor.ctrlPanel.remove(pushPanel);
172	236	//objEditor.ctrlPanel.remove(fillPanel);
173	237
..	..	@@ -242,6 +306,7 @@
242	306	//localCopy.parent = null;
243	307
244	308	frame = new JFrame();
	309	+ frame.setUndecorated(true);
245	310	objEditor = this;
246	311	this.callee = callee;
247	312
..	..	@@ -275,24 +340,40 @@
275	340	void SetupMenu()
276	341	{
277	342	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..."));
	343	+ menuBar.add(fileMenu = new Menu("File"));
	344	+ fileMenu.add(newItem = new MenuItem("New"));
	345	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	346	+
	347	+ //oe.menuBar.add(menu = new Menu("Include"));
	348	+ Menu menu = new Menu("Import");
	349	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	350	+ importOBJItem.addActionListener(this);
	351	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	352	+ import3DSItem.addActionListener(this);
	353	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	354	+ importVRMLX3DItem.addActionListener(this);
	355	+ menu.add("-");
	356	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	357	+ importGFDItem.addActionListener(this);
	358	+ fileMenu.add(menu);
	359	+ fileMenu.add("-");
	360	+
	361	+ fileMenu.add(saveItem = new MenuItem("Save"));
	362	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
283	363	//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("-");
	364	+ fileMenu.add("-");
	365	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	366	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	367	+ fileMenu.add("-");
288	368	if (client.parent != null)
289	369	{
290		- windowMenu.add(closeItem = new MenuItem("Close"));
	370	+ fileMenu.add(closeItem = new MenuItem("Close"));
291	371	} else
292	372	{
293		- windowMenu.add(closeItem = new MenuItem("Exit"));
	373	+ fileMenu.add(closeItem = new MenuItem("Exit"));
294	374	}
295	375
	376	+ newItem.addActionListener(this);
296	377	loadItem.addActionListener(this);
297	378	saveItem.addActionListener(this);
298	379	saveAsItem.addActionListener(this);
..	..	@@ -301,70 +382,48 @@
301	382	//povItem.addActionListener(this);
302	383	closeItem.addActionListener(this);
303	384
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	385	objectPanel = new JTabbedPane();
	386	+
	387	+ ChangeListener changeListener = new ChangeListener()
	388	+ {
	389	+ public void stateChanged(ChangeEvent changeEvent)
	390	+ {
	391	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	392	+// {
	393	+// if (latestObject != null)
	394	+// {
	395	+// refreshContents(true);
	396	+// SetMaterial(latestObject);
	397	+// }
	398	+//
	399	+// materialFlushed = true;
	400	+// }
	401	+
	402	+ refreshContents(false); // To refresh Info tab
	403	+ }
	404	+ };
	405	+ objectPanel.addChangeListener(changeListener);
	406	+
360	407	toolbarPanel = new JPanel();
361	408	toolbarPanel.setName("Toolbar");
362	409	treePanel = new cGridBag();
363	410	treePanel.setName("Tree");
	411	+
	412	+ editPanel = new cGridBag().setVertical(true);
	413	+ editPanel.setName("Edit");
	414	+
364	415	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
365		- ctrlPanel.setName("Edit");
	416	+
	417	+ editCommandsPanel = new cGridBag();
	418	+ editPanel.add(editCommandsPanel);
	419	+ editPanel.add(ctrlPanel);
	420	+
	421	+ toolboxPanel = new cGridBag().setVertical(false);
	422	+ toolboxPanel.setName("Toolbox");
	423	+
366	424	materialPanel = new cGridBag().setVertical(true);
367	425	materialPanel.setName("Material");
	426	+
368	427	/JTextPane/
369	428	infoarea = createTextPane();
370	429	doc = infoarea.getStyledDocument();
..	..	@@ -457,10 +516,10 @@
457	516	e.printStackTrace();
458	517	}
459	518
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();
	519	+// String selection = infoarea.getText();
	520	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	521	+// java.awt.datatransfer.Clipboard clipboard =
	522	+// Toolkit.getDefaultToolkit().getSystemClipboard();
464	523	//clipboard.setContents(data, data);
465	524	}
466	525
..	..	@@ -483,13 +542,13 @@
483	542	//SendInfo("Name:", "bold");
484	543	if (sel.GetTextures() != null \|\| debug)
485	544	{
486		- si.SendInfo(sel.toString(), "bold");
	545	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
487	546	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
488	547	if (sel.Size() > 0)
489	548	{
490	549	si.SendInfo("#children = " + sel.Size(), "regular");
491	550	}
492		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	551	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
493	552	if (debug)
494	553	{
495	554	try
..	..	@@ -531,7 +590,7 @@
531	590	}
532	591	if (sel.support != null)
533	592	{
534		- si.SendInfo(" support: " + sel.support, "regular");
	593	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
535	594	}
536	595	if (sel.scriptnode != null)
537	596	{
..	..	@@ -620,20 +679,92 @@
620	679	}
621	680	}
622	681
	682	+static GraphicsDevice device = GraphicsEnvironment
	683	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	684	+
	685	+ Rectangle keeprect;
	686	+ cRadio radio;
	687	+
	688	+cButton keepButton;
	689	+ cButton twoButton; // Full 3D
	690	+ cButton sixButton;
	691	+ cButton threeButton;
	692	+ cButton sevenButton;
	693	+ cButton fourButton; // full panel
	694	+ cButton oneButton; // full XYZ
	695	+ //cButton currentLayout;
	696	+
	697	+ boolean maximized;
	698	+
	699	+ cButton fullscreenLayout;
	700	+
	701	+ void Minimize()
	702	+ {
	703	+ frame.setState(Frame.ICONIFIED);
	704	+ }
	705	+
	706	+ void Maximize()
	707	+ {
	708	+ if (maximized)
	709	+ {
	710	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	711	+ }
	712	+ else
	713	+ {
	714	+ keeprect = frame.getBounds();
	715	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	716	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	717	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	718	+// frame.setState(Frame.MAXIMIZED_BOTH);
	719	+ }
	720	+
	721	+ maximized ^= true;
	722	+ }
	723	+
623	724	void ToggleFullScreen()
624	725	{
625		- if (CameraPane.FULLSCREEN)
	726	+ cameraView.ToggleFullScreen();
	727	+
	728	+ if (!CameraPane.FULLSCREEN)
626	729	{
627		- frame.getContentPane().remove(/"Center",/bigThree);
628		- framePanel.add(bigThree);
629		- frame.getContentPane().add(/"Center",/framePanel);
	730	+ device.setFullScreenWindow(null);
	731	+ //frame.setVisible(false);
	732	+// frame.removeNotify();
	733	+// frame.setUndecorated(false);
	734	+// frame.addNotify();
	735	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	736	+
	737	+// X frame.getContentPane().remove(/"Center",/bigThree);
	738	+// X framePanel.add(bigThree);
	739	+// X frame.getContentPane().add(/"Center",/framePanel);
	740	+ framePanel.setDividerLocation(1);
	741	+
	742	+ //frame.setVisible(true);
	743	+ radio.layout = keepButton;
	744	+ //theFrame = null;
	745	+ keepButton = null;
	746	+ radio.layout.doClick();
	747	+
630	748	} else
631	749	{
632		- frame.getContentPane().remove(/"Center",/framePanel);
633		- framePanel.remove(bigThree);
634		- frame.getContentPane().add(/"Center",/bigThree);
	750	+ keepButton = radio.layout;
	751	+ //keeprect = frame.getBounds();
	752	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	753	+// frame.getToolkit().getScreenSize().height);
	754	+ //frame.setVisible(false);
	755	+ device.setFullScreenWindow(frame);
	756	+// frame.removeNotify();
	757	+// frame.setUndecorated(true);
	758	+// frame.addNotify();
	759	+// X frame.getContentPane().remove(/"Center",/framePanel);
	760	+// X framePanel.remove(bigThree);
	761	+// X frame.getContentPane().add(/"Center",/bigThree);
	762	+ framePanel.setDividerLocation(0);
	763	+
	764	+ radio.layout = fullscreenLayout;
	765	+ radio.layout.doClick();
	766	+ //frame.setVisible(true);
635	767	}
636		- cameraView.ToggleFullScreen();
637	768	}
638	769
639	770	private JTextPane createTextPane()
..	..	@@ -734,7 +865,7 @@
734	865	protected static ImageIcon createImageIcon(String path,
735	866	String description)
736	867	{
737		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	868	+ java.net.URL imgURL = Grafreed.class.getResource(path);
738	869	if (imgURL != null)
739	870	{
740	871	return new ImageIcon(imgURL, description);
..	..	@@ -766,6 +897,7 @@
766	897	// NumberSlider vDivsField;
767	898	// JCheckBox endcaps;
768	899	JCheckBox liveCB;
	900	+ JCheckBox selectCB;
769	901	JCheckBox hideCB;
770	902	JCheckBox link2masterCB;
771	903	JCheckBox markCB;
..	..	@@ -773,7 +905,12 @@
773	905	JCheckBox speedupCB;
774	906	JCheckBox rewindCB;
775	907	JCheckBox flipVCB;
	908	+
	909	+ cCheckBox toggleTextureCB;
	910	+ cCheckBox toggleSwitchCB;
	911	+
776	912	JComboBox texresMenu;
	913	+
777	914	JButton resetButton;
778	915	JButton stepButton;
779	916	JButton stepAllButton;
..	..	@@ -782,9 +919,13 @@
782	919	JButton fasterButton;
783	920	JButton remarkButton;
784	921
	922	+ cGridBag editPanel;
	923	+ cGridBag editCommandsPanel;
	924	+
785	925	cGridBag namePanel;
786	926	cGridBag setupPanel;
787		- cGridBag commandsPanel;
	927	+ cGridBag setupPanel2;
	928	+ cGridBag objectCommandsPanel;
788	929	cGridBag pushPanel;
789	930	cGridBag fillPanel;
790	931
..	..	@@ -967,33 +1108,56 @@
967	1108	setupPanel = new cGridBag().setVertical(false);
968	1109
969	1110	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
970		- if (Globals.ADVANCED)
971		- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
972		- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1111	+ liveCB.setToolTipText("Animate object");
	1112	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1113	+ selectCB.setToolTipText("Make object selectable");
973	1114	// Return();
	1115	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1116	+ hideCB.setToolTipText("Hide object");
974	1117	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
975		- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
976		- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	1118	+ markCB.setToolTipText("Set the animation target transform");
	1119	+
	1120	+ setupPanel2 = new cGridBag().setVertical(false);
	1121	+
	1122	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1123	+ rewindCB.setToolTipText("Rewind animation");
	1124	+
	1125	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1126	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
977	1127
	1128	+ if (Globals.ADVANCED)
	1129	+ {
	1130	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1131	+ link2masterCB.setToolTipText("Attach to support");
	1132	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1133	+ speedupCB.setToolTipText("Option motion capture");
	1134	+ }
	1135	+
978	1136	oe.ctrlPanel.add(setupPanel);
979	1137	oe.ctrlPanel.Return();
	1138	+ oe.ctrlPanel.add(setupPanel2);
	1139	+ oe.ctrlPanel.Return();
980	1140
981		- commandsPanel = new cGridBag().setVertical(false);
	1141	+ objectCommandsPanel = new cGridBag().setVertical(false);
982	1142
983		- resetButton = AddButton(commandsPanel, "Reset");
984		- stepButton = AddButton(commandsPanel, "Step");
	1143	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1144	+ resetButton.setToolTipText("Jump to frame zero");
	1145	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1146	+ stepButton.setToolTipText("Step one frame");
985	1147	// resetAllButton = AddButton(oe, "Reset All");
986	1148	// stepAllButton = AddButton(oe, "Step All");
987		- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
988	1149	// Return();
989		- slowerButton = AddButton(commandsPanel, "Slow");
990		- fasterButton = AddButton(commandsPanel, "Fast");
991		- remarkButton = AddButton(commandsPanel, "Remark");
	1150	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1151	+ slowerButton.setToolTipText("Decrease animation speed");
	1152	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1153	+ fasterButton.setToolTipText("Increase animation speed");
	1154	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1155	+ remarkButton.setToolTipText("Set the current transform as the target");
992	1156
993		- oe.ctrlPanel.add(commandsPanel);
	1157	+ oe.ctrlPanel.add(objectCommandsPanel);
994	1158	oe.ctrlPanel.Return();
995	1159
996		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1160	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
997	1161	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
998	1162	//Return();
999	1163
..	..	@@ -1196,8 +1360,11 @@
1196	1360	//worldPanel.setName("World");
1197	1361	centralPanel = new cGridBag();
1198	1362	centralPanel.preferredWidth = 20;
1199		- timelinePanel = new JPanel(new BorderLayout());
1200		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1363	+
	1364	+ if (Globals.ADVANCED)
	1365	+ {
	1366	+ timelinePanel = new JPanel(new BorderLayout());
	1367	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1201	1368
1202	1369	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1203	1370	cameraPanel.setContinuousLayout(true);
..	..	@@ -1206,7 +1373,10 @@
1206	1373	// cameraPanel.setDividerSize(9);
1207	1374	cameraPanel.setResizeWeight(1.0);
1208	1375
	1376	+ }
	1377	+
1209	1378	centralPanel.add(cameraView);
	1379	+ centralPanel.setFocusable(true);
1210	1380	//frame.setJMenuBar(timelineMenubar);
1211	1381	//centralPanel.add(timelinePanel);
1212	1382
..	..	@@ -1269,11 +1439,12 @@
1269	1439	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1270	1440	//tmp.setName("Edit");
1271	1441	objectPanel.add(materialPanel);
	1442	+ objectPanel.add(toolboxPanel);
1272	1443	// JPanel north = new JPanel(new BorderLayout());
1273	1444	// north.setName("Edit");
1274	1445	// north.add(ctrlPanel, BorderLayout.NORTH);
1275	1446	// objectPanel.add(north);
1276		- objectPanel.add(ctrlPanel);
	1447	+ objectPanel.add(editPanel);
1277	1448	objectPanel.add(infoPanel);
1278	1449
1279	1450	/*
..	..	@@ -1295,14 +1466,12 @@
1295	1466	scrollpane.addMouseWheelListener(this); // Default not fast enough
1296	1467
1297	1468	/JTabbedPane/ scenePanel = new cGridBag();
1298		- scenePanel.preferredWidth = 7;
	1469	+ scenePanel.preferredWidth = 6;
1299	1470
1300	1471	JTabbedPane tabbedPane = new JTabbedPane();
1301	1472	tabbedPane.add(scrollpane);
1302	1473
1303		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1304		-
1305		- optionsPanel = new cGridBag().setVertical(true);
	1474	+ optionsPanel = new cGridBag().setVertical(false);
1306	1475
1307	1476	optionsPanel.setName("Options");
1308	1477
..	..	@@ -1310,6 +1479,8 @@
1310	1479
1311	1480	tabbedPane.add(optionsPanel);
1312	1481
	1482	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1483	+
1313	1484	scenePanel.add(tabbedPane);
1314	1485
1315	1486	/*
..	..	@@ -1401,9 +1572,13 @@
1401	1572
1402	1573	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1403	1574
1404		- frame.setSize(1024, 768);
1405		- frame.show();
	1575	+ frame.setSize(1280, 860);
	1576	+
	1577	+ frame.validate();
	1578	+ frame.setVisible(true);
1406	1579
	1580	+ cameraView.requestFocusInWindow();
	1581	+
1407	1582	gridPanel.setDividerLocation(1.0);
1408	1583
1409	1584	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1441,19 +1616,22 @@
1441	1616
1442	1617	cGridBag editBar = new cGridBag().setVertical(false);
1443	1618
1444		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1619	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1445	1620	createMaterialButton.setToolTipText("Create material");
1446	1621
1447	1622	/*
1448	1623	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1449	1624	*/
1450	1625
1451		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1626	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1452	1627	clearMaterialButton.setToolTipText("Clear material");
1453	1628
1454		- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1455		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1456		- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1629	+ if (Globals.ADVANCED)
	1630	+ {
	1631	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1632	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1633	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1634	+ }
1457	1635
1458	1636	editBar.preferredHeight = 15;
1459	1637
..	..	@@ -1722,12 +1900,15 @@
1722	1900	opacityPowerField.addChangeListener(this);
1723	1901	/**/
1724	1902
1725		- resetSlidersButton.addActionListener(this);
1726	1903	clearMaterialButton.addActionListener(this);
1727	1904	createMaterialButton.addActionListener(this);
1728		-
1729		- propagateToggle.addItemListener(this);
1730		- multiplyToggle.addItemListener(this);
	1905	+
	1906	+ if (Globals.ADVANCED)
	1907	+ {
	1908	+ resetSlidersButton.addActionListener(this);
	1909	+ propagateToggle.addItemListener(this);
	1910	+ multiplyToggle.addItemListener(this);
	1911	+ }
1731	1912	}
1732	1913
1733	1914	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1898,7 +2079,7 @@
1898	2079
1899	2080	//? flashIt = false;
1900	2081	CameraPane pane = (CameraPane) cameraView;
1901		- pane.clickStart(location.x, location.y, 0);
	2082	+ pane.clickStart(location.x, location.y, 0, 0);
1902	2083	pane.clickEnd(location.x, location.y, 0, true);
1903	2084
1904	2085	if (group.selection.size() == 1)
..	..	@@ -1947,6 +2128,7 @@
1947	2128	e2.printStackTrace();
1948	2129	}
1949	2130	}
	2131	+
1950	2132	LoadJMEThread loadThread;
1951	2133
1952	2134	class LoadJMEThread extends Thread
..	..	@@ -2004,6 +2186,7 @@
2004	2186	//LoadFile0(filename, converter);
2005	2187	}
2006	2188	}
	2189	+
2007	2190	LoadOBJThread loadObjThread;
2008	2191
2009	2192	class LoadOBJThread extends Thread
..	..	@@ -2082,19 +2265,19 @@
2082	2265
2083	2266	void LoadObjFile(String fullname)
2084	2267	{
2085		- /*
	2268	+ System.out.println("Loading " + fullname);
	2269	+ /**/
2086	2270	//lastFilename = fullname;
2087	2271	if(loadObjThread == null)
2088	2272	{
2089		- loadObjThread = new LoadOBJThread();
2090		- loadObjThread.start();
	2273	+ loadObjThread = new LoadOBJThread();
	2274	+ loadObjThread.start();
2091	2275	}
2092	2276
2093	2277	loadObjThread.add(fullname);
2094		- */
	2278	+ /**/
2095	2279
2096		- System.out.println("Loading " + fullname);
2097		- makeSomething(new FileObject(fullname, true), true);
	2280	+ //makeSomething(new FileObject(fullname, true), true);
2098	2281	}
2099	2282
2100	2283	void LoadGFDFile(String fullname)
..	..	@@ -2355,11 +2538,11 @@
2355	2538
2356	2539	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2357	2540	{
2358		- if (GrafreeD.standAlone)
	2541	+ if (Grafreed.standAlone)
2359	2542	{
2360	2543	/**/
2361	2544	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2362		- browser.show();
	2545	+ browser.setVisible(true);
2363	2546	String filename = browser.getFile();
2364	2547	if (filename != null && filename.length() > 0)
2365	2548	{
..	..	@@ -2711,6 +2894,8 @@
2711	2894
2712	2895	void SetMaterial(Object3D object)
2713	2896	{
	2897	+ latestObject = object;
	2898	+
2714	2899	cMaterial mat = object.material;
2715	2900
2716	2901	if (mat == null)
..	..	@@ -2719,7 +2904,8 @@
2719	2904	return;
2720	2905	}
2721	2906
2722		- multiplyToggle.setSelected(mat.multiply);
	2907	+ if (multiplyToggle != null)
	2908	+ multiplyToggle.setSelected(mat.multiply);
2723	2909
2724	2910	assert (object.projectedVertices != null);
2725	2911
..	..	@@ -2895,7 +3081,7 @@
2895	3081	cameraView.ToggleDL();
2896	3082	cameraView.repaint();
2897	3083	return;
2898		- } else if (event.getSource() == toggleTextureItem)
	3084	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2899	3085	{
2900	3086	cameraView.ToggleTexture();
2901	3087	// june 2013 copy.HardTouch();
..	..	@@ -2934,9 +3120,9 @@
2934	3120	frame.validate();
2935	3121
2936	3122	return;
2937		- } else if (event.getSource() == toggleRandomItem)
	3123	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2938	3124	{
2939		- cameraView.ToggleRandom();
	3125	+ cameraView.ToggleSwitch();
2940	3126	cameraView.repaint();
2941	3127	return;
2942	3128	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2965,6 +3151,10 @@
2965	3151	{
2966	3152	copy.live ^= true;
2967	3153	return;
	3154	+ } else if (event.getSource() == selectCB)
	3155	+ {
	3156	+ copy.dontselect ^= true;
	3157	+ return;
2968	3158	} else if (event.getSource() == hideCB)
2969	3159	{
2970	3160	copy.hide ^= true;
..	..	@@ -2979,6 +3169,7 @@
2979	3169	if (event.getSource() == randomCB)
2980	3170	{
2981	3171	copy.random ^= true;
	3172	+ objEditor.refreshContents();
2982	3173	return;
2983	3174	}
2984	3175	if (event.getSource() == speedupCB)
..	..	@@ -3002,8 +3193,9 @@
3002	3193
3003	3194	public void actionPerformed(ActionEvent event)
3004	3195	{
	3196	+ Object source = event.getSource();
3005	3197	// SCRIPT DIALOG
3006		- if (event.getSource() == okbutton)
	3198	+ if (source == okbutton)
3007	3199	{
3008	3200	textpanel.setVisible(false);
3009	3201	textpanel.remove(textarea);
..	..	@@ -3015,7 +3207,7 @@
3015	3207	textarea = null;
3016	3208	textpanel = null;
3017	3209	}
3018		- if (event.getSource() == cancelbutton)
	3210	+ if (source == cancelbutton)
3019	3211	{
3020	3212	textpanel.setVisible(false);
3021	3213	textpanel.remove(textarea);
..	..	@@ -3027,50 +3219,50 @@
3027	3219	//applySelf();
3028	3220	//client.refreshEditWindow();
3029	3221	//refreshContents();
3030		- if (event.getSource() == nameField)
	3222	+ if (source == nameField)
3031	3223	{
3032	3224	//System.out.println("ObjEditor " + event);
3033	3225	applySelf0(true);
3034	3226	//parent.applySelf();
3035	3227	objEditor.refreshContents();
3036		- } else if (event.getSource() == resetButton)
	3228	+ } else if (source == resetButton)
3037	3229	{
3038	3230	CameraPane.fullreset = true;
3039	3231	copy.Reset(); // ResetMeshes();
3040	3232	copy.Touch();
3041	3233	objEditor.refreshContents();
3042		- } else if (event.getSource() == stepItem)
	3234	+ } else if (source == stepItem)
3043	3235	{
3044	3236	//cameraView.ONESTEP = true;
3045	3237	Globals.ONESTEP = true;
3046	3238	cameraView.repaint();
3047	3239	return;
3048		- } else if (event.getSource() == stepButton)
	3240	+ } else if (source == stepButton)
3049	3241	{
3050	3242	copy.Step();
3051	3243	copy.Touch();
3052	3244	objEditor.refreshContents();
3053		- } else if (event.getSource() == slowerButton)
	3245	+ } else if (source == slowerButton)
3054	3246	{
3055	3247	copy.Slower();
3056	3248	copy.Touch();
3057	3249	objEditor.refreshContents();
3058		- } else if (event.getSource() == fasterButton)
	3250	+ } else if (source == fasterButton)
3059	3251	{
3060	3252	copy.Faster();
3061	3253	copy.Touch();
3062	3254	objEditor.refreshContents();
3063		- } else if (event.getSource() == remarkButton)
	3255	+ } else if (source == remarkButton)
3064	3256	{
3065	3257	copy.Remark();
3066	3258	copy.Touch();
3067	3259	objEditor.refreshContents();
3068		- } else if (event.getSource() == stepAllButton)
	3260	+ } else if (source == stepAllButton)
3069	3261	{
3070	3262	copy.StepAll();
3071	3263	copy.Touch();
3072	3264	objEditor.refreshContents();
3073		- } else if (event.getSource() == resetAllButton)
	3265	+ } else if (source == resetAllButton)
3074	3266	{
3075	3267	//CameraPane.fullreset = true;
3076	3268	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3103,53 +3295,75 @@
3103	3295	// Close();
3104	3296	// }
3105	3297	// else
3106		- if (event.getSource() == resetSlidersButton)
	3298	+ if (source == resetSlidersButton)
3107	3299	{
3108	3300	ResetSliders();
3109		- } else if (event.getSource() == clearMaterialButton)
	3301	+ } else if (source == clearMaterialButton)
3110	3302	{
3111	3303	ClearMaterial();
3112		- } else if (event.getSource() == createMaterialButton)
	3304	+ } else if (source == createMaterialButton)
3113	3305	{
3114	3306	CreateMaterial();
3115		- } else if (event.getSource() == clearPanelButton)
	3307	+ } else if (source == clearPanelButton)
3116	3308	{
3117	3309	copy.ClearUI();
3118	3310	refreshContents(true);
3119		- } /*
3120		- }
3121		-
3122		- public boolean action(Event event, Object arg)
3123		- {
3124		- */ else if (event.getSource() == closeItem)
	3311	+ } else if (source == importGFDItem)
	3312	+ {
	3313	+ ImportGFD();
	3314	+ } else
	3315	+ if (source == importVRMLX3DItem)
	3316	+ {
	3317	+ ImportVRMLX3D();
	3318	+ } else
	3319	+ if (source == import3DSItem)
	3320	+ {
	3321	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3322	+ } else
	3323	+ if (source == importOBJItem)
	3324	+ {
	3325	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3326	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3327	+ browser.setVisible(true);
	3328	+ String filename = browser.getFile();
	3329	+ if (filename != null && filename.length() > 0)
	3330	+ {
	3331	+ String fullname = browser.getDirectory() + filename;
	3332	+ makeSomething(ReadOBJ(fullname), true);
	3333	+ }
	3334	+ } else
	3335	+ if (source == closeItem)
3125	3336	{
3126	3337	Close();
3127	3338	//return true;
3128		- } else if (event.getSource() == loadItem)
	3339	+ } else if (source == loadItem)
3129	3340	{
3130	3341	load();
3131	3342	//return true;
3132		- } else if (event.getSource() == saveItem)
	3343	+ } else if (source == newItem)
	3344	+ {
	3345	+ New();
	3346	+ } else if (source == saveItem)
3133	3347	{
3134	3348	save();
3135	3349	//return true;
3136		- } else if (event.getSource() == saveAsItem)
	3350	+ } else if (source == saveAsItem)
3137	3351	{
3138	3352	saveAs();
3139	3353	//return true;
3140		- } else if (event.getSource() == reexportItem)
	3354	+ } else if (source == reexportItem)
3141	3355	{
3142	3356	reexport();
3143	3357	//return true;
3144		- } else if (event.getSource() == exportAsItem)
	3358	+ } else if (source == exportAsItem)
3145	3359	{
3146	3360	export();
3147	3361	//return true;
3148		- } else if (event.getSource() == povItem)
	3362	+ } else if (source == povItem)
3149	3363	{
3150	3364	generatePOV();
3151	3365	//return true;
3152		- } else if (event.getSource() == zBufferItem)
	3366	+ } else if (source == zBufferItem)
3153	3367	{
3154	3368	try
3155	3369	{
..	..	@@ -3171,21 +3385,8 @@
3171	3385	cameraView.repaint();
3172	3386	//return true;
3173	3387	}
3174		- */ else if (event.getSource() == editCameraItem)
3175		- {
3176		- cameraView.ProtectCamera();
3177		- cameraView.repaint();
3178		- return;
3179		- } else if (event.getSource() == revertCameraItem)
3180		- {
3181		- cameraView.RevertCamera();
3182		- cameraView.repaint();
3183		- return;
3184		-// } else if (event.getSource() == textureButton)
3185		-// {
3186		-// return; // true;
3187		- } else // combos...
3188		- if (event.getSource() == texresMenu)
	3388	+ */ else // combos...
	3389	+ if (source == texresMenu)
3189	3390	{
3190	3391	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3191	3392	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3197,6 +3398,266 @@
3197	3398	}
3198	3399	}
3199	3400
	3401	+ void New()
	3402	+ {
	3403	+ while (copy.Size() > 1)
	3404	+ {
	3405	+ copy.remove(1);
	3406	+ }
	3407	+
	3408	+ ResetModel();
	3409	+ objEditor.refreshContents();
	3410	+ }
	3411	+
	3412	+ static public byte[] Compress(Object3D o)
	3413	+ {
	3414	+ try
	3415	+ {
	3416	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3417	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3418	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3419	+
	3420	+ Object3D parent = o.parent;
	3421	+ o.parent = null;
	3422	+
	3423	+ out.writeObject(o);
	3424	+
	3425	+ o.parent = parent;
	3426	+
	3427	+ out.flush();
	3428	+
	3429	+ zstream.close();
	3430	+ out.close();
	3431	+
	3432	+ return baos.toByteArray();
	3433	+ } catch (Exception e)
	3434	+ {
	3435	+ System.err.println(e);
	3436	+ return null;
	3437	+ }
	3438	+ }
	3439	+
	3440	+ static public Object Uncompress(byte[] bytes)
	3441	+ {
	3442	+ System.out.println("#bytes = " + bytes.length);
	3443	+ try
	3444	+ {
	3445	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3446	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3447	+ ObjectInputStream in = new ObjectInputStream(istream);
	3448	+ Object obj = in.readObject();
	3449	+ in.close();
	3450	+
	3451	+ return obj;
	3452	+ } catch (Exception e)
	3453	+ {
	3454	+ System.err.println(e);
	3455	+ return null;
	3456	+ }
	3457	+ }
	3458	+
	3459	+ static public Object clone(Object o)
	3460	+ {
	3461	+ try
	3462	+ {
	3463	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3464	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3465	+
	3466	+ out.writeObject(o);
	3467	+
	3468	+ out.flush();
	3469	+ out.close();
	3470	+
	3471	+ byte[] bytes = baos.toByteArray();
	3472	+
	3473	+ System.out.println("clone = " + bytes.length);
	3474	+
	3475	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3476	+ ObjectInputStream in = new ObjectInputStream(bais);
	3477	+ Object obj = in.readObject();
	3478	+ in.close();
	3479	+
	3480	+ return obj;
	3481	+ } catch (Exception e)
	3482	+ {
	3483	+ System.err.println(e);
	3484	+ return null;
	3485	+ }
	3486	+ }
	3487	+
	3488	+ cRadio GetCurrentTab()
	3489	+ {
	3490	+ cRadio ab;
	3491	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3492	+ {
	3493	+ ab = (cRadio)e.nextElement();
	3494	+ if(ab.GetObject() == copy)
	3495	+ {
	3496	+ return ab;
	3497	+ }
	3498	+ }
	3499	+
	3500	+ return null;
	3501	+ }
	3502	+
	3503	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3504	+
	3505	+ public void Save()
	3506	+ {
	3507	+ System.err.println("Save");
	3508	+
	3509	+ cRadio tab = GetCurrentTab();
	3510	+
	3511	+ boolean temp = CameraPane.SWITCH;
	3512	+ CameraPane.SWITCH = false;
	3513	+
	3514	+ copy.ExtractBigData(hashtable);
	3515	+
	3516	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3517	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3518	+
	3519	+ copy.RestoreBigData(hashtable);
	3520	+
	3521	+ CameraPane.SWITCH = temp;
	3522	+
	3523	+ //assert(hashtable.isEmpty());
	3524	+
	3525	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3526	+ {
	3527	+ tab.graphs[i] = null;
	3528	+ }
	3529	+
	3530	+ // test save
	3531	+ if (false)
	3532	+ {
	3533	+ try
	3534	+ {
	3535	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3536	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3537	+
	3538	+ p.writeObject(copy);
	3539	+
	3540	+ p.flush();
	3541	+
	3542	+ ostream.close();
	3543	+ } catch (Exception e)
	3544	+ {
	3545	+ e.printStackTrace();
	3546	+ }
	3547	+ }
	3548	+ }
	3549	+
	3550	+ void CopyChanged(Object3D obj)
	3551	+ {
	3552	+ boolean temp = CameraPane.SWITCH;
	3553	+ CameraPane.SWITCH = false;
	3554	+
	3555	+ copy.ExtractBigData(hashtable);
	3556	+
	3557	+ copy.clear();
	3558	+
	3559	+ for (int i=0; i<obj.Size(); i++)
	3560	+ {
	3561	+ copy.add(obj.get(i));
	3562	+ }
	3563	+
	3564	+ copy.RestoreBigData(hashtable);
	3565	+
	3566	+ CameraPane.SWITCH = temp;
	3567	+
	3568	+ //assert(hashtable.isEmpty());
	3569	+
	3570	+ copy.Touch();
	3571	+
	3572	+ ResetModel();
	3573	+ copy.HardTouch(); // recompile?
	3574	+
	3575	+ cRadio ab;
	3576	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3577	+ {
	3578	+ ab = (cRadio)e.nextElement();
	3579	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3580	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3581	+ if (test != null)
	3582	+ {
	3583	+ test.editWindow = ab.object.editWindow;
	3584	+ ab.object = test;
	3585	+ }
	3586	+ }
	3587	+
	3588	+ refreshContents();
	3589	+ }
	3590	+
	3591	+ public void Undo()
	3592	+ {
	3593	+ System.err.println("Undo");
	3594	+
	3595	+ cRadio tab = GetCurrentTab();
	3596	+
	3597	+ if (tab.undoindex == 0)
	3598	+ {
	3599	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3600	+ return;
	3601	+ }
	3602	+
	3603	+ if (tab.graphs[tab.undoindex] == null)
	3604	+ {
	3605	+ Save();
	3606	+ tab.undoindex -= 1;
	3607	+ }
	3608	+
	3609	+ tab.undoindex -= 1;
	3610	+
	3611	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3612	+ }
	3613	+
	3614	+ public void Redo()
	3615	+ {
	3616	+ cRadio tab = GetCurrentTab();
	3617	+
	3618	+ if (tab.graphs[tab.undoindex + 1] == null)
	3619	+ {
	3620	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3621	+ return;
	3622	+ }
	3623	+
	3624	+ tab.undoindex += 1;
	3625	+
	3626	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3627	+ }
	3628	+
	3629	+ void ImportGFD()
	3630	+ {
	3631	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3632	+ browser.show();
	3633	+ String filename = browser.getFile();
	3634	+ if (filename != null && filename.length() > 0)
	3635	+ {
	3636	+ String fullname = browser.getDirectory() + filename;
	3637	+
	3638	+ //Object3D readobj =
	3639	+ objEditor.ReadGFD(fullname, objEditor);
	3640	+ //makeSomething(readobj);
	3641	+ }
	3642	+ }
	3643	+
	3644	+ void ImportVRMLX3D()
	3645	+ {
	3646	+ if (Grafreed.standAlone)
	3647	+ {
	3648	+ /**/
	3649	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3650	+ browser.show();
	3651	+ String filename = browser.getFile();
	3652	+ if (filename != null && filename.length() > 0)
	3653	+ {
	3654	+ String fullname = browser.getDirectory() + filename;
	3655	+ LoadVRMLX3D(fullname);
	3656	+ }
	3657	+ /**/
	3658	+ }
	3659	+ }
	3660	+
3200	3661	void ToggleAnimation()
3201	3662	{
3202	3663	if (!Globals.ANIMATION)
..	..	@@ -3212,8 +3673,8 @@
3212	3673
3213	3674	Globals.ANIMATION ^= true;
3214	3675
3215		- GrafreeD.wav.cursor = 0;
3216		- GrafreeD.wav.loop = 0;
	3676	+ Grafreed.wav.cursor = 0;
	3677	+ Grafreed.wav.loop = 0;
3217	3678	}
3218	3679	} else
3219	3680	{
..	..	@@ -3234,7 +3695,6 @@
3234	3695	callee.refreshContents();
3235	3696	} else
3236	3697	{
3237		- new Exception().printStackTrace();
3238	3698	System.exit(0);
3239	3699	}
3240	3700	}
..	..	@@ -3264,7 +3724,7 @@
3264	3724	void CreateMaterial()
3265	3725	{
3266	3726	//copy.ClearMaterial(); // PATCH
3267		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3727	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3268	3728	if (copy.selection.size() > 0)
3269	3729	//SetMaterial(copy);
3270	3730	{
..	..	@@ -3315,7 +3775,7 @@
3315	3775	assert false;
3316	3776	}
3317	3777
3318		- void EditSelection()
	3778	+ void EditSelection(boolean newWindow)
3319	3779	{
3320	3780	}
3321	3781
..	..	@@ -3323,11 +3783,11 @@
3323	3783	{
3324	3784	copy.ResetBlockLoop(); // temporary problem
3325	3785
3326		- boolean random = CameraPane.RANDOM;
3327		- CameraPane.RANDOM = false; // parse everything
	3786	+ boolean random = CameraPane.SWITCH;
	3787	+ CameraPane.SWITCH = false; // parse everything
3328	3788	copy.ResetDisplayList();
3329	3789	copy.HardTouch();
3330		- CameraPane.RANDOM = random;
	3790	+ CameraPane.SWITCH = random;
3331	3791	}
3332	3792
3333	3793	// public void applySelf()
..	..	@@ -3401,6 +3861,36 @@
3401	3861	{
3402	3862	//System.out.println("Propagate = " + propagate);
3403	3863	copy.UpdateMaterial(anchor, current, propagate);
	3864	+
	3865	+ if (copy.material != null)
	3866	+ {
	3867	+ cMaterial mat = copy.material;
	3868	+
	3869	+ colorField.SetToolTipValue((mat.color));
	3870	+ modulationField.SetToolTipValue((mat.modulation));
	3871	+ metalnessField.SetToolTipValue((mat.metalness));
	3872	+ diffuseField.SetToolTipValue((mat.diffuse));
	3873	+ specularField.SetToolTipValue((mat.specular));
	3874	+ shininessField.SetToolTipValue((mat.shininess));
	3875	+ shiftField.SetToolTipValue((mat.shift));
	3876	+ ambientField.SetToolTipValue((mat.ambient));
	3877	+ lightareaField.SetToolTipValue((mat.lightarea));
	3878	+ diffusenessField.SetToolTipValue((mat.factor));
	3879	+ velvetField.SetToolTipValue((mat.velvet));
	3880	+ sheenField.SetToolTipValue((mat.sheen));
	3881	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3882	+ backlitField.SetToolTipValue((mat.bump));
	3883	+ anisoField.SetToolTipValue((mat.aniso));
	3884	+ anisoVField.SetToolTipValue((mat.anisoV));
	3885	+ cameraField.SetToolTipValue((mat.cameralight));
	3886	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3887	+ shadowField.SetToolTipValue((mat.shadow));
	3888	+ textureField.SetToolTipValue((mat.texture));
	3889	+ opacityField.SetToolTipValue((mat.opacity));
	3890	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3891	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3892	+ }
	3893	+
3404	3894	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3405	3895	{
3406	3896	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3516,7 +4006,7 @@
3516	4006	}
3517	4007
3518	4008	if (normalpushField != null)
3519		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4009	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3520	4010	}
3521	4011
3522	4012	void SnapObject()
..	..	@@ -3780,6 +4270,8 @@
3780	4270
3781	4271	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3782	4272	{
	4273	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4274	+ Save();
3783	4275	//Tween.set(thing, 0).target(1).start(tweenManager);
3784	4276	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3785	4277	// if (thing instanceof GenericJointDemo)
..	..	@@ -3866,6 +4358,12 @@
3866	4358	{
3867	4359	ResetModel();
3868	4360	Select(thing.GetTreePath(), true, false); // unselect... false);
	4361	+
	4362	+ if (thing.Size() == 0)
	4363	+ {
	4364	+ //EditSelection(false);
	4365	+ }
	4366	+
3869	4367	refreshContents();
3870	4368	}
3871	4369
..	..	@@ -3983,6 +4481,7 @@
3983	4481	}
3984	4482	}
3985	4483	}
	4484	+
3986	4485	LoadGFDThread loadGFDThread;
3987	4486
3988	4487	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4002,8 +4501,10 @@
4002	4501
4003	4502	try
4004	4503	{
	4504	+ // Try compressed version first.
4005	4505	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4006		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4506	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4507	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4007	4508
4008	4509	readobj = (Object3D) p.readObject();
4009	4510	istream.close();
..	..	@@ -4011,7 +4512,20 @@
4011	4512	readobj.ResetDisplayList();
4012	4513	} catch (Exception e)
4013	4514	{
4014		- e.printStackTrace();
	4515	+ //e.printStackTrace();
	4516	+ try
	4517	+ {
	4518	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4519	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4520	+
	4521	+ readobj = (Object3D) p.readObject();
	4522	+ istream.close();
	4523	+
	4524	+ readobj.ResetDisplayList();
	4525	+ } catch (Exception e2)
	4526	+ {
	4527	+ e2.printStackTrace();
	4528	+ }
4015	4529	}
4016	4530	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4017	4531	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4057,6 +4571,12 @@
4057	4571
4058	4572	void LoadIt(Object obj)
4059	4573	{
	4574	+ if (obj == null)
	4575	+ {
	4576	+ // Invalid file
	4577	+ return;
	4578	+ }
	4579	+
4060	4580	System.out.println("Loaded " + obj);
4061	4581	//new Exception().printStackTrace();
4062	4582	Object3D readobj = (Object3D) obj;
..	..	@@ -4066,6 +4586,8 @@
4066	4586
4067	4587	if (readobj != null)
4068	4588	{
	4589	+ if (Globals.SAVEONMAKE)
	4590	+ Save();
4069	4591	try
4070	4592	{
4071	4593	//readobj.deepCopySelf(copy);
..	..	@@ -4128,7 +4650,7 @@
4128	4650
4129	4651	void load() // throws ClassNotFoundException
4130	4652	{
4131		- if (GrafreeD.standAlone)
	4653	+ if (Grafreed.standAlone)
4132	4654	{
4133	4655	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4134	4656	browser.show();
..	..	@@ -4215,11 +4737,13 @@
4215	4737	try
4216	4738	{
4217	4739	FileOutputStream ostream = new FileOutputStream(lastname);
4218		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4740	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4741	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4219	4742
4220	4743	p.writeObject(copy);
4221	4744	p.flush();
4222	4745
	4746	+ zstream.close();
4223	4747	ostream.close();
4224	4748
4225	4749	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4229,11 +4753,12 @@
4229	4753	{
4230	4754	}
4231	4755	}
	4756	+
4232	4757	String lastname;
4233	4758
4234	4759	void saveAs()
4235	4760	{
4236		- if (GrafreeD.standAlone)
	4761	+ if (Grafreed.standAlone)
4237	4762	{
4238	4763	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4239	4764	browser.setVisible(true);
..	..	@@ -4338,13 +4863,13 @@
4338	4863	try
4339	4864	{
4340	4865	FileOutputStream ostream = new FileOutputStream(filename);
4341		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4342		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4866	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4867	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4343	4868
4344	4869	Object3D objectparent = obj.parent;
4345	4870	obj.parent = null;
4346	4871
4347		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4872	+ Object3D object = (Object3D) Grafreed.clone(obj);
4348	4873
4349	4874	obj.parent = objectparent;
4350	4875
..	..	@@ -4356,8 +4881,8 @@
4356	4881	p.writeObject(object);
4357	4882	p.flush();
4358	4883
	4884	+ zstream.close();
4359	4885	ostream.close();
4360		- // zstream.close();
4361	4886
4362	4887	// group.selection.get(0).parent = parent;
4363	4888	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4378,7 +4903,7 @@
4378	4903	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4379	4904	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4380	4905	copy.generatePOV(buffer);
4381		- if (GrafreeD.standAlone)
	4906	+ if (Grafreed.standAlone)
4382	4907	{
4383	4908	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4384	4909	browser.show();
..	..	@@ -4404,7 +4929,8 @@
4404	4929	Object3D client;
4405	4930	Object3D copy;
4406	4931	MenuBar menuBar;
4407		- Menu windowMenu;
	4932	+ Menu fileMenu;
	4933	+ MenuItem newItem;
4408	4934	MenuItem loadItem;
4409	4935	MenuItem saveItem;
4410	4936	MenuItem saveAsItem;
..	..	@@ -4412,11 +4938,9 @@
4412	4938	MenuItem reexportItem;
4413	4939	MenuItem povItem;
4414	4940	MenuItem closeItem;
4415		- Menu cameraMenu;
	4941	+
4416	4942	CheckboxMenuItem zBufferItem;
4417	4943	//MenuItem normalLensItem;
4418		- MenuItem editCameraItem;
4419		- MenuItem revertCameraItem;
4420	4944	MenuItem stepItem;
4421	4945	CheckboxMenuItem toggleLiveItem;
4422	4946	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4427,25 +4951,38 @@
4427	4951	CheckboxMenuItem toggleFootContactItem;
4428	4952	CheckboxMenuItem toggleDLItem;
4429	4953	CheckboxMenuItem toggleTextureItem;
4430		- CheckboxMenuItem toggleRandomItem;
	4954	+ CheckboxMenuItem toggleSwitchItem;
4431	4955	CheckboxMenuItem toggleRootItem;
4432	4956	CheckboxMenuItem animationItem;
4433	4957	CheckboxMenuItem toggleHandleItem;
4434	4958	CheckboxMenuItem togglePaintItem;
4435	4959	JSplitPane mainPanel;
4436	4960	JScrollPane scrollpane;
	4961	+
4437	4962	JPanel toolbarPanel;
	4963	+
4438	4964	cGridBag treePanel;
	4965	+
4439	4966	JPanel radioPanel;
4440	4967	ButtonGroup buttonGroup;
4441		- cGridBag ctrlPanel;
	4968	+
	4969	+ cGridBag toolboxPanel;
4442	4970	cGridBag materialPanel;
	4971	+ cGridBag ctrlPanel;
	4972	+
4443	4973	JScrollPane infoPanel;
	4974	+
4444	4975	cGridBag optionsPanel;
	4976	+
4445	4977	JTabbedPane objectPanel;
	4978	+ boolean materialFlushed;
	4979	+ Object3D latestObject;
	4980	+
4446	4981	cGridBag XYZPanel;
	4982	+
4447	4983	JSplitPane gridPanel;
4448	4984	JSplitPane bigPanel;
	4985	+
4449	4986	cGridBag bigThree;
4450	4987	cGridBag scenePanel;
4451	4988	cGridBag centralPanel;
..	..	@@ -4560,8 +5097,13 @@
4560	5097	cNumberSlider fogField;
4561	5098	JLabel opacityPowerLabel;
4562	5099	cNumberSlider opacityPowerField;
4563		- JTree jTree;
	5100	+ cTree jTree;
4564	5101	//ObjectUI parent;
4565	5102
4566	5103	cNumberSlider normalpushField;
	5104	+
	5105	+ private MenuItem importGFDItem;
	5106	+ private MenuItem importVRMLX3DItem;
	5107	+ private MenuItem import3DSItem;
	5108	+ private MenuItem importOBJItem;
4567	5109	}