~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -35,6 +36,67 @@
35	36
36	37	GroupEditor callee;
37	38	JFrame frame;
	39	+
	40	+ static ObjEditor theFrame;
	41	+
	42	+ cButton GetButton(String name, boolean border)
	43	+ {
	44	+ try
	45	+ {
	46	+ ImageIcon icon = GetIcon(name);
	47	+ return new cButton(icon, border);
	48	+ }
	49	+ catch (Exception e)
	50	+ {
	51	+ return new cButton(name, border);
	52	+ }
	53	+ }
	54	+
	55	+ cToggleButton GetToggleButton(String name, boolean border)
	56	+ {
	57	+ try
	58	+ {
	59	+ ImageIcon icon = GetIcon(name);
	60	+ return new cToggleButton(icon, border);
	61	+ }
	62	+ catch (Exception e)
	63	+ {
	64	+ return new cToggleButton(name, border);
	65	+ }
	66	+ }
	67	+
	68	+ cCheckBox GetCheckBox(String name, boolean border)
	69	+ {
	70	+ try
	71	+ {
	72	+ ImageIcon icon = GetIcon(name);
	73	+ return new cCheckBox(icon, border);
	74	+ }
	75	+ catch (Exception e)
	76	+ {
	77	+ return new cCheckBox(name, border);
	78	+ }
	79	+ }
	80	+
	81	+ private ImageIcon GetIcon(String name) throws IOException
	82	+ {
	83	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	84	+
	85	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	86	+ {
	87	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	88	+ Graphics2D g = resized.createGraphics();
	89	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	90	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	91	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	92	+ g.dispose();
	93	+
	94	+ image = resized;
	95	+ }
	96	+
	97	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	98	+ return icon;
	99	+ }
38	100
39	101	// SCRIPT
40	102
..	..	@@ -143,6 +205,8 @@
143	205	//nameField.removeActionListener(this);
144	206	// objEditor.ctrlPanel.remove(nameField);
145	207
	208	+ objEditor.ctrlPanel.remove(namePanel);
	209	+
146	210	if (!GroupEditor.allparams)
147	211	return;
148	212
..	..	@@ -165,9 +229,9 @@
165	229	// objEditor.ctrlPanel.remove(fasterButton);
166	230	// objEditor.ctrlPanel.remove(remarkButton);
167	231
168		- objEditor.ctrlPanel.remove(namePanel);
169	232	objEditor.ctrlPanel.remove(setupPanel);
170		- objEditor.ctrlPanel.remove(commandsPanel);
	233	+ objEditor.ctrlPanel.remove(setupPanel2);
	234	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
171	235	objEditor.ctrlPanel.remove(pushPanel);
172	236	//objEditor.ctrlPanel.remove(fillPanel);
173	237
..	..	@@ -242,6 +306,7 @@
242	306	//localCopy.parent = null;
243	307
244	308	frame = new JFrame();
	309	+ frame.setUndecorated(true);
245	310	objEditor = this;
246	311	this.callee = callee;
247	312
..	..	@@ -275,24 +340,40 @@
275	340	void SetupMenu()
276	341	{
277	342	frame.setMenuBar(menuBar = new MenuBar());
278		- menuBar.add(windowMenu = new Menu("File"));
279		- windowMenu.add(loadItem = new MenuItem("Load..."));
280		- windowMenu.add("-");
281		- windowMenu.add(saveItem = new MenuItem("Save"));
282		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	343	+ menuBar.add(fileMenu = new Menu("File"));
	344	+ fileMenu.add(newItem = new MenuItem("New"));
	345	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	346	+
	347	+ //oe.menuBar.add(menu = new Menu("Include"));
	348	+ Menu menu = new Menu("Import");
	349	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	350	+ importOBJItem.addActionListener(this);
	351	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	352	+ import3DSItem.addActionListener(this);
	353	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	354	+ importVRMLX3DItem.addActionListener(this);
	355	+ menu.add("-");
	356	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	357	+ importGFDItem.addActionListener(this);
	358	+ fileMenu.add(menu);
	359	+ fileMenu.add("-");
	360	+
	361	+ fileMenu.add(saveItem = new MenuItem("Save"));
	362	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
283	363	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
284		- windowMenu.add("-");
285		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
286		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
287		- windowMenu.add("-");
	364	+ fileMenu.add("-");
	365	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	366	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	367	+ fileMenu.add("-");
288	368	if (client.parent != null)
289	369	{
290		- windowMenu.add(closeItem = new MenuItem("Close"));
	370	+ fileMenu.add(closeItem = new MenuItem("Close"));
291	371	} else
292	372	{
293		- windowMenu.add(closeItem = new MenuItem("Exit"));
	373	+ fileMenu.add(closeItem = new MenuItem("Exit"));
294	374	}
295	375
	376	+ newItem.addActionListener(this);
296	377	loadItem.addActionListener(this);
297	378	saveItem.addActionListener(this);
298	379	saveAsItem.addActionListener(this);
..	..	@@ -301,70 +382,27 @@
301	382	//povItem.addActionListener(this);
302	383	closeItem.addActionListener(this);
303	384
304		- menuBar.add(cameraMenu = new Menu("View"));
305		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
306		- //zBufferItem.addActionListener(this);
307		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
308		- //normalLensItem.addActionListener(this);
309		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
310		- revertCameraItem.addActionListener(this);
311		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
312		- toggleTimelineItem.addItemListener(this);
313		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314		- toggleFullScreenItem.addItemListener(this);
315		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316		- cameraMenu.add("-");
317		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
318		- toggleTextureItem.addItemListener(this);
319		- toggleTextureItem.setState(CameraPane.textureon);
320		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
321		- toggleLiveItem.addItemListener(this);
322		- toggleLiveItem.setState(Globals.isLIVE());
323		- cameraMenu.add(stepItem = new MenuItem("Step"));
324		- stepItem.addActionListener(this);
325		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
326		-// toggleDLItem.addItemListener(this);
327		-// toggleDLItem.setState(false);
328		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
329		- toggleRenderItem.addItemListener(this);
330		- toggleRenderItem.setState(!CameraPane.frozen);
331		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
332		- toggleDebugItem.addItemListener(this);
333		- toggleDebugItem.setState(CameraPane.DEBUG);
334		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
335		- toggleFrustumItem.addItemListener(this);
336		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
337		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
338		- toggleFootContactItem.addItemListener(this);
339		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
340		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
341		- toggleRandomItem.addItemListener(this);
342		- toggleRandomItem.setState(CameraPane.RANDOM);
343		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
344		- toggleHandleItem.addItemListener(this);
345		- toggleHandleItem.setState(CameraPane.HANDLES);
346		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
347		- togglePaintItem.addItemListener(this);
348		- togglePaintItem.setState(CameraPane.PAINTMODE);
349		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
350		-// toggleRootItem.addItemListener(this);
351		-// toggleRootItem.setState(false);
352		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
353		-// animationItem.addItemListener(this);
354		-// animationItem.setState(CameraPane.ANIMATION);
355		- cameraMenu.add("-");
356		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
357		- editCameraItem.addActionListener(this);
358		-
359	385	objectPanel = new JTabbedPane();
360	386	toolbarPanel = new JPanel();
361	387	toolbarPanel.setName("Toolbar");
362	388	treePanel = new cGridBag();
363	389	treePanel.setName("Tree");
	390	+
	391	+ editPanel = new cGridBag().setVertical(true);
	392	+ editPanel.setName("Edit");
	393	+
364	394	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
365		- ctrlPanel.setName("Edit");
	395	+
	396	+ editCommandsPanel = new cGridBag();
	397	+ editPanel.add(editCommandsPanel);
	398	+ editPanel.add(ctrlPanel);
	399	+
	400	+ toolboxPanel = new cGridBag().setVertical(false);
	401	+ toolboxPanel.setName("Toolbox");
	402	+
366	403	materialPanel = new cGridBag().setVertical(true);
367	404	materialPanel.setName("Material");
	405	+
368	406	/JTextPane/
369	407	infoarea = createTextPane();
370	408	doc = infoarea.getStyledDocument();
..	..	@@ -457,10 +495,10 @@
457	495	e.printStackTrace();
458	496	}
459	497
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();
	498	+// String selection = infoarea.getText();
	499	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	500	+// java.awt.datatransfer.Clipboard clipboard =
	501	+// Toolkit.getDefaultToolkit().getSystemClipboard();
464	502	//clipboard.setContents(data, data);
465	503	}
466	504
..	..	@@ -483,13 +521,13 @@
483	521	//SendInfo("Name:", "bold");
484	522	if (sel.GetTextures() != null \|\| debug)
485	523	{
486		- si.SendInfo(sel.toString(), "bold");
	524	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
487	525	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
488	526	if (sel.Size() > 0)
489	527	{
490	528	si.SendInfo("#children = " + sel.Size(), "regular");
491	529	}
492		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	530	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
493	531	if (debug)
494	532	{
495	533	try
..	..	@@ -531,7 +569,7 @@
531	569	}
532	570	if (sel.support != null)
533	571	{
534		- si.SendInfo(" support: " + sel.support, "regular");
	572	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
535	573	}
536	574	if (sel.scriptnode != null)
537	575	{
..	..	@@ -620,19 +658,91 @@
620	658	}
621	659	}
622	660
	661	+static GraphicsDevice device = GraphicsEnvironment
	662	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	663	+
	664	+ Rectangle keeprect;
	665	+ cRadio radio;
	666	+
	667	+cButton keepButton;
	668	+ cButton twoButton; // Full 3D
	669	+ cButton sixButton;
	670	+ cButton threeButton;
	671	+ cButton sevenButton;
	672	+ cButton fourButton; // full panel
	673	+ cButton oneButton; // full XYZ
	674	+ //cButton currentLayout;
	675	+
	676	+ boolean maximized;
	677	+
	678	+ cButton fullscreenLayout;
	679	+
	680	+ void Minimize()
	681	+ {
	682	+ frame.setState(Frame.ICONIFIED);
	683	+ }
	684	+
	685	+ void Maximize()
	686	+ {
	687	+ if (maximized)
	688	+ {
	689	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	690	+ }
	691	+ else
	692	+ {
	693	+ keeprect = frame.getBounds();
	694	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	695	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	696	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	697	+// frame.setState(Frame.MAXIMIZED_BOTH);
	698	+ }
	699	+
	700	+ maximized ^= true;
	701	+ }
	702	+
623	703	void ToggleFullScreen()
624	704	{
625	705	if (CameraPane.FULLSCREEN)
626	706	{
627		- frame.getContentPane().remove(/"Center",/bigThree);
628		- framePanel.add(bigThree);
629		- frame.getContentPane().add(/"Center",/framePanel);
	707	+ device.setFullScreenWindow(null);
	708	+ //frame.setVisible(false);
	709	+// frame.removeNotify();
	710	+// frame.setUndecorated(false);
	711	+// frame.addNotify();
	712	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	713	+
	714	+// X frame.getContentPane().remove(/"Center",/bigThree);
	715	+// X framePanel.add(bigThree);
	716	+// X frame.getContentPane().add(/"Center",/framePanel);
	717	+ framePanel.setDividerLocation(1);
	718	+
	719	+ //frame.setVisible(true);
	720	+ radio.layout = keepButton;
	721	+ //theFrame = null;
	722	+ keepButton = null;
	723	+ radio.layout.doClick();
	724	+
630	725	} else
631	726	{
632		- frame.getContentPane().remove(/"Center",/framePanel);
633		- framePanel.remove(bigThree);
634		- frame.getContentPane().add(/"Center",/bigThree);
	727	+ keepButton = radio.layout;
	728	+ //keeprect = frame.getBounds();
	729	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	730	+// frame.getToolkit().getScreenSize().height);
	731	+ //frame.setVisible(false);
	732	+ device.setFullScreenWindow(frame);
	733	+// frame.removeNotify();
	734	+// frame.setUndecorated(true);
	735	+// frame.addNotify();
	736	+// X frame.getContentPane().remove(/"Center",/framePanel);
	737	+// X framePanel.remove(bigThree);
	738	+// X frame.getContentPane().add(/"Center",/bigThree);
	739	+ framePanel.setDividerLocation(0);
	740	+
	741	+ radio.layout = fullscreenLayout;
	742	+ radio.layout.doClick();
	743	+ //frame.setVisible(true);
635	744	}
	745	+
636	746	cameraView.ToggleFullScreen();
637	747	}
638	748
..	..	@@ -734,7 +844,7 @@
734	844	protected static ImageIcon createImageIcon(String path,
735	845	String description)
736	846	{
737		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	847	+ java.net.URL imgURL = Grafreed.class.getResource(path);
738	848	if (imgURL != null)
739	849	{
740	850	return new ImageIcon(imgURL, description);
..	..	@@ -766,6 +876,7 @@
766	876	// NumberSlider vDivsField;
767	877	// JCheckBox endcaps;
768	878	JCheckBox liveCB;
	879	+ JCheckBox selectCB;
769	880	JCheckBox hideCB;
770	881	JCheckBox link2masterCB;
771	882	JCheckBox markCB;
..	..	@@ -782,9 +893,13 @@
782	893	JButton fasterButton;
783	894	JButton remarkButton;
784	895
	896	+ cGridBag editPanel;
	897	+ cGridBag editCommandsPanel;
	898	+
785	899	cGridBag namePanel;
786	900	cGridBag setupPanel;
787		- cGridBag commandsPanel;
	901	+ cGridBag setupPanel2;
	902	+ cGridBag objectCommandsPanel;
788	903	cGridBag pushPanel;
789	904	cGridBag fillPanel;
790	905
..	..	@@ -951,10 +1066,6 @@
951	1066
952	1067	void SetupUI2(ObjEditor oe)
953	1068	{
954		-// oe.aConstraints.weightx = 0;
955		-// oe.aConstraints.weighty = 0;
956		-// oe.aConstraints.gridx = 0;
957		-// oe.aConstraints.gridy = 0;
958	1069	//SetupName(oe);
959	1070
960	1071	namePanel = new cGridBag();
..	..	@@ -971,32 +1082,56 @@
971	1082	setupPanel = new cGridBag().setVertical(false);
972	1083
973	1084	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
974		- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
975		- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1085	+ liveCB.setToolTipText("Animate object");
	1086	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1087	+ selectCB.setToolTipText("Make object selectable");
976	1088	// Return();
	1089	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1090	+ hideCB.setToolTipText("Hide object");
977	1091	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
978		- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
979		- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	1092	+ markCB.setToolTipText("Set the animation target transform");
	1093	+
	1094	+ setupPanel2 = new cGridBag().setVertical(false);
	1095	+
	1096	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1097	+ rewindCB.setToolTipText("Rewind animation");
	1098	+
	1099	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1100	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
980	1101
	1102	+ if (Globals.ADVANCED)
	1103	+ {
	1104	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1105	+ link2masterCB.setToolTipText("Attach to support");
	1106	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1107	+ speedupCB.setToolTipText("Option motion capture");
	1108	+ }
	1109	+
981	1110	oe.ctrlPanel.add(setupPanel);
982	1111	oe.ctrlPanel.Return();
	1112	+ oe.ctrlPanel.add(setupPanel2);
	1113	+ oe.ctrlPanel.Return();
983	1114
984		- commandsPanel = new cGridBag().setVertical(false);
	1115	+ objectCommandsPanel = new cGridBag().setVertical(false);
985	1116
986		- resetButton = AddButton(commandsPanel, "Reset");
987		- stepButton = AddButton(commandsPanel, "Step");
	1117	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1118	+ resetButton.setToolTipText("Jump to frame zero");
	1119	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1120	+ stepButton.setToolTipText("Step one frame");
988	1121	// resetAllButton = AddButton(oe, "Reset All");
989	1122	// stepAllButton = AddButton(oe, "Step All");
990		- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
991	1123	// Return();
992		- slowerButton = AddButton(commandsPanel, "Slow");
993		- fasterButton = AddButton(commandsPanel, "Fast");
994		- remarkButton = AddButton(commandsPanel, "Remark");
	1124	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1125	+ slowerButton.setToolTipText("Decrease animation speed");
	1126	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1127	+ fasterButton.setToolTipText("Increase animation speed");
	1128	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1129	+ remarkButton.setToolTipText("Set the current transform as the target");
995	1130
996		- oe.ctrlPanel.add(commandsPanel);
	1131	+ oe.ctrlPanel.add(objectCommandsPanel);
997	1132	oe.ctrlPanel.Return();
998	1133
999		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1134	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1000	1135	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1001	1136	//Return();
1002	1137
..	..	@@ -1199,8 +1334,11 @@
1199	1334	//worldPanel.setName("World");
1200	1335	centralPanel = new cGridBag();
1201	1336	centralPanel.preferredWidth = 20;
1202		- timelinePanel = new JPanel(new BorderLayout());
1203		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1337	+
	1338	+ if (Globals.ADVANCED)
	1339	+ {
	1340	+ timelinePanel = new JPanel(new BorderLayout());
	1341	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1204	1342
1205	1343	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1206	1344	cameraPanel.setContinuousLayout(true);
..	..	@@ -1209,7 +1347,10 @@
1209	1347	// cameraPanel.setDividerSize(9);
1210	1348	cameraPanel.setResizeWeight(1.0);
1211	1349
	1350	+ }
	1351	+
1212	1352	centralPanel.add(cameraView);
	1353	+ centralPanel.setFocusable(true);
1213	1354	//frame.setJMenuBar(timelineMenubar);
1214	1355	//centralPanel.add(timelinePanel);
1215	1356
..	..	@@ -1271,12 +1412,13 @@
1271	1412
1272	1413	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1273	1414	//tmp.setName("Edit");
	1415	+ objectPanel.add(toolboxPanel);
1274	1416	objectPanel.add(materialPanel);
1275	1417	// JPanel north = new JPanel(new BorderLayout());
1276	1418	// north.setName("Edit");
1277	1419	// north.add(ctrlPanel, BorderLayout.NORTH);
1278	1420	// objectPanel.add(north);
1279		- objectPanel.add(ctrlPanel);
	1421	+ objectPanel.add(editPanel);
1280	1422	objectPanel.add(infoPanel);
1281	1423
1282	1424	/*
..	..	@@ -1298,7 +1440,7 @@
1298	1440	scrollpane.addMouseWheelListener(this); // Default not fast enough
1299	1441
1300	1442	/JTabbedPane/ scenePanel = new cGridBag();
1301		- scenePanel.preferredWidth = 7;
	1443	+ scenePanel.preferredWidth = 6;
1302	1444
1303	1445	JTabbedPane tabbedPane = new JTabbedPane();
1304	1446	tabbedPane.add(scrollpane);
..	..	@@ -1404,9 +1546,11 @@
1404	1546
1405	1547	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1406	1548
1407		- frame.setSize(1024, 768);
1408		- frame.show();
	1549	+ frame.setSize(1280, 860);
	1550	+ frame.setVisible(true);
1409	1551
	1552	+ cameraView.requestFocusInWindow();
	1553	+
1410	1554	gridPanel.setDividerLocation(1.0);
1411	1555
1412	1556	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1444,19 +1588,22 @@
1444	1588
1445	1589	cGridBag editBar = new cGridBag().setVertical(false);
1446	1590
1447		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1591	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1448	1592	createMaterialButton.setToolTipText("Create material");
1449	1593
1450	1594	/*
1451	1595	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1452	1596	*/
1453	1597
1454		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1598	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1455	1599	clearMaterialButton.setToolTipText("Clear material");
1456	1600
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);
	1601	+ if (Globals.ADVANCED)
	1602	+ {
	1603	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1604	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1605	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1606	+ }
1460	1607
1461	1608	editBar.preferredHeight = 15;
1462	1609
..	..	@@ -1725,12 +1872,15 @@
1725	1872	opacityPowerField.addChangeListener(this);
1726	1873	/**/
1727	1874
1728		- resetSlidersButton.addActionListener(this);
1729	1875	clearMaterialButton.addActionListener(this);
1730	1876	createMaterialButton.addActionListener(this);
1731		-
1732		- propagateToggle.addItemListener(this);
1733		- multiplyToggle.addItemListener(this);
	1877	+
	1878	+ if (Globals.ADVANCED)
	1879	+ {
	1880	+ resetSlidersButton.addActionListener(this);
	1881	+ propagateToggle.addItemListener(this);
	1882	+ multiplyToggle.addItemListener(this);
	1883	+ }
1734	1884	}
1735	1885
1736	1886	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1901,7 +2051,7 @@
1901	2051
1902	2052	//? flashIt = false;
1903	2053	CameraPane pane = (CameraPane) cameraView;
1904		- pane.clickStart(location.x, location.y, 0);
	2054	+ pane.clickStart(location.x, location.y, 0, 0);
1905	2055	pane.clickEnd(location.x, location.y, 0, true);
1906	2056
1907	2057	if (group.selection.size() == 1)
..	..	@@ -1950,6 +2100,7 @@
1950	2100	e2.printStackTrace();
1951	2101	}
1952	2102	}
	2103	+
1953	2104	LoadJMEThread loadThread;
1954	2105
1955	2106	class LoadJMEThread extends Thread
..	..	@@ -2007,6 +2158,7 @@
2007	2158	//LoadFile0(filename, converter);
2008	2159	}
2009	2160	}
	2161	+
2010	2162	LoadOBJThread loadObjThread;
2011	2163
2012	2164	class LoadOBJThread extends Thread
..	..	@@ -2085,19 +2237,19 @@
2085	2237
2086	2238	void LoadObjFile(String fullname)
2087	2239	{
2088		- /*
	2240	+ System.out.println("Loading " + fullname);
	2241	+ /**/
2089	2242	//lastFilename = fullname;
2090	2243	if(loadObjThread == null)
2091	2244	{
2092		- loadObjThread = new LoadOBJThread();
2093		- loadObjThread.start();
	2245	+ loadObjThread = new LoadOBJThread();
	2246	+ loadObjThread.start();
2094	2247	}
2095	2248
2096	2249	loadObjThread.add(fullname);
2097		- */
	2250	+ /**/
2098	2251
2099		- System.out.println("Loading " + fullname);
2100		- makeSomething(new FileObject(fullname, true), true);
	2252	+ //makeSomething(new FileObject(fullname, true), true);
2101	2253	}
2102	2254
2103	2255	void LoadGFDFile(String fullname)
..	..	@@ -2358,11 +2510,11 @@
2358	2510
2359	2511	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2360	2512	{
2361		- if (GrafreeD.standAlone)
	2513	+ if (Grafreed.standAlone)
2362	2514	{
2363	2515	/**/
2364	2516	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2365		- browser.show();
	2517	+ browser.setVisible(true);
2366	2518	String filename = browser.getFile();
2367	2519	if (filename != null && filename.length() > 0)
2368	2520	{
..	..	@@ -2722,7 +2874,8 @@
2722	2874	return;
2723	2875	}
2724	2876
2725		- multiplyToggle.setSelected(mat.multiply);
	2877	+ if (multiplyToggle != null)
	2878	+ multiplyToggle.setSelected(mat.multiply);
2726	2879
2727	2880	assert (object.projectedVertices != null);
2728	2881
..	..	@@ -2937,9 +3090,9 @@
2937	3090	frame.validate();
2938	3091
2939	3092	return;
2940		- } else if (event.getSource() == toggleRandomItem)
	3093	+ } else if (event.getSource() == toggleSwitchItem)
2941	3094	{
2942		- cameraView.ToggleRandom();
	3095	+ cameraView.ToggleSwitch();
2943	3096	cameraView.repaint();
2944	3097	return;
2945	3098	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2968,6 +3121,10 @@
2968	3121	{
2969	3122	copy.live ^= true;
2970	3123	return;
	3124	+ } else if (event.getSource() == selectCB)
	3125	+ {
	3126	+ copy.dontselect ^= true;
	3127	+ return;
2971	3128	} else if (event.getSource() == hideCB)
2972	3129	{
2973	3130	copy.hide ^= true;
..	..	@@ -2982,6 +3139,7 @@
2982	3139	if (event.getSource() == randomCB)
2983	3140	{
2984	3141	copy.random ^= true;
	3142	+ objEditor.refreshContents();
2985	3143	return;
2986	3144	}
2987	3145	if (event.getSource() == speedupCB)
..	..	@@ -3005,8 +3163,9 @@
3005	3163
3006	3164	public void actionPerformed(ActionEvent event)
3007	3165	{
	3166	+ Object source = event.getSource();
3008	3167	// SCRIPT DIALOG
3009		- if (event.getSource() == okbutton)
	3168	+ if (source == okbutton)
3010	3169	{
3011	3170	textpanel.setVisible(false);
3012	3171	textpanel.remove(textarea);
..	..	@@ -3018,7 +3177,7 @@
3018	3177	textarea = null;
3019	3178	textpanel = null;
3020	3179	}
3021		- if (event.getSource() == cancelbutton)
	3180	+ if (source == cancelbutton)
3022	3181	{
3023	3182	textpanel.setVisible(false);
3024	3183	textpanel.remove(textarea);
..	..	@@ -3030,50 +3189,50 @@
3030	3189	//applySelf();
3031	3190	//client.refreshEditWindow();
3032	3191	//refreshContents();
3033		- if (event.getSource() == nameField)
	3192	+ if (source == nameField)
3034	3193	{
3035	3194	//System.out.println("ObjEditor " + event);
3036	3195	applySelf0(true);
3037	3196	//parent.applySelf();
3038	3197	objEditor.refreshContents();
3039		- } else if (event.getSource() == resetButton)
	3198	+ } else if (source == resetButton)
3040	3199	{
3041	3200	CameraPane.fullreset = true;
3042	3201	copy.Reset(); // ResetMeshes();
3043	3202	copy.Touch();
3044	3203	objEditor.refreshContents();
3045		- } else if (event.getSource() == stepItem)
	3204	+ } else if (source == stepItem)
3046	3205	{
3047	3206	//cameraView.ONESTEP = true;
3048	3207	Globals.ONESTEP = true;
3049	3208	cameraView.repaint();
3050	3209	return;
3051		- } else if (event.getSource() == stepButton)
	3210	+ } else if (source == stepButton)
3052	3211	{
3053	3212	copy.Step();
3054	3213	copy.Touch();
3055	3214	objEditor.refreshContents();
3056		- } else if (event.getSource() == slowerButton)
	3215	+ } else if (source == slowerButton)
3057	3216	{
3058	3217	copy.Slower();
3059	3218	copy.Touch();
3060	3219	objEditor.refreshContents();
3061		- } else if (event.getSource() == fasterButton)
	3220	+ } else if (source == fasterButton)
3062	3221	{
3063	3222	copy.Faster();
3064	3223	copy.Touch();
3065	3224	objEditor.refreshContents();
3066		- } else if (event.getSource() == remarkButton)
	3225	+ } else if (source == remarkButton)
3067	3226	{
3068	3227	copy.Remark();
3069	3228	copy.Touch();
3070	3229	objEditor.refreshContents();
3071		- } else if (event.getSource() == stepAllButton)
	3230	+ } else if (source == stepAllButton)
3072	3231	{
3073	3232	copy.StepAll();
3074	3233	copy.Touch();
3075	3234	objEditor.refreshContents();
3076		- } else if (event.getSource() == resetAllButton)
	3235	+ } else if (source == resetAllButton)
3077	3236	{
3078	3237	//CameraPane.fullreset = true;
3079	3238	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3106,53 +3265,75 @@
3106	3265	// Close();
3107	3266	// }
3108	3267	// else
3109		- if (event.getSource() == resetSlidersButton)
	3268	+ if (source == resetSlidersButton)
3110	3269	{
3111	3270	ResetSliders();
3112		- } else if (event.getSource() == clearMaterialButton)
	3271	+ } else if (source == clearMaterialButton)
3113	3272	{
3114	3273	ClearMaterial();
3115		- } else if (event.getSource() == createMaterialButton)
	3274	+ } else if (source == createMaterialButton)
3116	3275	{
3117	3276	CreateMaterial();
3118		- } else if (event.getSource() == clearPanelButton)
	3277	+ } else if (source == clearPanelButton)
3119	3278	{
3120	3279	copy.ClearUI();
3121	3280	refreshContents(true);
3122		- } /*
3123		- }
3124		-
3125		- public boolean action(Event event, Object arg)
3126		- {
3127		- */ else if (event.getSource() == closeItem)
	3281	+ } else if (source == importGFDItem)
	3282	+ {
	3283	+ ImportGFD();
	3284	+ } else
	3285	+ if (source == importVRMLX3DItem)
	3286	+ {
	3287	+ ImportVRMLX3D();
	3288	+ } else
	3289	+ if (source == import3DSItem)
	3290	+ {
	3291	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3292	+ } else
	3293	+ if (source == importOBJItem)
	3294	+ {
	3295	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3296	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3297	+ browser.setVisible(true);
	3298	+ String filename = browser.getFile();
	3299	+ if (filename != null && filename.length() > 0)
	3300	+ {
	3301	+ String fullname = browser.getDirectory() + filename;
	3302	+ makeSomething(ReadOBJ(fullname), true);
	3303	+ }
	3304	+ } else
	3305	+ if (source == closeItem)
3128	3306	{
3129	3307	Close();
3130	3308	//return true;
3131		- } else if (event.getSource() == loadItem)
	3309	+ } else if (source == loadItem)
3132	3310	{
3133	3311	load();
3134	3312	//return true;
3135		- } else if (event.getSource() == saveItem)
	3313	+ } else if (source == newItem)
	3314	+ {
	3315	+ New();
	3316	+ } else if (source == saveItem)
3136	3317	{
3137	3318	save();
3138	3319	//return true;
3139		- } else if (event.getSource() == saveAsItem)
	3320	+ } else if (source == saveAsItem)
3140	3321	{
3141	3322	saveAs();
3142	3323	//return true;
3143		- } else if (event.getSource() == reexportItem)
	3324	+ } else if (source == reexportItem)
3144	3325	{
3145	3326	reexport();
3146	3327	//return true;
3147		- } else if (event.getSource() == exportAsItem)
	3328	+ } else if (source == exportAsItem)
3148	3329	{
3149	3330	export();
3150	3331	//return true;
3151		- } else if (event.getSource() == povItem)
	3332	+ } else if (source == povItem)
3152	3333	{
3153	3334	generatePOV();
3154	3335	//return true;
3155		- } else if (event.getSource() == zBufferItem)
	3336	+ } else if (source == zBufferItem)
3156	3337	{
3157	3338	try
3158	3339	{
..	..	@@ -3174,21 +3355,8 @@
3174	3355	cameraView.repaint();
3175	3356	//return true;
3176	3357	}
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)
	3358	+ */ else // combos...
	3359	+ if (source == texresMenu)
3192	3360	{
3193	3361	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3194	3362	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3200,12 +3368,272 @@
3200	3368	}
3201	3369	}
3202	3370
	3371	+ void New()
	3372	+ {
	3373	+ while (copy.Size() > 1)
	3374	+ {
	3375	+ copy.remove(1);
	3376	+ }
	3377	+
	3378	+ ResetModel();
	3379	+ objEditor.refreshContents();
	3380	+ }
	3381	+
	3382	+ static public byte[] Compress(Object3D o)
	3383	+ {
	3384	+ try
	3385	+ {
	3386	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3387	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3388	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3389	+
	3390	+ Object3D parent = o.parent;
	3391	+ o.parent = null;
	3392	+
	3393	+ out.writeObject(o);
	3394	+
	3395	+ o.parent = parent;
	3396	+
	3397	+ out.flush();
	3398	+
	3399	+ zstream.close();
	3400	+ out.close();
	3401	+
	3402	+ return baos.toByteArray();
	3403	+ } catch (Exception e)
	3404	+ {
	3405	+ System.err.println(e);
	3406	+ return null;
	3407	+ }
	3408	+ }
	3409	+
	3410	+ static public Object Uncompress(byte[] bytes)
	3411	+ {
	3412	+ System.out.println("#bytes = " + bytes.length);
	3413	+ try
	3414	+ {
	3415	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3416	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3417	+ ObjectInputStream in = new ObjectInputStream(istream);
	3418	+ Object obj = in.readObject();
	3419	+ in.close();
	3420	+
	3421	+ return obj;
	3422	+ } catch (Exception e)
	3423	+ {
	3424	+ System.err.println(e);
	3425	+ return null;
	3426	+ }
	3427	+ }
	3428	+
	3429	+ static public Object clone(Object o)
	3430	+ {
	3431	+ try
	3432	+ {
	3433	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3434	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3435	+
	3436	+ out.writeObject(o);
	3437	+
	3438	+ out.flush();
	3439	+ out.close();
	3440	+
	3441	+ byte[] bytes = baos.toByteArray();
	3442	+
	3443	+ System.out.println("clone = " + bytes.length);
	3444	+
	3445	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3446	+ ObjectInputStream in = new ObjectInputStream(bais);
	3447	+ Object obj = in.readObject();
	3448	+ in.close();
	3449	+
	3450	+ return obj;
	3451	+ } catch (Exception e)
	3452	+ {
	3453	+ System.err.println(e);
	3454	+ return null;
	3455	+ }
	3456	+ }
	3457	+
	3458	+ cRadio GetCurrentTab()
	3459	+ {
	3460	+ cRadio ab;
	3461	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3462	+ {
	3463	+ ab = (cRadio)e.nextElement();
	3464	+ if(ab.GetObject() == copy)
	3465	+ {
	3466	+ return ab;
	3467	+ }
	3468	+ }
	3469	+
	3470	+ return null;
	3471	+ }
	3472	+
	3473	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3474	+
	3475	+ public void Save()
	3476	+ {
	3477	+ System.err.println("Save");
	3478	+
	3479	+ cRadio tab = GetCurrentTab();
	3480	+
	3481	+ boolean temp = CameraPane.SWITCH;
	3482	+ CameraPane.SWITCH = false;
	3483	+
	3484	+ copy.ExtractBigData(hashtable);
	3485	+
	3486	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3487	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3488	+
	3489	+ copy.RestoreBigData(hashtable);
	3490	+
	3491	+ CameraPane.SWITCH = temp;
	3492	+
	3493	+ //assert(hashtable.isEmpty());
	3494	+
	3495	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3496	+ {
	3497	+ tab.graphs[i] = null;
	3498	+ }
	3499	+
	3500	+ // test save
	3501	+ if (false)
	3502	+ {
	3503	+ try
	3504	+ {
	3505	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3506	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3507	+
	3508	+ p.writeObject(copy);
	3509	+
	3510	+ p.flush();
	3511	+
	3512	+ ostream.close();
	3513	+ } catch (Exception e)
	3514	+ {
	3515	+ e.printStackTrace();
	3516	+ }
	3517	+ }
	3518	+ }
	3519	+
	3520	+ void CopyChanged(Object3D obj)
	3521	+ {
	3522	+ boolean temp = CameraPane.SWITCH;
	3523	+ CameraPane.SWITCH = false;
	3524	+
	3525	+ copy.ExtractBigData(hashtable);
	3526	+
	3527	+ copy.clear();
	3528	+
	3529	+ for (int i=0; i<obj.Size(); i++)
	3530	+ {
	3531	+ copy.add(obj.get(i));
	3532	+ }
	3533	+
	3534	+ copy.RestoreBigData(hashtable);
	3535	+
	3536	+ CameraPane.SWITCH = temp;
	3537	+
	3538	+ //assert(hashtable.isEmpty());
	3539	+
	3540	+ copy.Touch();
	3541	+
	3542	+ ResetModel();
	3543	+ copy.HardTouch(); // recompile?
	3544	+
	3545	+ cRadio ab;
	3546	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3547	+ {
	3548	+ ab = (cRadio)e.nextElement();
	3549	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3550	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3551	+ if (test != null)
	3552	+ {
	3553	+ test.editWindow = ab.object.editWindow;
	3554	+ ab.object = test;
	3555	+ }
	3556	+ }
	3557	+
	3558	+ refreshContents();
	3559	+ }
	3560	+
	3561	+ public void Undo()
	3562	+ {
	3563	+ System.err.println("Undo");
	3564	+
	3565	+ cRadio tab = GetCurrentTab();
	3566	+
	3567	+ if (tab.undoindex == 0)
	3568	+ {
	3569	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3570	+ return;
	3571	+ }
	3572	+
	3573	+ if (tab.graphs[tab.undoindex] == null)
	3574	+ {
	3575	+ Save();
	3576	+ tab.undoindex -= 1;
	3577	+ }
	3578	+
	3579	+ tab.undoindex -= 1;
	3580	+
	3581	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3582	+ }
	3583	+
	3584	+ public void Redo()
	3585	+ {
	3586	+ cRadio tab = GetCurrentTab();
	3587	+
	3588	+ if (tab.graphs[tab.undoindex + 1] == null)
	3589	+ {
	3590	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3591	+ return;
	3592	+ }
	3593	+
	3594	+ tab.undoindex += 1;
	3595	+
	3596	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3597	+ }
	3598	+
	3599	+ void ImportGFD()
	3600	+ {
	3601	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3602	+ browser.show();
	3603	+ String filename = browser.getFile();
	3604	+ if (filename != null && filename.length() > 0)
	3605	+ {
	3606	+ String fullname = browser.getDirectory() + filename;
	3607	+
	3608	+ //Object3D readobj =
	3609	+ objEditor.ReadGFD(fullname, objEditor);
	3610	+ //makeSomething(readobj);
	3611	+ }
	3612	+ }
	3613	+
	3614	+ void ImportVRMLX3D()
	3615	+ {
	3616	+ if (Grafreed.standAlone)
	3617	+ {
	3618	+ /**/
	3619	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3620	+ browser.show();
	3621	+ String filename = browser.getFile();
	3622	+ if (filename != null && filename.length() > 0)
	3623	+ {
	3624	+ String fullname = browser.getDirectory() + filename;
	3625	+ LoadVRMLX3D(fullname);
	3626	+ }
	3627	+ /**/
	3628	+ }
	3629	+ }
	3630	+
3203	3631	void ToggleAnimation()
3204	3632	{
3205	3633	if (!Globals.ANIMATION)
3206	3634	{
3207	3635	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3208		- browser.show();
	3636	+ browser.setVisible(true);
3209	3637	String filename = browser.getFile();
3210	3638	if (filename != null && filename.length() > 0)
3211	3639	{
..	..	@@ -3215,8 +3643,8 @@
3215	3643
3216	3644	Globals.ANIMATION ^= true;
3217	3645
3218		- GrafreeD.wav.cursor = 0;
3219		- GrafreeD.wav.loop = 0;
	3646	+ Grafreed.wav.cursor = 0;
	3647	+ Grafreed.wav.loop = 0;
3220	3648	}
3221	3649	} else
3222	3650	{
..	..	@@ -3237,7 +3665,6 @@
3237	3665	callee.refreshContents();
3238	3666	} else
3239	3667	{
3240		- new Exception().printStackTrace();
3241	3668	System.exit(0);
3242	3669	}
3243	3670	}
..	..	@@ -3267,7 +3694,7 @@
3267	3694	void CreateMaterial()
3268	3695	{
3269	3696	//copy.ClearMaterial(); // PATCH
3270		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3697	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3271	3698	if (copy.selection.size() > 0)
3272	3699	//SetMaterial(copy);
3273	3700	{
..	..	@@ -3318,7 +3745,7 @@
3318	3745	assert false;
3319	3746	}
3320	3747
3321		- void EditSelection()
	3748	+ void EditSelection(boolean newWindow)
3322	3749	{
3323	3750	}
3324	3751
..	..	@@ -3326,11 +3753,11 @@
3326	3753	{
3327	3754	copy.ResetBlockLoop(); // temporary problem
3328	3755
3329		- boolean random = CameraPane.RANDOM;
3330		- CameraPane.RANDOM = false; // parse everything
	3756	+ boolean random = CameraPane.SWITCH;
	3757	+ CameraPane.SWITCH = false; // parse everything
3331	3758	copy.ResetDisplayList();
3332	3759	copy.HardTouch();
3333		- CameraPane.RANDOM = random;
	3760	+ CameraPane.SWITCH = random;
3334	3761	}
3335	3762
3336	3763	// public void applySelf()
..	..	@@ -3404,6 +3831,36 @@
3404	3831	{
3405	3832	//System.out.println("Propagate = " + propagate);
3406	3833	copy.UpdateMaterial(anchor, current, propagate);
	3834	+
	3835	+ if (copy.material != null)
	3836	+ {
	3837	+ cMaterial mat = copy.material;
	3838	+
	3839	+ colorField.SetToolTipValue((mat.color));
	3840	+ modulationField.SetToolTipValue((mat.modulation));
	3841	+ metalnessField.SetToolTipValue((mat.metalness));
	3842	+ diffuseField.SetToolTipValue((mat.diffuse));
	3843	+ specularField.SetToolTipValue((mat.specular));
	3844	+ shininessField.SetToolTipValue((mat.shininess));
	3845	+ shiftField.SetToolTipValue((mat.shift));
	3846	+ ambientField.SetToolTipValue((mat.ambient));
	3847	+ lightareaField.SetToolTipValue((mat.lightarea));
	3848	+ diffusenessField.SetToolTipValue((mat.factor));
	3849	+ velvetField.SetToolTipValue((mat.velvet));
	3850	+ sheenField.SetToolTipValue((mat.sheen));
	3851	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3852	+ backlitField.SetToolTipValue((mat.bump));
	3853	+ anisoField.SetToolTipValue((mat.aniso));
	3854	+ anisoVField.SetToolTipValue((mat.anisoV));
	3855	+ cameraField.SetToolTipValue((mat.cameralight));
	3856	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3857	+ shadowField.SetToolTipValue((mat.shadow));
	3858	+ textureField.SetToolTipValue((mat.texture));
	3859	+ opacityField.SetToolTipValue((mat.opacity));
	3860	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3861	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3862	+ }
	3863	+
3407	3864	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3408	3865	{
3409	3866	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3519,7 +3976,7 @@
3519	3976	}
3520	3977
3521	3978	if (normalpushField != null)
3522		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3979	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3523	3980	}
3524	3981
3525	3982	void SnapObject()
..	..	@@ -3783,6 +4240,8 @@
3783	4240
3784	4241	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3785	4242	{
	4243	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4244	+ Save();
3786	4245	//Tween.set(thing, 0).target(1).start(tweenManager);
3787	4246	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3788	4247	// if (thing instanceof GenericJointDemo)
..	..	@@ -3869,6 +4328,12 @@
3869	4328	{
3870	4329	ResetModel();
3871	4330	Select(thing.GetTreePath(), true, false); // unselect... false);
	4331	+
	4332	+ if (thing.Size() == 0)
	4333	+ {
	4334	+ //EditSelection(false);
	4335	+ }
	4336	+
3872	4337	refreshContents();
3873	4338	}
3874	4339
..	..	@@ -3986,6 +4451,7 @@
3986	4451	}
3987	4452	}
3988	4453	}
	4454	+
3989	4455	LoadGFDThread loadGFDThread;
3990	4456
3991	4457	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4005,8 +4471,10 @@
4005	4471
4006	4472	try
4007	4473	{
	4474	+ // Try compressed version first.
4008	4475	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4009		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4476	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4477	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4010	4478
4011	4479	readobj = (Object3D) p.readObject();
4012	4480	istream.close();
..	..	@@ -4014,7 +4482,20 @@
4014	4482	readobj.ResetDisplayList();
4015	4483	} catch (Exception e)
4016	4484	{
4017		- e.printStackTrace();
	4485	+ //e.printStackTrace();
	4486	+ try
	4487	+ {
	4488	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4489	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4490	+
	4491	+ readobj = (Object3D) p.readObject();
	4492	+ istream.close();
	4493	+
	4494	+ readobj.ResetDisplayList();
	4495	+ } catch (Exception e2)
	4496	+ {
	4497	+ e2.printStackTrace();
	4498	+ }
4018	4499	}
4019	4500	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4020	4501	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4060,6 +4541,12 @@
4060	4541
4061	4542	void LoadIt(Object obj)
4062	4543	{
	4544	+ if (obj == null)
	4545	+ {
	4546	+ // Invalid file
	4547	+ return;
	4548	+ }
	4549	+
4063	4550	System.out.println("Loaded " + obj);
4064	4551	//new Exception().printStackTrace();
4065	4552	Object3D readobj = (Object3D) obj;
..	..	@@ -4069,6 +4556,8 @@
4069	4556
4070	4557	if (readobj != null)
4071	4558	{
	4559	+ if (Globals.SAVEONMAKE)
	4560	+ Save();
4072	4561	try
4073	4562	{
4074	4563	//readobj.deepCopySelf(copy);
..	..	@@ -4131,7 +4620,7 @@
4131	4620
4132	4621	void load() // throws ClassNotFoundException
4133	4622	{
4134		- if (GrafreeD.standAlone)
	4623	+ if (Grafreed.standAlone)
4135	4624	{
4136	4625	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4137	4626	browser.show();
..	..	@@ -4218,11 +4707,13 @@
4218	4707	try
4219	4708	{
4220	4709	FileOutputStream ostream = new FileOutputStream(lastname);
4221		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4710	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4711	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4222	4712
4223	4713	p.writeObject(copy);
4224	4714	p.flush();
4225	4715
	4716	+ zstream.close();
4226	4717	ostream.close();
4227	4718
4228	4719	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4232,11 +4723,12 @@
4232	4723	{
4233	4724	}
4234	4725	}
	4726	+
4235	4727	String lastname;
4236	4728
4237	4729	void saveAs()
4238	4730	{
4239		- if (GrafreeD.standAlone)
	4731	+ if (Grafreed.standAlone)
4240	4732	{
4241	4733	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4242	4734	browser.setVisible(true);
..	..	@@ -4341,13 +4833,13 @@
4341	4833	try
4342	4834	{
4343	4835	FileOutputStream ostream = new FileOutputStream(filename);
4344		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4345		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4836	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4837	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4346	4838
4347	4839	Object3D objectparent = obj.parent;
4348	4840	obj.parent = null;
4349	4841
4350		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4842	+ Object3D object = (Object3D) Grafreed.clone(obj);
4351	4843
4352	4844	obj.parent = objectparent;
4353	4845
..	..	@@ -4359,8 +4851,8 @@
4359	4851	p.writeObject(object);
4360	4852	p.flush();
4361	4853
	4854	+ zstream.close();
4362	4855	ostream.close();
4363		- // zstream.close();
4364	4856
4365	4857	// group.selection.get(0).parent = parent;
4366	4858	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4381,7 +4873,7 @@
4381	4873	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4382	4874	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4383	4875	copy.generatePOV(buffer);
4384		- if (GrafreeD.standAlone)
	4876	+ if (Grafreed.standAlone)
4385	4877	{
4386	4878	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4387	4879	browser.show();
..	..	@@ -4407,7 +4899,8 @@
4407	4899	Object3D client;
4408	4900	Object3D copy;
4409	4901	MenuBar menuBar;
4410		- Menu windowMenu;
	4902	+ Menu fileMenu;
	4903	+ MenuItem newItem;
4411	4904	MenuItem loadItem;
4412	4905	MenuItem saveItem;
4413	4906	MenuItem saveAsItem;
..	..	@@ -4415,11 +4908,9 @@
4415	4908	MenuItem reexportItem;
4416	4909	MenuItem povItem;
4417	4910	MenuItem closeItem;
4418		- Menu cameraMenu;
	4911	+
4419	4912	CheckboxMenuItem zBufferItem;
4420	4913	//MenuItem normalLensItem;
4421		- MenuItem editCameraItem;
4422		- MenuItem revertCameraItem;
4423	4914	MenuItem stepItem;
4424	4915	CheckboxMenuItem toggleLiveItem;
4425	4916	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4430,25 +4921,36 @@
4430	4921	CheckboxMenuItem toggleFootContactItem;
4431	4922	CheckboxMenuItem toggleDLItem;
4432	4923	CheckboxMenuItem toggleTextureItem;
4433		- CheckboxMenuItem toggleRandomItem;
	4924	+ CheckboxMenuItem toggleSwitchItem;
4434	4925	CheckboxMenuItem toggleRootItem;
4435	4926	CheckboxMenuItem animationItem;
4436	4927	CheckboxMenuItem toggleHandleItem;
4437	4928	CheckboxMenuItem togglePaintItem;
4438	4929	JSplitPane mainPanel;
4439	4930	JScrollPane scrollpane;
	4931	+
4440	4932	JPanel toolbarPanel;
	4933	+
4441	4934	cGridBag treePanel;
	4935	+
4442	4936	JPanel radioPanel;
4443	4937	ButtonGroup buttonGroup;
4444		- cGridBag ctrlPanel;
	4938	+
	4939	+ cGridBag toolboxPanel;
4445	4940	cGridBag materialPanel;
	4941	+ cGridBag ctrlPanel;
	4942	+
4446	4943	JScrollPane infoPanel;
	4944	+
4447	4945	cGridBag optionsPanel;
	4946	+
4448	4947	JTabbedPane objectPanel;
	4948	+
4449	4949	cGridBag XYZPanel;
	4950	+
4450	4951	JSplitPane gridPanel;
4451	4952	JSplitPane bigPanel;
	4953	+
4452	4954	cGridBag bigThree;
4453	4955	cGridBag scenePanel;
4454	4956	cGridBag centralPanel;
..	..	@@ -4563,8 +5065,13 @@
4563	5065	cNumberSlider fogField;
4564	5066	JLabel opacityPowerLabel;
4565	5067	cNumberSlider opacityPowerField;
4566		- JTree jTree;
	5068	+ cTree jTree;
4567	5069	//ObjectUI parent;
4568	5070
4569	5071	cNumberSlider normalpushField;
	5072	+
	5073	+ private MenuItem importGFDItem;
	5074	+ private MenuItem importVRMLX3DItem;
	5075	+ private MenuItem import3DSItem;
	5076	+ private MenuItem importOBJItem;
4570	5077	}