~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,54 @@
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	+ cCheckBox GetCheckBox(String name, boolean border)
	56	+ {
	57	+ try
	58	+ {
	59	+ ImageIcon icon = GetIcon(name);
	60	+ return new cCheckBox(icon, border);
	61	+ }
	62	+ catch (Exception e)
	63	+ {
	64	+ return new cCheckBox(name, border);
	65	+ }
	66	+ }
	67	+
	68	+ private ImageIcon GetIcon(String name) throws IOException
	69	+ {
	70	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	71	+
	72	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	73	+ {
	74	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	75	+ Graphics2D g = resized.createGraphics();
	76	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	77	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	78	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	79	+ g.dispose();
	80	+
	81	+ image = resized;
	82	+ }
	83	+
	84	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	85	+ return icon;
	86	+ }
38	87
39	88	// SCRIPT
40	89
..	..	@@ -143,6 +192,8 @@
143	192	//nameField.removeActionListener(this);
144	193	// objEditor.ctrlPanel.remove(nameField);
145	194
	195	+ objEditor.ctrlPanel.remove(namePanel);
	196	+
146	197	if (!GroupEditor.allparams)
147	198	return;
148	199
..	..	@@ -165,9 +216,9 @@
165	216	// objEditor.ctrlPanel.remove(fasterButton);
166	217	// objEditor.ctrlPanel.remove(remarkButton);
167	218
168		- objEditor.ctrlPanel.remove(namePanel);
169	219	objEditor.ctrlPanel.remove(setupPanel);
170		- objEditor.ctrlPanel.remove(commandsPanel);
	220	+ objEditor.ctrlPanel.remove(setupPanel2);
	221	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
171	222	objEditor.ctrlPanel.remove(pushPanel);
172	223	//objEditor.ctrlPanel.remove(fillPanel);
173	224
..	..	@@ -242,6 +293,7 @@
242	293	//localCopy.parent = null;
243	294
244	295	frame = new JFrame();
	296	+ frame.setUndecorated(true);
245	297	objEditor = this;
246	298	this.callee = callee;
247	299
..	..	@@ -275,24 +327,40 @@
275	327	void SetupMenu()
276	328	{
277	329	frame.setMenuBar(menuBar = new MenuBar());
278		- menuBar.add(windowMenu = new Menu("File"));
279		- windowMenu.add(loadItem = new MenuItem("Load..."));
280		- windowMenu.add("-");
281		- windowMenu.add(saveItem = new MenuItem("Save"));
282		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	330	+ menuBar.add(fileMenu = new Menu("File"));
	331	+ fileMenu.add(newItem = new MenuItem("New"));
	332	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	333	+
	334	+ //oe.menuBar.add(menu = new Menu("Include"));
	335	+ Menu menu = new Menu("Import");
	336	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	337	+ importOBJItem.addActionListener(this);
	338	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	339	+ import3DSItem.addActionListener(this);
	340	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	341	+ importVRMLX3DItem.addActionListener(this);
	342	+ menu.add("-");
	343	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	344	+ importGFDItem.addActionListener(this);
	345	+ fileMenu.add(menu);
	346	+ fileMenu.add("-");
	347	+
	348	+ fileMenu.add(saveItem = new MenuItem("Save"));
	349	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
283	350	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
284		- windowMenu.add("-");
285		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
286		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
287		- windowMenu.add("-");
	351	+ fileMenu.add("-");
	352	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	353	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	354	+ fileMenu.add("-");
288	355	if (client.parent != null)
289	356	{
290		- windowMenu.add(closeItem = new MenuItem("Close"));
	357	+ fileMenu.add(closeItem = new MenuItem("Close"));
291	358	} else
292	359	{
293		- windowMenu.add(closeItem = new MenuItem("Exit"));
	360	+ fileMenu.add(closeItem = new MenuItem("Exit"));
294	361	}
295	362
	363	+ newItem.addActionListener(this);
296	364	loadItem.addActionListener(this);
297	365	saveItem.addActionListener(this);
298	366	saveAsItem.addActionListener(this);
..	..	@@ -301,69 +369,23 @@
301	369	//povItem.addActionListener(this);
302	370	closeItem.addActionListener(this);
303	371
304		- menuBar.add(cameraMenu = new Menu("View"));
305		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
306		- //zBufferItem.addActionListener(this);
307		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
308		- //normalLensItem.addActionListener(this);
309		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
310		- revertCameraItem.addActionListener(this);
311		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
312		- toggleTimelineItem.addItemListener(this);
313		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314		- toggleFullScreenItem.addItemListener(this);
315		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316		- cameraMenu.add("-");
317		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
318		- toggleTextureItem.addItemListener(this);
319		- toggleTextureItem.setState(CameraPane.textureon);
320		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
321		- toggleLiveItem.addItemListener(this);
322		- toggleLiveItem.setState(Globals.isLIVE());
323		- cameraMenu.add(stepItem = new MenuItem("Step"));
324		- stepItem.addActionListener(this);
325		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
326		-// toggleDLItem.addItemListener(this);
327		-// toggleDLItem.setState(false);
328		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
329		- toggleRenderItem.addItemListener(this);
330		- toggleRenderItem.setState(!CameraPane.frozen);
331		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
332		- toggleDebugItem.addItemListener(this);
333		- toggleDebugItem.setState(CameraPane.DEBUG);
334		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
335		- toggleFrustumItem.addItemListener(this);
336		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
337		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
338		- toggleFootContactItem.addItemListener(this);
339		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
340		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
341		- toggleRandomItem.addItemListener(this);
342		- toggleRandomItem.setState(CameraPane.RANDOM);
343		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
344		- toggleHandleItem.addItemListener(this);
345		- toggleHandleItem.setState(CameraPane.HANDLES);
346		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
347		- togglePaintItem.addItemListener(this);
348		- togglePaintItem.setState(CameraPane.PAINTMODE);
349		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
350		-// toggleRootItem.addItemListener(this);
351		-// toggleRootItem.setState(false);
352		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
353		-// animationItem.addItemListener(this);
354		-// animationItem.setState(CameraPane.ANIMATION);
355		- cameraMenu.add("-");
356		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
357		- editCameraItem.addActionListener(this);
358		-
359	372	objectPanel = new JTabbedPane();
360	373	toolbarPanel = new JPanel();
361	374	toolbarPanel.setName("Toolbar");
362	375	treePanel = new cGridBag();
363	376	treePanel.setName("Tree");
	377	+
	378	+ editPanel = new cGridBag().setVertical(true);
	379	+ editPanel.setName("Edit");
	380	+
364	381	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
365		- ctrlPanel.setName("Edit");
	382	+
	383	+ editCommandsPanel = new cGridBag();
	384	+ editPanel.add(editCommandsPanel);
	385	+ editPanel.add(ctrlPanel);
	386	+
366	387	materialPanel = new cGridBag().setVertical(true);
	388	+
367	389	materialPanel.setName("Material");
368	390	/JTextPane/
369	391	infoarea = createTextPane();
..	..	@@ -457,10 +479,10 @@
457	479	e.printStackTrace();
458	480	}
459	481
460		- String selection = infoarea.getText();
461		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
462		- java.awt.datatransfer.Clipboard clipboard =
463		- Toolkit.getDefaultToolkit().getSystemClipboard();
	482	+// String selection = infoarea.getText();
	483	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	484	+// java.awt.datatransfer.Clipboard clipboard =
	485	+// Toolkit.getDefaultToolkit().getSystemClipboard();
464	486	//clipboard.setContents(data, data);
465	487	}
466	488
..	..	@@ -483,13 +505,13 @@
483	505	//SendInfo("Name:", "bold");
484	506	if (sel.GetTextures() != null \|\| debug)
485	507	{
486		- si.SendInfo(sel.toString(), "bold");
	508	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
487	509	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
488	510	if (sel.Size() > 0)
489	511	{
490	512	si.SendInfo("#children = " + sel.Size(), "regular");
491	513	}
492		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	514	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
493	515	if (debug)
494	516	{
495	517	try
..	..	@@ -531,7 +553,7 @@
531	553	}
532	554	if (sel.support != null)
533	555	{
534		- si.SendInfo(" support: " + sel.support, "regular");
	556	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
535	557	}
536	558	if (sel.scriptnode != null)
537	559	{
..	..	@@ -620,19 +642,89 @@
620	642	}
621	643	}
622	644
	645	+static GraphicsDevice device = GraphicsEnvironment
	646	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	647	+
	648	+ Rectangle keeprect;
	649	+ cRadio radio;
	650	+
	651	+cButton keepButton;
	652	+ cButton twoButton; // Full 3D
	653	+ cButton sixButton;
	654	+ cButton threeButton;
	655	+ cButton sevenButton;
	656	+ cButton fourButton; // full panel
	657	+ cButton oneButton; // full XYZ
	658	+ //cButton currentLayout;
	659	+
	660	+ boolean maximized;
	661	+
	662	+ void Minimize()
	663	+ {
	664	+ frame.setState(Frame.ICONIFIED);
	665	+ }
	666	+
	667	+ void Maximize()
	668	+ {
	669	+ if (maximized)
	670	+ {
	671	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	672	+ }
	673	+ else
	674	+ {
	675	+ keeprect = frame.getBounds();
	676	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	677	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	678	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	679	+// frame.setState(Frame.MAXIMIZED_BOTH);
	680	+ }
	681	+
	682	+ maximized ^= true;
	683	+ }
	684	+
623	685	void ToggleFullScreen()
624	686	{
625	687	if (CameraPane.FULLSCREEN)
626	688	{
627		- frame.getContentPane().remove(/"Center",/bigThree);
628		- framePanel.add(bigThree);
629		- frame.getContentPane().add(/"Center",/framePanel);
	689	+ device.setFullScreenWindow(null);
	690	+ //frame.setVisible(false);
	691	+// frame.removeNotify();
	692	+// frame.setUndecorated(false);
	693	+// frame.addNotify();
	694	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	695	+
	696	+// X frame.getContentPane().remove(/"Center",/bigThree);
	697	+// X framePanel.add(bigThree);
	698	+// X frame.getContentPane().add(/"Center",/framePanel);
	699	+ framePanel.setDividerLocation(1);
	700	+
	701	+ //frame.setVisible(true);
	702	+ radio.layout = keepButton;
	703	+ //theFrame = null;
	704	+ keepButton = null;
	705	+ radio.layout.doClick();
	706	+
630	707	} else
631	708	{
632		- frame.getContentPane().remove(/"Center",/framePanel);
633		- framePanel.remove(bigThree);
634		- frame.getContentPane().add(/"Center",/bigThree);
	709	+ keepButton = radio.layout;
	710	+ //keeprect = frame.getBounds();
	711	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	712	+// frame.getToolkit().getScreenSize().height);
	713	+ //frame.setVisible(false);
	714	+ device.setFullScreenWindow(frame);
	715	+// frame.removeNotify();
	716	+// frame.setUndecorated(true);
	717	+// frame.addNotify();
	718	+// X frame.getContentPane().remove(/"Center",/framePanel);
	719	+// X framePanel.remove(bigThree);
	720	+// X frame.getContentPane().add(/"Center",/bigThree);
	721	+ framePanel.setDividerLocation(0);
	722	+
	723	+ radio.layout = twoButton;
	724	+ radio.layout.doClick();
	725	+ //frame.setVisible(true);
635	726	}
	727	+
636	728	cameraView.ToggleFullScreen();
637	729	}
638	730
..	..	@@ -734,7 +826,7 @@
734	826	protected static ImageIcon createImageIcon(String path,
735	827	String description)
736	828	{
737		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	829	+ java.net.URL imgURL = Grafreed.class.getResource(path);
738	830	if (imgURL != null)
739	831	{
740	832	return new ImageIcon(imgURL, description);
..	..	@@ -766,6 +858,7 @@
766	858	// NumberSlider vDivsField;
767	859	// JCheckBox endcaps;
768	860	JCheckBox liveCB;
	861	+ JCheckBox selectCB;
769	862	JCheckBox hideCB;
770	863	JCheckBox link2masterCB;
771	864	JCheckBox markCB;
..	..	@@ -782,9 +875,13 @@
782	875	JButton fasterButton;
783	876	JButton remarkButton;
784	877
	878	+ cGridBag editPanel;
	879	+ cGridBag editCommandsPanel;
	880	+
785	881	cGridBag namePanel;
786	882	cGridBag setupPanel;
787		- cGridBag commandsPanel;
	883	+ cGridBag setupPanel2;
	884	+ cGridBag objectCommandsPanel;
788	885	cGridBag pushPanel;
789	886	cGridBag fillPanel;
790	887
..	..	@@ -951,10 +1048,6 @@
951	1048
952	1049	void SetupUI2(ObjEditor oe)
953	1050	{
954		-// oe.aConstraints.weightx = 0;
955		-// oe.aConstraints.weighty = 0;
956		-// oe.aConstraints.gridx = 0;
957		-// oe.aConstraints.gridy = 0;
958	1051	//SetupName(oe);
959	1052
960	1053	namePanel = new cGridBag();
..	..	@@ -971,32 +1064,56 @@
971	1064	setupPanel = new cGridBag().setVertical(false);
972	1065
973	1066	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
974		- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
975		- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1067	+ liveCB.setToolTipText("Animate object");
	1068	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1069	+ selectCB.setToolTipText("Make object selectable");
976	1070	// Return();
	1071	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1072	+ hideCB.setToolTipText("Hide object");
977	1073	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
978		- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
979		- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	1074	+ markCB.setToolTipText("Set the animation target transform");
	1075	+
	1076	+ setupPanel2 = new cGridBag().setVertical(false);
	1077	+
	1078	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1079	+ rewindCB.setToolTipText("Rewind animation");
	1080	+
	1081	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1082	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
980	1083
	1084	+ if (Globals.ADVANCED)
	1085	+ {
	1086	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1087	+ link2masterCB.setToolTipText("Attach to support");
	1088	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1089	+ speedupCB.setToolTipText("Option motion capture");
	1090	+ }
	1091	+
981	1092	oe.ctrlPanel.add(setupPanel);
982	1093	oe.ctrlPanel.Return();
	1094	+ oe.ctrlPanel.add(setupPanel2);
	1095	+ oe.ctrlPanel.Return();
983	1096
984		- commandsPanel = new cGridBag().setVertical(false);
	1097	+ objectCommandsPanel = new cGridBag().setVertical(false);
985	1098
986		- resetButton = AddButton(commandsPanel, "Reset");
987		- stepButton = AddButton(commandsPanel, "Step");
	1099	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1100	+ resetButton.setToolTipText("Jump to frame zero");
	1101	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1102	+ stepButton.setToolTipText("Step one frame");
988	1103	// resetAllButton = AddButton(oe, "Reset All");
989	1104	// stepAllButton = AddButton(oe, "Step All");
990		- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
991	1105	// Return();
992		- slowerButton = AddButton(commandsPanel, "Slow");
993		- fasterButton = AddButton(commandsPanel, "Fast");
994		- remarkButton = AddButton(commandsPanel, "Remark");
	1106	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1107	+ slowerButton.setToolTipText("Decrease animation speed");
	1108	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1109	+ fasterButton.setToolTipText("Increase animation speed");
	1110	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1111	+ remarkButton.setToolTipText("Set the current transform as the target");
995	1112
996		- oe.ctrlPanel.add(commandsPanel);
	1113	+ oe.ctrlPanel.add(objectCommandsPanel);
997	1114	oe.ctrlPanel.Return();
998	1115
999		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1116	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1000	1117	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1001	1118	//Return();
1002	1119
..	..	@@ -1199,8 +1316,11 @@
1199	1316	//worldPanel.setName("World");
1200	1317	centralPanel = new cGridBag();
1201	1318	centralPanel.preferredWidth = 20;
1202		- timelinePanel = new JPanel(new BorderLayout());
1203		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1319	+
	1320	+ if (Globals.ADVANCED)
	1321	+ {
	1322	+ timelinePanel = new JPanel(new BorderLayout());
	1323	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1204	1324
1205	1325	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1206	1326	cameraPanel.setContinuousLayout(true);
..	..	@@ -1209,7 +1329,10 @@
1209	1329	// cameraPanel.setDividerSize(9);
1210	1330	cameraPanel.setResizeWeight(1.0);
1211	1331
	1332	+ }
	1333	+
1212	1334	centralPanel.add(cameraView);
	1335	+ centralPanel.setFocusable(true);
1213	1336	//frame.setJMenuBar(timelineMenubar);
1214	1337	//centralPanel.add(timelinePanel);
1215	1338
..	..	@@ -1276,7 +1399,7 @@
1276	1399	// north.setName("Edit");
1277	1400	// north.add(ctrlPanel, BorderLayout.NORTH);
1278	1401	// objectPanel.add(north);
1279		- objectPanel.add(ctrlPanel);
	1402	+ objectPanel.add(editPanel);
1280	1403	objectPanel.add(infoPanel);
1281	1404
1282	1405	/*
..	..	@@ -1298,7 +1421,7 @@
1298	1421	scrollpane.addMouseWheelListener(this); // Default not fast enough
1299	1422
1300	1423	/JTabbedPane/ scenePanel = new cGridBag();
1301		- scenePanel.preferredWidth = 7;
	1424	+ scenePanel.preferredWidth = 6;
1302	1425
1303	1426	JTabbedPane tabbedPane = new JTabbedPane();
1304	1427	tabbedPane.add(scrollpane);
..	..	@@ -1404,9 +1527,11 @@
1404	1527
1405	1528	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1406	1529
1407		- frame.setSize(1024, 768);
1408		- frame.show();
	1530	+ frame.setSize(1280, 860);
	1531	+ frame.setVisible(true);
1409	1532
	1533	+ cameraView.requestFocusInWindow();
	1534	+
1410	1535	gridPanel.setDividerLocation(1.0);
1411	1536
1412	1537	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1444,19 +1569,22 @@
1444	1569
1445	1570	cGridBag editBar = new cGridBag().setVertical(false);
1446	1571
1447		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1572	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1448	1573	createMaterialButton.setToolTipText("Create material");
1449	1574
1450	1575	/*
1451	1576	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1452	1577	*/
1453	1578
1454		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1579	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1455	1580	clearMaterialButton.setToolTipText("Clear material");
1456	1581
1457		- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1458		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1459		- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1582	+ if (Globals.ADVANCED)
	1583	+ {
	1584	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1585	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1586	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1587	+ }
1460	1588
1461	1589	editBar.preferredHeight = 15;
1462	1590
..	..	@@ -1725,12 +1853,15 @@
1725	1853	opacityPowerField.addChangeListener(this);
1726	1854	/**/
1727	1855
1728		- resetSlidersButton.addActionListener(this);
1729	1856	clearMaterialButton.addActionListener(this);
1730	1857	createMaterialButton.addActionListener(this);
1731		-
1732		- propagateToggle.addItemListener(this);
1733		- multiplyToggle.addItemListener(this);
	1858	+
	1859	+ if (Globals.ADVANCED)
	1860	+ {
	1861	+ resetSlidersButton.addActionListener(this);
	1862	+ propagateToggle.addItemListener(this);
	1863	+ multiplyToggle.addItemListener(this);
	1864	+ }
1734	1865	}
1735	1866
1736	1867	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1901,7 +2032,7 @@
1901	2032
1902	2033	//? flashIt = false;
1903	2034	CameraPane pane = (CameraPane) cameraView;
1904		- pane.clickStart(location.x, location.y, 0);
	2035	+ pane.clickStart(location.x, location.y, 0, 0);
1905	2036	pane.clickEnd(location.x, location.y, 0, true);
1906	2037
1907	2038	if (group.selection.size() == 1)
..	..	@@ -1950,6 +2081,7 @@
1950	2081	e2.printStackTrace();
1951	2082	}
1952	2083	}
	2084	+
1953	2085	LoadJMEThread loadThread;
1954	2086
1955	2087	class LoadJMEThread extends Thread
..	..	@@ -2007,6 +2139,7 @@
2007	2139	//LoadFile0(filename, converter);
2008	2140	}
2009	2141	}
	2142	+
2010	2143	LoadOBJThread loadObjThread;
2011	2144
2012	2145	class LoadOBJThread extends Thread
..	..	@@ -2085,19 +2218,19 @@
2085	2218
2086	2219	void LoadObjFile(String fullname)
2087	2220	{
2088		- /*
	2221	+ System.out.println("Loading " + fullname);
	2222	+ /**/
2089	2223	//lastFilename = fullname;
2090	2224	if(loadObjThread == null)
2091	2225	{
2092		- loadObjThread = new LoadOBJThread();
2093		- loadObjThread.start();
	2226	+ loadObjThread = new LoadOBJThread();
	2227	+ loadObjThread.start();
2094	2228	}
2095	2229
2096	2230	loadObjThread.add(fullname);
2097		- */
	2231	+ /**/
2098	2232
2099		- System.out.println("Loading " + fullname);
2100		- makeSomething(new FileObject(fullname, true), true);
	2233	+ //makeSomething(new FileObject(fullname, true), true);
2101	2234	}
2102	2235
2103	2236	void LoadGFDFile(String fullname)
..	..	@@ -2358,11 +2491,11 @@
2358	2491
2359	2492	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2360	2493	{
2361		- if (GrafreeD.standAlone)
	2494	+ if (Grafreed.standAlone)
2362	2495	{
2363	2496	/**/
2364	2497	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2365		- browser.show();
	2498	+ browser.setVisible(true);
2366	2499	String filename = browser.getFile();
2367	2500	if (filename != null && filename.length() > 0)
2368	2501	{
..	..	@@ -2722,7 +2855,8 @@
2722	2855	return;
2723	2856	}
2724	2857
2725		- multiplyToggle.setSelected(mat.multiply);
	2858	+ if (multiplyToggle != null)
	2859	+ multiplyToggle.setSelected(mat.multiply);
2726	2860
2727	2861	assert (object.projectedVertices != null);
2728	2862
..	..	@@ -2937,9 +3071,9 @@
2937	3071	frame.validate();
2938	3072
2939	3073	return;
2940		- } else if (event.getSource() == toggleRandomItem)
	3074	+ } else if (event.getSource() == toggleSwitchItem)
2941	3075	{
2942		- cameraView.ToggleRandom();
	3076	+ cameraView.ToggleSwitch();
2943	3077	cameraView.repaint();
2944	3078	return;
2945	3079	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2968,6 +3102,10 @@
2968	3102	{
2969	3103	copy.live ^= true;
2970	3104	return;
	3105	+ } else if (event.getSource() == selectCB)
	3106	+ {
	3107	+ copy.dontselect ^= true;
	3108	+ return;
2971	3109	} else if (event.getSource() == hideCB)
2972	3110	{
2973	3111	copy.hide ^= true;
..	..	@@ -2982,6 +3120,7 @@
2982	3120	if (event.getSource() == randomCB)
2983	3121	{
2984	3122	copy.random ^= true;
	3123	+ objEditor.refreshContents();
2985	3124	return;
2986	3125	}
2987	3126	if (event.getSource() == speedupCB)
..	..	@@ -3005,8 +3144,9 @@
3005	3144
3006	3145	public void actionPerformed(ActionEvent event)
3007	3146	{
	3147	+ Object source = event.getSource();
3008	3148	// SCRIPT DIALOG
3009		- if (event.getSource() == okbutton)
	3149	+ if (source == okbutton)
3010	3150	{
3011	3151	textpanel.setVisible(false);
3012	3152	textpanel.remove(textarea);
..	..	@@ -3018,7 +3158,7 @@
3018	3158	textarea = null;
3019	3159	textpanel = null;
3020	3160	}
3021		- if (event.getSource() == cancelbutton)
	3161	+ if (source == cancelbutton)
3022	3162	{
3023	3163	textpanel.setVisible(false);
3024	3164	textpanel.remove(textarea);
..	..	@@ -3030,50 +3170,50 @@
3030	3170	//applySelf();
3031	3171	//client.refreshEditWindow();
3032	3172	//refreshContents();
3033		- if (event.getSource() == nameField)
	3173	+ if (source == nameField)
3034	3174	{
3035	3175	//System.out.println("ObjEditor " + event);
3036	3176	applySelf0(true);
3037	3177	//parent.applySelf();
3038	3178	objEditor.refreshContents();
3039		- } else if (event.getSource() == resetButton)
	3179	+ } else if (source == resetButton)
3040	3180	{
3041	3181	CameraPane.fullreset = true;
3042	3182	copy.Reset(); // ResetMeshes();
3043	3183	copy.Touch();
3044	3184	objEditor.refreshContents();
3045		- } else if (event.getSource() == stepItem)
	3185	+ } else if (source == stepItem)
3046	3186	{
3047	3187	//cameraView.ONESTEP = true;
3048	3188	Globals.ONESTEP = true;
3049	3189	cameraView.repaint();
3050	3190	return;
3051		- } else if (event.getSource() == stepButton)
	3191	+ } else if (source == stepButton)
3052	3192	{
3053	3193	copy.Step();
3054	3194	copy.Touch();
3055	3195	objEditor.refreshContents();
3056		- } else if (event.getSource() == slowerButton)
	3196	+ } else if (source == slowerButton)
3057	3197	{
3058	3198	copy.Slower();
3059	3199	copy.Touch();
3060	3200	objEditor.refreshContents();
3061		- } else if (event.getSource() == fasterButton)
	3201	+ } else if (source == fasterButton)
3062	3202	{
3063	3203	copy.Faster();
3064	3204	copy.Touch();
3065	3205	objEditor.refreshContents();
3066		- } else if (event.getSource() == remarkButton)
	3206	+ } else if (source == remarkButton)
3067	3207	{
3068	3208	copy.Remark();
3069	3209	copy.Touch();
3070	3210	objEditor.refreshContents();
3071		- } else if (event.getSource() == stepAllButton)
	3211	+ } else if (source == stepAllButton)
3072	3212	{
3073	3213	copy.StepAll();
3074	3214	copy.Touch();
3075	3215	objEditor.refreshContents();
3076		- } else if (event.getSource() == resetAllButton)
	3216	+ } else if (source == resetAllButton)
3077	3217	{
3078	3218	//CameraPane.fullreset = true;
3079	3219	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3106,53 +3246,75 @@
3106	3246	// Close();
3107	3247	// }
3108	3248	// else
3109		- if (event.getSource() == resetSlidersButton)
	3249	+ if (source == resetSlidersButton)
3110	3250	{
3111	3251	ResetSliders();
3112		- } else if (event.getSource() == clearMaterialButton)
	3252	+ } else if (source == clearMaterialButton)
3113	3253	{
3114	3254	ClearMaterial();
3115		- } else if (event.getSource() == createMaterialButton)
	3255	+ } else if (source == createMaterialButton)
3116	3256	{
3117	3257	CreateMaterial();
3118		- } else if (event.getSource() == clearPanelButton)
	3258	+ } else if (source == clearPanelButton)
3119	3259	{
3120	3260	copy.ClearUI();
3121	3261	refreshContents(true);
3122		- } /*
3123		- }
3124		-
3125		- public boolean action(Event event, Object arg)
3126		- {
3127		- */ else if (event.getSource() == closeItem)
	3262	+ } else if (source == importGFDItem)
	3263	+ {
	3264	+ ImportGFD();
	3265	+ } else
	3266	+ if (source == importVRMLX3DItem)
	3267	+ {
	3268	+ ImportVRMLX3D();
	3269	+ } else
	3270	+ if (source == import3DSItem)
	3271	+ {
	3272	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3273	+ } else
	3274	+ if (source == importOBJItem)
	3275	+ {
	3276	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3277	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3278	+ browser.setVisible(true);
	3279	+ String filename = browser.getFile();
	3280	+ if (filename != null && filename.length() > 0)
	3281	+ {
	3282	+ String fullname = browser.getDirectory() + filename;
	3283	+ makeSomething(ReadOBJ(fullname), true);
	3284	+ }
	3285	+ } else
	3286	+ if (source == closeItem)
3128	3287	{
3129	3288	Close();
3130	3289	//return true;
3131		- } else if (event.getSource() == loadItem)
	3290	+ } else if (source == loadItem)
3132	3291	{
3133	3292	load();
3134	3293	//return true;
3135		- } else if (event.getSource() == saveItem)
	3294	+ } else if (source == newItem)
	3295	+ {
	3296	+ New();
	3297	+ } else if (source == saveItem)
3136	3298	{
3137	3299	save();
3138	3300	//return true;
3139		- } else if (event.getSource() == saveAsItem)
	3301	+ } else if (source == saveAsItem)
3140	3302	{
3141	3303	saveAs();
3142	3304	//return true;
3143		- } else if (event.getSource() == reexportItem)
	3305	+ } else if (source == reexportItem)
3144	3306	{
3145	3307	reexport();
3146	3308	//return true;
3147		- } else if (event.getSource() == exportAsItem)
	3309	+ } else if (source == exportAsItem)
3148	3310	{
3149	3311	export();
3150	3312	//return true;
3151		- } else if (event.getSource() == povItem)
	3313	+ } else if (source == povItem)
3152	3314	{
3153	3315	generatePOV();
3154	3316	//return true;
3155		- } else if (event.getSource() == zBufferItem)
	3317	+ } else if (source == zBufferItem)
3156	3318	{
3157	3319	try
3158	3320	{
..	..	@@ -3174,21 +3336,8 @@
3174	3336	cameraView.repaint();
3175	3337	//return true;
3176	3338	}
3177		- */ else if (event.getSource() == editCameraItem)
3178		- {
3179		- cameraView.ProtectCamera();
3180		- cameraView.repaint();
3181		- return;
3182		- } else if (event.getSource() == revertCameraItem)
3183		- {
3184		- cameraView.RevertCamera();
3185		- cameraView.repaint();
3186		- return;
3187		-// } else if (event.getSource() == textureButton)
3188		-// {
3189		-// return; // true;
3190		- } else // combos...
3191		- if (event.getSource() == texresMenu)
	3339	+ */ else // combos...
	3340	+ if (source == texresMenu)
3192	3341	{
3193	3342	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3194	3343	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3200,12 +3349,272 @@
3200	3349	}
3201	3350	}
3202	3351
	3352	+ void New()
	3353	+ {
	3354	+ while (copy.Size() > 1)
	3355	+ {
	3356	+ copy.remove(1);
	3357	+ }
	3358	+
	3359	+ ResetModel();
	3360	+ objEditor.refreshContents();
	3361	+ }
	3362	+
	3363	+ static public byte[] Compress(Object3D o)
	3364	+ {
	3365	+ try
	3366	+ {
	3367	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3368	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3369	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3370	+
	3371	+ Object3D parent = o.parent;
	3372	+ o.parent = null;
	3373	+
	3374	+ out.writeObject(o);
	3375	+
	3376	+ o.parent = parent;
	3377	+
	3378	+ out.flush();
	3379	+
	3380	+ zstream.close();
	3381	+ out.close();
	3382	+
	3383	+ return baos.toByteArray();
	3384	+ } catch (Exception e)
	3385	+ {
	3386	+ System.err.println(e);
	3387	+ return null;
	3388	+ }
	3389	+ }
	3390	+
	3391	+ static public Object Uncompress(byte[] bytes)
	3392	+ {
	3393	+ System.out.println("#bytes = " + bytes.length);
	3394	+ try
	3395	+ {
	3396	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3397	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3398	+ ObjectInputStream in = new ObjectInputStream(istream);
	3399	+ Object obj = in.readObject();
	3400	+ in.close();
	3401	+
	3402	+ return obj;
	3403	+ } catch (Exception e)
	3404	+ {
	3405	+ System.err.println(e);
	3406	+ return null;
	3407	+ }
	3408	+ }
	3409	+
	3410	+ static public Object clone(Object o)
	3411	+ {
	3412	+ try
	3413	+ {
	3414	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3415	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3416	+
	3417	+ out.writeObject(o);
	3418	+
	3419	+ out.flush();
	3420	+ out.close();
	3421	+
	3422	+ byte[] bytes = baos.toByteArray();
	3423	+
	3424	+ System.out.println("clone = " + bytes.length);
	3425	+
	3426	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3427	+ ObjectInputStream in = new ObjectInputStream(bais);
	3428	+ Object obj = in.readObject();
	3429	+ in.close();
	3430	+
	3431	+ return obj;
	3432	+ } catch (Exception e)
	3433	+ {
	3434	+ System.err.println(e);
	3435	+ return null;
	3436	+ }
	3437	+ }
	3438	+
	3439	+ cRadio GetCurrentTab()
	3440	+ {
	3441	+ cRadio ab;
	3442	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3443	+ {
	3444	+ ab = (cRadio)e.nextElement();
	3445	+ if(ab.GetObject() == copy)
	3446	+ {
	3447	+ return ab;
	3448	+ }
	3449	+ }
	3450	+
	3451	+ return null;
	3452	+ }
	3453	+
	3454	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3455	+
	3456	+ public void Save()
	3457	+ {
	3458	+ System.err.println("Save");
	3459	+
	3460	+ cRadio tab = GetCurrentTab();
	3461	+
	3462	+ boolean temp = CameraPane.SWITCH;
	3463	+ CameraPane.SWITCH = false;
	3464	+
	3465	+ copy.ExtractBigData(hashtable);
	3466	+
	3467	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3468	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3469	+
	3470	+ copy.RestoreBigData(hashtable);
	3471	+
	3472	+ CameraPane.SWITCH = temp;
	3473	+
	3474	+ //assert(hashtable.isEmpty());
	3475	+
	3476	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3477	+ {
	3478	+ tab.graphs[i] = null;
	3479	+ }
	3480	+
	3481	+ // test save
	3482	+ if (false)
	3483	+ {
	3484	+ try
	3485	+ {
	3486	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3487	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3488	+
	3489	+ p.writeObject(copy);
	3490	+
	3491	+ p.flush();
	3492	+
	3493	+ ostream.close();
	3494	+ } catch (Exception e)
	3495	+ {
	3496	+ e.printStackTrace();
	3497	+ }
	3498	+ }
	3499	+ }
	3500	+
	3501	+ void CopyChanged(Object3D obj)
	3502	+ {
	3503	+ boolean temp = CameraPane.SWITCH;
	3504	+ CameraPane.SWITCH = false;
	3505	+
	3506	+ copy.ExtractBigData(hashtable);
	3507	+
	3508	+ copy.clear();
	3509	+
	3510	+ for (int i=0; i<obj.Size(); i++)
	3511	+ {
	3512	+ copy.add(obj.get(i));
	3513	+ }
	3514	+
	3515	+ copy.RestoreBigData(hashtable);
	3516	+
	3517	+ CameraPane.SWITCH = temp;
	3518	+
	3519	+ //assert(hashtable.isEmpty());
	3520	+
	3521	+ copy.Touch();
	3522	+
	3523	+ ResetModel();
	3524	+ copy.HardTouch(); // recompile?
	3525	+
	3526	+ cRadio ab;
	3527	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3528	+ {
	3529	+ ab = (cRadio)e.nextElement();
	3530	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3531	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3532	+ if (test != null)
	3533	+ {
	3534	+ test.editWindow = ab.object.editWindow;
	3535	+ ab.object = test;
	3536	+ }
	3537	+ }
	3538	+
	3539	+ refreshContents();
	3540	+ }
	3541	+
	3542	+ public void Undo()
	3543	+ {
	3544	+ System.err.println("Undo");
	3545	+
	3546	+ cRadio tab = GetCurrentTab();
	3547	+
	3548	+ if (tab.undoindex == 0)
	3549	+ {
	3550	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3551	+ return;
	3552	+ }
	3553	+
	3554	+ if (tab.graphs[tab.undoindex] == null)
	3555	+ {
	3556	+ Save();
	3557	+ tab.undoindex -= 1;
	3558	+ }
	3559	+
	3560	+ tab.undoindex -= 1;
	3561	+
	3562	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3563	+ }
	3564	+
	3565	+ public void Redo()
	3566	+ {
	3567	+ cRadio tab = GetCurrentTab();
	3568	+
	3569	+ if (tab.graphs[tab.undoindex + 1] == null)
	3570	+ {
	3571	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3572	+ return;
	3573	+ }
	3574	+
	3575	+ tab.undoindex += 1;
	3576	+
	3577	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3578	+ }
	3579	+
	3580	+ void ImportGFD()
	3581	+ {
	3582	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3583	+ browser.show();
	3584	+ String filename = browser.getFile();
	3585	+ if (filename != null && filename.length() > 0)
	3586	+ {
	3587	+ String fullname = browser.getDirectory() + filename;
	3588	+
	3589	+ //Object3D readobj =
	3590	+ objEditor.ReadGFD(fullname, objEditor);
	3591	+ //makeSomething(readobj);
	3592	+ }
	3593	+ }
	3594	+
	3595	+ void ImportVRMLX3D()
	3596	+ {
	3597	+ if (Grafreed.standAlone)
	3598	+ {
	3599	+ /**/
	3600	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3601	+ browser.show();
	3602	+ String filename = browser.getFile();
	3603	+ if (filename != null && filename.length() > 0)
	3604	+ {
	3605	+ String fullname = browser.getDirectory() + filename;
	3606	+ LoadVRMLX3D(fullname);
	3607	+ }
	3608	+ /**/
	3609	+ }
	3610	+ }
	3611	+
3203	3612	void ToggleAnimation()
3204	3613	{
3205	3614	if (!Globals.ANIMATION)
3206	3615	{
3207	3616	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3208		- browser.show();
	3617	+ browser.setVisible(true);
3209	3618	String filename = browser.getFile();
3210	3619	if (filename != null && filename.length() > 0)
3211	3620	{
..	..	@@ -3215,8 +3624,8 @@
3215	3624
3216	3625	Globals.ANIMATION ^= true;
3217	3626
3218		- GrafreeD.wav.cursor = 0;
3219		- GrafreeD.wav.loop = 0;
	3627	+ Grafreed.wav.cursor = 0;
	3628	+ Grafreed.wav.loop = 0;
3220	3629	}
3221	3630	} else
3222	3631	{
..	..	@@ -3237,7 +3646,6 @@
3237	3646	callee.refreshContents();
3238	3647	} else
3239	3648	{
3240		- new Exception().printStackTrace();
3241	3649	System.exit(0);
3242	3650	}
3243	3651	}
..	..	@@ -3267,7 +3675,7 @@
3267	3675	void CreateMaterial()
3268	3676	{
3269	3677	//copy.ClearMaterial(); // PATCH
3270		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3678	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3271	3679	if (copy.selection.size() > 0)
3272	3680	//SetMaterial(copy);
3273	3681	{
..	..	@@ -3326,11 +3734,11 @@
3326	3734	{
3327	3735	copy.ResetBlockLoop(); // temporary problem
3328	3736
3329		- boolean random = CameraPane.RANDOM;
3330		- CameraPane.RANDOM = false; // parse everything
	3737	+ boolean random = CameraPane.SWITCH;
	3738	+ CameraPane.SWITCH = false; // parse everything
3331	3739	copy.ResetDisplayList();
3332	3740	copy.HardTouch();
3333		- CameraPane.RANDOM = random;
	3741	+ CameraPane.SWITCH = random;
3334	3742	}
3335	3743
3336	3744	// public void applySelf()
..	..	@@ -3404,6 +3812,36 @@
3404	3812	{
3405	3813	//System.out.println("Propagate = " + propagate);
3406	3814	copy.UpdateMaterial(anchor, current, propagate);
	3815	+
	3816	+ if (copy.material != null)
	3817	+ {
	3818	+ cMaterial mat = copy.material;
	3819	+
	3820	+ colorField.SetToolTipValue((mat.color));
	3821	+ modulationField.SetToolTipValue((mat.modulation));
	3822	+ metalnessField.SetToolTipValue((mat.metalness));
	3823	+ diffuseField.SetToolTipValue((mat.diffuse));
	3824	+ specularField.SetToolTipValue((mat.specular));
	3825	+ shininessField.SetToolTipValue((mat.shininess));
	3826	+ shiftField.SetToolTipValue((mat.shift));
	3827	+ ambientField.SetToolTipValue((mat.ambient));
	3828	+ lightareaField.SetToolTipValue((mat.lightarea));
	3829	+ diffusenessField.SetToolTipValue((mat.factor));
	3830	+ velvetField.SetToolTipValue((mat.velvet));
	3831	+ sheenField.SetToolTipValue((mat.sheen));
	3832	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3833	+ backlitField.SetToolTipValue((mat.bump));
	3834	+ anisoField.SetToolTipValue((mat.aniso));
	3835	+ anisoVField.SetToolTipValue((mat.anisoV));
	3836	+ cameraField.SetToolTipValue((mat.cameralight));
	3837	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3838	+ shadowField.SetToolTipValue((mat.shadow));
	3839	+ textureField.SetToolTipValue((mat.texture));
	3840	+ opacityField.SetToolTipValue((mat.opacity));
	3841	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3842	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3843	+ }
	3844	+
3407	3845	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3408	3846	{
3409	3847	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3519,7 +3957,7 @@
3519	3957	}
3520	3958
3521	3959	if (normalpushField != null)
3522		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3960	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3523	3961	}
3524	3962
3525	3963	void SnapObject()
..	..	@@ -3783,6 +4221,8 @@
3783	4221
3784	4222	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3785	4223	{
	4224	+ if (Globals.SAVEONMAKE)
	4225	+ Save();
3786	4226	//Tween.set(thing, 0).target(1).start(tweenManager);
3787	4227	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3788	4228	// if (thing instanceof GenericJointDemo)
..	..	@@ -3986,6 +4426,7 @@
3986	4426	}
3987	4427	}
3988	4428	}
	4429	+
3989	4430	LoadGFDThread loadGFDThread;
3990	4431
3991	4432	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4005,8 +4446,10 @@
4005	4446
4006	4447	try
4007	4448	{
	4449	+ // Try compressed version first.
4008	4450	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4009		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4451	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4452	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4010	4453
4011	4454	readobj = (Object3D) p.readObject();
4012	4455	istream.close();
..	..	@@ -4014,7 +4457,20 @@
4014	4457	readobj.ResetDisplayList();
4015	4458	} catch (Exception e)
4016	4459	{
4017		- e.printStackTrace();
	4460	+ //e.printStackTrace();
	4461	+ try
	4462	+ {
	4463	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4464	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4465	+
	4466	+ readobj = (Object3D) p.readObject();
	4467	+ istream.close();
	4468	+
	4469	+ readobj.ResetDisplayList();
	4470	+ } catch (Exception e2)
	4471	+ {
	4472	+ e2.printStackTrace();
	4473	+ }
4018	4474	}
4019	4475	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4020	4476	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4060,6 +4516,12 @@
4060	4516
4061	4517	void LoadIt(Object obj)
4062	4518	{
	4519	+ if (obj == null)
	4520	+ {
	4521	+ // Invalid file
	4522	+ return;
	4523	+ }
	4524	+
4063	4525	System.out.println("Loaded " + obj);
4064	4526	//new Exception().printStackTrace();
4065	4527	Object3D readobj = (Object3D) obj;
..	..	@@ -4069,6 +4531,8 @@
4069	4531
4070	4532	if (readobj != null)
4071	4533	{
	4534	+ if (Globals.SAVEONMAKE)
	4535	+ Save();
4072	4536	try
4073	4537	{
4074	4538	//readobj.deepCopySelf(copy);
..	..	@@ -4131,7 +4595,7 @@
4131	4595
4132	4596	void load() // throws ClassNotFoundException
4133	4597	{
4134		- if (GrafreeD.standAlone)
	4598	+ if (Grafreed.standAlone)
4135	4599	{
4136	4600	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4137	4601	browser.show();
..	..	@@ -4218,11 +4682,13 @@
4218	4682	try
4219	4683	{
4220	4684	FileOutputStream ostream = new FileOutputStream(lastname);
4221		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4685	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4686	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4222	4687
4223	4688	p.writeObject(copy);
4224	4689	p.flush();
4225	4690
	4691	+ zstream.close();
4226	4692	ostream.close();
4227	4693
4228	4694	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4232,11 +4698,12 @@
4232	4698	{
4233	4699	}
4234	4700	}
	4701	+
4235	4702	String lastname;
4236	4703
4237	4704	void saveAs()
4238	4705	{
4239		- if (GrafreeD.standAlone)
	4706	+ if (Grafreed.standAlone)
4240	4707	{
4241	4708	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4242	4709	browser.setVisible(true);
..	..	@@ -4341,13 +4808,13 @@
4341	4808	try
4342	4809	{
4343	4810	FileOutputStream ostream = new FileOutputStream(filename);
4344		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4345		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4811	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4812	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4346	4813
4347	4814	Object3D objectparent = obj.parent;
4348	4815	obj.parent = null;
4349	4816
4350		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4817	+ Object3D object = (Object3D) Grafreed.clone(obj);
4351	4818
4352	4819	obj.parent = objectparent;
4353	4820
..	..	@@ -4359,8 +4826,8 @@
4359	4826	p.writeObject(object);
4360	4827	p.flush();
4361	4828
	4829	+ zstream.close();
4362	4830	ostream.close();
4363		- // zstream.close();
4364	4831
4365	4832	// group.selection.get(0).parent = parent;
4366	4833	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4381,7 +4848,7 @@
4381	4848	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4382	4849	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4383	4850	copy.generatePOV(buffer);
4384		- if (GrafreeD.standAlone)
	4851	+ if (Grafreed.standAlone)
4385	4852	{
4386	4853	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4387	4854	browser.show();
..	..	@@ -4407,7 +4874,8 @@
4407	4874	Object3D client;
4408	4875	Object3D copy;
4409	4876	MenuBar menuBar;
4410		- Menu windowMenu;
	4877	+ Menu fileMenu;
	4878	+ MenuItem newItem;
4411	4879	MenuItem loadItem;
4412	4880	MenuItem saveItem;
4413	4881	MenuItem saveAsItem;
..	..	@@ -4415,11 +4883,9 @@
4415	4883	MenuItem reexportItem;
4416	4884	MenuItem povItem;
4417	4885	MenuItem closeItem;
4418		- Menu cameraMenu;
	4886	+
4419	4887	CheckboxMenuItem zBufferItem;
4420	4888	//MenuItem normalLensItem;
4421		- MenuItem editCameraItem;
4422		- MenuItem revertCameraItem;
4423	4889	MenuItem stepItem;
4424	4890	CheckboxMenuItem toggleLiveItem;
4425	4891	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4430,7 +4896,7 @@
4430	4896	CheckboxMenuItem toggleFootContactItem;
4431	4897	CheckboxMenuItem toggleDLItem;
4432	4898	CheckboxMenuItem toggleTextureItem;
4433		- CheckboxMenuItem toggleRandomItem;
	4899	+ CheckboxMenuItem toggleSwitchItem;
4434	4900	CheckboxMenuItem toggleRootItem;
4435	4901	CheckboxMenuItem animationItem;
4436	4902	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4567,4 +5033,9 @@
4567	5033	//ObjectUI parent;
4568	5034
4569	5035	cNumberSlider normalpushField;
	5036	+
	5037	+ private MenuItem importGFDItem;
	5038	+ private MenuItem importVRMLX3DItem;
	5039	+ private MenuItem import3DSItem;
	5040	+ private MenuItem importOBJItem;
4570	5041	}