~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -35,6 +39,67 @@
35	39
36	40	GroupEditor callee;
37	41	JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ cButton GetButton(String name, boolean border)
	46	+ {
	47	+ try
	48	+ {
	49	+ ImageIcon icon = GetIcon(name);
	50	+ return new cButton(icon, border);
	51	+ }
	52	+ catch (Exception e)
	53	+ {
	54	+ return new cButton(name, border);
	55	+ }
	56	+ }
	57	+
	58	+ cToggleButton GetToggleButton(String name, boolean border)
	59	+ {
	60	+ try
	61	+ {
	62	+ ImageIcon icon = GetIcon(name);
	63	+ return new cToggleButton(icon, border);
	64	+ }
	65	+ catch (Exception e)
	66	+ {
	67	+ return new cToggleButton(name, border);
	68	+ }
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ try
	74	+ {
	75	+ ImageIcon icon = GetIcon(name);
	76	+ return new cCheckBox(icon, border);
	77	+ }
	78	+ catch (Exception e)
	79	+ {
	80	+ return new cCheckBox(name, border);
	81	+ }
	82	+ }
	83	+
	84	+ private ImageIcon GetIcon(String name) throws IOException
	85	+ {
	86	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	87	+
	88	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	89	+ {
	90	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	91	+ Graphics2D g = resized.createGraphics();
	92	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	93	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	94	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	95	+ g.dispose();
	96	+
	97	+ image = resized;
	98	+ }
	99	+
	100	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	101	+ return icon;
	102	+ }
38	103
39	104	// SCRIPT
40	105
..	..	@@ -145,7 +210,7 @@
145	210
146	211	objEditor.ctrlPanel.remove(namePanel);
147	212
148		- if (!GroupEditor.allparams)
	213	+ if (!allparams)
149	214	return;
150	215
151	216	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -168,7 +233,8 @@
168	233	// objEditor.ctrlPanel.remove(remarkButton);
169	234
170	235	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	236	+ objEditor.ctrlPanel.remove(setupPanel2);
	237	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	238	objEditor.ctrlPanel.remove(pushPanel);
173	239	//objEditor.ctrlPanel.remove(fillPanel);
174	240
..	..	@@ -243,6 +309,7 @@
243	309	//localCopy.parent = null;
244	310
245	311	frame = new JFrame();
	312	+ frame.setUndecorated(true);
246	313	objEditor = this;
247	314	this.callee = callee;
248	315
..	..	@@ -273,27 +340,48 @@
273	340	return frame.action(event, obj);
274	341	}
275	342
	343	+ // Cannot work without static
	344	+ static boolean allparams = true;
	345	+
	346	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	347	+
276	348	void SetupMenu()
277	349	{
278	350	frame.setMenuBar(menuBar = new MenuBar());
279		- menuBar.add(windowMenu = new Menu("File"));
280		- windowMenu.add(loadItem = new MenuItem("Load..."));
281		- windowMenu.add("-");
282		- windowMenu.add(saveItem = new MenuItem("Save"));
283		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	351	+ menuBar.add(fileMenu = new Menu("File"));
	352	+ fileMenu.add(newItem = new MenuItem("New"));
	353	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	354	+
	355	+ //oe.menuBar.add(menu = new Menu("Include"));
	356	+ Menu menu = new Menu("Import");
	357	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	358	+ importOBJItem.addActionListener(this);
	359	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	360	+ import3DSItem.addActionListener(this);
	361	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	362	+ importVRMLX3DItem.addActionListener(this);
	363	+ menu.add("-");
	364	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	365	+ importGFDItem.addActionListener(this);
	366	+ fileMenu.add(menu);
	367	+ fileMenu.add("-");
	368	+
	369	+ fileMenu.add(saveItem = new MenuItem("Save"));
	370	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284	371	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
285		- windowMenu.add("-");
286		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
287		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
288		- windowMenu.add("-");
	372	+ fileMenu.add("-");
	373	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	374	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	375	+ fileMenu.add("-");
289	376	if (client.parent != null)
290	377	{
291		- windowMenu.add(closeItem = new MenuItem("Close"));
	378	+ fileMenu.add(closeItem = new MenuItem("Close"));
292	379	} else
293	380	{
294		- windowMenu.add(closeItem = new MenuItem("Exit"));
	381	+ fileMenu.add(closeItem = new MenuItem("Exit"));
295	382	}
296	383
	384	+ newItem.addActionListener(this);
297	385	loadItem.addActionListener(this);
298	386	saveItem.addActionListener(this);
299	387	saveAsItem.addActionListener(this);
..	..	@@ -302,70 +390,53 @@
302	390	//povItem.addActionListener(this);
303	391	closeItem.addActionListener(this);
304	392
305		- menuBar.add(cameraMenu = new Menu("View"));
306		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
307		- //zBufferItem.addActionListener(this);
308		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
309		- //normalLensItem.addActionListener(this);
310		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
311		- revertCameraItem.addActionListener(this);
312		- 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	393	objectPanel = new JTabbedPane();
	394	+
	395	+ ChangeListener changeListener = new ChangeListener()
	396	+ {
	397	+ public void stateChanged(ChangeEvent changeEvent)
	398	+ {
	399	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	400	+// {
	401	+// if (latestObject != null)
	402	+// {
	403	+// refreshContents(true);
	404	+// SetMaterial(latestObject);
	405	+// }
	406	+//
	407	+// materialFlushed = true;
	408	+// }
	409	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	410	+// {
	411	+// if (listUI.size() == 0)
	412	+// EditSelection(false);
	413	+// }
	414	+
	415	+ refreshContents(false); // To refresh Info tab
	416	+ }
	417	+ };
	418	+ objectPanel.addChangeListener(changeListener);
	419	+
361	420	toolbarPanel = new JPanel();
362	421	toolbarPanel.setName("Toolbar");
363	422	treePanel = new cGridBag();
364	423	treePanel.setName("Tree");
	424	+
	425	+ editPanel = new cGridBag().setVertical(true);
	426	+ editPanel.setName("Edit");
	427	+
365	428	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
366		- ctrlPanel.setName("Edit");
	429	+
	430	+ editCommandsPanel = new cGridBag();
	431	+ editPanel.add(editCommandsPanel);
	432	+ editPanel.add(ctrlPanel);
	433	+
	434	+ toolboxPanel = new cGridBag().setVertical(false);
	435	+ toolboxPanel.setName("Toolbox");
	436	+
367	437	materialPanel = new cGridBag().setVertical(true);
368	438	materialPanel.setName("Material");
	439	+
369	440	/JTextPane/
370	441	infoarea = createTextPane();
371	442	doc = infoarea.getStyledDocument();
..	..	@@ -390,7 +461,14 @@
390	461	mainPanel.setDividerSize(9);
391	462	mainPanel.setDividerLocation(0.5); //1.0);
392	463	mainPanel.setResizeWeight(0.5);
393		-
	464	+
	465	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	466	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	467	+ divider.setDividerSize(15);
	468	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	469	+
	470	+ mainPanel.setUI(new BasicSplitPaneUI());
	471	+
394	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
395	473	//mainPanel.setLayout(new GridBagLayout());
396	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -458,10 +536,10 @@
458	536	e.printStackTrace();
459	537	}
460	538
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();
	539	+// String selection = infoarea.getText();
	540	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	541	+// java.awt.datatransfer.Clipboard clipboard =
	542	+// Toolkit.getDefaultToolkit().getSystemClipboard();
465	543	//clipboard.setContents(data, data);
466	544	}
467	545
..	..	@@ -484,13 +562,13 @@
484	562	//SendInfo("Name:", "bold");
485	563	if (sel.GetTextures() != null \|\| debug)
486	564	{
487		- si.SendInfo(sel.toString(), "bold");
	565	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
488	566	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
489	567	if (sel.Size() > 0)
490	568	{
491	569	si.SendInfo("#children = " + sel.Size(), "regular");
492	570	}
493		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	571	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
494	572	if (debug)
495	573	{
496	574	try
..	..	@@ -532,7 +610,7 @@
532	610	}
533	611	if (sel.support != null)
534	612	{
535		- si.SendInfo(" support: " + sel.support, "regular");
	613	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
536	614	}
537	615	if (sel.scriptnode != null)
538	616	{
..	..	@@ -621,20 +699,92 @@
621	699	}
622	700	}
623	701
	702	+static GraphicsDevice device = GraphicsEnvironment
	703	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	704	+
	705	+ Rectangle keeprect;
	706	+ cRadio radio;
	707	+
	708	+cButton keepButton;
	709	+ cButton twoButton; // Full 3D
	710	+ cButton sixButton;
	711	+ cButton threeButton;
	712	+ cButton sevenButton;
	713	+ cButton fourButton; // full panel
	714	+ cButton oneButton; // full XYZ
	715	+ //cButton currentLayout;
	716	+
	717	+ boolean maximized;
	718	+
	719	+ cButton fullscreenLayout;
	720	+
	721	+ void Minimize()
	722	+ {
	723	+ frame.setState(Frame.ICONIFIED);
	724	+ }
	725	+
	726	+ void Maximize()
	727	+ {
	728	+ if (maximized)
	729	+ {
	730	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	731	+ }
	732	+ else
	733	+ {
	734	+ keeprect = frame.getBounds();
	735	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	736	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	737	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	738	+// frame.setState(Frame.MAXIMIZED_BOTH);
	739	+ }
	740	+
	741	+ maximized ^= true;
	742	+ }
	743	+
624	744	void ToggleFullScreen()
625	745	{
626		- if (CameraPane.FULLSCREEN)
	746	+ cameraView.ToggleFullScreen();
	747	+
	748	+ if (!CameraPane.FULLSCREEN)
627	749	{
628		- frame.getContentPane().remove(/"Center",/bigThree);
629		- framePanel.add(bigThree);
630		- frame.getContentPane().add(/"Center",/framePanel);
	750	+ device.setFullScreenWindow(null);
	751	+ //frame.setVisible(false);
	752	+// frame.removeNotify();
	753	+// frame.setUndecorated(false);
	754	+// frame.addNotify();
	755	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	756	+
	757	+// X frame.getContentPane().remove(/"Center",/bigThree);
	758	+// X framePanel.add(bigThree);
	759	+// X frame.getContentPane().add(/"Center",/framePanel);
	760	+ framePanel.setDividerLocation(1);
	761	+
	762	+ //frame.setVisible(true);
	763	+ radio.layout = keepButton;
	764	+ //theFrame = null;
	765	+ keepButton = null;
	766	+ radio.layout.doClick();
	767	+
631	768	} else
632	769	{
633		- frame.getContentPane().remove(/"Center",/framePanel);
634		- framePanel.remove(bigThree);
635		- frame.getContentPane().add(/"Center",/bigThree);
	770	+ keepButton = radio.layout;
	771	+ //keeprect = frame.getBounds();
	772	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	773	+// frame.getToolkit().getScreenSize().height);
	774	+ //frame.setVisible(false);
	775	+ device.setFullScreenWindow(frame);
	776	+// frame.removeNotify();
	777	+// frame.setUndecorated(true);
	778	+// frame.addNotify();
	779	+// X frame.getContentPane().remove(/"Center",/framePanel);
	780	+// X framePanel.remove(bigThree);
	781	+// X frame.getContentPane().add(/"Center",/bigThree);
	782	+ framePanel.setDividerLocation(0);
	783	+
	784	+ radio.layout = fullscreenLayout;
	785	+ radio.layout.doClick();
	786	+ //frame.setVisible(true);
636	787	}
637		- cameraView.ToggleFullScreen();
638	788	}
639	789
640	790	private JTextPane createTextPane()
..	..	@@ -735,7 +885,7 @@
735	885	protected static ImageIcon createImageIcon(String path,
736	886	String description)
737	887	{
738		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	888	+ java.net.URL imgURL = Grafreed.class.getResource(path);
739	889	if (imgURL != null)
740	890	{
741	891	return new ImageIcon(imgURL, description);
..	..	@@ -767,6 +917,7 @@
767	917	// NumberSlider vDivsField;
768	918	// JCheckBox endcaps;
769	919	JCheckBox liveCB;
	920	+ JCheckBox selectCB;
770	921	JCheckBox hideCB;
771	922	JCheckBox link2masterCB;
772	923	JCheckBox markCB;
..	..	@@ -774,7 +925,12 @@
774	925	JCheckBox speedupCB;
775	926	JCheckBox rewindCB;
776	927	JCheckBox flipVCB;
	928	+
	929	+ cCheckBox toggleTextureCB;
	930	+ cCheckBox toggleSwitchCB;
	931	+
777	932	JComboBox texresMenu;
	933	+
778	934	JButton resetButton;
779	935	JButton stepButton;
780	936	JButton stepAllButton;
..	..	@@ -783,9 +939,13 @@
783	939	JButton fasterButton;
784	940	JButton remarkButton;
785	941
	942	+ cGridBag editPanel;
	943	+ cGridBag editCommandsPanel;
	944	+
786	945	cGridBag namePanel;
787	946	cGridBag setupPanel;
788		- cGridBag commandsPanel;
	947	+ cGridBag setupPanel2;
	948	+ cGridBag objectCommandsPanel;
789	949	cGridBag pushPanel;
790	950	cGridBag fillPanel;
791	951
..	..	@@ -962,56 +1122,62 @@
962	1122
963	1123	oe.ctrlPanel.Return();
964	1124
965		- if (!GroupEditor.allparams)
	1125	+ if (!allparams)
966	1126	return;
967	1127
968	1128	setupPanel = new cGridBag().setVertical(false);
969	1129
970	1130	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
971	1131	liveCB.setToolTipText("Animate object");
	1132	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1133	+ selectCB.setToolTipText("Make object selectable");
	1134	+// Return();
972	1135	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
973	1136	hideCB.setToolTipText("Hide object");
974		-// Return();
975	1137	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
976		- markCB.setToolTipText("Set the animation target transform");
	1138	+ markCB.setToolTipText("As animation target transform");
977	1139
978		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1140	+ setupPanel2 = new cGridBag().setVertical(false);
	1141	+
	1142	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
979	1143	rewindCB.setToolTipText("Rewind animation");
980	1144
981		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
982		- randomCB.setToolTipText("Option for switch node");
	1145	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1146	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
983	1147
984	1148	if (Globals.ADVANCED)
985	1149	{
986		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	1150	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
987	1151	link2masterCB.setToolTipText("Attach to support");
988		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1152	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
989	1153	speedupCB.setToolTipText("Option motion capture");
990	1154	}
991	1155
992	1156	oe.ctrlPanel.add(setupPanel);
993	1157	oe.ctrlPanel.Return();
	1158	+ oe.ctrlPanel.add(setupPanel2);
	1159	+ oe.ctrlPanel.Return();
994	1160
995		- commandsPanel = new cGridBag().setVertical(false);
	1161	+ objectCommandsPanel = new cGridBag().setVertical(false);
996	1162
997		- resetButton = AddButton(commandsPanel, "Reset");
	1163	+ resetButton = AddButton(objectCommandsPanel, "Reset");
998	1164	resetButton.setToolTipText("Jump to frame zero");
999		- stepButton = AddButton(commandsPanel, "Step");
	1165	+ stepButton = AddButton(objectCommandsPanel, "Step");
1000	1166	stepButton.setToolTipText("Step one frame");
1001	1167	// resetAllButton = AddButton(oe, "Reset All");
1002	1168	// stepAllButton = AddButton(oe, "Step All");
1003	1169	// Return();
1004		- slowerButton = AddButton(commandsPanel, "Slow");
	1170	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1005	1171	slowerButton.setToolTipText("Decrease animation speed");
1006		- fasterButton = AddButton(commandsPanel, "Fast");
	1172	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1007	1173	fasterButton.setToolTipText("Increase animation speed");
1008		- remarkButton = AddButton(commandsPanel, "Remark");
	1174	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1009	1175	remarkButton.setToolTipText("Set the current transform as the target");
1010	1176
1011		- oe.ctrlPanel.add(commandsPanel);
	1177	+ oe.ctrlPanel.add(objectCommandsPanel);
1012	1178	oe.ctrlPanel.Return();
1013	1179
1014		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1180	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1015	1181	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1016	1182	//Return();
1017	1183
..	..	@@ -1214,8 +1380,11 @@
1214	1380	//worldPanel.setName("World");
1215	1381	centralPanel = new cGridBag();
1216	1382	centralPanel.preferredWidth = 20;
1217		- timelinePanel = new JPanel(new BorderLayout());
1218		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1383	+
	1384	+ if (Globals.ADVANCED)
	1385	+ {
	1386	+ timelinePanel = new JPanel(new BorderLayout());
	1387	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1219	1388
1220	1389	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1221	1390	cameraPanel.setContinuousLayout(true);
..	..	@@ -1224,7 +1393,10 @@
1224	1393	// cameraPanel.setDividerSize(9);
1225	1394	cameraPanel.setResizeWeight(1.0);
1226	1395
	1396	+ }
	1397	+
1227	1398	centralPanel.add(cameraView);
	1399	+ centralPanel.setFocusable(true);
1228	1400	//frame.setJMenuBar(timelineMenubar);
1229	1401	//centralPanel.add(timelinePanel);
1230	1402
..	..	@@ -1291,8 +1463,9 @@
1291	1463	// north.setName("Edit");
1292	1464	// north.add(ctrlPanel, BorderLayout.NORTH);
1293	1465	// objectPanel.add(north);
1294		- objectPanel.add(ctrlPanel);
	1466	+ objectPanel.add(editPanel);
1295	1467	objectPanel.add(infoPanel);
	1468	+ objectPanel.add(toolboxPanel);
1296	1469
1297	1470	/*
1298	1471	aConstraints.gridx = 0;
..	..	@@ -1301,7 +1474,7 @@
1301	1474	aConstraints.gridy += 1;
1302	1475	aConstraints.gridwidth = 1;
1303	1476	mainPanel.add(objectPanel, aConstraints);
1304		- */
	1477	+ */
1305	1478
1306	1479	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1307	1480	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1313,14 +1486,12 @@
1313	1486	scrollpane.addMouseWheelListener(this); // Default not fast enough
1314	1487
1315	1488	/JTabbedPane/ scenePanel = new cGridBag();
1316		- scenePanel.preferredWidth = 7;
	1489	+ scenePanel.preferredWidth = 6;
1317	1490
1318	1491	JTabbedPane tabbedPane = new JTabbedPane();
1319	1492	tabbedPane.add(scrollpane);
1320	1493
1321		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1322		-
1323		- optionsPanel = new cGridBag().setVertical(true);
	1494	+ optionsPanel = new cGridBag().setVertical(false);
1324	1495
1325	1496	optionsPanel.setName("Options");
1326	1497
..	..	@@ -1328,6 +1499,8 @@
1328	1499
1329	1500	tabbedPane.add(optionsPanel);
1330	1501
	1502	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1503	+
1331	1504	scenePanel.add(tabbedPane);
1332	1505
1333	1506	/*
..	..	@@ -1419,9 +1592,13 @@
1419	1592
1420	1593	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1421	1594
1422		- frame.setSize(1024, 768);
1423		- frame.show();
	1595	+ frame.setSize(1280, 860);
	1596	+
	1597	+ frame.validate();
	1598	+ frame.setVisible(true);
1424	1599
	1600	+ cameraView.requestFocusInWindow();
	1601	+
1425	1602	gridPanel.setDividerLocation(1.0);
1426	1603
1427	1604	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1459,19 +1636,22 @@
1459	1636
1460	1637	cGridBag editBar = new cGridBag().setVertical(false);
1461	1638
1462		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1639	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1463	1640	createMaterialButton.setToolTipText("Create material");
1464	1641
1465	1642	/*
1466	1643	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1467	1644	*/
1468	1645
1469		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1646	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1470	1647	clearMaterialButton.setToolTipText("Clear material");
1471	1648
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);
	1649	+ if (Globals.ADVANCED)
	1650	+ {
	1651	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1652	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1653	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1654	+ }
1475	1655
1476	1656	editBar.preferredHeight = 15;
1477	1657
..	..	@@ -1740,12 +1920,15 @@
1740	1920	opacityPowerField.addChangeListener(this);
1741	1921	/**/
1742	1922
1743		- resetSlidersButton.addActionListener(this);
1744	1923	clearMaterialButton.addActionListener(this);
1745	1924	createMaterialButton.addActionListener(this);
1746		-
1747		- propagateToggle.addItemListener(this);
1748		- multiplyToggle.addItemListener(this);
	1925	+
	1926	+ if (Globals.ADVANCED)
	1927	+ {
	1928	+ resetSlidersButton.addActionListener(this);
	1929	+ propagateToggle.addItemListener(this);
	1930	+ multiplyToggle.addItemListener(this);
	1931	+ }
1749	1932	}
1750	1933
1751	1934	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1916,7 +2099,7 @@
1916	2099
1917	2100	//? flashIt = false;
1918	2101	CameraPane pane = (CameraPane) cameraView;
1919		- pane.clickStart(location.x, location.y, 0);
	2102	+ pane.clickStart(location.x, location.y, 0, 0);
1920	2103	pane.clickEnd(location.x, location.y, 0, true);
1921	2104
1922	2105	if (group.selection.size() == 1)
..	..	@@ -1965,6 +2148,7 @@
1965	2148	e2.printStackTrace();
1966	2149	}
1967	2150	}
	2151	+
1968	2152	LoadJMEThread loadThread;
1969	2153
1970	2154	class LoadJMEThread extends Thread
..	..	@@ -2022,6 +2206,7 @@
2022	2206	//LoadFile0(filename, converter);
2023	2207	}
2024	2208	}
	2209	+
2025	2210	LoadOBJThread loadObjThread;
2026	2211
2027	2212	class LoadOBJThread extends Thread
..	..	@@ -2100,19 +2285,19 @@
2100	2285
2101	2286	void LoadObjFile(String fullname)
2102	2287	{
2103		- /*
	2288	+ System.out.println("Loading " + fullname);
	2289	+ /**/
2104	2290	//lastFilename = fullname;
2105	2291	if(loadObjThread == null)
2106	2292	{
2107		- loadObjThread = new LoadOBJThread();
2108		- loadObjThread.start();
	2293	+ loadObjThread = new LoadOBJThread();
	2294	+ loadObjThread.start();
2109	2295	}
2110	2296
2111	2297	loadObjThread.add(fullname);
2112		- */
	2298	+ /**/
2113	2299
2114		- System.out.println("Loading " + fullname);
2115		- makeSomething(new FileObject(fullname, true), true);
	2300	+ //makeSomething(new FileObject(fullname, true), true);
2116	2301	}
2117	2302
2118	2303	void LoadGFDFile(String fullname)
..	..	@@ -2373,11 +2558,11 @@
2373	2558
2374	2559	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2375	2560	{
2376		- if (GrafreeD.standAlone)
	2561	+ if (Grafreed.standAlone)
2377	2562	{
2378	2563	/**/
2379	2564	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2380		- browser.show();
	2565	+ browser.setVisible(true);
2381	2566	String filename = browser.getFile();
2382	2567	if (filename != null && filename.length() > 0)
2383	2568	{
..	..	@@ -2729,6 +2914,8 @@
2729	2914
2730	2915	void SetMaterial(Object3D object)
2731	2916	{
	2917	+ latestObject = object;
	2918	+
2732	2919	cMaterial mat = object.material;
2733	2920
2734	2921	if (mat == null)
..	..	@@ -2737,7 +2924,8 @@
2737	2924	return;
2738	2925	}
2739	2926
2740		- multiplyToggle.setSelected(mat.multiply);
	2927	+ if (multiplyToggle != null)
	2928	+ multiplyToggle.setSelected(mat.multiply);
2741	2929
2742	2930	assert (object.projectedVertices != null);
2743	2931
..	..	@@ -2839,12 +3027,17 @@
2839	3027	// }
2840	3028
2841	3029	/**/
2842		- if (deselect)
	3030	+ if (deselect \|\| child == null)
2843	3031	{
2844	3032	//group.deselectAll();
2845	3033	//freeze = true;
2846	3034	GetTree().clearSelection();
2847	3035	//freeze = false;
	3036	+
	3037	+ if (child == null)
	3038	+ {
	3039	+ return;
	3040	+ }
2848	3041	}
2849	3042
2850	3043	//group.addSelectee(child);
..	..	@@ -2913,7 +3106,7 @@
2913	3106	cameraView.ToggleDL();
2914	3107	cameraView.repaint();
2915	3108	return;
2916		- } else if (event.getSource() == toggleTextureItem)
	3109	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2917	3110	{
2918	3111	cameraView.ToggleTexture();
2919	3112	// june 2013 copy.HardTouch();
..	..	@@ -2952,9 +3145,9 @@
2952	3145	frame.validate();
2953	3146
2954	3147	return;
2955		- } else if (event.getSource() == toggleRandomItem)
	3148	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2956	3149	{
2957		- cameraView.ToggleRandom();
	3150	+ cameraView.ToggleSwitch();
2958	3151	cameraView.repaint();
2959	3152	return;
2960	3153	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2982,6 +3175,10 @@
2982	3175	} else if (event.getSource() == liveCB)
2983	3176	{
2984	3177	copy.live ^= true;
	3178	+ return;
	3179	+ } else if (event.getSource() == selectCB)
	3180	+ {
	3181	+ copy.dontselect ^= true;
2985	3182	return;
2986	3183	} else if (event.getSource() == hideCB)
2987	3184	{
..	..	@@ -3021,8 +3218,9 @@
3021	3218
3022	3219	public void actionPerformed(ActionEvent event)
3023	3220	{
	3221	+ Object source = event.getSource();
3024	3222	// SCRIPT DIALOG
3025		- if (event.getSource() == okbutton)
	3223	+ if (source == okbutton)
3026	3224	{
3027	3225	textpanel.setVisible(false);
3028	3226	textpanel.remove(textarea);
..	..	@@ -3034,7 +3232,7 @@
3034	3232	textarea = null;
3035	3233	textpanel = null;
3036	3234	}
3037		- if (event.getSource() == cancelbutton)
	3235	+ if (source == cancelbutton)
3038	3236	{
3039	3237	textpanel.setVisible(false);
3040	3238	textpanel.remove(textarea);
..	..	@@ -3046,50 +3244,50 @@
3046	3244	//applySelf();
3047	3245	//client.refreshEditWindow();
3048	3246	//refreshContents();
3049		- if (event.getSource() == nameField)
	3247	+ if (source == nameField)
3050	3248	{
3051	3249	//System.out.println("ObjEditor " + event);
3052	3250	applySelf0(true);
3053	3251	//parent.applySelf();
3054	3252	objEditor.refreshContents();
3055		- } else if (event.getSource() == resetButton)
	3253	+ } else if (source == resetButton)
3056	3254	{
3057	3255	CameraPane.fullreset = true;
3058	3256	copy.Reset(); // ResetMeshes();
3059	3257	copy.Touch();
3060	3258	objEditor.refreshContents();
3061		- } else if (event.getSource() == stepItem)
	3259	+ } else if (source == stepItem)
3062	3260	{
3063	3261	//cameraView.ONESTEP = true;
3064	3262	Globals.ONESTEP = true;
3065	3263	cameraView.repaint();
3066	3264	return;
3067		- } else if (event.getSource() == stepButton)
	3265	+ } else if (source == stepButton)
3068	3266	{
3069	3267	copy.Step();
3070	3268	copy.Touch();
3071	3269	objEditor.refreshContents();
3072		- } else if (event.getSource() == slowerButton)
	3270	+ } else if (source == slowerButton)
3073	3271	{
3074	3272	copy.Slower();
3075	3273	copy.Touch();
3076	3274	objEditor.refreshContents();
3077		- } else if (event.getSource() == fasterButton)
	3275	+ } else if (source == fasterButton)
3078	3276	{
3079	3277	copy.Faster();
3080	3278	copy.Touch();
3081	3279	objEditor.refreshContents();
3082		- } else if (event.getSource() == remarkButton)
	3280	+ } else if (source == remarkButton)
3083	3281	{
3084	3282	copy.Remark();
3085	3283	copy.Touch();
3086	3284	objEditor.refreshContents();
3087		- } else if (event.getSource() == stepAllButton)
	3285	+ } else if (source == stepAllButton)
3088	3286	{
3089	3287	copy.StepAll();
3090	3288	copy.Touch();
3091	3289	objEditor.refreshContents();
3092		- } else if (event.getSource() == resetAllButton)
	3290	+ } else if (source == resetAllButton)
3093	3291	{
3094	3292	//CameraPane.fullreset = true;
3095	3293	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3122,53 +3320,75 @@
3122	3320	// Close();
3123	3321	// }
3124	3322	// else
3125		- if (event.getSource() == resetSlidersButton)
	3323	+ if (source == resetSlidersButton)
3126	3324	{
3127	3325	ResetSliders();
3128		- } else if (event.getSource() == clearMaterialButton)
	3326	+ } else if (source == clearMaterialButton)
3129	3327	{
3130	3328	ClearMaterial();
3131		- } else if (event.getSource() == createMaterialButton)
	3329	+ } else if (source == createMaterialButton)
3132	3330	{
3133	3331	CreateMaterial();
3134		- } else if (event.getSource() == clearPanelButton)
	3332	+ } else if (source == clearPanelButton)
3135	3333	{
3136	3334	copy.ClearUI();
3137	3335	refreshContents(true);
3138		- } /*
3139		- }
3140		-
3141		- public boolean action(Event event, Object arg)
3142		- {
3143		- */ else if (event.getSource() == closeItem)
	3336	+ } else if (source == importGFDItem)
	3337	+ {
	3338	+ ImportGFD();
	3339	+ } else
	3340	+ if (source == importVRMLX3DItem)
	3341	+ {
	3342	+ ImportVRMLX3D();
	3343	+ } else
	3344	+ if (source == import3DSItem)
	3345	+ {
	3346	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3347	+ } else
	3348	+ if (source == importOBJItem)
	3349	+ {
	3350	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3351	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3352	+ browser.setVisible(true);
	3353	+ String filename = browser.getFile();
	3354	+ if (filename != null && filename.length() > 0)
	3355	+ {
	3356	+ String fullname = browser.getDirectory() + filename;
	3357	+ makeSomething(ReadOBJ(fullname), true);
	3358	+ }
	3359	+ } else
	3360	+ if (source == closeItem)
3144	3361	{
3145	3362	Close();
3146	3363	//return true;
3147		- } else if (event.getSource() == loadItem)
	3364	+ } else if (source == loadItem)
3148	3365	{
3149	3366	load();
3150	3367	//return true;
3151		- } else if (event.getSource() == saveItem)
	3368	+ } else if (source == newItem)
	3369	+ {
	3370	+ New();
	3371	+ } else if (source == saveItem)
3152	3372	{
3153	3373	save();
3154	3374	//return true;
3155		- } else if (event.getSource() == saveAsItem)
	3375	+ } else if (source == saveAsItem)
3156	3376	{
3157	3377	saveAs();
3158	3378	//return true;
3159		- } else if (event.getSource() == reexportItem)
	3379	+ } else if (source == reexportItem)
3160	3380	{
3161	3381	reexport();
3162	3382	//return true;
3163		- } else if (event.getSource() == exportAsItem)
	3383	+ } else if (source == exportAsItem)
3164	3384	{
3165	3385	export();
3166	3386	//return true;
3167		- } else if (event.getSource() == povItem)
	3387	+ } else if (source == povItem)
3168	3388	{
3169	3389	generatePOV();
3170	3390	//return true;
3171		- } else if (event.getSource() == zBufferItem)
	3391	+ } else if (source == zBufferItem)
3172	3392	{
3173	3393	try
3174	3394	{
..	..	@@ -3190,21 +3410,8 @@
3190	3410	cameraView.repaint();
3191	3411	//return true;
3192	3412	}
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)
	3413	+ */ else // combos...
	3414	+ if (source == texresMenu)
3208	3415	{
3209	3416	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3210	3417	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3216,6 +3423,281 @@
3216	3423	}
3217	3424	}
3218	3425
	3426	+ void New()
	3427	+ {
	3428	+ while (copy.Size() > 1)
	3429	+ {
	3430	+ copy.remove(1);
	3431	+ }
	3432	+
	3433	+ ResetModel();
	3434	+ objEditor.refreshContents();
	3435	+ }
	3436	+
	3437	+ static public byte[] Compress(Object3D o)
	3438	+ {
	3439	+ try
	3440	+ {
	3441	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3442	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3443	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3444	+
	3445	+ Object3D parent = o.parent;
	3446	+ o.parent = null;
	3447	+
	3448	+ out.writeObject(o);
	3449	+
	3450	+ o.parent = parent;
	3451	+
	3452	+ out.flush();
	3453	+
	3454	+ zstream.close();
	3455	+ out.close();
	3456	+
	3457	+ return baos.toByteArray();
	3458	+ } catch (Exception e)
	3459	+ {
	3460	+ System.err.println(e);
	3461	+ return null;
	3462	+ }
	3463	+ }
	3464	+
	3465	+ static public Object Uncompress(byte[] bytes)
	3466	+ {
	3467	+ System.out.println("#bytes = " + bytes.length);
	3468	+ try
	3469	+ {
	3470	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3471	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3472	+ ObjectInputStream in = new ObjectInputStream(istream);
	3473	+ Object obj = in.readObject();
	3474	+ in.close();
	3475	+
	3476	+ return obj;
	3477	+ } catch (Exception e)
	3478	+ {
	3479	+ System.err.println(e);
	3480	+ return null;
	3481	+ }
	3482	+ }
	3483	+
	3484	+ static public Object clone(Object o)
	3485	+ {
	3486	+ try
	3487	+ {
	3488	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3489	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3490	+
	3491	+ out.writeObject(o);
	3492	+
	3493	+ out.flush();
	3494	+ out.close();
	3495	+
	3496	+ byte[] bytes = baos.toByteArray();
	3497	+
	3498	+ System.out.println("clone = " + bytes.length);
	3499	+
	3500	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3501	+ ObjectInputStream in = new ObjectInputStream(bais);
	3502	+ Object obj = in.readObject();
	3503	+ in.close();
	3504	+
	3505	+ return obj;
	3506	+ } catch (Exception e)
	3507	+ {
	3508	+ System.err.println(e);
	3509	+ return null;
	3510	+ }
	3511	+ }
	3512	+
	3513	+ cRadio GetCurrentTab()
	3514	+ {
	3515	+ cRadio ab;
	3516	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3517	+ {
	3518	+ ab = (cRadio)e.nextElement();
	3519	+ if(ab.GetObject() == copy)
	3520	+ {
	3521	+ return ab;
	3522	+ }
	3523	+ }
	3524	+
	3525	+ return null;
	3526	+ }
	3527	+
	3528	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3529	+
	3530	+ public void Save()
	3531	+ {
	3532	+ System.err.println("Save");
	3533	+
	3534	+ cRadio tab = GetCurrentTab();
	3535	+
	3536	+ boolean temp = CameraPane.SWITCH;
	3537	+ CameraPane.SWITCH = false;
	3538	+
	3539	+ copy.ExtractBigData(hashtable);
	3540	+
	3541	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3542	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3543	+
	3544	+ copy.RestoreBigData(hashtable);
	3545	+
	3546	+ CameraPane.SWITCH = temp;
	3547	+
	3548	+ //assert(hashtable.isEmpty());
	3549	+
	3550	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3551	+ {
	3552	+ tab.graphs[i] = null;
	3553	+ }
	3554	+
	3555	+ SetUndoStates();
	3556	+
	3557	+ // test save
	3558	+ if (false)
	3559	+ {
	3560	+ try
	3561	+ {
	3562	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3563	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3564	+
	3565	+ p.writeObject(copy);
	3566	+
	3567	+ p.flush();
	3568	+
	3569	+ ostream.close();
	3570	+ } catch (Exception e)
	3571	+ {
	3572	+ e.printStackTrace();
	3573	+ }
	3574	+ }
	3575	+ }
	3576	+
	3577	+ void CopyChanged(Object3D obj)
	3578	+ {
	3579	+ SetUndoStates();
	3580	+
	3581	+ boolean temp = CameraPane.SWITCH;
	3582	+ CameraPane.SWITCH = false;
	3583	+
	3584	+ copy.ExtractBigData(hashtable);
	3585	+
	3586	+ copy.clear();
	3587	+
	3588	+ for (int i=0; i<obj.Size(); i++)
	3589	+ {
	3590	+ copy.add(obj.get(i));
	3591	+ }
	3592	+
	3593	+ copy.RestoreBigData(hashtable);
	3594	+
	3595	+ CameraPane.SWITCH = temp;
	3596	+
	3597	+ //assert(hashtable.isEmpty());
	3598	+
	3599	+ copy.Touch();
	3600	+
	3601	+ ResetModel();
	3602	+ copy.HardTouch(); // recompile?
	3603	+
	3604	+ cRadio ab;
	3605	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3606	+ {
	3607	+ ab = (cRadio)e.nextElement();
	3608	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3609	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3610	+ if (test != null)
	3611	+ {
	3612	+ test.editWindow = ab.object.editWindow;
	3613	+ ab.object = test;
	3614	+ }
	3615	+ }
	3616	+
	3617	+ refreshContents();
	3618	+ }
	3619	+
	3620	+ cButton undoButton;
	3621	+ cButton redoButton;
	3622	+
	3623	+ void SetUndoStates()
	3624	+ {
	3625	+ cRadio tab = GetCurrentTab();
	3626	+
	3627	+ undoButton.setEnabled(tab.undoindex > 0);
	3628	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3629	+ }
	3630	+
	3631	+ public void Undo()
	3632	+ {
	3633	+ System.err.println("Undo");
	3634	+
	3635	+ cRadio tab = GetCurrentTab();
	3636	+
	3637	+ if (tab.undoindex == 0)
	3638	+ {
	3639	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3640	+ return;
	3641	+ }
	3642	+
	3643	+ if (tab.graphs[tab.undoindex] == null)
	3644	+ {
	3645	+ Save();
	3646	+ tab.undoindex -= 1;
	3647	+ }
	3648	+
	3649	+ tab.undoindex -= 1;
	3650	+
	3651	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3652	+ }
	3653	+
	3654	+ public void Redo()
	3655	+ {
	3656	+ cRadio tab = GetCurrentTab();
	3657	+
	3658	+ if (tab.graphs[tab.undoindex + 1] == null)
	3659	+ {
	3660	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3661	+ return;
	3662	+ }
	3663	+
	3664	+ tab.undoindex += 1;
	3665	+
	3666	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3667	+ }
	3668	+
	3669	+ void ImportGFD()
	3670	+ {
	3671	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3672	+ browser.show();
	3673	+ String filename = browser.getFile();
	3674	+ if (filename != null && filename.length() > 0)
	3675	+ {
	3676	+ String fullname = browser.getDirectory() + filename;
	3677	+
	3678	+ //Object3D readobj =
	3679	+ objEditor.ReadGFD(fullname, objEditor);
	3680	+ //makeSomething(readobj);
	3681	+ }
	3682	+ }
	3683	+
	3684	+ void ImportVRMLX3D()
	3685	+ {
	3686	+ if (Grafreed.standAlone)
	3687	+ {
	3688	+ /**/
	3689	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3690	+ browser.show();
	3691	+ String filename = browser.getFile();
	3692	+ if (filename != null && filename.length() > 0)
	3693	+ {
	3694	+ String fullname = browser.getDirectory() + filename;
	3695	+ LoadVRMLX3D(fullname);
	3696	+ }
	3697	+ /**/
	3698	+ }
	3699	+ }
	3700	+
3219	3701	void ToggleAnimation()
3220	3702	{
3221	3703	if (!Globals.ANIMATION)
..	..	@@ -3231,8 +3713,8 @@
3231	3713
3232	3714	Globals.ANIMATION ^= true;
3233	3715
3234		- GrafreeD.wav.cursor = 0;
3235		- GrafreeD.wav.loop = 0;
	3716	+ Grafreed.wav.cursor = 0;
	3717	+ Grafreed.wav.loop = 0;
3236	3718	}
3237	3719	} else
3238	3720	{
..	..	@@ -3253,7 +3735,6 @@
3253	3735	callee.refreshContents();
3254	3736	} else
3255	3737	{
3256		- new Exception().printStackTrace();
3257	3738	System.exit(0);
3258	3739	}
3259	3740	}
..	..	@@ -3283,7 +3764,7 @@
3283	3764	void CreateMaterial()
3284	3765	{
3285	3766	//copy.ClearMaterial(); // PATCH
3286		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3767	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3287	3768	if (copy.selection.size() > 0)
3288	3769	//SetMaterial(copy);
3289	3770	{
..	..	@@ -3334,7 +3815,7 @@
3334	3815	assert false;
3335	3816	}
3336	3817
3337		- void EditSelection()
	3818	+ void EditSelection(boolean newWindow)
3338	3819	{
3339	3820	}
3340	3821
..	..	@@ -3342,11 +3823,11 @@
3342	3823	{
3343	3824	copy.ResetBlockLoop(); // temporary problem
3344	3825
3345		- boolean random = CameraPane.RANDOM;
3346		- CameraPane.RANDOM = false; // parse everything
	3826	+ boolean random = CameraPane.SWITCH;
	3827	+ CameraPane.SWITCH = false; // parse everything
3347	3828	copy.ResetDisplayList();
3348	3829	copy.HardTouch();
3349		- CameraPane.RANDOM = random;
	3830	+ CameraPane.SWITCH = random;
3350	3831	}
3351	3832
3352	3833	// public void applySelf()
..	..	@@ -3420,6 +3901,36 @@
3420	3901	{
3421	3902	//System.out.println("Propagate = " + propagate);
3422	3903	copy.UpdateMaterial(anchor, current, propagate);
	3904	+
	3905	+ if (copy.material != null)
	3906	+ {
	3907	+ cMaterial mat = copy.material;
	3908	+
	3909	+ colorField.SetToolTipValue((mat.color));
	3910	+ modulationField.SetToolTipValue((mat.modulation));
	3911	+ metalnessField.SetToolTipValue((mat.metalness));
	3912	+ diffuseField.SetToolTipValue((mat.diffuse));
	3913	+ specularField.SetToolTipValue((mat.specular));
	3914	+ shininessField.SetToolTipValue((mat.shininess));
	3915	+ shiftField.SetToolTipValue((mat.shift));
	3916	+ ambientField.SetToolTipValue((mat.ambient));
	3917	+ lightareaField.SetToolTipValue((mat.lightarea));
	3918	+ diffusenessField.SetToolTipValue((mat.factor));
	3919	+ velvetField.SetToolTipValue((mat.velvet));
	3920	+ sheenField.SetToolTipValue((mat.sheen));
	3921	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3922	+ backlitField.SetToolTipValue((mat.bump));
	3923	+ anisoField.SetToolTipValue((mat.aniso));
	3924	+ anisoVField.SetToolTipValue((mat.anisoV));
	3925	+ cameraField.SetToolTipValue((mat.cameralight));
	3926	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3927	+ shadowField.SetToolTipValue((mat.shadow));
	3928	+ textureField.SetToolTipValue((mat.texture));
	3929	+ opacityField.SetToolTipValue((mat.opacity));
	3930	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3931	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3932	+ }
	3933	+
3423	3934	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3424	3935	{
3425	3936	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3535,7 +4046,7 @@
3535	4046	}
3536	4047
3537	4048	if (normalpushField != null)
3538		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4049	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3539	4050	}
3540	4051
3541	4052	void SnapObject()
..	..	@@ -3799,6 +4310,8 @@
3799	4310
3800	4311	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3801	4312	{
	4313	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4314	+ Save();
3802	4315	//Tween.set(thing, 0).target(1).start(tweenManager);
3803	4316	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3804	4317	// if (thing instanceof GenericJointDemo)
..	..	@@ -3885,6 +4398,12 @@
3885	4398	{
3886	4399	ResetModel();
3887	4400	Select(thing.GetTreePath(), true, false); // unselect... false);
	4401	+
	4402	+ if (thing.Size() == 0)
	4403	+ {
	4404	+ //EditSelection(false);
	4405	+ }
	4406	+
3888	4407	refreshContents();
3889	4408	}
3890	4409
..	..	@@ -4002,6 +4521,7 @@
4002	4521	}
4003	4522	}
4004	4523	}
	4524	+
4005	4525	LoadGFDThread loadGFDThread;
4006	4526
4007	4527	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4021,8 +4541,10 @@
4021	4541
4022	4542	try
4023	4543	{
	4544	+ // Try compressed version first.
4024	4545	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4025		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4546	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4547	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4026	4548
4027	4549	readobj = (Object3D) p.readObject();
4028	4550	istream.close();
..	..	@@ -4030,7 +4552,20 @@
4030	4552	readobj.ResetDisplayList();
4031	4553	} catch (Exception e)
4032	4554	{
4033		- e.printStackTrace();
	4555	+ //e.printStackTrace();
	4556	+ try
	4557	+ {
	4558	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4559	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4560	+
	4561	+ readobj = (Object3D) p.readObject();
	4562	+ istream.close();
	4563	+
	4564	+ readobj.ResetDisplayList();
	4565	+ } catch (Exception e2)
	4566	+ {
	4567	+ e2.printStackTrace();
	4568	+ }
4034	4569	}
4035	4570	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4036	4571	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4076,6 +4611,12 @@
4076	4611
4077	4612	void LoadIt(Object obj)
4078	4613	{
	4614	+ if (obj == null)
	4615	+ {
	4616	+ // Invalid file
	4617	+ return;
	4618	+ }
	4619	+
4079	4620	System.out.println("Loaded " + obj);
4080	4621	//new Exception().printStackTrace();
4081	4622	Object3D readobj = (Object3D) obj;
..	..	@@ -4085,6 +4626,8 @@
4085	4626
4086	4627	if (readobj != null)
4087	4628	{
	4629	+ if (Globals.SAVEONMAKE)
	4630	+ Save();
4088	4631	try
4089	4632	{
4090	4633	//readobj.deepCopySelf(copy);
..	..	@@ -4147,7 +4690,7 @@
4147	4690
4148	4691	void load() // throws ClassNotFoundException
4149	4692	{
4150		- if (GrafreeD.standAlone)
	4693	+ if (Grafreed.standAlone)
4151	4694	{
4152	4695	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4153	4696	browser.show();
..	..	@@ -4234,11 +4777,13 @@
4234	4777	try
4235	4778	{
4236	4779	FileOutputStream ostream = new FileOutputStream(lastname);
4237		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4780	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4781	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4238	4782
4239	4783	p.writeObject(copy);
4240	4784	p.flush();
4241	4785
	4786	+ zstream.close();
4242	4787	ostream.close();
4243	4788
4244	4789	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4248,17 +4793,20 @@
4248	4793	{
4249	4794	}
4250	4795	}
	4796	+
4251	4797	String lastname;
4252	4798
4253	4799	void saveAs()
4254	4800	{
4255		- if (GrafreeD.standAlone)
	4801	+ if (Grafreed.standAlone)
4256	4802	{
4257	4803	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4258	4804	browser.setVisible(true);
4259	4805	String filename = browser.getFile();
4260	4806	if (filename != null && filename.length() > 0)
4261	4807	{
	4808	+ if (!filename.endsWith(".gfd"))
	4809	+ filename += ".gfd";
4262	4810	lastname = browser.getDirectory() + filename;
4263	4811	save();
4264	4812	}
..	..	@@ -4357,13 +4905,13 @@
4357	4905	try
4358	4906	{
4359	4907	FileOutputStream ostream = new FileOutputStream(filename);
4360		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4361		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4908	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4909	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4362	4910
4363	4911	Object3D objectparent = obj.parent;
4364	4912	obj.parent = null;
4365	4913
4366		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4914	+ Object3D object = (Object3D) Grafreed.clone(obj);
4367	4915
4368	4916	obj.parent = objectparent;
4369	4917
..	..	@@ -4375,8 +4923,8 @@
4375	4923	p.writeObject(object);
4376	4924	p.flush();
4377	4925
	4926	+ zstream.close();
4378	4927	ostream.close();
4379		- // zstream.close();
4380	4928
4381	4929	// group.selection.get(0).parent = parent;
4382	4930	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4397,7 +4945,7 @@
4397	4945	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4398	4946	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4399	4947	copy.generatePOV(buffer);
4400		- if (GrafreeD.standAlone)
	4948	+ if (Grafreed.standAlone)
4401	4949	{
4402	4950	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4403	4951	browser.show();
..	..	@@ -4423,7 +4971,8 @@
4423	4971	Object3D client;
4424	4972	Object3D copy;
4425	4973	MenuBar menuBar;
4426		- Menu windowMenu;
	4974	+ Menu fileMenu;
	4975	+ MenuItem newItem;
4427	4976	MenuItem loadItem;
4428	4977	MenuItem saveItem;
4429	4978	MenuItem saveAsItem;
..	..	@@ -4431,11 +4980,9 @@
4431	4980	MenuItem reexportItem;
4432	4981	MenuItem povItem;
4433	4982	MenuItem closeItem;
4434		- Menu cameraMenu;
	4983	+
4435	4984	CheckboxMenuItem zBufferItem;
4436	4985	//MenuItem normalLensItem;
4437		- MenuItem editCameraItem;
4438		- MenuItem revertCameraItem;
4439	4986	MenuItem stepItem;
4440	4987	CheckboxMenuItem toggleLiveItem;
4441	4988	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4446,25 +4993,38 @@
4446	4993	CheckboxMenuItem toggleFootContactItem;
4447	4994	CheckboxMenuItem toggleDLItem;
4448	4995	CheckboxMenuItem toggleTextureItem;
4449		- CheckboxMenuItem toggleRandomItem;
	4996	+ CheckboxMenuItem toggleSwitchItem;
4450	4997	CheckboxMenuItem toggleRootItem;
4451	4998	CheckboxMenuItem animationItem;
4452	4999	CheckboxMenuItem toggleHandleItem;
4453	5000	CheckboxMenuItem togglePaintItem;
4454	5001	JSplitPane mainPanel;
4455	5002	JScrollPane scrollpane;
	5003	+
4456	5004	JPanel toolbarPanel;
	5005	+
4457	5006	cGridBag treePanel;
	5007	+
4458	5008	JPanel radioPanel;
4459	5009	ButtonGroup buttonGroup;
4460		- cGridBag ctrlPanel;
	5010	+
	5011	+ cGridBag toolboxPanel;
4461	5012	cGridBag materialPanel;
	5013	+ cGridBag ctrlPanel;
	5014	+
4462	5015	JScrollPane infoPanel;
	5016	+
4463	5017	cGridBag optionsPanel;
	5018	+
4464	5019	JTabbedPane objectPanel;
	5020	+ boolean materialFlushed;
	5021	+ Object3D latestObject;
	5022	+
4465	5023	cGridBag XYZPanel;
	5024	+
4466	5025	JSplitPane gridPanel;
4467	5026	JSplitPane bigPanel;
	5027	+
4468	5028	cGridBag bigThree;
4469	5029	cGridBag scenePanel;
4470	5030	cGridBag centralPanel;
..	..	@@ -4579,8 +5139,13 @@
4579	5139	cNumberSlider fogField;
4580	5140	JLabel opacityPowerLabel;
4581	5141	cNumberSlider opacityPowerField;
4582		- JTree jTree;
	5142	+ cTree jTree;
4583	5143	//ObjectUI parent;
4584	5144
4585	5145	cNumberSlider normalpushField;
	5146	+
	5147	+ private MenuItem importGFDItem;
	5148	+ private MenuItem importVRMLX3DItem;
	5149	+ private MenuItem import3DSItem;
	5150	+ private MenuItem importOBJItem;
4586	5151	}