~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
..	..	@@ -145,7 +207,7 @@
145	207
146	208	objEditor.ctrlPanel.remove(namePanel);
147	209
148		- if (!GroupEditor.allparams)
	210	+ if (!allparams)
149	211	return;
150	212
151	213	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -168,7 +230,8 @@
168	230	// objEditor.ctrlPanel.remove(remarkButton);
169	231
170	232	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	233	+ objEditor.ctrlPanel.remove(setupPanel2);
	234	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	235	objEditor.ctrlPanel.remove(pushPanel);
173	236	//objEditor.ctrlPanel.remove(fillPanel);
174	237
..	..	@@ -243,6 +306,7 @@
243	306	//localCopy.parent = null;
244	307
245	308	frame = new JFrame();
	309	+ frame.setUndecorated(true);
246	310	objEditor = this;
247	311	this.callee = callee;
248	312
..	..	@@ -273,27 +337,48 @@
273	337	return frame.action(event, obj);
274	338	}
275	339
	340	+ // Cannot work without static
	341	+ static boolean allparams = true;
	342	+
	343	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	344	+
276	345	void SetupMenu()
277	346	{
278	347	frame.setMenuBar(menuBar = new MenuBar());
279		- menuBar.add(windowMenu = new Menu("File"));
280		- windowMenu.add(loadItem = new MenuItem("Load..."));
281		- windowMenu.add("-");
282		- windowMenu.add(saveItem = new MenuItem("Save"));
283		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	348	+ menuBar.add(fileMenu = new Menu("File"));
	349	+ fileMenu.add(newItem = new MenuItem("New"));
	350	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	351	+
	352	+ //oe.menuBar.add(menu = new Menu("Include"));
	353	+ Menu menu = new Menu("Import");
	354	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	355	+ importOBJItem.addActionListener(this);
	356	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	357	+ import3DSItem.addActionListener(this);
	358	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	359	+ importVRMLX3DItem.addActionListener(this);
	360	+ menu.add("-");
	361	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	362	+ importGFDItem.addActionListener(this);
	363	+ fileMenu.add(menu);
	364	+ fileMenu.add("-");
	365	+
	366	+ fileMenu.add(saveItem = new MenuItem("Save"));
	367	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284	368	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
285		- windowMenu.add("-");
286		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
287		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
288		- windowMenu.add("-");
	369	+ fileMenu.add("-");
	370	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	371	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	372	+ fileMenu.add("-");
289	373	if (client.parent != null)
290	374	{
291		- windowMenu.add(closeItem = new MenuItem("Close"));
	375	+ fileMenu.add(closeItem = new MenuItem("Close"));
292	376	} else
293	377	{
294		- windowMenu.add(closeItem = new MenuItem("Exit"));
	378	+ fileMenu.add(closeItem = new MenuItem("Exit"));
295	379	}
296	380
	381	+ newItem.addActionListener(this);
297	382	loadItem.addActionListener(this);
298	383	saveItem.addActionListener(this);
299	384	saveAsItem.addActionListener(this);
..	..	@@ -302,70 +387,53 @@
302	387	//povItem.addActionListener(this);
303	388	closeItem.addActionListener(this);
304	389
305		- menuBar.add(cameraMenu = new Menu("View"));
306		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
307		- //zBufferItem.addActionListener(this);
308		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
309		- //normalLensItem.addActionListener(this);
310		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
311		- revertCameraItem.addActionListener(this);
312		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
313		- toggleTimelineItem.addItemListener(this);
314		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
315		- toggleFullScreenItem.addItemListener(this);
316		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
317		- cameraMenu.add("-");
318		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
319		- toggleTextureItem.addItemListener(this);
320		- toggleTextureItem.setState(CameraPane.textureon);
321		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
322		- toggleLiveItem.addItemListener(this);
323		- toggleLiveItem.setState(Globals.isLIVE());
324		- cameraMenu.add(stepItem = new MenuItem("Step"));
325		- stepItem.addActionListener(this);
326		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
327		-// toggleDLItem.addItemListener(this);
328		-// toggleDLItem.setState(false);
329		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
330		- toggleRenderItem.addItemListener(this);
331		- toggleRenderItem.setState(!CameraPane.frozen);
332		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
333		- toggleDebugItem.addItemListener(this);
334		- toggleDebugItem.setState(CameraPane.DEBUG);
335		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
336		- toggleFrustumItem.addItemListener(this);
337		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
338		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
339		- toggleFootContactItem.addItemListener(this);
340		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
341		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
342		- toggleRandomItem.addItemListener(this);
343		- toggleRandomItem.setState(CameraPane.RANDOM);
344		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
345		- toggleHandleItem.addItemListener(this);
346		- toggleHandleItem.setState(CameraPane.HANDLES);
347		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
348		- togglePaintItem.addItemListener(this);
349		- togglePaintItem.setState(CameraPane.PAINTMODE);
350		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
351		-// toggleRootItem.addItemListener(this);
352		-// toggleRootItem.setState(false);
353		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
354		-// animationItem.addItemListener(this);
355		-// animationItem.setState(CameraPane.ANIMATION);
356		- cameraMenu.add("-");
357		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
358		- editCameraItem.addActionListener(this);
359		-
360	390	objectPanel = new JTabbedPane();
	391	+
	392	+ ChangeListener changeListener = new ChangeListener()
	393	+ {
	394	+ public void stateChanged(ChangeEvent changeEvent)
	395	+ {
	396	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	397	+// {
	398	+// if (latestObject != null)
	399	+// {
	400	+// refreshContents(true);
	401	+// SetMaterial(latestObject);
	402	+// }
	403	+//
	404	+// materialFlushed = true;
	405	+// }
	406	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	407	+// {
	408	+// if (listUI.size() == 0)
	409	+// EditSelection(false);
	410	+// }
	411	+
	412	+ refreshContents(false); // To refresh Info tab
	413	+ }
	414	+ };
	415	+ objectPanel.addChangeListener(changeListener);
	416	+
361	417	toolbarPanel = new JPanel();
362	418	toolbarPanel.setName("Toolbar");
363	419	treePanel = new cGridBag();
364	420	treePanel.setName("Tree");
	421	+
	422	+ editPanel = new cGridBag().setVertical(true);
	423	+ editPanel.setName("Edit");
	424	+
365	425	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
366		- ctrlPanel.setName("Edit");
	426	+
	427	+ editCommandsPanel = new cGridBag();
	428	+ editPanel.add(editCommandsPanel);
	429	+ editPanel.add(ctrlPanel);
	430	+
	431	+ toolboxPanel = new cGridBag().setVertical(false);
	432	+ toolboxPanel.setName("Toolbox");
	433	+
367	434	materialPanel = new cGridBag().setVertical(true);
368	435	materialPanel.setName("Material");
	436	+
369	437	/JTextPane/
370	438	infoarea = createTextPane();
371	439	doc = infoarea.getStyledDocument();
..	..	@@ -458,10 +526,10 @@
458	526	e.printStackTrace();
459	527	}
460	528
461		- String selection = infoarea.getText();
462		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
463		- java.awt.datatransfer.Clipboard clipboard =
464		- Toolkit.getDefaultToolkit().getSystemClipboard();
	529	+// String selection = infoarea.getText();
	530	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	531	+// java.awt.datatransfer.Clipboard clipboard =
	532	+// Toolkit.getDefaultToolkit().getSystemClipboard();
465	533	//clipboard.setContents(data, data);
466	534	}
467	535
..	..	@@ -484,13 +552,13 @@
484	552	//SendInfo("Name:", "bold");
485	553	if (sel.GetTextures() != null \|\| debug)
486	554	{
487		- si.SendInfo(sel.toString(), "bold");
	555	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
488	556	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
489	557	if (sel.Size() > 0)
490	558	{
491	559	si.SendInfo("#children = " + sel.Size(), "regular");
492	560	}
493		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	561	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
494	562	if (debug)
495	563	{
496	564	try
..	..	@@ -532,7 +600,7 @@
532	600	}
533	601	if (sel.support != null)
534	602	{
535		- si.SendInfo(" support: " + sel.support, "regular");
	603	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
536	604	}
537	605	if (sel.scriptnode != null)
538	606	{
..	..	@@ -621,20 +689,92 @@
621	689	}
622	690	}
623	691
	692	+static GraphicsDevice device = GraphicsEnvironment
	693	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	694	+
	695	+ Rectangle keeprect;
	696	+ cRadio radio;
	697	+
	698	+cButton keepButton;
	699	+ cButton twoButton; // Full 3D
	700	+ cButton sixButton;
	701	+ cButton threeButton;
	702	+ cButton sevenButton;
	703	+ cButton fourButton; // full panel
	704	+ cButton oneButton; // full XYZ
	705	+ //cButton currentLayout;
	706	+
	707	+ boolean maximized;
	708	+
	709	+ cButton fullscreenLayout;
	710	+
	711	+ void Minimize()
	712	+ {
	713	+ frame.setState(Frame.ICONIFIED);
	714	+ }
	715	+
	716	+ void Maximize()
	717	+ {
	718	+ if (maximized)
	719	+ {
	720	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	721	+ }
	722	+ else
	723	+ {
	724	+ keeprect = frame.getBounds();
	725	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	726	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	727	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	728	+// frame.setState(Frame.MAXIMIZED_BOTH);
	729	+ }
	730	+
	731	+ maximized ^= true;
	732	+ }
	733	+
624	734	void ToggleFullScreen()
625	735	{
626		- if (CameraPane.FULLSCREEN)
	736	+ cameraView.ToggleFullScreen();
	737	+
	738	+ if (!CameraPane.FULLSCREEN)
627	739	{
628		- frame.getContentPane().remove(/"Center",/bigThree);
629		- framePanel.add(bigThree);
630		- frame.getContentPane().add(/"Center",/framePanel);
	740	+ device.setFullScreenWindow(null);
	741	+ //frame.setVisible(false);
	742	+// frame.removeNotify();
	743	+// frame.setUndecorated(false);
	744	+// frame.addNotify();
	745	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	746	+
	747	+// X frame.getContentPane().remove(/"Center",/bigThree);
	748	+// X framePanel.add(bigThree);
	749	+// X frame.getContentPane().add(/"Center",/framePanel);
	750	+ framePanel.setDividerLocation(1);
	751	+
	752	+ //frame.setVisible(true);
	753	+ radio.layout = keepButton;
	754	+ //theFrame = null;
	755	+ keepButton = null;
	756	+ radio.layout.doClick();
	757	+
631	758	} else
632	759	{
633		- frame.getContentPane().remove(/"Center",/framePanel);
634		- framePanel.remove(bigThree);
635		- frame.getContentPane().add(/"Center",/bigThree);
	760	+ keepButton = radio.layout;
	761	+ //keeprect = frame.getBounds();
	762	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	763	+// frame.getToolkit().getScreenSize().height);
	764	+ //frame.setVisible(false);
	765	+ device.setFullScreenWindow(frame);
	766	+// frame.removeNotify();
	767	+// frame.setUndecorated(true);
	768	+// frame.addNotify();
	769	+// X frame.getContentPane().remove(/"Center",/framePanel);
	770	+// X framePanel.remove(bigThree);
	771	+// X frame.getContentPane().add(/"Center",/bigThree);
	772	+ framePanel.setDividerLocation(0);
	773	+
	774	+ radio.layout = fullscreenLayout;
	775	+ radio.layout.doClick();
	776	+ //frame.setVisible(true);
636	777	}
637		- cameraView.ToggleFullScreen();
638	778	}
639	779
640	780	private JTextPane createTextPane()
..	..	@@ -735,7 +875,7 @@
735	875	protected static ImageIcon createImageIcon(String path,
736	876	String description)
737	877	{
738		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	878	+ java.net.URL imgURL = Grafreed.class.getResource(path);
739	879	if (imgURL != null)
740	880	{
741	881	return new ImageIcon(imgURL, description);
..	..	@@ -767,6 +907,7 @@
767	907	// NumberSlider vDivsField;
768	908	// JCheckBox endcaps;
769	909	JCheckBox liveCB;
	910	+ JCheckBox selectCB;
770	911	JCheckBox hideCB;
771	912	JCheckBox link2masterCB;
772	913	JCheckBox markCB;
..	..	@@ -774,7 +915,12 @@
774	915	JCheckBox speedupCB;
775	916	JCheckBox rewindCB;
776	917	JCheckBox flipVCB;
	918	+
	919	+ cCheckBox toggleTextureCB;
	920	+ cCheckBox toggleSwitchCB;
	921	+
777	922	JComboBox texresMenu;
	923	+
778	924	JButton resetButton;
779	925	JButton stepButton;
780	926	JButton stepAllButton;
..	..	@@ -783,9 +929,13 @@
783	929	JButton fasterButton;
784	930	JButton remarkButton;
785	931
	932	+ cGridBag editPanel;
	933	+ cGridBag editCommandsPanel;
	934	+
786	935	cGridBag namePanel;
787	936	cGridBag setupPanel;
788		- cGridBag commandsPanel;
	937	+ cGridBag setupPanel2;
	938	+ cGridBag objectCommandsPanel;
789	939	cGridBag pushPanel;
790	940	cGridBag fillPanel;
791	941
..	..	@@ -962,56 +1112,62 @@
962	1112
963	1113	oe.ctrlPanel.Return();
964	1114
965		- if (!GroupEditor.allparams)
	1115	+ if (!allparams)
966	1116	return;
967	1117
968	1118	setupPanel = new cGridBag().setVertical(false);
969	1119
970	1120	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
971	1121	liveCB.setToolTipText("Animate object");
	1122	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1123	+ selectCB.setToolTipText("Make object selectable");
	1124	+// Return();
972	1125	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
973	1126	hideCB.setToolTipText("Hide object");
974		-// Return();
975	1127	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
976	1128	markCB.setToolTipText("Set the animation target transform");
977	1129
978		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1130	+ setupPanel2 = new cGridBag().setVertical(false);
	1131	+
	1132	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
979	1133	rewindCB.setToolTipText("Rewind animation");
980	1134
981		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
982		- randomCB.setToolTipText("Option for switch node");
	1135	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1136	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
983	1137
984	1138	if (Globals.ADVANCED)
985	1139	{
986		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	1140	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
987	1141	link2masterCB.setToolTipText("Attach to support");
988		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1142	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
989	1143	speedupCB.setToolTipText("Option motion capture");
990	1144	}
991	1145
992	1146	oe.ctrlPanel.add(setupPanel);
993	1147	oe.ctrlPanel.Return();
	1148	+ oe.ctrlPanel.add(setupPanel2);
	1149	+ oe.ctrlPanel.Return();
994	1150
995		- commandsPanel = new cGridBag().setVertical(false);
	1151	+ objectCommandsPanel = new cGridBag().setVertical(false);
996	1152
997		- resetButton = AddButton(commandsPanel, "Reset");
	1153	+ resetButton = AddButton(objectCommandsPanel, "Reset");
998	1154	resetButton.setToolTipText("Jump to frame zero");
999		- stepButton = AddButton(commandsPanel, "Step");
	1155	+ stepButton = AddButton(objectCommandsPanel, "Step");
1000	1156	stepButton.setToolTipText("Step one frame");
1001	1157	// resetAllButton = AddButton(oe, "Reset All");
1002	1158	// stepAllButton = AddButton(oe, "Step All");
1003	1159	// Return();
1004		- slowerButton = AddButton(commandsPanel, "Slow");
	1160	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1005	1161	slowerButton.setToolTipText("Decrease animation speed");
1006		- fasterButton = AddButton(commandsPanel, "Fast");
	1162	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1007	1163	fasterButton.setToolTipText("Increase animation speed");
1008		- remarkButton = AddButton(commandsPanel, "Remark");
	1164	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1009	1165	remarkButton.setToolTipText("Set the current transform as the target");
1010	1166
1011		- oe.ctrlPanel.add(commandsPanel);
	1167	+ oe.ctrlPanel.add(objectCommandsPanel);
1012	1168	oe.ctrlPanel.Return();
1013	1169
1014		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1170	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1015	1171	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1016	1172	//Return();
1017	1173
..	..	@@ -1214,8 +1370,11 @@
1214	1370	//worldPanel.setName("World");
1215	1371	centralPanel = new cGridBag();
1216	1372	centralPanel.preferredWidth = 20;
1217		- timelinePanel = new JPanel(new BorderLayout());
1218		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1373	+
	1374	+ if (Globals.ADVANCED)
	1375	+ {
	1376	+ timelinePanel = new JPanel(new BorderLayout());
	1377	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1219	1378
1220	1379	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1221	1380	cameraPanel.setContinuousLayout(true);
..	..	@@ -1224,7 +1383,10 @@
1224	1383	// cameraPanel.setDividerSize(9);
1225	1384	cameraPanel.setResizeWeight(1.0);
1226	1385
	1386	+ }
	1387	+
1227	1388	centralPanel.add(cameraView);
	1389	+ centralPanel.setFocusable(true);
1228	1390	//frame.setJMenuBar(timelineMenubar);
1229	1391	//centralPanel.add(timelinePanel);
1230	1392
..	..	@@ -1291,8 +1453,9 @@
1291	1453	// north.setName("Edit");
1292	1454	// north.add(ctrlPanel, BorderLayout.NORTH);
1293	1455	// objectPanel.add(north);
1294		- objectPanel.add(ctrlPanel);
	1456	+ objectPanel.add(editPanel);
1295	1457	objectPanel.add(infoPanel);
	1458	+ objectPanel.add(toolboxPanel);
1296	1459
1297	1460	/*
1298	1461	aConstraints.gridx = 0;
..	..	@@ -1301,7 +1464,7 @@
1301	1464	aConstraints.gridy += 1;
1302	1465	aConstraints.gridwidth = 1;
1303	1466	mainPanel.add(objectPanel, aConstraints);
1304		- */
	1467	+ */
1305	1468
1306	1469	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1307	1470	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1313,14 +1476,12 @@
1313	1476	scrollpane.addMouseWheelListener(this); // Default not fast enough
1314	1477
1315	1478	/JTabbedPane/ scenePanel = new cGridBag();
1316		- scenePanel.preferredWidth = 7;
	1479	+ scenePanel.preferredWidth = 6;
1317	1480
1318	1481	JTabbedPane tabbedPane = new JTabbedPane();
1319	1482	tabbedPane.add(scrollpane);
1320	1483
1321		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1322		-
1323		- optionsPanel = new cGridBag().setVertical(true);
	1484	+ optionsPanel = new cGridBag().setVertical(false);
1324	1485
1325	1486	optionsPanel.setName("Options");
1326	1487
..	..	@@ -1328,6 +1489,8 @@
1328	1489
1329	1490	tabbedPane.add(optionsPanel);
1330	1491
	1492	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1493	+
1331	1494	scenePanel.add(tabbedPane);
1332	1495
1333	1496	/*
..	..	@@ -1419,9 +1582,13 @@
1419	1582
1420	1583	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1421	1584
1422		- frame.setSize(1024, 768);
1423		- frame.show();
	1585	+ frame.setSize(1280, 860);
	1586	+
	1587	+ frame.validate();
	1588	+ frame.setVisible(true);
1424	1589
	1590	+ cameraView.requestFocusInWindow();
	1591	+
1425	1592	gridPanel.setDividerLocation(1.0);
1426	1593
1427	1594	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1459,19 +1626,22 @@
1459	1626
1460	1627	cGridBag editBar = new cGridBag().setVertical(false);
1461	1628
1462		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1629	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1463	1630	createMaterialButton.setToolTipText("Create material");
1464	1631
1465	1632	/*
1466	1633	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1467	1634	*/
1468	1635
1469		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1636	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1470	1637	clearMaterialButton.setToolTipText("Clear material");
1471	1638
1472		- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1473		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1474		- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1639	+ if (Globals.ADVANCED)
	1640	+ {
	1641	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1642	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1643	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1644	+ }
1475	1645
1476	1646	editBar.preferredHeight = 15;
1477	1647
..	..	@@ -1740,12 +1910,15 @@
1740	1910	opacityPowerField.addChangeListener(this);
1741	1911	/**/
1742	1912
1743		- resetSlidersButton.addActionListener(this);
1744	1913	clearMaterialButton.addActionListener(this);
1745	1914	createMaterialButton.addActionListener(this);
1746		-
1747		- propagateToggle.addItemListener(this);
1748		- multiplyToggle.addItemListener(this);
	1915	+
	1916	+ if (Globals.ADVANCED)
	1917	+ {
	1918	+ resetSlidersButton.addActionListener(this);
	1919	+ propagateToggle.addItemListener(this);
	1920	+ multiplyToggle.addItemListener(this);
	1921	+ }
1749	1922	}
1750	1923
1751	1924	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1916,7 +2089,7 @@
1916	2089
1917	2090	//? flashIt = false;
1918	2091	CameraPane pane = (CameraPane) cameraView;
1919		- pane.clickStart(location.x, location.y, 0);
	2092	+ pane.clickStart(location.x, location.y, 0, 0);
1920	2093	pane.clickEnd(location.x, location.y, 0, true);
1921	2094
1922	2095	if (group.selection.size() == 1)
..	..	@@ -1965,6 +2138,7 @@
1965	2138	e2.printStackTrace();
1966	2139	}
1967	2140	}
	2141	+
1968	2142	LoadJMEThread loadThread;
1969	2143
1970	2144	class LoadJMEThread extends Thread
..	..	@@ -2022,6 +2196,7 @@
2022	2196	//LoadFile0(filename, converter);
2023	2197	}
2024	2198	}
	2199	+
2025	2200	LoadOBJThread loadObjThread;
2026	2201
2027	2202	class LoadOBJThread extends Thread
..	..	@@ -2100,19 +2275,19 @@
2100	2275
2101	2276	void LoadObjFile(String fullname)
2102	2277	{
2103		- /*
	2278	+ System.out.println("Loading " + fullname);
	2279	+ /**/
2104	2280	//lastFilename = fullname;
2105	2281	if(loadObjThread == null)
2106	2282	{
2107		- loadObjThread = new LoadOBJThread();
2108		- loadObjThread.start();
	2283	+ loadObjThread = new LoadOBJThread();
	2284	+ loadObjThread.start();
2109	2285	}
2110	2286
2111	2287	loadObjThread.add(fullname);
2112		- */
	2288	+ /**/
2113	2289
2114		- System.out.println("Loading " + fullname);
2115		- makeSomething(new FileObject(fullname, true), true);
	2290	+ //makeSomething(new FileObject(fullname, true), true);
2116	2291	}
2117	2292
2118	2293	void LoadGFDFile(String fullname)
..	..	@@ -2373,11 +2548,11 @@
2373	2548
2374	2549	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2375	2550	{
2376		- if (GrafreeD.standAlone)
	2551	+ if (Grafreed.standAlone)
2377	2552	{
2378	2553	/**/
2379	2554	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2380		- browser.show();
	2555	+ browser.setVisible(true);
2381	2556	String filename = browser.getFile();
2382	2557	if (filename != null && filename.length() > 0)
2383	2558	{
..	..	@@ -2729,6 +2904,8 @@
2729	2904
2730	2905	void SetMaterial(Object3D object)
2731	2906	{
	2907	+ latestObject = object;
	2908	+
2732	2909	cMaterial mat = object.material;
2733	2910
2734	2911	if (mat == null)
..	..	@@ -2737,7 +2914,8 @@
2737	2914	return;
2738	2915	}
2739	2916
2740		- multiplyToggle.setSelected(mat.multiply);
	2917	+ if (multiplyToggle != null)
	2918	+ multiplyToggle.setSelected(mat.multiply);
2741	2919
2742	2920	assert (object.projectedVertices != null);
2743	2921
..	..	@@ -2913,7 +3091,7 @@
2913	3091	cameraView.ToggleDL();
2914	3092	cameraView.repaint();
2915	3093	return;
2916		- } else if (event.getSource() == toggleTextureItem)
	3094	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2917	3095	{
2918	3096	cameraView.ToggleTexture();
2919	3097	// june 2013 copy.HardTouch();
..	..	@@ -2952,9 +3130,9 @@
2952	3130	frame.validate();
2953	3131
2954	3132	return;
2955		- } else if (event.getSource() == toggleRandomItem)
	3133	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2956	3134	{
2957		- cameraView.ToggleRandom();
	3135	+ cameraView.ToggleSwitch();
2958	3136	cameraView.repaint();
2959	3137	return;
2960	3138	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2982,6 +3160,10 @@
2982	3160	} else if (event.getSource() == liveCB)
2983	3161	{
2984	3162	copy.live ^= true;
	3163	+ return;
	3164	+ } else if (event.getSource() == selectCB)
	3165	+ {
	3166	+ copy.dontselect ^= true;
2985	3167	return;
2986	3168	} else if (event.getSource() == hideCB)
2987	3169	{
..	..	@@ -3021,8 +3203,9 @@
3021	3203
3022	3204	public void actionPerformed(ActionEvent event)
3023	3205	{
	3206	+ Object source = event.getSource();
3024	3207	// SCRIPT DIALOG
3025		- if (event.getSource() == okbutton)
	3208	+ if (source == okbutton)
3026	3209	{
3027	3210	textpanel.setVisible(false);
3028	3211	textpanel.remove(textarea);
..	..	@@ -3034,7 +3217,7 @@
3034	3217	textarea = null;
3035	3218	textpanel = null;
3036	3219	}
3037		- if (event.getSource() == cancelbutton)
	3220	+ if (source == cancelbutton)
3038	3221	{
3039	3222	textpanel.setVisible(false);
3040	3223	textpanel.remove(textarea);
..	..	@@ -3046,50 +3229,50 @@
3046	3229	//applySelf();
3047	3230	//client.refreshEditWindow();
3048	3231	//refreshContents();
3049		- if (event.getSource() == nameField)
	3232	+ if (source == nameField)
3050	3233	{
3051	3234	//System.out.println("ObjEditor " + event);
3052	3235	applySelf0(true);
3053	3236	//parent.applySelf();
3054	3237	objEditor.refreshContents();
3055		- } else if (event.getSource() == resetButton)
	3238	+ } else if (source == resetButton)
3056	3239	{
3057	3240	CameraPane.fullreset = true;
3058	3241	copy.Reset(); // ResetMeshes();
3059	3242	copy.Touch();
3060	3243	objEditor.refreshContents();
3061		- } else if (event.getSource() == stepItem)
	3244	+ } else if (source == stepItem)
3062	3245	{
3063	3246	//cameraView.ONESTEP = true;
3064	3247	Globals.ONESTEP = true;
3065	3248	cameraView.repaint();
3066	3249	return;
3067		- } else if (event.getSource() == stepButton)
	3250	+ } else if (source == stepButton)
3068	3251	{
3069	3252	copy.Step();
3070	3253	copy.Touch();
3071	3254	objEditor.refreshContents();
3072		- } else if (event.getSource() == slowerButton)
	3255	+ } else if (source == slowerButton)
3073	3256	{
3074	3257	copy.Slower();
3075	3258	copy.Touch();
3076	3259	objEditor.refreshContents();
3077		- } else if (event.getSource() == fasterButton)
	3260	+ } else if (source == fasterButton)
3078	3261	{
3079	3262	copy.Faster();
3080	3263	copy.Touch();
3081	3264	objEditor.refreshContents();
3082		- } else if (event.getSource() == remarkButton)
	3265	+ } else if (source == remarkButton)
3083	3266	{
3084	3267	copy.Remark();
3085	3268	copy.Touch();
3086	3269	objEditor.refreshContents();
3087		- } else if (event.getSource() == stepAllButton)
	3270	+ } else if (source == stepAllButton)
3088	3271	{
3089	3272	copy.StepAll();
3090	3273	copy.Touch();
3091	3274	objEditor.refreshContents();
3092		- } else if (event.getSource() == resetAllButton)
	3275	+ } else if (source == resetAllButton)
3093	3276	{
3094	3277	//CameraPane.fullreset = true;
3095	3278	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3122,53 +3305,75 @@
3122	3305	// Close();
3123	3306	// }
3124	3307	// else
3125		- if (event.getSource() == resetSlidersButton)
	3308	+ if (source == resetSlidersButton)
3126	3309	{
3127	3310	ResetSliders();
3128		- } else if (event.getSource() == clearMaterialButton)
	3311	+ } else if (source == clearMaterialButton)
3129	3312	{
3130	3313	ClearMaterial();
3131		- } else if (event.getSource() == createMaterialButton)
	3314	+ } else if (source == createMaterialButton)
3132	3315	{
3133	3316	CreateMaterial();
3134		- } else if (event.getSource() == clearPanelButton)
	3317	+ } else if (source == clearPanelButton)
3135	3318	{
3136	3319	copy.ClearUI();
3137	3320	refreshContents(true);
3138		- } /*
3139		- }
3140		-
3141		- public boolean action(Event event, Object arg)
3142		- {
3143		- */ else if (event.getSource() == closeItem)
	3321	+ } else if (source == importGFDItem)
	3322	+ {
	3323	+ ImportGFD();
	3324	+ } else
	3325	+ if (source == importVRMLX3DItem)
	3326	+ {
	3327	+ ImportVRMLX3D();
	3328	+ } else
	3329	+ if (source == import3DSItem)
	3330	+ {
	3331	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3332	+ } else
	3333	+ if (source == importOBJItem)
	3334	+ {
	3335	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3336	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3337	+ browser.setVisible(true);
	3338	+ String filename = browser.getFile();
	3339	+ if (filename != null && filename.length() > 0)
	3340	+ {
	3341	+ String fullname = browser.getDirectory() + filename;
	3342	+ makeSomething(ReadOBJ(fullname), true);
	3343	+ }
	3344	+ } else
	3345	+ if (source == closeItem)
3144	3346	{
3145	3347	Close();
3146	3348	//return true;
3147		- } else if (event.getSource() == loadItem)
	3349	+ } else if (source == loadItem)
3148	3350	{
3149	3351	load();
3150	3352	//return true;
3151		- } else if (event.getSource() == saveItem)
	3353	+ } else if (source == newItem)
	3354	+ {
	3355	+ New();
	3356	+ } else if (source == saveItem)
3152	3357	{
3153	3358	save();
3154	3359	//return true;
3155		- } else if (event.getSource() == saveAsItem)
	3360	+ } else if (source == saveAsItem)
3156	3361	{
3157	3362	saveAs();
3158	3363	//return true;
3159		- } else if (event.getSource() == reexportItem)
	3364	+ } else if (source == reexportItem)
3160	3365	{
3161	3366	reexport();
3162	3367	//return true;
3163		- } else if (event.getSource() == exportAsItem)
	3368	+ } else if (source == exportAsItem)
3164	3369	{
3165	3370	export();
3166	3371	//return true;
3167		- } else if (event.getSource() == povItem)
	3372	+ } else if (source == povItem)
3168	3373	{
3169	3374	generatePOV();
3170	3375	//return true;
3171		- } else if (event.getSource() == zBufferItem)
	3376	+ } else if (source == zBufferItem)
3172	3377	{
3173	3378	try
3174	3379	{
..	..	@@ -3190,21 +3395,8 @@
3190	3395	cameraView.repaint();
3191	3396	//return true;
3192	3397	}
3193		- */ else if (event.getSource() == editCameraItem)
3194		- {
3195		- cameraView.ProtectCamera();
3196		- cameraView.repaint();
3197		- return;
3198		- } else if (event.getSource() == revertCameraItem)
3199		- {
3200		- cameraView.RevertCamera();
3201		- cameraView.repaint();
3202		- return;
3203		-// } else if (event.getSource() == textureButton)
3204		-// {
3205		-// return; // true;
3206		- } else // combos...
3207		- if (event.getSource() == texresMenu)
	3398	+ */ else // combos...
	3399	+ if (source == texresMenu)
3208	3400	{
3209	3401	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3210	3402	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3216,6 +3408,281 @@
3216	3408	}
3217	3409	}
3218	3410
	3411	+ void New()
	3412	+ {
	3413	+ while (copy.Size() > 1)
	3414	+ {
	3415	+ copy.remove(1);
	3416	+ }
	3417	+
	3418	+ ResetModel();
	3419	+ objEditor.refreshContents();
	3420	+ }
	3421	+
	3422	+ static public byte[] Compress(Object3D o)
	3423	+ {
	3424	+ try
	3425	+ {
	3426	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3427	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3428	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3429	+
	3430	+ Object3D parent = o.parent;
	3431	+ o.parent = null;
	3432	+
	3433	+ out.writeObject(o);
	3434	+
	3435	+ o.parent = parent;
	3436	+
	3437	+ out.flush();
	3438	+
	3439	+ zstream.close();
	3440	+ out.close();
	3441	+
	3442	+ return baos.toByteArray();
	3443	+ } catch (Exception e)
	3444	+ {
	3445	+ System.err.println(e);
	3446	+ return null;
	3447	+ }
	3448	+ }
	3449	+
	3450	+ static public Object Uncompress(byte[] bytes)
	3451	+ {
	3452	+ System.out.println("#bytes = " + bytes.length);
	3453	+ try
	3454	+ {
	3455	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3456	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3457	+ ObjectInputStream in = new ObjectInputStream(istream);
	3458	+ Object obj = in.readObject();
	3459	+ in.close();
	3460	+
	3461	+ return obj;
	3462	+ } catch (Exception e)
	3463	+ {
	3464	+ System.err.println(e);
	3465	+ return null;
	3466	+ }
	3467	+ }
	3468	+
	3469	+ static public Object clone(Object o)
	3470	+ {
	3471	+ try
	3472	+ {
	3473	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3474	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3475	+
	3476	+ out.writeObject(o);
	3477	+
	3478	+ out.flush();
	3479	+ out.close();
	3480	+
	3481	+ byte[] bytes = baos.toByteArray();
	3482	+
	3483	+ System.out.println("clone = " + bytes.length);
	3484	+
	3485	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3486	+ ObjectInputStream in = new ObjectInputStream(bais);
	3487	+ Object obj = in.readObject();
	3488	+ in.close();
	3489	+
	3490	+ return obj;
	3491	+ } catch (Exception e)
	3492	+ {
	3493	+ System.err.println(e);
	3494	+ return null;
	3495	+ }
	3496	+ }
	3497	+
	3498	+ cRadio GetCurrentTab()
	3499	+ {
	3500	+ cRadio ab;
	3501	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3502	+ {
	3503	+ ab = (cRadio)e.nextElement();
	3504	+ if(ab.GetObject() == copy)
	3505	+ {
	3506	+ return ab;
	3507	+ }
	3508	+ }
	3509	+
	3510	+ return null;
	3511	+ }
	3512	+
	3513	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3514	+
	3515	+ public void Save()
	3516	+ {
	3517	+ System.err.println("Save");
	3518	+
	3519	+ cRadio tab = GetCurrentTab();
	3520	+
	3521	+ boolean temp = CameraPane.SWITCH;
	3522	+ CameraPane.SWITCH = false;
	3523	+
	3524	+ copy.ExtractBigData(hashtable);
	3525	+
	3526	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3527	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3528	+
	3529	+ copy.RestoreBigData(hashtable);
	3530	+
	3531	+ CameraPane.SWITCH = temp;
	3532	+
	3533	+ //assert(hashtable.isEmpty());
	3534	+
	3535	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3536	+ {
	3537	+ tab.graphs[i] = null;
	3538	+ }
	3539	+
	3540	+ SetUndoStates();
	3541	+
	3542	+ // test save
	3543	+ if (false)
	3544	+ {
	3545	+ try
	3546	+ {
	3547	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3548	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3549	+
	3550	+ p.writeObject(copy);
	3551	+
	3552	+ p.flush();
	3553	+
	3554	+ ostream.close();
	3555	+ } catch (Exception e)
	3556	+ {
	3557	+ e.printStackTrace();
	3558	+ }
	3559	+ }
	3560	+ }
	3561	+
	3562	+ void CopyChanged(Object3D obj)
	3563	+ {
	3564	+ SetUndoStates();
	3565	+
	3566	+ boolean temp = CameraPane.SWITCH;
	3567	+ CameraPane.SWITCH = false;
	3568	+
	3569	+ copy.ExtractBigData(hashtable);
	3570	+
	3571	+ copy.clear();
	3572	+
	3573	+ for (int i=0; i<obj.Size(); i++)
	3574	+ {
	3575	+ copy.add(obj.get(i));
	3576	+ }
	3577	+
	3578	+ copy.RestoreBigData(hashtable);
	3579	+
	3580	+ CameraPane.SWITCH = temp;
	3581	+
	3582	+ //assert(hashtable.isEmpty());
	3583	+
	3584	+ copy.Touch();
	3585	+
	3586	+ ResetModel();
	3587	+ copy.HardTouch(); // recompile?
	3588	+
	3589	+ cRadio ab;
	3590	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3591	+ {
	3592	+ ab = (cRadio)e.nextElement();
	3593	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3594	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3595	+ if (test != null)
	3596	+ {
	3597	+ test.editWindow = ab.object.editWindow;
	3598	+ ab.object = test;
	3599	+ }
	3600	+ }
	3601	+
	3602	+ refreshContents();
	3603	+ }
	3604	+
	3605	+ cButton undoButton;
	3606	+ cButton redoButton;
	3607	+
	3608	+ void SetUndoStates()
	3609	+ {
	3610	+ cRadio tab = GetCurrentTab();
	3611	+
	3612	+ undoButton.setEnabled(tab.undoindex > 0);
	3613	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3614	+ }
	3615	+
	3616	+ public void Undo()
	3617	+ {
	3618	+ System.err.println("Undo");
	3619	+
	3620	+ cRadio tab = GetCurrentTab();
	3621	+
	3622	+ if (tab.undoindex == 0)
	3623	+ {
	3624	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3625	+ return;
	3626	+ }
	3627	+
	3628	+ if (tab.graphs[tab.undoindex] == null)
	3629	+ {
	3630	+ Save();
	3631	+ tab.undoindex -= 1;
	3632	+ }
	3633	+
	3634	+ tab.undoindex -= 1;
	3635	+
	3636	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3637	+ }
	3638	+
	3639	+ public void Redo()
	3640	+ {
	3641	+ cRadio tab = GetCurrentTab();
	3642	+
	3643	+ if (tab.graphs[tab.undoindex + 1] == null)
	3644	+ {
	3645	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3646	+ return;
	3647	+ }
	3648	+
	3649	+ tab.undoindex += 1;
	3650	+
	3651	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3652	+ }
	3653	+
	3654	+ void ImportGFD()
	3655	+ {
	3656	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3657	+ browser.show();
	3658	+ String filename = browser.getFile();
	3659	+ if (filename != null && filename.length() > 0)
	3660	+ {
	3661	+ String fullname = browser.getDirectory() + filename;
	3662	+
	3663	+ //Object3D readobj =
	3664	+ objEditor.ReadGFD(fullname, objEditor);
	3665	+ //makeSomething(readobj);
	3666	+ }
	3667	+ }
	3668	+
	3669	+ void ImportVRMLX3D()
	3670	+ {
	3671	+ if (Grafreed.standAlone)
	3672	+ {
	3673	+ /**/
	3674	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3675	+ browser.show();
	3676	+ String filename = browser.getFile();
	3677	+ if (filename != null && filename.length() > 0)
	3678	+ {
	3679	+ String fullname = browser.getDirectory() + filename;
	3680	+ LoadVRMLX3D(fullname);
	3681	+ }
	3682	+ /**/
	3683	+ }
	3684	+ }
	3685	+
3219	3686	void ToggleAnimation()
3220	3687	{
3221	3688	if (!Globals.ANIMATION)
..	..	@@ -3231,8 +3698,8 @@
3231	3698
3232	3699	Globals.ANIMATION ^= true;
3233	3700
3234		- GrafreeD.wav.cursor = 0;
3235		- GrafreeD.wav.loop = 0;
	3701	+ Grafreed.wav.cursor = 0;
	3702	+ Grafreed.wav.loop = 0;
3236	3703	}
3237	3704	} else
3238	3705	{
..	..	@@ -3253,7 +3720,6 @@
3253	3720	callee.refreshContents();
3254	3721	} else
3255	3722	{
3256		- new Exception().printStackTrace();
3257	3723	System.exit(0);
3258	3724	}
3259	3725	}
..	..	@@ -3283,7 +3749,7 @@
3283	3749	void CreateMaterial()
3284	3750	{
3285	3751	//copy.ClearMaterial(); // PATCH
3286		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3752	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3287	3753	if (copy.selection.size() > 0)
3288	3754	//SetMaterial(copy);
3289	3755	{
..	..	@@ -3334,7 +3800,7 @@
3334	3800	assert false;
3335	3801	}
3336	3802
3337		- void EditSelection()
	3803	+ void EditSelection(boolean newWindow)
3338	3804	{
3339	3805	}
3340	3806
..	..	@@ -3342,11 +3808,11 @@
3342	3808	{
3343	3809	copy.ResetBlockLoop(); // temporary problem
3344	3810
3345		- boolean random = CameraPane.RANDOM;
3346		- CameraPane.RANDOM = false; // parse everything
	3811	+ boolean random = CameraPane.SWITCH;
	3812	+ CameraPane.SWITCH = false; // parse everything
3347	3813	copy.ResetDisplayList();
3348	3814	copy.HardTouch();
3349		- CameraPane.RANDOM = random;
	3815	+ CameraPane.SWITCH = random;
3350	3816	}
3351	3817
3352	3818	// public void applySelf()
..	..	@@ -3420,6 +3886,36 @@
3420	3886	{
3421	3887	//System.out.println("Propagate = " + propagate);
3422	3888	copy.UpdateMaterial(anchor, current, propagate);
	3889	+
	3890	+ if (copy.material != null)
	3891	+ {
	3892	+ cMaterial mat = copy.material;
	3893	+
	3894	+ colorField.SetToolTipValue((mat.color));
	3895	+ modulationField.SetToolTipValue((mat.modulation));
	3896	+ metalnessField.SetToolTipValue((mat.metalness));
	3897	+ diffuseField.SetToolTipValue((mat.diffuse));
	3898	+ specularField.SetToolTipValue((mat.specular));
	3899	+ shininessField.SetToolTipValue((mat.shininess));
	3900	+ shiftField.SetToolTipValue((mat.shift));
	3901	+ ambientField.SetToolTipValue((mat.ambient));
	3902	+ lightareaField.SetToolTipValue((mat.lightarea));
	3903	+ diffusenessField.SetToolTipValue((mat.factor));
	3904	+ velvetField.SetToolTipValue((mat.velvet));
	3905	+ sheenField.SetToolTipValue((mat.sheen));
	3906	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3907	+ backlitField.SetToolTipValue((mat.bump));
	3908	+ anisoField.SetToolTipValue((mat.aniso));
	3909	+ anisoVField.SetToolTipValue((mat.anisoV));
	3910	+ cameraField.SetToolTipValue((mat.cameralight));
	3911	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3912	+ shadowField.SetToolTipValue((mat.shadow));
	3913	+ textureField.SetToolTipValue((mat.texture));
	3914	+ opacityField.SetToolTipValue((mat.opacity));
	3915	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3916	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3917	+ }
	3918	+
3423	3919	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3424	3920	{
3425	3921	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3535,7 +4031,7 @@
3535	4031	}
3536	4032
3537	4033	if (normalpushField != null)
3538		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4034	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3539	4035	}
3540	4036
3541	4037	void SnapObject()
..	..	@@ -3799,6 +4295,8 @@
3799	4295
3800	4296	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3801	4297	{
	4298	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4299	+ Save();
3802	4300	//Tween.set(thing, 0).target(1).start(tweenManager);
3803	4301	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3804	4302	// if (thing instanceof GenericJointDemo)
..	..	@@ -3885,6 +4383,12 @@
3885	4383	{
3886	4384	ResetModel();
3887	4385	Select(thing.GetTreePath(), true, false); // unselect... false);
	4386	+
	4387	+ if (thing.Size() == 0)
	4388	+ {
	4389	+ //EditSelection(false);
	4390	+ }
	4391	+
3888	4392	refreshContents();
3889	4393	}
3890	4394
..	..	@@ -4002,6 +4506,7 @@
4002	4506	}
4003	4507	}
4004	4508	}
	4509	+
4005	4510	LoadGFDThread loadGFDThread;
4006	4511
4007	4512	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4021,8 +4526,10 @@
4021	4526
4022	4527	try
4023	4528	{
	4529	+ // Try compressed version first.
4024	4530	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4025		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4531	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4532	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4026	4533
4027	4534	readobj = (Object3D) p.readObject();
4028	4535	istream.close();
..	..	@@ -4030,7 +4537,20 @@
4030	4537	readobj.ResetDisplayList();
4031	4538	} catch (Exception e)
4032	4539	{
4033		- e.printStackTrace();
	4540	+ //e.printStackTrace();
	4541	+ try
	4542	+ {
	4543	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4544	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4545	+
	4546	+ readobj = (Object3D) p.readObject();
	4547	+ istream.close();
	4548	+
	4549	+ readobj.ResetDisplayList();
	4550	+ } catch (Exception e2)
	4551	+ {
	4552	+ e2.printStackTrace();
	4553	+ }
4034	4554	}
4035	4555	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4036	4556	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4076,6 +4596,12 @@
4076	4596
4077	4597	void LoadIt(Object obj)
4078	4598	{
	4599	+ if (obj == null)
	4600	+ {
	4601	+ // Invalid file
	4602	+ return;
	4603	+ }
	4604	+
4079	4605	System.out.println("Loaded " + obj);
4080	4606	//new Exception().printStackTrace();
4081	4607	Object3D readobj = (Object3D) obj;
..	..	@@ -4085,6 +4611,8 @@
4085	4611
4086	4612	if (readobj != null)
4087	4613	{
	4614	+ if (Globals.SAVEONMAKE)
	4615	+ Save();
4088	4616	try
4089	4617	{
4090	4618	//readobj.deepCopySelf(copy);
..	..	@@ -4147,7 +4675,7 @@
4147	4675
4148	4676	void load() // throws ClassNotFoundException
4149	4677	{
4150		- if (GrafreeD.standAlone)
	4678	+ if (Grafreed.standAlone)
4151	4679	{
4152	4680	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4153	4681	browser.show();
..	..	@@ -4234,11 +4762,13 @@
4234	4762	try
4235	4763	{
4236	4764	FileOutputStream ostream = new FileOutputStream(lastname);
4237		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4765	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4766	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4238	4767
4239	4768	p.writeObject(copy);
4240	4769	p.flush();
4241	4770
	4771	+ zstream.close();
4242	4772	ostream.close();
4243	4773
4244	4774	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4248,17 +4778,20 @@
4248	4778	{
4249	4779	}
4250	4780	}
	4781	+
4251	4782	String lastname;
4252	4783
4253	4784	void saveAs()
4254	4785	{
4255		- if (GrafreeD.standAlone)
	4786	+ if (Grafreed.standAlone)
4256	4787	{
4257	4788	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4258	4789	browser.setVisible(true);
4259	4790	String filename = browser.getFile();
4260	4791	if (filename != null && filename.length() > 0)
4261	4792	{
	4793	+ if (!filename.endsWith(".gfd"))
	4794	+ filename += ".gfd";
4262	4795	lastname = browser.getDirectory() + filename;
4263	4796	save();
4264	4797	}
..	..	@@ -4357,13 +4890,13 @@
4357	4890	try
4358	4891	{
4359	4892	FileOutputStream ostream = new FileOutputStream(filename);
4360		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4361		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4893	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4894	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4362	4895
4363	4896	Object3D objectparent = obj.parent;
4364	4897	obj.parent = null;
4365	4898
4366		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4899	+ Object3D object = (Object3D) Grafreed.clone(obj);
4367	4900
4368	4901	obj.parent = objectparent;
4369	4902
..	..	@@ -4375,8 +4908,8 @@
4375	4908	p.writeObject(object);
4376	4909	p.flush();
4377	4910
	4911	+ zstream.close();
4378	4912	ostream.close();
4379		- // zstream.close();
4380	4913
4381	4914	// group.selection.get(0).parent = parent;
4382	4915	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4397,7 +4930,7 @@
4397	4930	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4398	4931	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4399	4932	copy.generatePOV(buffer);
4400		- if (GrafreeD.standAlone)
	4933	+ if (Grafreed.standAlone)
4401	4934	{
4402	4935	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4403	4936	browser.show();
..	..	@@ -4423,7 +4956,8 @@
4423	4956	Object3D client;
4424	4957	Object3D copy;
4425	4958	MenuBar menuBar;
4426		- Menu windowMenu;
	4959	+ Menu fileMenu;
	4960	+ MenuItem newItem;
4427	4961	MenuItem loadItem;
4428	4962	MenuItem saveItem;
4429	4963	MenuItem saveAsItem;
..	..	@@ -4431,11 +4965,9 @@
4431	4965	MenuItem reexportItem;
4432	4966	MenuItem povItem;
4433	4967	MenuItem closeItem;
4434		- Menu cameraMenu;
	4968	+
4435	4969	CheckboxMenuItem zBufferItem;
4436	4970	//MenuItem normalLensItem;
4437		- MenuItem editCameraItem;
4438		- MenuItem revertCameraItem;
4439	4971	MenuItem stepItem;
4440	4972	CheckboxMenuItem toggleLiveItem;
4441	4973	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4446,25 +4978,38 @@
4446	4978	CheckboxMenuItem toggleFootContactItem;
4447	4979	CheckboxMenuItem toggleDLItem;
4448	4980	CheckboxMenuItem toggleTextureItem;
4449		- CheckboxMenuItem toggleRandomItem;
	4981	+ CheckboxMenuItem toggleSwitchItem;
4450	4982	CheckboxMenuItem toggleRootItem;
4451	4983	CheckboxMenuItem animationItem;
4452	4984	CheckboxMenuItem toggleHandleItem;
4453	4985	CheckboxMenuItem togglePaintItem;
4454	4986	JSplitPane mainPanel;
4455	4987	JScrollPane scrollpane;
	4988	+
4456	4989	JPanel toolbarPanel;
	4990	+
4457	4991	cGridBag treePanel;
	4992	+
4458	4993	JPanel radioPanel;
4459	4994	ButtonGroup buttonGroup;
4460		- cGridBag ctrlPanel;
	4995	+
	4996	+ cGridBag toolboxPanel;
4461	4997	cGridBag materialPanel;
	4998	+ cGridBag ctrlPanel;
	4999	+
4462	5000	JScrollPane infoPanel;
	5001	+
4463	5002	cGridBag optionsPanel;
	5003	+
4464	5004	JTabbedPane objectPanel;
	5005	+ boolean materialFlushed;
	5006	+ Object3D latestObject;
	5007	+
4465	5008	cGridBag XYZPanel;
	5009	+
4466	5010	JSplitPane gridPanel;
4467	5011	JSplitPane bigPanel;
	5012	+
4468	5013	cGridBag bigThree;
4469	5014	cGridBag scenePanel;
4470	5015	cGridBag centralPanel;
..	..	@@ -4579,8 +5124,13 @@
4579	5124	cNumberSlider fogField;
4580	5125	JLabel opacityPowerLabel;
4581	5126	cNumberSlider opacityPowerField;
4582		- JTree jTree;
	5127	+ cTree jTree;
4583	5128	//ObjectUI parent;
4584	5129
4585	5130	cNumberSlider normalpushField;
	5131	+
	5132	+ private MenuItem importGFDItem;
	5133	+ private MenuItem importVRMLX3DItem;
	5134	+ private MenuItem import3DSItem;
	5135	+ private MenuItem importOBJItem;
4586	5136	}