~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
..	..	@@ -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
..	..	@@ -276,24 +340,40 @@
276	340	void SetupMenu()
277	341	{
278	342	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..."));
	343	+ menuBar.add(fileMenu = new Menu("File"));
	344	+ fileMenu.add(newItem = new MenuItem("New"));
	345	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	346	+
	347	+ //oe.menuBar.add(menu = new Menu("Include"));
	348	+ Menu menu = new Menu("Import");
	349	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	350	+ importOBJItem.addActionListener(this);
	351	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	352	+ import3DSItem.addActionListener(this);
	353	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	354	+ importVRMLX3DItem.addActionListener(this);
	355	+ menu.add("-");
	356	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	357	+ importGFDItem.addActionListener(this);
	358	+ fileMenu.add(menu);
	359	+ fileMenu.add("-");
	360	+
	361	+ fileMenu.add(saveItem = new MenuItem("Save"));
	362	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284	363	//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("-");
	364	+ fileMenu.add("-");
	365	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	366	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	367	+ fileMenu.add("-");
289	368	if (client.parent != null)
290	369	{
291		- windowMenu.add(closeItem = new MenuItem("Close"));
	370	+ fileMenu.add(closeItem = new MenuItem("Close"));
292	371	} else
293	372	{
294		- windowMenu.add(closeItem = new MenuItem("Exit"));
	373	+ fileMenu.add(closeItem = new MenuItem("Exit"));
295	374	}
296	375
	376	+ newItem.addActionListener(this);
297	377	loadItem.addActionListener(this);
298	378	saveItem.addActionListener(this);
299	379	saveAsItem.addActionListener(this);
..	..	@@ -302,70 +382,48 @@
302	382	//povItem.addActionListener(this);
303	383	closeItem.addActionListener(this);
304	384
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	385	objectPanel = new JTabbedPane();
	386	+
	387	+ ChangeListener changeListener = new ChangeListener()
	388	+ {
	389	+ public void stateChanged(ChangeEvent changeEvent)
	390	+ {
	391	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	392	+// {
	393	+// if (latestObject != null)
	394	+// {
	395	+// refreshContents(true);
	396	+// SetMaterial(latestObject);
	397	+// }
	398	+//
	399	+// materialFlushed = true;
	400	+// }
	401	+
	402	+ refreshContents(false); // To refresh Info tab
	403	+ }
	404	+ };
	405	+ objectPanel.addChangeListener(changeListener);
	406	+
361	407	toolbarPanel = new JPanel();
362	408	toolbarPanel.setName("Toolbar");
363	409	treePanel = new cGridBag();
364	410	treePanel.setName("Tree");
	411	+
	412	+ editPanel = new cGridBag().setVertical(true);
	413	+ editPanel.setName("Edit");
	414	+
365	415	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
366		- ctrlPanel.setName("Edit");
	416	+
	417	+ editCommandsPanel = new cGridBag();
	418	+ editPanel.add(editCommandsPanel);
	419	+ editPanel.add(ctrlPanel);
	420	+
	421	+ toolboxPanel = new cGridBag().setVertical(false);
	422	+ toolboxPanel.setName("Toolbox");
	423	+
367	424	materialPanel = new cGridBag().setVertical(true);
368	425	materialPanel.setName("Material");
	426	+
369	427	/JTextPane/
370	428	infoarea = createTextPane();
371	429	doc = infoarea.getStyledDocument();
..	..	@@ -458,10 +516,10 @@
458	516	e.printStackTrace();
459	517	}
460	518
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();
	519	+// String selection = infoarea.getText();
	520	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	521	+// java.awt.datatransfer.Clipboard clipboard =
	522	+// Toolkit.getDefaultToolkit().getSystemClipboard();
465	523	//clipboard.setContents(data, data);
466	524	}
467	525
..	..	@@ -484,13 +542,13 @@
484	542	//SendInfo("Name:", "bold");
485	543	if (sel.GetTextures() != null \|\| debug)
486	544	{
487		- si.SendInfo(sel.toString(), "bold");
	545	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
488	546	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
489	547	if (sel.Size() > 0)
490	548	{
491	549	si.SendInfo("#children = " + sel.Size(), "regular");
492	550	}
493		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	551	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
494	552	if (debug)
495	553	{
496	554	try
..	..	@@ -532,7 +590,7 @@
532	590	}
533	591	if (sel.support != null)
534	592	{
535		- si.SendInfo(" support: " + sel.support, "regular");
	593	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
536	594	}
537	595	if (sel.scriptnode != null)
538	596	{
..	..	@@ -621,20 +679,92 @@
621	679	}
622	680	}
623	681
	682	+static GraphicsDevice device = GraphicsEnvironment
	683	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	684	+
	685	+ Rectangle keeprect;
	686	+ cRadio radio;
	687	+
	688	+cButton keepButton;
	689	+ cButton twoButton; // Full 3D
	690	+ cButton sixButton;
	691	+ cButton threeButton;
	692	+ cButton sevenButton;
	693	+ cButton fourButton; // full panel
	694	+ cButton oneButton; // full XYZ
	695	+ //cButton currentLayout;
	696	+
	697	+ boolean maximized;
	698	+
	699	+ cButton fullscreenLayout;
	700	+
	701	+ void Minimize()
	702	+ {
	703	+ frame.setState(Frame.ICONIFIED);
	704	+ }
	705	+
	706	+ void Maximize()
	707	+ {
	708	+ if (maximized)
	709	+ {
	710	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	711	+ }
	712	+ else
	713	+ {
	714	+ keeprect = frame.getBounds();
	715	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	716	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	717	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	718	+// frame.setState(Frame.MAXIMIZED_BOTH);
	719	+ }
	720	+
	721	+ maximized ^= true;
	722	+ }
	723	+
624	724	void ToggleFullScreen()
625	725	{
626		- if (CameraPane.FULLSCREEN)
	726	+ cameraView.ToggleFullScreen();
	727	+
	728	+ if (!CameraPane.FULLSCREEN)
627	729	{
628		- frame.getContentPane().remove(/"Center",/bigThree);
629		- framePanel.add(bigThree);
630		- frame.getContentPane().add(/"Center",/framePanel);
	730	+ device.setFullScreenWindow(null);
	731	+ //frame.setVisible(false);
	732	+// frame.removeNotify();
	733	+// frame.setUndecorated(false);
	734	+// frame.addNotify();
	735	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	736	+
	737	+// X frame.getContentPane().remove(/"Center",/bigThree);
	738	+// X framePanel.add(bigThree);
	739	+// X frame.getContentPane().add(/"Center",/framePanel);
	740	+ framePanel.setDividerLocation(1);
	741	+
	742	+ //frame.setVisible(true);
	743	+ radio.layout = keepButton;
	744	+ //theFrame = null;
	745	+ keepButton = null;
	746	+ radio.layout.doClick();
	747	+
631	748	} else
632	749	{
633		- frame.getContentPane().remove(/"Center",/framePanel);
634		- framePanel.remove(bigThree);
635		- frame.getContentPane().add(/"Center",/bigThree);
	750	+ keepButton = radio.layout;
	751	+ //keeprect = frame.getBounds();
	752	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	753	+// frame.getToolkit().getScreenSize().height);
	754	+ //frame.setVisible(false);
	755	+ device.setFullScreenWindow(frame);
	756	+// frame.removeNotify();
	757	+// frame.setUndecorated(true);
	758	+// frame.addNotify();
	759	+// X frame.getContentPane().remove(/"Center",/framePanel);
	760	+// X framePanel.remove(bigThree);
	761	+// X frame.getContentPane().add(/"Center",/bigThree);
	762	+ framePanel.setDividerLocation(0);
	763	+
	764	+ radio.layout = fullscreenLayout;
	765	+ radio.layout.doClick();
	766	+ //frame.setVisible(true);
636	767	}
637		- cameraView.ToggleFullScreen();
638	768	}
639	769
640	770	private JTextPane createTextPane()
..	..	@@ -735,7 +865,7 @@
735	865	protected static ImageIcon createImageIcon(String path,
736	866	String description)
737	867	{
738		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	868	+ java.net.URL imgURL = Grafreed.class.getResource(path);
739	869	if (imgURL != null)
740	870	{
741	871	return new ImageIcon(imgURL, description);
..	..	@@ -767,6 +897,7 @@
767	897	// NumberSlider vDivsField;
768	898	// JCheckBox endcaps;
769	899	JCheckBox liveCB;
	900	+ JCheckBox selectCB;
770	901	JCheckBox hideCB;
771	902	JCheckBox link2masterCB;
772	903	JCheckBox markCB;
..	..	@@ -774,7 +905,12 @@
774	905	JCheckBox speedupCB;
775	906	JCheckBox rewindCB;
776	907	JCheckBox flipVCB;
	908	+
	909	+ cCheckBox toggleTextureCB;
	910	+ cCheckBox toggleSwitchCB;
	911	+
777	912	JComboBox texresMenu;
	913	+
778	914	JButton resetButton;
779	915	JButton stepButton;
780	916	JButton stepAllButton;
..	..	@@ -783,9 +919,13 @@
783	919	JButton fasterButton;
784	920	JButton remarkButton;
785	921
	922	+ cGridBag editPanel;
	923	+ cGridBag editCommandsPanel;
	924	+
786	925	cGridBag namePanel;
787	926	cGridBag setupPanel;
788		- cGridBag commandsPanel;
	927	+ cGridBag setupPanel2;
	928	+ cGridBag objectCommandsPanel;
789	929	cGridBag pushPanel;
790	930	cGridBag fillPanel;
791	931
..	..	@@ -969,49 +1109,55 @@
969	1109
970	1110	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
971	1111	liveCB.setToolTipText("Animate object");
	1112	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1113	+ selectCB.setToolTipText("Make object selectable");
	1114	+// Return();
972	1115	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
973	1116	hideCB.setToolTipText("Hide object");
974		-// Return();
975	1117	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
976	1118	markCB.setToolTipText("Set the animation target transform");
977	1119
978		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1120	+ setupPanel2 = new cGridBag().setVertical(false);
	1121	+
	1122	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
979	1123	rewindCB.setToolTipText("Rewind animation");
980	1124
981		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
982		- randomCB.setToolTipText("Option for switch node");
	1125	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1126	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
983	1127
984	1128	if (Globals.ADVANCED)
985	1129	{
986		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	1130	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
987	1131	link2masterCB.setToolTipText("Attach to support");
988		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1132	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
989	1133	speedupCB.setToolTipText("Option motion capture");
990	1134	}
991	1135
992	1136	oe.ctrlPanel.add(setupPanel);
993	1137	oe.ctrlPanel.Return();
	1138	+ oe.ctrlPanel.add(setupPanel2);
	1139	+ oe.ctrlPanel.Return();
994	1140
995		- commandsPanel = new cGridBag().setVertical(false);
	1141	+ objectCommandsPanel = new cGridBag().setVertical(false);
996	1142
997		- resetButton = AddButton(commandsPanel, "Reset");
	1143	+ resetButton = AddButton(objectCommandsPanel, "Reset");
998	1144	resetButton.setToolTipText("Jump to frame zero");
999		- stepButton = AddButton(commandsPanel, "Step");
	1145	+ stepButton = AddButton(objectCommandsPanel, "Step");
1000	1146	stepButton.setToolTipText("Step one frame");
1001	1147	// resetAllButton = AddButton(oe, "Reset All");
1002	1148	// stepAllButton = AddButton(oe, "Step All");
1003	1149	// Return();
1004		- slowerButton = AddButton(commandsPanel, "Slow");
	1150	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1005	1151	slowerButton.setToolTipText("Decrease animation speed");
1006		- fasterButton = AddButton(commandsPanel, "Fast");
	1152	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1007	1153	fasterButton.setToolTipText("Increase animation speed");
1008		- remarkButton = AddButton(commandsPanel, "Remark");
	1154	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1009	1155	remarkButton.setToolTipText("Set the current transform as the target");
1010	1156
1011		- oe.ctrlPanel.add(commandsPanel);
	1157	+ oe.ctrlPanel.add(objectCommandsPanel);
1012	1158	oe.ctrlPanel.Return();
1013	1159
1014		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1160	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1015	1161	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1016	1162	//Return();
1017	1163
..	..	@@ -1214,8 +1360,11 @@
1214	1360	//worldPanel.setName("World");
1215	1361	centralPanel = new cGridBag();
1216	1362	centralPanel.preferredWidth = 20;
1217		- timelinePanel = new JPanel(new BorderLayout());
1218		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1363	+
	1364	+ if (Globals.ADVANCED)
	1365	+ {
	1366	+ timelinePanel = new JPanel(new BorderLayout());
	1367	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1219	1368
1220	1369	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1221	1370	cameraPanel.setContinuousLayout(true);
..	..	@@ -1224,7 +1373,10 @@
1224	1373	// cameraPanel.setDividerSize(9);
1225	1374	cameraPanel.setResizeWeight(1.0);
1226	1375
	1376	+ }
	1377	+
1227	1378	centralPanel.add(cameraView);
	1379	+ centralPanel.setFocusable(true);
1228	1380	//frame.setJMenuBar(timelineMenubar);
1229	1381	//centralPanel.add(timelinePanel);
1230	1382
..	..	@@ -1287,11 +1439,12 @@
1287	1439	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1288	1440	//tmp.setName("Edit");
1289	1441	objectPanel.add(materialPanel);
	1442	+ objectPanel.add(toolboxPanel);
1290	1443	// JPanel north = new JPanel(new BorderLayout());
1291	1444	// north.setName("Edit");
1292	1445	// north.add(ctrlPanel, BorderLayout.NORTH);
1293	1446	// objectPanel.add(north);
1294		- objectPanel.add(ctrlPanel);
	1447	+ objectPanel.add(editPanel);
1295	1448	objectPanel.add(infoPanel);
1296	1449
1297	1450	/*
..	..	@@ -1313,14 +1466,12 @@
1313	1466	scrollpane.addMouseWheelListener(this); // Default not fast enough
1314	1467
1315	1468	/JTabbedPane/ scenePanel = new cGridBag();
1316		- scenePanel.preferredWidth = 7;
	1469	+ scenePanel.preferredWidth = 6;
1317	1470
1318	1471	JTabbedPane tabbedPane = new JTabbedPane();
1319	1472	tabbedPane.add(scrollpane);
1320	1473
1321		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1322		-
1323		- optionsPanel = new cGridBag().setVertical(true);
	1474	+ optionsPanel = new cGridBag().setVertical(false);
1324	1475
1325	1476	optionsPanel.setName("Options");
1326	1477
..	..	@@ -1328,6 +1479,8 @@
1328	1479
1329	1480	tabbedPane.add(optionsPanel);
1330	1481
	1482	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1483	+
1331	1484	scenePanel.add(tabbedPane);
1332	1485
1333	1486	/*
..	..	@@ -1419,9 +1572,13 @@
1419	1572
1420	1573	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1421	1574
1422		- frame.setSize(1024, 768);
1423		- frame.show();
	1575	+ frame.setSize(1280, 860);
	1576	+
	1577	+ frame.validate();
	1578	+ frame.setVisible(true);
1424	1579
	1580	+ cameraView.requestFocusInWindow();
	1581	+
1425	1582	gridPanel.setDividerLocation(1.0);
1426	1583
1427	1584	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1459,19 +1616,22 @@
1459	1616
1460	1617	cGridBag editBar = new cGridBag().setVertical(false);
1461	1618
1462		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1619	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1463	1620	createMaterialButton.setToolTipText("Create material");
1464	1621
1465	1622	/*
1466	1623	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1467	1624	*/
1468	1625
1469		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1626	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1470	1627	clearMaterialButton.setToolTipText("Clear material");
1471	1628
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);
	1629	+ if (Globals.ADVANCED)
	1630	+ {
	1631	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1632	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1633	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1634	+ }
1475	1635
1476	1636	editBar.preferredHeight = 15;
1477	1637
..	..	@@ -1740,12 +1900,15 @@
1740	1900	opacityPowerField.addChangeListener(this);
1741	1901	/**/
1742	1902
1743		- resetSlidersButton.addActionListener(this);
1744	1903	clearMaterialButton.addActionListener(this);
1745	1904	createMaterialButton.addActionListener(this);
1746		-
1747		- propagateToggle.addItemListener(this);
1748		- multiplyToggle.addItemListener(this);
	1905	+
	1906	+ if (Globals.ADVANCED)
	1907	+ {
	1908	+ resetSlidersButton.addActionListener(this);
	1909	+ propagateToggle.addItemListener(this);
	1910	+ multiplyToggle.addItemListener(this);
	1911	+ }
1749	1912	}
1750	1913
1751	1914	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1916,7 +2079,7 @@
1916	2079
1917	2080	//? flashIt = false;
1918	2081	CameraPane pane = (CameraPane) cameraView;
1919		- pane.clickStart(location.x, location.y, 0);
	2082	+ pane.clickStart(location.x, location.y, 0, 0);
1920	2083	pane.clickEnd(location.x, location.y, 0, true);
1921	2084
1922	2085	if (group.selection.size() == 1)
..	..	@@ -1965,6 +2128,7 @@
1965	2128	e2.printStackTrace();
1966	2129	}
1967	2130	}
	2131	+
1968	2132	LoadJMEThread loadThread;
1969	2133
1970	2134	class LoadJMEThread extends Thread
..	..	@@ -2022,6 +2186,7 @@
2022	2186	//LoadFile0(filename, converter);
2023	2187	}
2024	2188	}
	2189	+
2025	2190	LoadOBJThread loadObjThread;
2026	2191
2027	2192	class LoadOBJThread extends Thread
..	..	@@ -2100,19 +2265,19 @@
2100	2265
2101	2266	void LoadObjFile(String fullname)
2102	2267	{
2103		- /*
	2268	+ System.out.println("Loading " + fullname);
	2269	+ /**/
2104	2270	//lastFilename = fullname;
2105	2271	if(loadObjThread == null)
2106	2272	{
2107		- loadObjThread = new LoadOBJThread();
2108		- loadObjThread.start();
	2273	+ loadObjThread = new LoadOBJThread();
	2274	+ loadObjThread.start();
2109	2275	}
2110	2276
2111	2277	loadObjThread.add(fullname);
2112		- */
	2278	+ /**/
2113	2279
2114		- System.out.println("Loading " + fullname);
2115		- makeSomething(new FileObject(fullname, true), true);
	2280	+ //makeSomething(new FileObject(fullname, true), true);
2116	2281	}
2117	2282
2118	2283	void LoadGFDFile(String fullname)
..	..	@@ -2373,11 +2538,11 @@
2373	2538
2374	2539	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2375	2540	{
2376		- if (GrafreeD.standAlone)
	2541	+ if (Grafreed.standAlone)
2377	2542	{
2378	2543	/**/
2379	2544	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2380		- browser.show();
	2545	+ browser.setVisible(true);
2381	2546	String filename = browser.getFile();
2382	2547	if (filename != null && filename.length() > 0)
2383	2548	{
..	..	@@ -2729,6 +2894,8 @@
2729	2894
2730	2895	void SetMaterial(Object3D object)
2731	2896	{
	2897	+ latestObject = object;
	2898	+
2732	2899	cMaterial mat = object.material;
2733	2900
2734	2901	if (mat == null)
..	..	@@ -2737,7 +2904,8 @@
2737	2904	return;
2738	2905	}
2739	2906
2740		- multiplyToggle.setSelected(mat.multiply);
	2907	+ if (multiplyToggle != null)
	2908	+ multiplyToggle.setSelected(mat.multiply);
2741	2909
2742	2910	assert (object.projectedVertices != null);
2743	2911
..	..	@@ -2913,7 +3081,7 @@
2913	3081	cameraView.ToggleDL();
2914	3082	cameraView.repaint();
2915	3083	return;
2916		- } else if (event.getSource() == toggleTextureItem)
	3084	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2917	3085	{
2918	3086	cameraView.ToggleTexture();
2919	3087	// june 2013 copy.HardTouch();
..	..	@@ -2952,9 +3120,9 @@
2952	3120	frame.validate();
2953	3121
2954	3122	return;
2955		- } else if (event.getSource() == toggleRandomItem)
	3123	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2956	3124	{
2957		- cameraView.ToggleRandom();
	3125	+ cameraView.ToggleSwitch();
2958	3126	cameraView.repaint();
2959	3127	return;
2960	3128	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2982,6 +3150,10 @@
2982	3150	} else if (event.getSource() == liveCB)
2983	3151	{
2984	3152	copy.live ^= true;
	3153	+ return;
	3154	+ } else if (event.getSource() == selectCB)
	3155	+ {
	3156	+ copy.dontselect ^= true;
2985	3157	return;
2986	3158	} else if (event.getSource() == hideCB)
2987	3159	{
..	..	@@ -3021,8 +3193,9 @@
3021	3193
3022	3194	public void actionPerformed(ActionEvent event)
3023	3195	{
	3196	+ Object source = event.getSource();
3024	3197	// SCRIPT DIALOG
3025		- if (event.getSource() == okbutton)
	3198	+ if (source == okbutton)
3026	3199	{
3027	3200	textpanel.setVisible(false);
3028	3201	textpanel.remove(textarea);
..	..	@@ -3034,7 +3207,7 @@
3034	3207	textarea = null;
3035	3208	textpanel = null;
3036	3209	}
3037		- if (event.getSource() == cancelbutton)
	3210	+ if (source == cancelbutton)
3038	3211	{
3039	3212	textpanel.setVisible(false);
3040	3213	textpanel.remove(textarea);
..	..	@@ -3046,50 +3219,50 @@
3046	3219	//applySelf();
3047	3220	//client.refreshEditWindow();
3048	3221	//refreshContents();
3049		- if (event.getSource() == nameField)
	3222	+ if (source == nameField)
3050	3223	{
3051	3224	//System.out.println("ObjEditor " + event);
3052	3225	applySelf0(true);
3053	3226	//parent.applySelf();
3054	3227	objEditor.refreshContents();
3055		- } else if (event.getSource() == resetButton)
	3228	+ } else if (source == resetButton)
3056	3229	{
3057	3230	CameraPane.fullreset = true;
3058	3231	copy.Reset(); // ResetMeshes();
3059	3232	copy.Touch();
3060	3233	objEditor.refreshContents();
3061		- } else if (event.getSource() == stepItem)
	3234	+ } else if (source == stepItem)
3062	3235	{
3063	3236	//cameraView.ONESTEP = true;
3064	3237	Globals.ONESTEP = true;
3065	3238	cameraView.repaint();
3066	3239	return;
3067		- } else if (event.getSource() == stepButton)
	3240	+ } else if (source == stepButton)
3068	3241	{
3069	3242	copy.Step();
3070	3243	copy.Touch();
3071	3244	objEditor.refreshContents();
3072		- } else if (event.getSource() == slowerButton)
	3245	+ } else if (source == slowerButton)
3073	3246	{
3074	3247	copy.Slower();
3075	3248	copy.Touch();
3076	3249	objEditor.refreshContents();
3077		- } else if (event.getSource() == fasterButton)
	3250	+ } else if (source == fasterButton)
3078	3251	{
3079	3252	copy.Faster();
3080	3253	copy.Touch();
3081	3254	objEditor.refreshContents();
3082		- } else if (event.getSource() == remarkButton)
	3255	+ } else if (source == remarkButton)
3083	3256	{
3084	3257	copy.Remark();
3085	3258	copy.Touch();
3086	3259	objEditor.refreshContents();
3087		- } else if (event.getSource() == stepAllButton)
	3260	+ } else if (source == stepAllButton)
3088	3261	{
3089	3262	copy.StepAll();
3090	3263	copy.Touch();
3091	3264	objEditor.refreshContents();
3092		- } else if (event.getSource() == resetAllButton)
	3265	+ } else if (source == resetAllButton)
3093	3266	{
3094	3267	//CameraPane.fullreset = true;
3095	3268	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3122,53 +3295,75 @@
3122	3295	// Close();
3123	3296	// }
3124	3297	// else
3125		- if (event.getSource() == resetSlidersButton)
	3298	+ if (source == resetSlidersButton)
3126	3299	{
3127	3300	ResetSliders();
3128		- } else if (event.getSource() == clearMaterialButton)
	3301	+ } else if (source == clearMaterialButton)
3129	3302	{
3130	3303	ClearMaterial();
3131		- } else if (event.getSource() == createMaterialButton)
	3304	+ } else if (source == createMaterialButton)
3132	3305	{
3133	3306	CreateMaterial();
3134		- } else if (event.getSource() == clearPanelButton)
	3307	+ } else if (source == clearPanelButton)
3135	3308	{
3136	3309	copy.ClearUI();
3137	3310	refreshContents(true);
3138		- } /*
3139		- }
3140		-
3141		- public boolean action(Event event, Object arg)
3142		- {
3143		- */ else if (event.getSource() == closeItem)
	3311	+ } else if (source == importGFDItem)
	3312	+ {
	3313	+ ImportGFD();
	3314	+ } else
	3315	+ if (source == importVRMLX3DItem)
	3316	+ {
	3317	+ ImportVRMLX3D();
	3318	+ } else
	3319	+ if (source == import3DSItem)
	3320	+ {
	3321	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3322	+ } else
	3323	+ if (source == importOBJItem)
	3324	+ {
	3325	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3326	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3327	+ browser.setVisible(true);
	3328	+ String filename = browser.getFile();
	3329	+ if (filename != null && filename.length() > 0)
	3330	+ {
	3331	+ String fullname = browser.getDirectory() + filename;
	3332	+ makeSomething(ReadOBJ(fullname), true);
	3333	+ }
	3334	+ } else
	3335	+ if (source == closeItem)
3144	3336	{
3145	3337	Close();
3146	3338	//return true;
3147		- } else if (event.getSource() == loadItem)
	3339	+ } else if (source == loadItem)
3148	3340	{
3149	3341	load();
3150	3342	//return true;
3151		- } else if (event.getSource() == saveItem)
	3343	+ } else if (source == newItem)
	3344	+ {
	3345	+ New();
	3346	+ } else if (source == saveItem)
3152	3347	{
3153	3348	save();
3154	3349	//return true;
3155		- } else if (event.getSource() == saveAsItem)
	3350	+ } else if (source == saveAsItem)
3156	3351	{
3157	3352	saveAs();
3158	3353	//return true;
3159		- } else if (event.getSource() == reexportItem)
	3354	+ } else if (source == reexportItem)
3160	3355	{
3161	3356	reexport();
3162	3357	//return true;
3163		- } else if (event.getSource() == exportAsItem)
	3358	+ } else if (source == exportAsItem)
3164	3359	{
3165	3360	export();
3166	3361	//return true;
3167		- } else if (event.getSource() == povItem)
	3362	+ } else if (source == povItem)
3168	3363	{
3169	3364	generatePOV();
3170	3365	//return true;
3171		- } else if (event.getSource() == zBufferItem)
	3366	+ } else if (source == zBufferItem)
3172	3367	{
3173	3368	try
3174	3369	{
..	..	@@ -3190,21 +3385,8 @@
3190	3385	cameraView.repaint();
3191	3386	//return true;
3192	3387	}
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)
	3388	+ */ else // combos...
	3389	+ if (source == texresMenu)
3208	3390	{
3209	3391	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3210	3392	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3216,6 +3398,266 @@
3216	3398	}
3217	3399	}
3218	3400
	3401	+ void New()
	3402	+ {
	3403	+ while (copy.Size() > 1)
	3404	+ {
	3405	+ copy.remove(1);
	3406	+ }
	3407	+
	3408	+ ResetModel();
	3409	+ objEditor.refreshContents();
	3410	+ }
	3411	+
	3412	+ static public byte[] Compress(Object3D o)
	3413	+ {
	3414	+ try
	3415	+ {
	3416	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3417	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3418	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3419	+
	3420	+ Object3D parent = o.parent;
	3421	+ o.parent = null;
	3422	+
	3423	+ out.writeObject(o);
	3424	+
	3425	+ o.parent = parent;
	3426	+
	3427	+ out.flush();
	3428	+
	3429	+ zstream.close();
	3430	+ out.close();
	3431	+
	3432	+ return baos.toByteArray();
	3433	+ } catch (Exception e)
	3434	+ {
	3435	+ System.err.println(e);
	3436	+ return null;
	3437	+ }
	3438	+ }
	3439	+
	3440	+ static public Object Uncompress(byte[] bytes)
	3441	+ {
	3442	+ System.out.println("#bytes = " + bytes.length);
	3443	+ try
	3444	+ {
	3445	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3446	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3447	+ ObjectInputStream in = new ObjectInputStream(istream);
	3448	+ Object obj = in.readObject();
	3449	+ in.close();
	3450	+
	3451	+ return obj;
	3452	+ } catch (Exception e)
	3453	+ {
	3454	+ System.err.println(e);
	3455	+ return null;
	3456	+ }
	3457	+ }
	3458	+
	3459	+ static public Object clone(Object o)
	3460	+ {
	3461	+ try
	3462	+ {
	3463	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3464	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3465	+
	3466	+ out.writeObject(o);
	3467	+
	3468	+ out.flush();
	3469	+ out.close();
	3470	+
	3471	+ byte[] bytes = baos.toByteArray();
	3472	+
	3473	+ System.out.println("clone = " + bytes.length);
	3474	+
	3475	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3476	+ ObjectInputStream in = new ObjectInputStream(bais);
	3477	+ Object obj = in.readObject();
	3478	+ in.close();
	3479	+
	3480	+ return obj;
	3481	+ } catch (Exception e)
	3482	+ {
	3483	+ System.err.println(e);
	3484	+ return null;
	3485	+ }
	3486	+ }
	3487	+
	3488	+ cRadio GetCurrentTab()
	3489	+ {
	3490	+ cRadio ab;
	3491	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3492	+ {
	3493	+ ab = (cRadio)e.nextElement();
	3494	+ if(ab.GetObject() == copy)
	3495	+ {
	3496	+ return ab;
	3497	+ }
	3498	+ }
	3499	+
	3500	+ return null;
	3501	+ }
	3502	+
	3503	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3504	+
	3505	+ public void Save()
	3506	+ {
	3507	+ System.err.println("Save");
	3508	+
	3509	+ cRadio tab = GetCurrentTab();
	3510	+
	3511	+ boolean temp = CameraPane.SWITCH;
	3512	+ CameraPane.SWITCH = false;
	3513	+
	3514	+ copy.ExtractBigData(hashtable);
	3515	+
	3516	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3517	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3518	+
	3519	+ copy.RestoreBigData(hashtable);
	3520	+
	3521	+ CameraPane.SWITCH = temp;
	3522	+
	3523	+ //assert(hashtable.isEmpty());
	3524	+
	3525	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3526	+ {
	3527	+ tab.graphs[i] = null;
	3528	+ }
	3529	+
	3530	+ // test save
	3531	+ if (false)
	3532	+ {
	3533	+ try
	3534	+ {
	3535	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3536	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3537	+
	3538	+ p.writeObject(copy);
	3539	+
	3540	+ p.flush();
	3541	+
	3542	+ ostream.close();
	3543	+ } catch (Exception e)
	3544	+ {
	3545	+ e.printStackTrace();
	3546	+ }
	3547	+ }
	3548	+ }
	3549	+
	3550	+ void CopyChanged(Object3D obj)
	3551	+ {
	3552	+ boolean temp = CameraPane.SWITCH;
	3553	+ CameraPane.SWITCH = false;
	3554	+
	3555	+ copy.ExtractBigData(hashtable);
	3556	+
	3557	+ copy.clear();
	3558	+
	3559	+ for (int i=0; i<obj.Size(); i++)
	3560	+ {
	3561	+ copy.add(obj.get(i));
	3562	+ }
	3563	+
	3564	+ copy.RestoreBigData(hashtable);
	3565	+
	3566	+ CameraPane.SWITCH = temp;
	3567	+
	3568	+ //assert(hashtable.isEmpty());
	3569	+
	3570	+ copy.Touch();
	3571	+
	3572	+ ResetModel();
	3573	+ copy.HardTouch(); // recompile?
	3574	+
	3575	+ cRadio ab;
	3576	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3577	+ {
	3578	+ ab = (cRadio)e.nextElement();
	3579	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3580	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3581	+ if (test != null)
	3582	+ {
	3583	+ test.editWindow = ab.object.editWindow;
	3584	+ ab.object = test;
	3585	+ }
	3586	+ }
	3587	+
	3588	+ refreshContents();
	3589	+ }
	3590	+
	3591	+ public void Undo()
	3592	+ {
	3593	+ System.err.println("Undo");
	3594	+
	3595	+ cRadio tab = GetCurrentTab();
	3596	+
	3597	+ if (tab.undoindex == 0)
	3598	+ {
	3599	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3600	+ return;
	3601	+ }
	3602	+
	3603	+ if (tab.graphs[tab.undoindex] == null)
	3604	+ {
	3605	+ Save();
	3606	+ tab.undoindex -= 1;
	3607	+ }
	3608	+
	3609	+ tab.undoindex -= 1;
	3610	+
	3611	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3612	+ }
	3613	+
	3614	+ public void Redo()
	3615	+ {
	3616	+ cRadio tab = GetCurrentTab();
	3617	+
	3618	+ if (tab.graphs[tab.undoindex + 1] == null)
	3619	+ {
	3620	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3621	+ return;
	3622	+ }
	3623	+
	3624	+ tab.undoindex += 1;
	3625	+
	3626	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3627	+ }
	3628	+
	3629	+ void ImportGFD()
	3630	+ {
	3631	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3632	+ browser.show();
	3633	+ String filename = browser.getFile();
	3634	+ if (filename != null && filename.length() > 0)
	3635	+ {
	3636	+ String fullname = browser.getDirectory() + filename;
	3637	+
	3638	+ //Object3D readobj =
	3639	+ objEditor.ReadGFD(fullname, objEditor);
	3640	+ //makeSomething(readobj);
	3641	+ }
	3642	+ }
	3643	+
	3644	+ void ImportVRMLX3D()
	3645	+ {
	3646	+ if (Grafreed.standAlone)
	3647	+ {
	3648	+ /**/
	3649	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3650	+ browser.show();
	3651	+ String filename = browser.getFile();
	3652	+ if (filename != null && filename.length() > 0)
	3653	+ {
	3654	+ String fullname = browser.getDirectory() + filename;
	3655	+ LoadVRMLX3D(fullname);
	3656	+ }
	3657	+ /**/
	3658	+ }
	3659	+ }
	3660	+
3219	3661	void ToggleAnimation()
3220	3662	{
3221	3663	if (!Globals.ANIMATION)
..	..	@@ -3231,8 +3673,8 @@
3231	3673
3232	3674	Globals.ANIMATION ^= true;
3233	3675
3234		- GrafreeD.wav.cursor = 0;
3235		- GrafreeD.wav.loop = 0;
	3676	+ Grafreed.wav.cursor = 0;
	3677	+ Grafreed.wav.loop = 0;
3236	3678	}
3237	3679	} else
3238	3680	{
..	..	@@ -3253,7 +3695,6 @@
3253	3695	callee.refreshContents();
3254	3696	} else
3255	3697	{
3256		- new Exception().printStackTrace();
3257	3698	System.exit(0);
3258	3699	}
3259	3700	}
..	..	@@ -3283,7 +3724,7 @@
3283	3724	void CreateMaterial()
3284	3725	{
3285	3726	//copy.ClearMaterial(); // PATCH
3286		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3727	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3287	3728	if (copy.selection.size() > 0)
3288	3729	//SetMaterial(copy);
3289	3730	{
..	..	@@ -3334,7 +3775,7 @@
3334	3775	assert false;
3335	3776	}
3336	3777
3337		- void EditSelection()
	3778	+ void EditSelection(boolean newWindow)
3338	3779	{
3339	3780	}
3340	3781
..	..	@@ -3342,11 +3783,11 @@
3342	3783	{
3343	3784	copy.ResetBlockLoop(); // temporary problem
3344	3785
3345		- boolean random = CameraPane.RANDOM;
3346		- CameraPane.RANDOM = false; // parse everything
	3786	+ boolean random = CameraPane.SWITCH;
	3787	+ CameraPane.SWITCH = false; // parse everything
3347	3788	copy.ResetDisplayList();
3348	3789	copy.HardTouch();
3349		- CameraPane.RANDOM = random;
	3790	+ CameraPane.SWITCH = random;
3350	3791	}
3351	3792
3352	3793	// public void applySelf()
..	..	@@ -3420,6 +3861,36 @@
3420	3861	{
3421	3862	//System.out.println("Propagate = " + propagate);
3422	3863	copy.UpdateMaterial(anchor, current, propagate);
	3864	+
	3865	+ if (copy.material != null)
	3866	+ {
	3867	+ cMaterial mat = copy.material;
	3868	+
	3869	+ colorField.SetToolTipValue((mat.color));
	3870	+ modulationField.SetToolTipValue((mat.modulation));
	3871	+ metalnessField.SetToolTipValue((mat.metalness));
	3872	+ diffuseField.SetToolTipValue((mat.diffuse));
	3873	+ specularField.SetToolTipValue((mat.specular));
	3874	+ shininessField.SetToolTipValue((mat.shininess));
	3875	+ shiftField.SetToolTipValue((mat.shift));
	3876	+ ambientField.SetToolTipValue((mat.ambient));
	3877	+ lightareaField.SetToolTipValue((mat.lightarea));
	3878	+ diffusenessField.SetToolTipValue((mat.factor));
	3879	+ velvetField.SetToolTipValue((mat.velvet));
	3880	+ sheenField.SetToolTipValue((mat.sheen));
	3881	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3882	+ backlitField.SetToolTipValue((mat.bump));
	3883	+ anisoField.SetToolTipValue((mat.aniso));
	3884	+ anisoVField.SetToolTipValue((mat.anisoV));
	3885	+ cameraField.SetToolTipValue((mat.cameralight));
	3886	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3887	+ shadowField.SetToolTipValue((mat.shadow));
	3888	+ textureField.SetToolTipValue((mat.texture));
	3889	+ opacityField.SetToolTipValue((mat.opacity));
	3890	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3891	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3892	+ }
	3893	+
3423	3894	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3424	3895	{
3425	3896	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3535,7 +4006,7 @@
3535	4006	}
3536	4007
3537	4008	if (normalpushField != null)
3538		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4009	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3539	4010	}
3540	4011
3541	4012	void SnapObject()
..	..	@@ -3799,6 +4270,8 @@
3799	4270
3800	4271	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3801	4272	{
	4273	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4274	+ Save();
3802	4275	//Tween.set(thing, 0).target(1).start(tweenManager);
3803	4276	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3804	4277	// if (thing instanceof GenericJointDemo)
..	..	@@ -3885,6 +4358,12 @@
3885	4358	{
3886	4359	ResetModel();
3887	4360	Select(thing.GetTreePath(), true, false); // unselect... false);
	4361	+
	4362	+ if (thing.Size() == 0)
	4363	+ {
	4364	+ //EditSelection(false);
	4365	+ }
	4366	+
3888	4367	refreshContents();
3889	4368	}
3890	4369
..	..	@@ -4002,6 +4481,7 @@
4002	4481	}
4003	4482	}
4004	4483	}
	4484	+
4005	4485	LoadGFDThread loadGFDThread;
4006	4486
4007	4487	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4021,8 +4501,10 @@
4021	4501
4022	4502	try
4023	4503	{
	4504	+ // Try compressed version first.
4024	4505	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4025		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4506	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4507	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4026	4508
4027	4509	readobj = (Object3D) p.readObject();
4028	4510	istream.close();
..	..	@@ -4030,7 +4512,20 @@
4030	4512	readobj.ResetDisplayList();
4031	4513	} catch (Exception e)
4032	4514	{
4033		- e.printStackTrace();
	4515	+ //e.printStackTrace();
	4516	+ try
	4517	+ {
	4518	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4519	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4520	+
	4521	+ readobj = (Object3D) p.readObject();
	4522	+ istream.close();
	4523	+
	4524	+ readobj.ResetDisplayList();
	4525	+ } catch (Exception e2)
	4526	+ {
	4527	+ e2.printStackTrace();
	4528	+ }
4034	4529	}
4035	4530	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4036	4531	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4076,6 +4571,12 @@
4076	4571
4077	4572	void LoadIt(Object obj)
4078	4573	{
	4574	+ if (obj == null)
	4575	+ {
	4576	+ // Invalid file
	4577	+ return;
	4578	+ }
	4579	+
4079	4580	System.out.println("Loaded " + obj);
4080	4581	//new Exception().printStackTrace();
4081	4582	Object3D readobj = (Object3D) obj;
..	..	@@ -4085,6 +4586,8 @@
4085	4586
4086	4587	if (readobj != null)
4087	4588	{
	4589	+ if (Globals.SAVEONMAKE)
	4590	+ Save();
4088	4591	try
4089	4592	{
4090	4593	//readobj.deepCopySelf(copy);
..	..	@@ -4147,7 +4650,7 @@
4147	4650
4148	4651	void load() // throws ClassNotFoundException
4149	4652	{
4150		- if (GrafreeD.standAlone)
	4653	+ if (Grafreed.standAlone)
4151	4654	{
4152	4655	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4153	4656	browser.show();
..	..	@@ -4234,11 +4737,13 @@
4234	4737	try
4235	4738	{
4236	4739	FileOutputStream ostream = new FileOutputStream(lastname);
4237		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4740	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4741	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4238	4742
4239	4743	p.writeObject(copy);
4240	4744	p.flush();
4241	4745
	4746	+ zstream.close();
4242	4747	ostream.close();
4243	4748
4244	4749	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4248,11 +4753,12 @@
4248	4753	{
4249	4754	}
4250	4755	}
	4756	+
4251	4757	String lastname;
4252	4758
4253	4759	void saveAs()
4254	4760	{
4255		- if (GrafreeD.standAlone)
	4761	+ if (Grafreed.standAlone)
4256	4762	{
4257	4763	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4258	4764	browser.setVisible(true);
..	..	@@ -4357,13 +4863,13 @@
4357	4863	try
4358	4864	{
4359	4865	FileOutputStream ostream = new FileOutputStream(filename);
4360		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4361		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4866	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4867	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4362	4868
4363	4869	Object3D objectparent = obj.parent;
4364	4870	obj.parent = null;
4365	4871
4366		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4872	+ Object3D object = (Object3D) Grafreed.clone(obj);
4367	4873
4368	4874	obj.parent = objectparent;
4369	4875
..	..	@@ -4375,8 +4881,8 @@
4375	4881	p.writeObject(object);
4376	4882	p.flush();
4377	4883
	4884	+ zstream.close();
4378	4885	ostream.close();
4379		- // zstream.close();
4380	4886
4381	4887	// group.selection.get(0).parent = parent;
4382	4888	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4397,7 +4903,7 @@
4397	4903	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4398	4904	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4399	4905	copy.generatePOV(buffer);
4400		- if (GrafreeD.standAlone)
	4906	+ if (Grafreed.standAlone)
4401	4907	{
4402	4908	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4403	4909	browser.show();
..	..	@@ -4423,7 +4929,8 @@
4423	4929	Object3D client;
4424	4930	Object3D copy;
4425	4931	MenuBar menuBar;
4426		- Menu windowMenu;
	4932	+ Menu fileMenu;
	4933	+ MenuItem newItem;
4427	4934	MenuItem loadItem;
4428	4935	MenuItem saveItem;
4429	4936	MenuItem saveAsItem;
..	..	@@ -4431,11 +4938,9 @@
4431	4938	MenuItem reexportItem;
4432	4939	MenuItem povItem;
4433	4940	MenuItem closeItem;
4434		- Menu cameraMenu;
	4941	+
4435	4942	CheckboxMenuItem zBufferItem;
4436	4943	//MenuItem normalLensItem;
4437		- MenuItem editCameraItem;
4438		- MenuItem revertCameraItem;
4439	4944	MenuItem stepItem;
4440	4945	CheckboxMenuItem toggleLiveItem;
4441	4946	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4446,25 +4951,38 @@
4446	4951	CheckboxMenuItem toggleFootContactItem;
4447	4952	CheckboxMenuItem toggleDLItem;
4448	4953	CheckboxMenuItem toggleTextureItem;
4449		- CheckboxMenuItem toggleRandomItem;
	4954	+ CheckboxMenuItem toggleSwitchItem;
4450	4955	CheckboxMenuItem toggleRootItem;
4451	4956	CheckboxMenuItem animationItem;
4452	4957	CheckboxMenuItem toggleHandleItem;
4453	4958	CheckboxMenuItem togglePaintItem;
4454	4959	JSplitPane mainPanel;
4455	4960	JScrollPane scrollpane;
	4961	+
4456	4962	JPanel toolbarPanel;
	4963	+
4457	4964	cGridBag treePanel;
	4965	+
4458	4966	JPanel radioPanel;
4459	4967	ButtonGroup buttonGroup;
4460		- cGridBag ctrlPanel;
	4968	+
	4969	+ cGridBag toolboxPanel;
4461	4970	cGridBag materialPanel;
	4971	+ cGridBag ctrlPanel;
	4972	+
4462	4973	JScrollPane infoPanel;
	4974	+
4463	4975	cGridBag optionsPanel;
	4976	+
4464	4977	JTabbedPane objectPanel;
	4978	+ boolean materialFlushed;
	4979	+ Object3D latestObject;
	4980	+
4465	4981	cGridBag XYZPanel;
	4982	+
4466	4983	JSplitPane gridPanel;
4467	4984	JSplitPane bigPanel;
	4985	+
4468	4986	cGridBag bigThree;
4469	4987	cGridBag scenePanel;
4470	4988	cGridBag centralPanel;
..	..	@@ -4579,8 +5097,13 @@
4579	5097	cNumberSlider fogField;
4580	5098	JLabel opacityPowerLabel;
4581	5099	cNumberSlider opacityPowerField;
4582		- JTree jTree;
	5100	+ cTree jTree;
4583	5101	//ObjectUI parent;
4584	5102
4585	5103	cNumberSlider normalpushField;
	5104	+
	5105	+ private MenuItem importGFDItem;
	5106	+ private MenuItem importVRMLX3DItem;
	5107	+ private MenuItem import3DSItem;
	5108	+ private MenuItem importOBJItem;
4586	5109	}