~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -35,6 +36,67 @@
35	36
36	37	GroupEditor callee;
37	38	JFrame frame;
	39	+
	40	+ static ObjEditor theFrame;
	41	+
	42	+ cButton GetButton(String name, boolean border)
	43	+ {
	44	+ try
	45	+ {
	46	+ ImageIcon icon = GetIcon(name);
	47	+ return new cButton(icon, border);
	48	+ }
	49	+ catch (Exception e)
	50	+ {
	51	+ return new cButton(name, border);
	52	+ }
	53	+ }
	54	+
	55	+ cToggleButton GetToggleButton(String name, boolean border)
	56	+ {
	57	+ try
	58	+ {
	59	+ ImageIcon icon = GetIcon(name);
	60	+ return new cToggleButton(icon, border);
	61	+ }
	62	+ catch (Exception e)
	63	+ {
	64	+ return new cToggleButton(name, border);
	65	+ }
	66	+ }
	67	+
	68	+ cCheckBox GetCheckBox(String name, boolean border)
	69	+ {
	70	+ try
	71	+ {
	72	+ ImageIcon icon = GetIcon(name);
	73	+ return new cCheckBox(icon, border);
	74	+ }
	75	+ catch (Exception e)
	76	+ {
	77	+ return new cCheckBox(name, border);
	78	+ }
	79	+ }
	80	+
	81	+ private ImageIcon GetIcon(String name) throws IOException
	82	+ {
	83	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	84	+
	85	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	86	+ {
	87	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	88	+ Graphics2D g = resized.createGraphics();
	89	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	90	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	91	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	92	+ g.dispose();
	93	+
	94	+ image = resized;
	95	+ }
	96	+
	97	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	98	+ return icon;
	99	+ }
38	100
39	101	// SCRIPT
40	102
..	..	@@ -168,7 +230,8 @@
168	230	// objEditor.ctrlPanel.remove(remarkButton);
169	231
170	232	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	233	+ objEditor.ctrlPanel.remove(setupPanel2);
	234	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	235	objEditor.ctrlPanel.remove(pushPanel);
173	236	//objEditor.ctrlPanel.remove(fillPanel);
174	237
..	..	@@ -243,6 +306,7 @@
243	306	//localCopy.parent = null;
244	307
245	308	frame = new JFrame();
	309	+ frame.setUndecorated(true);
246	310	objEditor = this;
247	311	this.callee = callee;
248	312
..	..	@@ -276,24 +340,40 @@
276	340	void SetupMenu()
277	341	{
278	342	frame.setMenuBar(menuBar = new MenuBar());
279		- menuBar.add(windowMenu = new Menu("File"));
280		- windowMenu.add(loadItem = new MenuItem("Load..."));
281		- windowMenu.add("-");
282		- windowMenu.add(saveItem = new MenuItem("Save"));
283		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	343	+ menuBar.add(fileMenu = new Menu("File"));
	344	+ fileMenu.add(newItem = new MenuItem("New"));
	345	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	346	+
	347	+ //oe.menuBar.add(menu = new Menu("Include"));
	348	+ Menu menu = new Menu("Import");
	349	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	350	+ importOBJItem.addActionListener(this);
	351	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	352	+ import3DSItem.addActionListener(this);
	353	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	354	+ importVRMLX3DItem.addActionListener(this);
	355	+ menu.add("-");
	356	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	357	+ importGFDItem.addActionListener(this);
	358	+ fileMenu.add(menu);
	359	+ fileMenu.add("-");
	360	+
	361	+ fileMenu.add(saveItem = new MenuItem("Save"));
	362	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284	363	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
285		- windowMenu.add("-");
286		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
287		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
288		- windowMenu.add("-");
	364	+ fileMenu.add("-");
	365	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	366	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	367	+ fileMenu.add("-");
289	368	if (client.parent != null)
290	369	{
291		- windowMenu.add(closeItem = new MenuItem("Close"));
	370	+ fileMenu.add(closeItem = new MenuItem("Close"));
292	371	} else
293	372	{
294		- windowMenu.add(closeItem = new MenuItem("Exit"));
	373	+ fileMenu.add(closeItem = new MenuItem("Exit"));
295	374	}
296	375
	376	+ newItem.addActionListener(this);
297	377	loadItem.addActionListener(this);
298	378	saveItem.addActionListener(this);
299	379	saveAsItem.addActionListener(this);
..	..	@@ -302,86 +382,48 @@
302	382	//povItem.addActionListener(this);
303	383	closeItem.addActionListener(this);
304	384
305		- menuBar.add(cameraMenu = new Menu("View"));
306		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
307		- //zBufferItem.addActionListener(this);
308		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
309		- //normalLensItem.addActionListener(this);
310		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
311		- revertCameraItem.addActionListener(this);
312		-
313		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314		- toggleFullScreenItem.addItemListener(this);
315		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316		- cameraMenu.add("-");
317		-
318		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
319		- toggleTextureItem.addItemListener(this);
320		- toggleTextureItem.setState(CameraPane.textureon);
321		-
322		- if (Globals.ADVANCED)
323		- {
324		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
325		- toggleLiveItem.addItemListener(this);
326		- toggleLiveItem.setState(Globals.isLIVE());
327		-
328		- cameraMenu.add(stepItem = new MenuItem("Step"));
329		- stepItem.addActionListener(this);
330		- // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
331		- // toggleDLItem.addItemListener(this);
332		- // toggleDLItem.setState(false);
333		-
334		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
335		- toggleRenderItem.addItemListener(this);
336		- toggleRenderItem.setState(!CameraPane.frozen);
337		-
338		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
339		- toggleDebugItem.addItemListener(this);
340		- toggleDebugItem.setState(CameraPane.DEBUG);
341		-
342		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
343		- toggleFrustumItem.addItemListener(this);
344		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
345		-
346		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
347		- toggleFootContactItem.addItemListener(this);
348		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
349		-
350		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
351		- toggleTimelineItem.addItemListener(this);
352		- }
353		-
354		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
355		- toggleSwitchItem.addItemListener(this);
356		- toggleSwitchItem.setState(CameraPane.SWITCH);
357		-
358		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
359		- toggleHandleItem.addItemListener(this);
360		- toggleHandleItem.setState(CameraPane.HANDLES);
361		-
362		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
363		- togglePaintItem.addItemListener(this);
364		- togglePaintItem.setState(CameraPane.PAINTMODE);
365		-
366		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
367		-// toggleRootItem.addItemListener(this);
368		-// toggleRootItem.setState(false);
369		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
370		-// animationItem.addItemListener(this);
371		-// animationItem.setState(CameraPane.ANIMATION);
372		- cameraMenu.add("-");
373		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
374		- editCameraItem.addActionListener(this);
375		-
376	385	objectPanel = new JTabbedPane();
	386	+
	387	+ ChangeListener changeListener = new ChangeListener()
	388	+ {
	389	+ public void stateChanged(ChangeEvent changeEvent)
	390	+ {
	391	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	392	+// {
	393	+// if (latestObject != null)
	394	+// {
	395	+// refreshContents(true);
	396	+// SetMaterial(latestObject);
	397	+// }
	398	+//
	399	+// materialFlushed = true;
	400	+// }
	401	+
	402	+ refreshContents(false); // To refresh Info tab
	403	+ }
	404	+ };
	405	+ objectPanel.addChangeListener(changeListener);
	406	+
377	407	toolbarPanel = new JPanel();
378	408	toolbarPanel.setName("Toolbar");
379	409	treePanel = new cGridBag();
380	410	treePanel.setName("Tree");
	411	+
	412	+ editPanel = new cGridBag().setVertical(true);
	413	+ editPanel.setName("Edit");
	414	+
381	415	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
382		- ctrlPanel.setName("Edit");
	416	+
	417	+ editCommandsPanel = new cGridBag();
	418	+ editPanel.add(editCommandsPanel);
	419	+ editPanel.add(ctrlPanel);
	420	+
	421	+ toolboxPanel = new cGridBag().setVertical(false);
	422	+ toolboxPanel.setName("Toolbox");
	423	+
383	424	materialPanel = new cGridBag().setVertical(true);
384	425	materialPanel.setName("Material");
	426	+
385	427	/JTextPane/
386	428	infoarea = createTextPane();
387	429	doc = infoarea.getStyledDocument();
..	..	@@ -474,10 +516,10 @@
474	516	e.printStackTrace();
475	517	}
476	518
477		- String selection = infoarea.getText();
478		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
479		- java.awt.datatransfer.Clipboard clipboard =
480		- Toolkit.getDefaultToolkit().getSystemClipboard();
	519	+// String selection = infoarea.getText();
	520	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	521	+// java.awt.datatransfer.Clipboard clipboard =
	522	+// Toolkit.getDefaultToolkit().getSystemClipboard();
481	523	//clipboard.setContents(data, data);
482	524	}
483	525
..	..	@@ -500,13 +542,13 @@
500	542	//SendInfo("Name:", "bold");
501	543	if (sel.GetTextures() != null \|\| debug)
502	544	{
503		- si.SendInfo(sel.toString(), "bold");
	545	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
504	546	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
505	547	if (sel.Size() > 0)
506	548	{
507	549	si.SendInfo("#children = " + sel.Size(), "regular");
508	550	}
509		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	551	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
510	552	if (debug)
511	553	{
512	554	try
..	..	@@ -548,7 +590,7 @@
548	590	}
549	591	if (sel.support != null)
550	592	{
551		- si.SendInfo(" support: " + sel.support, "regular");
	593	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
552	594	}
553	595	if (sel.scriptnode != null)
554	596	{
..	..	@@ -637,19 +679,91 @@
637	679	}
638	680	}
639	681
	682	+static GraphicsDevice device = GraphicsEnvironment
	683	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	684	+
	685	+ Rectangle keeprect;
	686	+ cRadio radio;
	687	+
	688	+cButton keepButton;
	689	+ cButton twoButton; // Full 3D
	690	+ cButton sixButton;
	691	+ cButton threeButton;
	692	+ cButton sevenButton;
	693	+ cButton fourButton; // full panel
	694	+ cButton oneButton; // full XYZ
	695	+ //cButton currentLayout;
	696	+
	697	+ boolean maximized;
	698	+
	699	+ cButton fullscreenLayout;
	700	+
	701	+ void Minimize()
	702	+ {
	703	+ frame.setState(Frame.ICONIFIED);
	704	+ }
	705	+
	706	+ void Maximize()
	707	+ {
	708	+ if (maximized)
	709	+ {
	710	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	711	+ }
	712	+ else
	713	+ {
	714	+ keeprect = frame.getBounds();
	715	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	716	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	717	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	718	+// frame.setState(Frame.MAXIMIZED_BOTH);
	719	+ }
	720	+
	721	+ maximized ^= true;
	722	+ }
	723	+
640	724	void ToggleFullScreen()
641	725	{
642	726	if (CameraPane.FULLSCREEN)
643	727	{
644		- frame.getContentPane().remove(/"Center",/bigThree);
645		- framePanel.add(bigThree);
646		- frame.getContentPane().add(/"Center",/framePanel);
	728	+ device.setFullScreenWindow(null);
	729	+ //frame.setVisible(false);
	730	+// frame.removeNotify();
	731	+// frame.setUndecorated(false);
	732	+// frame.addNotify();
	733	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	734	+
	735	+// X frame.getContentPane().remove(/"Center",/bigThree);
	736	+// X framePanel.add(bigThree);
	737	+// X frame.getContentPane().add(/"Center",/framePanel);
	738	+ framePanel.setDividerLocation(1);
	739	+
	740	+ //frame.setVisible(true);
	741	+ radio.layout = keepButton;
	742	+ //theFrame = null;
	743	+ keepButton = null;
	744	+ radio.layout.doClick();
	745	+
647	746	} else
648	747	{
649		- frame.getContentPane().remove(/"Center",/framePanel);
650		- framePanel.remove(bigThree);
651		- frame.getContentPane().add(/"Center",/bigThree);
	748	+ keepButton = radio.layout;
	749	+ //keeprect = frame.getBounds();
	750	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	751	+// frame.getToolkit().getScreenSize().height);
	752	+ //frame.setVisible(false);
	753	+ device.setFullScreenWindow(frame);
	754	+// frame.removeNotify();
	755	+// frame.setUndecorated(true);
	756	+// frame.addNotify();
	757	+// X frame.getContentPane().remove(/"Center",/framePanel);
	758	+// X framePanel.remove(bigThree);
	759	+// X frame.getContentPane().add(/"Center",/bigThree);
	760	+ framePanel.setDividerLocation(0);
	761	+
	762	+ radio.layout = fullscreenLayout;
	763	+ radio.layout.doClick();
	764	+ //frame.setVisible(true);
652	765	}
	766	+
653	767	cameraView.ToggleFullScreen();
654	768	}
655	769
..	..	@@ -751,7 +865,7 @@
751	865	protected static ImageIcon createImageIcon(String path,
752	866	String description)
753	867	{
754		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	868	+ java.net.URL imgURL = Grafreed.class.getResource(path);
755	869	if (imgURL != null)
756	870	{
757	871	return new ImageIcon(imgURL, description);
..	..	@@ -783,6 +897,7 @@
783	897	// NumberSlider vDivsField;
784	898	// JCheckBox endcaps;
785	899	JCheckBox liveCB;
	900	+ JCheckBox selectCB;
786	901	JCheckBox hideCB;
787	902	JCheckBox link2masterCB;
788	903	JCheckBox markCB;
..	..	@@ -790,7 +905,12 @@
790	905	JCheckBox speedupCB;
791	906	JCheckBox rewindCB;
792	907	JCheckBox flipVCB;
	908	+
	909	+ cCheckBox toggleTextureCB;
	910	+ cCheckBox toggleSwitchCB;
	911	+
793	912	JComboBox texresMenu;
	913	+
794	914	JButton resetButton;
795	915	JButton stepButton;
796	916	JButton stepAllButton;
..	..	@@ -799,9 +919,13 @@
799	919	JButton fasterButton;
800	920	JButton remarkButton;
801	921
	922	+ cGridBag editPanel;
	923	+ cGridBag editCommandsPanel;
	924	+
802	925	cGridBag namePanel;
803	926	cGridBag setupPanel;
804		- cGridBag commandsPanel;
	927	+ cGridBag setupPanel2;
	928	+ cGridBag objectCommandsPanel;
805	929	cGridBag pushPanel;
806	930	cGridBag fillPanel;
807	931
..	..	@@ -985,49 +1109,55 @@
985	1109
986	1110	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
987	1111	liveCB.setToolTipText("Animate object");
	1112	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1113	+ selectCB.setToolTipText("Make object selectable");
	1114	+// Return();
988	1115	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
989	1116	hideCB.setToolTipText("Hide object");
990		-// Return();
991	1117	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
992	1118	markCB.setToolTipText("Set the animation target transform");
993	1119
994		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1120	+ setupPanel2 = new cGridBag().setVertical(false);
	1121	+
	1122	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
995	1123	rewindCB.setToolTipText("Rewind animation");
996	1124
997		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
998		- randomCB.setToolTipText("Option for switch node");
	1125	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1126	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
999	1127
1000	1128	if (Globals.ADVANCED)
1001	1129	{
1002		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	1130	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1003	1131	link2masterCB.setToolTipText("Attach to support");
1004		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1132	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1005	1133	speedupCB.setToolTipText("Option motion capture");
1006	1134	}
1007	1135
1008	1136	oe.ctrlPanel.add(setupPanel);
1009	1137	oe.ctrlPanel.Return();
	1138	+ oe.ctrlPanel.add(setupPanel2);
	1139	+ oe.ctrlPanel.Return();
1010	1140
1011		- commandsPanel = new cGridBag().setVertical(false);
	1141	+ objectCommandsPanel = new cGridBag().setVertical(false);
1012	1142
1013		- resetButton = AddButton(commandsPanel, "Reset");
	1143	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1014	1144	resetButton.setToolTipText("Jump to frame zero");
1015		- stepButton = AddButton(commandsPanel, "Step");
	1145	+ stepButton = AddButton(objectCommandsPanel, "Step");
1016	1146	stepButton.setToolTipText("Step one frame");
1017	1147	// resetAllButton = AddButton(oe, "Reset All");
1018	1148	// stepAllButton = AddButton(oe, "Step All");
1019	1149	// Return();
1020		- slowerButton = AddButton(commandsPanel, "Slow");
	1150	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1021	1151	slowerButton.setToolTipText("Decrease animation speed");
1022		- fasterButton = AddButton(commandsPanel, "Fast");
	1152	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1023	1153	fasterButton.setToolTipText("Increase animation speed");
1024		- remarkButton = AddButton(commandsPanel, "Remark");
	1154	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1025	1155	remarkButton.setToolTipText("Set the current transform as the target");
1026	1156
1027		- oe.ctrlPanel.add(commandsPanel);
	1157	+ oe.ctrlPanel.add(objectCommandsPanel);
1028	1158	oe.ctrlPanel.Return();
1029	1159
1030		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1160	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1031	1161	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1032	1162	//Return();
1033	1163
..	..	@@ -1230,8 +1360,11 @@
1230	1360	//worldPanel.setName("World");
1231	1361	centralPanel = new cGridBag();
1232	1362	centralPanel.preferredWidth = 20;
1233		- timelinePanel = new JPanel(new BorderLayout());
1234		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1363	+
	1364	+ if (Globals.ADVANCED)
	1365	+ {
	1366	+ timelinePanel = new JPanel(new BorderLayout());
	1367	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1235	1368
1236	1369	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1237	1370	cameraPanel.setContinuousLayout(true);
..	..	@@ -1240,7 +1373,10 @@
1240	1373	// cameraPanel.setDividerSize(9);
1241	1374	cameraPanel.setResizeWeight(1.0);
1242	1375
	1376	+ }
	1377	+
1243	1378	centralPanel.add(cameraView);
	1379	+ centralPanel.setFocusable(true);
1244	1380	//frame.setJMenuBar(timelineMenubar);
1245	1381	//centralPanel.add(timelinePanel);
1246	1382
..	..	@@ -1303,11 +1439,12 @@
1303	1439	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1304	1440	//tmp.setName("Edit");
1305	1441	objectPanel.add(materialPanel);
	1442	+ objectPanel.add(toolboxPanel);
1306	1443	// JPanel north = new JPanel(new BorderLayout());
1307	1444	// north.setName("Edit");
1308	1445	// north.add(ctrlPanel, BorderLayout.NORTH);
1309	1446	// objectPanel.add(north);
1310		- objectPanel.add(ctrlPanel);
	1447	+ objectPanel.add(editPanel);
1311	1448	objectPanel.add(infoPanel);
1312	1449
1313	1450	/*
..	..	@@ -1329,14 +1466,12 @@
1329	1466	scrollpane.addMouseWheelListener(this); // Default not fast enough
1330	1467
1331	1468	/JTabbedPane/ scenePanel = new cGridBag();
1332		- scenePanel.preferredWidth = 7;
	1469	+ scenePanel.preferredWidth = 6;
1333	1470
1334	1471	JTabbedPane tabbedPane = new JTabbedPane();
1335	1472	tabbedPane.add(scrollpane);
1336	1473
1337		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1338		-
1339		- optionsPanel = new cGridBag().setVertical(true);
	1474	+ optionsPanel = new cGridBag().setVertical(false);
1340	1475
1341	1476	optionsPanel.setName("Options");
1342	1477
..	..	@@ -1344,6 +1479,8 @@
1344	1479
1345	1480	tabbedPane.add(optionsPanel);
1346	1481
	1482	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1483	+
1347	1484	scenePanel.add(tabbedPane);
1348	1485
1349	1486	/*
..	..	@@ -1435,9 +1572,13 @@
1435	1572
1436	1573	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1437	1574
1438		- frame.setSize(1024, 768);
1439		- frame.show();
	1575	+ frame.setSize(1280, 860);
	1576	+
	1577	+ frame.validate();
	1578	+ frame.setVisible(true);
1440	1579
	1580	+ cameraView.requestFocusInWindow();
	1581	+
1441	1582	gridPanel.setDividerLocation(1.0);
1442	1583
1443	1584	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1475,19 +1616,19 @@
1475	1616
1476	1617	cGridBag editBar = new cGridBag().setVertical(false);
1477	1618
1478		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1619	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1479	1620	createMaterialButton.setToolTipText("Create material");
1480	1621
1481	1622	/*
1482	1623	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1483	1624	*/
1484	1625
1485		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1626	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1486	1627	clearMaterialButton.setToolTipText("Clear material");
1487	1628
1488	1629	if (Globals.ADVANCED)
1489	1630	{
1490		- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1631	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
1491	1632	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1492	1633	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1493	1634	}
..	..	@@ -1938,7 +2079,7 @@
1938	2079
1939	2080	//? flashIt = false;
1940	2081	CameraPane pane = (CameraPane) cameraView;
1941		- pane.clickStart(location.x, location.y, 0);
	2082	+ pane.clickStart(location.x, location.y, 0, 0);
1942	2083	pane.clickEnd(location.x, location.y, 0, true);
1943	2084
1944	2085	if (group.selection.size() == 1)
..	..	@@ -1987,6 +2128,7 @@
1987	2128	e2.printStackTrace();
1988	2129	}
1989	2130	}
	2131	+
1990	2132	LoadJMEThread loadThread;
1991	2133
1992	2134	class LoadJMEThread extends Thread
..	..	@@ -2044,6 +2186,7 @@
2044	2186	//LoadFile0(filename, converter);
2045	2187	}
2046	2188	}
	2189	+
2047	2190	LoadOBJThread loadObjThread;
2048	2191
2049	2192	class LoadOBJThread extends Thread
..	..	@@ -2122,19 +2265,19 @@
2122	2265
2123	2266	void LoadObjFile(String fullname)
2124	2267	{
2125		- /*
	2268	+ System.out.println("Loading " + fullname);
	2269	+ /**/
2126	2270	//lastFilename = fullname;
2127	2271	if(loadObjThread == null)
2128	2272	{
2129		- loadObjThread = new LoadOBJThread();
2130		- loadObjThread.start();
	2273	+ loadObjThread = new LoadOBJThread();
	2274	+ loadObjThread.start();
2131	2275	}
2132	2276
2133	2277	loadObjThread.add(fullname);
2134		- */
	2278	+ /**/
2135	2279
2136		- System.out.println("Loading " + fullname);
2137		- makeSomething(new FileObject(fullname, true), true);
	2280	+ //makeSomething(new FileObject(fullname, true), true);
2138	2281	}
2139	2282
2140	2283	void LoadGFDFile(String fullname)
..	..	@@ -2395,11 +2538,11 @@
2395	2538
2396	2539	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2397	2540	{
2398		- if (GrafreeD.standAlone)
	2541	+ if (Grafreed.standAlone)
2399	2542	{
2400	2543	/**/
2401	2544	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2402		- browser.show();
	2545	+ browser.setVisible(true);
2403	2546	String filename = browser.getFile();
2404	2547	if (filename != null && filename.length() > 0)
2405	2548	{
..	..	@@ -2751,6 +2894,8 @@
2751	2894
2752	2895	void SetMaterial(Object3D object)
2753	2896	{
	2897	+ latestObject = object;
	2898	+
2754	2899	cMaterial mat = object.material;
2755	2900
2756	2901	if (mat == null)
..	..	@@ -2936,7 +3081,7 @@
2936	3081	cameraView.ToggleDL();
2937	3082	cameraView.repaint();
2938	3083	return;
2939		- } else if (event.getSource() == toggleTextureItem)
	3084	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2940	3085	{
2941	3086	cameraView.ToggleTexture();
2942	3087	// june 2013 copy.HardTouch();
..	..	@@ -2975,9 +3120,9 @@
2975	3120	frame.validate();
2976	3121
2977	3122	return;
2978		- } else if (event.getSource() == toggleSwitchItem)
	3123	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2979	3124	{
2980		- cameraView.ToggleRandom();
	3125	+ cameraView.ToggleSwitch();
2981	3126	cameraView.repaint();
2982	3127	return;
2983	3128	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3005,6 +3150,10 @@
3005	3150	} else if (event.getSource() == liveCB)
3006	3151	{
3007	3152	copy.live ^= true;
	3153	+ return;
	3154	+ } else if (event.getSource() == selectCB)
	3155	+ {
	3156	+ copy.dontselect ^= true;
3008	3157	return;
3009	3158	} else if (event.getSource() == hideCB)
3010	3159	{
..	..	@@ -3044,8 +3193,9 @@
3044	3193
3045	3194	public void actionPerformed(ActionEvent event)
3046	3195	{
	3196	+ Object source = event.getSource();
3047	3197	// SCRIPT DIALOG
3048		- if (event.getSource() == okbutton)
	3198	+ if (source == okbutton)
3049	3199	{
3050	3200	textpanel.setVisible(false);
3051	3201	textpanel.remove(textarea);
..	..	@@ -3057,7 +3207,7 @@
3057	3207	textarea = null;
3058	3208	textpanel = null;
3059	3209	}
3060		- if (event.getSource() == cancelbutton)
	3210	+ if (source == cancelbutton)
3061	3211	{
3062	3212	textpanel.setVisible(false);
3063	3213	textpanel.remove(textarea);
..	..	@@ -3069,50 +3219,50 @@
3069	3219	//applySelf();
3070	3220	//client.refreshEditWindow();
3071	3221	//refreshContents();
3072		- if (event.getSource() == nameField)
	3222	+ if (source == nameField)
3073	3223	{
3074	3224	//System.out.println("ObjEditor " + event);
3075	3225	applySelf0(true);
3076	3226	//parent.applySelf();
3077	3227	objEditor.refreshContents();
3078		- } else if (event.getSource() == resetButton)
	3228	+ } else if (source == resetButton)
3079	3229	{
3080	3230	CameraPane.fullreset = true;
3081	3231	copy.Reset(); // ResetMeshes();
3082	3232	copy.Touch();
3083	3233	objEditor.refreshContents();
3084		- } else if (event.getSource() == stepItem)
	3234	+ } else if (source == stepItem)
3085	3235	{
3086	3236	//cameraView.ONESTEP = true;
3087	3237	Globals.ONESTEP = true;
3088	3238	cameraView.repaint();
3089	3239	return;
3090		- } else if (event.getSource() == stepButton)
	3240	+ } else if (source == stepButton)
3091	3241	{
3092	3242	copy.Step();
3093	3243	copy.Touch();
3094	3244	objEditor.refreshContents();
3095		- } else if (event.getSource() == slowerButton)
	3245	+ } else if (source == slowerButton)
3096	3246	{
3097	3247	copy.Slower();
3098	3248	copy.Touch();
3099	3249	objEditor.refreshContents();
3100		- } else if (event.getSource() == fasterButton)
	3250	+ } else if (source == fasterButton)
3101	3251	{
3102	3252	copy.Faster();
3103	3253	copy.Touch();
3104	3254	objEditor.refreshContents();
3105		- } else if (event.getSource() == remarkButton)
	3255	+ } else if (source == remarkButton)
3106	3256	{
3107	3257	copy.Remark();
3108	3258	copy.Touch();
3109	3259	objEditor.refreshContents();
3110		- } else if (event.getSource() == stepAllButton)
	3260	+ } else if (source == stepAllButton)
3111	3261	{
3112	3262	copy.StepAll();
3113	3263	copy.Touch();
3114	3264	objEditor.refreshContents();
3115		- } else if (event.getSource() == resetAllButton)
	3265	+ } else if (source == resetAllButton)
3116	3266	{
3117	3267	//CameraPane.fullreset = true;
3118	3268	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3145,53 +3295,75 @@
3145	3295	// Close();
3146	3296	// }
3147	3297	// else
3148		- if (event.getSource() == resetSlidersButton)
	3298	+ if (source == resetSlidersButton)
3149	3299	{
3150	3300	ResetSliders();
3151		- } else if (event.getSource() == clearMaterialButton)
	3301	+ } else if (source == clearMaterialButton)
3152	3302	{
3153	3303	ClearMaterial();
3154		- } else if (event.getSource() == createMaterialButton)
	3304	+ } else if (source == createMaterialButton)
3155	3305	{
3156	3306	CreateMaterial();
3157		- } else if (event.getSource() == clearPanelButton)
	3307	+ } else if (source == clearPanelButton)
3158	3308	{
3159	3309	copy.ClearUI();
3160	3310	refreshContents(true);
3161		- } /*
3162		- }
3163		-
3164		- public boolean action(Event event, Object arg)
3165		- {
3166		- */ else if (event.getSource() == closeItem)
	3311	+ } else if (source == importGFDItem)
	3312	+ {
	3313	+ ImportGFD();
	3314	+ } else
	3315	+ if (source == importVRMLX3DItem)
	3316	+ {
	3317	+ ImportVRMLX3D();
	3318	+ } else
	3319	+ if (source == import3DSItem)
	3320	+ {
	3321	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3322	+ } else
	3323	+ if (source == importOBJItem)
	3324	+ {
	3325	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3326	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3327	+ browser.setVisible(true);
	3328	+ String filename = browser.getFile();
	3329	+ if (filename != null && filename.length() > 0)
	3330	+ {
	3331	+ String fullname = browser.getDirectory() + filename;
	3332	+ makeSomething(ReadOBJ(fullname), true);
	3333	+ }
	3334	+ } else
	3335	+ if (source == closeItem)
3167	3336	{
3168	3337	Close();
3169	3338	//return true;
3170		- } else if (event.getSource() == loadItem)
	3339	+ } else if (source == loadItem)
3171	3340	{
3172	3341	load();
3173	3342	//return true;
3174		- } else if (event.getSource() == saveItem)
	3343	+ } else if (source == newItem)
	3344	+ {
	3345	+ New();
	3346	+ } else if (source == saveItem)
3175	3347	{
3176	3348	save();
3177	3349	//return true;
3178		- } else if (event.getSource() == saveAsItem)
	3350	+ } else if (source == saveAsItem)
3179	3351	{
3180	3352	saveAs();
3181	3353	//return true;
3182		- } else if (event.getSource() == reexportItem)
	3354	+ } else if (source == reexportItem)
3183	3355	{
3184	3356	reexport();
3185	3357	//return true;
3186		- } else if (event.getSource() == exportAsItem)
	3358	+ } else if (source == exportAsItem)
3187	3359	{
3188	3360	export();
3189	3361	//return true;
3190		- } else if (event.getSource() == povItem)
	3362	+ } else if (source == povItem)
3191	3363	{
3192	3364	generatePOV();
3193	3365	//return true;
3194		- } else if (event.getSource() == zBufferItem)
	3366	+ } else if (source == zBufferItem)
3195	3367	{
3196	3368	try
3197	3369	{
..	..	@@ -3213,21 +3385,8 @@
3213	3385	cameraView.repaint();
3214	3386	//return true;
3215	3387	}
3216		- */ else if (event.getSource() == editCameraItem)
3217		- {
3218		- cameraView.ProtectCamera();
3219		- cameraView.repaint();
3220		- return;
3221		- } else if (event.getSource() == revertCameraItem)
3222		- {
3223		- cameraView.RevertCamera();
3224		- cameraView.repaint();
3225		- return;
3226		-// } else if (event.getSource() == textureButton)
3227		-// {
3228		-// return; // true;
3229		- } else // combos...
3230		- if (event.getSource() == texresMenu)
	3388	+ */ else // combos...
	3389	+ if (source == texresMenu)
3231	3390	{
3232	3391	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3233	3392	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3239,6 +3398,266 @@
3239	3398	}
3240	3399	}
3241	3400
	3401	+ void New()
	3402	+ {
	3403	+ while (copy.Size() > 1)
	3404	+ {
	3405	+ copy.remove(1);
	3406	+ }
	3407	+
	3408	+ ResetModel();
	3409	+ objEditor.refreshContents();
	3410	+ }
	3411	+
	3412	+ static public byte[] Compress(Object3D o)
	3413	+ {
	3414	+ try
	3415	+ {
	3416	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3417	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3418	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3419	+
	3420	+ Object3D parent = o.parent;
	3421	+ o.parent = null;
	3422	+
	3423	+ out.writeObject(o);
	3424	+
	3425	+ o.parent = parent;
	3426	+
	3427	+ out.flush();
	3428	+
	3429	+ zstream.close();
	3430	+ out.close();
	3431	+
	3432	+ return baos.toByteArray();
	3433	+ } catch (Exception e)
	3434	+ {
	3435	+ System.err.println(e);
	3436	+ return null;
	3437	+ }
	3438	+ }
	3439	+
	3440	+ static public Object Uncompress(byte[] bytes)
	3441	+ {
	3442	+ System.out.println("#bytes = " + bytes.length);
	3443	+ try
	3444	+ {
	3445	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3446	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3447	+ ObjectInputStream in = new ObjectInputStream(istream);
	3448	+ Object obj = in.readObject();
	3449	+ in.close();
	3450	+
	3451	+ return obj;
	3452	+ } catch (Exception e)
	3453	+ {
	3454	+ System.err.println(e);
	3455	+ return null;
	3456	+ }
	3457	+ }
	3458	+
	3459	+ static public Object clone(Object o)
	3460	+ {
	3461	+ try
	3462	+ {
	3463	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3464	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3465	+
	3466	+ out.writeObject(o);
	3467	+
	3468	+ out.flush();
	3469	+ out.close();
	3470	+
	3471	+ byte[] bytes = baos.toByteArray();
	3472	+
	3473	+ System.out.println("clone = " + bytes.length);
	3474	+
	3475	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3476	+ ObjectInputStream in = new ObjectInputStream(bais);
	3477	+ Object obj = in.readObject();
	3478	+ in.close();
	3479	+
	3480	+ return obj;
	3481	+ } catch (Exception e)
	3482	+ {
	3483	+ System.err.println(e);
	3484	+ return null;
	3485	+ }
	3486	+ }
	3487	+
	3488	+ cRadio GetCurrentTab()
	3489	+ {
	3490	+ cRadio ab;
	3491	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3492	+ {
	3493	+ ab = (cRadio)e.nextElement();
	3494	+ if(ab.GetObject() == copy)
	3495	+ {
	3496	+ return ab;
	3497	+ }
	3498	+ }
	3499	+
	3500	+ return null;
	3501	+ }
	3502	+
	3503	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3504	+
	3505	+ public void Save()
	3506	+ {
	3507	+ System.err.println("Save");
	3508	+
	3509	+ cRadio tab = GetCurrentTab();
	3510	+
	3511	+ boolean temp = CameraPane.SWITCH;
	3512	+ CameraPane.SWITCH = false;
	3513	+
	3514	+ copy.ExtractBigData(hashtable);
	3515	+
	3516	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3517	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3518	+
	3519	+ copy.RestoreBigData(hashtable);
	3520	+
	3521	+ CameraPane.SWITCH = temp;
	3522	+
	3523	+ //assert(hashtable.isEmpty());
	3524	+
	3525	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3526	+ {
	3527	+ tab.graphs[i] = null;
	3528	+ }
	3529	+
	3530	+ // test save
	3531	+ if (false)
	3532	+ {
	3533	+ try
	3534	+ {
	3535	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3536	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3537	+
	3538	+ p.writeObject(copy);
	3539	+
	3540	+ p.flush();
	3541	+
	3542	+ ostream.close();
	3543	+ } catch (Exception e)
	3544	+ {
	3545	+ e.printStackTrace();
	3546	+ }
	3547	+ }
	3548	+ }
	3549	+
	3550	+ void CopyChanged(Object3D obj)
	3551	+ {
	3552	+ boolean temp = CameraPane.SWITCH;
	3553	+ CameraPane.SWITCH = false;
	3554	+
	3555	+ copy.ExtractBigData(hashtable);
	3556	+
	3557	+ copy.clear();
	3558	+
	3559	+ for (int i=0; i<obj.Size(); i++)
	3560	+ {
	3561	+ copy.add(obj.get(i));
	3562	+ }
	3563	+
	3564	+ copy.RestoreBigData(hashtable);
	3565	+
	3566	+ CameraPane.SWITCH = temp;
	3567	+
	3568	+ //assert(hashtable.isEmpty());
	3569	+
	3570	+ copy.Touch();
	3571	+
	3572	+ ResetModel();
	3573	+ copy.HardTouch(); // recompile?
	3574	+
	3575	+ cRadio ab;
	3576	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3577	+ {
	3578	+ ab = (cRadio)e.nextElement();
	3579	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3580	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3581	+ if (test != null)
	3582	+ {
	3583	+ test.editWindow = ab.object.editWindow;
	3584	+ ab.object = test;
	3585	+ }
	3586	+ }
	3587	+
	3588	+ refreshContents();
	3589	+ }
	3590	+
	3591	+ public void Undo()
	3592	+ {
	3593	+ System.err.println("Undo");
	3594	+
	3595	+ cRadio tab = GetCurrentTab();
	3596	+
	3597	+ if (tab.undoindex == 0)
	3598	+ {
	3599	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3600	+ return;
	3601	+ }
	3602	+
	3603	+ if (tab.graphs[tab.undoindex] == null)
	3604	+ {
	3605	+ Save();
	3606	+ tab.undoindex -= 1;
	3607	+ }
	3608	+
	3609	+ tab.undoindex -= 1;
	3610	+
	3611	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3612	+ }
	3613	+
	3614	+ public void Redo()
	3615	+ {
	3616	+ cRadio tab = GetCurrentTab();
	3617	+
	3618	+ if (tab.graphs[tab.undoindex + 1] == null)
	3619	+ {
	3620	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3621	+ return;
	3622	+ }
	3623	+
	3624	+ tab.undoindex += 1;
	3625	+
	3626	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3627	+ }
	3628	+
	3629	+ void ImportGFD()
	3630	+ {
	3631	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3632	+ browser.show();
	3633	+ String filename = browser.getFile();
	3634	+ if (filename != null && filename.length() > 0)
	3635	+ {
	3636	+ String fullname = browser.getDirectory() + filename;
	3637	+
	3638	+ //Object3D readobj =
	3639	+ objEditor.ReadGFD(fullname, objEditor);
	3640	+ //makeSomething(readobj);
	3641	+ }
	3642	+ }
	3643	+
	3644	+ void ImportVRMLX3D()
	3645	+ {
	3646	+ if (Grafreed.standAlone)
	3647	+ {
	3648	+ /**/
	3649	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3650	+ browser.show();
	3651	+ String filename = browser.getFile();
	3652	+ if (filename != null && filename.length() > 0)
	3653	+ {
	3654	+ String fullname = browser.getDirectory() + filename;
	3655	+ LoadVRMLX3D(fullname);
	3656	+ }
	3657	+ /**/
	3658	+ }
	3659	+ }
	3660	+
3242	3661	void ToggleAnimation()
3243	3662	{
3244	3663	if (!Globals.ANIMATION)
..	..	@@ -3254,8 +3673,8 @@
3254	3673
3255	3674	Globals.ANIMATION ^= true;
3256	3675
3257		- GrafreeD.wav.cursor = 0;
3258		- GrafreeD.wav.loop = 0;
	3676	+ Grafreed.wav.cursor = 0;
	3677	+ Grafreed.wav.loop = 0;
3259	3678	}
3260	3679	} else
3261	3680	{
..	..	@@ -3276,7 +3695,6 @@
3276	3695	callee.refreshContents();
3277	3696	} else
3278	3697	{
3279		- new Exception().printStackTrace();
3280	3698	System.exit(0);
3281	3699	}
3282	3700	}
..	..	@@ -3357,7 +3775,7 @@
3357	3775	assert false;
3358	3776	}
3359	3777
3360		- void EditSelection()
	3778	+ void EditSelection(boolean newWindow)
3361	3779	{
3362	3780	}
3363	3781
..	..	@@ -3443,6 +3861,36 @@
3443	3861	{
3444	3862	//System.out.println("Propagate = " + propagate);
3445	3863	copy.UpdateMaterial(anchor, current, propagate);
	3864	+
	3865	+ if (copy.material != null)
	3866	+ {
	3867	+ cMaterial mat = copy.material;
	3868	+
	3869	+ colorField.SetToolTipValue((mat.color));
	3870	+ modulationField.SetToolTipValue((mat.modulation));
	3871	+ metalnessField.SetToolTipValue((mat.metalness));
	3872	+ diffuseField.SetToolTipValue((mat.diffuse));
	3873	+ specularField.SetToolTipValue((mat.specular));
	3874	+ shininessField.SetToolTipValue((mat.shininess));
	3875	+ shiftField.SetToolTipValue((mat.shift));
	3876	+ ambientField.SetToolTipValue((mat.ambient));
	3877	+ lightareaField.SetToolTipValue((mat.lightarea));
	3878	+ diffusenessField.SetToolTipValue((mat.factor));
	3879	+ velvetField.SetToolTipValue((mat.velvet));
	3880	+ sheenField.SetToolTipValue((mat.sheen));
	3881	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3882	+ backlitField.SetToolTipValue((mat.bump));
	3883	+ anisoField.SetToolTipValue((mat.aniso));
	3884	+ anisoVField.SetToolTipValue((mat.anisoV));
	3885	+ cameraField.SetToolTipValue((mat.cameralight));
	3886	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3887	+ shadowField.SetToolTipValue((mat.shadow));
	3888	+ textureField.SetToolTipValue((mat.texture));
	3889	+ opacityField.SetToolTipValue((mat.opacity));
	3890	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3891	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3892	+ }
	3893	+
3446	3894	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3447	3895	{
3448	3896	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3558,7 +4006,7 @@
3558	4006	}
3559	4007
3560	4008	if (normalpushField != null)
3561		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4009	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3562	4010	}
3563	4011
3564	4012	void SnapObject()
..	..	@@ -3822,6 +4270,8 @@
3822	4270
3823	4271	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3824	4272	{
	4273	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4274	+ Save();
3825	4275	//Tween.set(thing, 0).target(1).start(tweenManager);
3826	4276	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3827	4277	// if (thing instanceof GenericJointDemo)
..	..	@@ -3908,6 +4358,12 @@
3908	4358	{
3909	4359	ResetModel();
3910	4360	Select(thing.GetTreePath(), true, false); // unselect... false);
	4361	+
	4362	+ if (thing.Size() == 0)
	4363	+ {
	4364	+ //EditSelection(false);
	4365	+ }
	4366	+
3911	4367	refreshContents();
3912	4368	}
3913	4369
..	..	@@ -4025,6 +4481,7 @@
4025	4481	}
4026	4482	}
4027	4483	}
	4484	+
4028	4485	LoadGFDThread loadGFDThread;
4029	4486
4030	4487	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4044,8 +4501,10 @@
4044	4501
4045	4502	try
4046	4503	{
	4504	+ // Try compressed version first.
4047	4505	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4048		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4506	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4507	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4049	4508
4050	4509	readobj = (Object3D) p.readObject();
4051	4510	istream.close();
..	..	@@ -4053,7 +4512,20 @@
4053	4512	readobj.ResetDisplayList();
4054	4513	} catch (Exception e)
4055	4514	{
4056		- e.printStackTrace();
	4515	+ //e.printStackTrace();
	4516	+ try
	4517	+ {
	4518	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4519	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4520	+
	4521	+ readobj = (Object3D) p.readObject();
	4522	+ istream.close();
	4523	+
	4524	+ readobj.ResetDisplayList();
	4525	+ } catch (Exception e2)
	4526	+ {
	4527	+ e2.printStackTrace();
	4528	+ }
4057	4529	}
4058	4530	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4059	4531	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4099,6 +4571,12 @@
4099	4571
4100	4572	void LoadIt(Object obj)
4101	4573	{
	4574	+ if (obj == null)
	4575	+ {
	4576	+ // Invalid file
	4577	+ return;
	4578	+ }
	4579	+
4102	4580	System.out.println("Loaded " + obj);
4103	4581	//new Exception().printStackTrace();
4104	4582	Object3D readobj = (Object3D) obj;
..	..	@@ -4108,6 +4586,8 @@
4108	4586
4109	4587	if (readobj != null)
4110	4588	{
	4589	+ if (Globals.SAVEONMAKE)
	4590	+ Save();
4111	4591	try
4112	4592	{
4113	4593	//readobj.deepCopySelf(copy);
..	..	@@ -4170,7 +4650,7 @@
4170	4650
4171	4651	void load() // throws ClassNotFoundException
4172	4652	{
4173		- if (GrafreeD.standAlone)
	4653	+ if (Grafreed.standAlone)
4174	4654	{
4175	4655	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4176	4656	browser.show();
..	..	@@ -4257,11 +4737,13 @@
4257	4737	try
4258	4738	{
4259	4739	FileOutputStream ostream = new FileOutputStream(lastname);
4260		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4740	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4741	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4261	4742
4262	4743	p.writeObject(copy);
4263	4744	p.flush();
4264	4745
	4746	+ zstream.close();
4265	4747	ostream.close();
4266	4748
4267	4749	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4271,11 +4753,12 @@
4271	4753	{
4272	4754	}
4273	4755	}
	4756	+
4274	4757	String lastname;
4275	4758
4276	4759	void saveAs()
4277	4760	{
4278		- if (GrafreeD.standAlone)
	4761	+ if (Grafreed.standAlone)
4279	4762	{
4280	4763	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4281	4764	browser.setVisible(true);
..	..	@@ -4380,13 +4863,13 @@
4380	4863	try
4381	4864	{
4382	4865	FileOutputStream ostream = new FileOutputStream(filename);
4383		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4384		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4866	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4867	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4385	4868
4386	4869	Object3D objectparent = obj.parent;
4387	4870	obj.parent = null;
4388	4871
4389		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4872	+ Object3D object = (Object3D) Grafreed.clone(obj);
4390	4873
4391	4874	obj.parent = objectparent;
4392	4875
..	..	@@ -4398,8 +4881,8 @@
4398	4881	p.writeObject(object);
4399	4882	p.flush();
4400	4883
	4884	+ zstream.close();
4401	4885	ostream.close();
4402		- // zstream.close();
4403	4886
4404	4887	// group.selection.get(0).parent = parent;
4405	4888	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4420,7 +4903,7 @@
4420	4903	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4421	4904	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4422	4905	copy.generatePOV(buffer);
4423		- if (GrafreeD.standAlone)
	4906	+ if (Grafreed.standAlone)
4424	4907	{
4425	4908	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4426	4909	browser.show();
..	..	@@ -4446,7 +4929,8 @@
4446	4929	Object3D client;
4447	4930	Object3D copy;
4448	4931	MenuBar menuBar;
4449		- Menu windowMenu;
	4932	+ Menu fileMenu;
	4933	+ MenuItem newItem;
4450	4934	MenuItem loadItem;
4451	4935	MenuItem saveItem;
4452	4936	MenuItem saveAsItem;
..	..	@@ -4454,11 +4938,9 @@
4454	4938	MenuItem reexportItem;
4455	4939	MenuItem povItem;
4456	4940	MenuItem closeItem;
4457		- Menu cameraMenu;
	4941	+
4458	4942	CheckboxMenuItem zBufferItem;
4459	4943	//MenuItem normalLensItem;
4460		- MenuItem editCameraItem;
4461		- MenuItem revertCameraItem;
4462	4944	MenuItem stepItem;
4463	4945	CheckboxMenuItem toggleLiveItem;
4464	4946	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4476,18 +4958,31 @@
4476	4958	CheckboxMenuItem togglePaintItem;
4477	4959	JSplitPane mainPanel;
4478	4960	JScrollPane scrollpane;
	4961	+
4479	4962	JPanel toolbarPanel;
	4963	+
4480	4964	cGridBag treePanel;
	4965	+
4481	4966	JPanel radioPanel;
4482	4967	ButtonGroup buttonGroup;
4483		- cGridBag ctrlPanel;
	4968	+
	4969	+ cGridBag toolboxPanel;
4484	4970	cGridBag materialPanel;
	4971	+ cGridBag ctrlPanel;
	4972	+
4485	4973	JScrollPane infoPanel;
	4974	+
4486	4975	cGridBag optionsPanel;
	4976	+
4487	4977	JTabbedPane objectPanel;
	4978	+ boolean materialFlushed;
	4979	+ Object3D latestObject;
	4980	+
4488	4981	cGridBag XYZPanel;
	4982	+
4489	4983	JSplitPane gridPanel;
4490	4984	JSplitPane bigPanel;
	4985	+
4491	4986	cGridBag bigThree;
4492	4987	cGridBag scenePanel;
4493	4988	cGridBag centralPanel;
..	..	@@ -4602,8 +5097,13 @@
4602	5097	cNumberSlider fogField;
4603	5098	JLabel opacityPowerLabel;
4604	5099	cNumberSlider opacityPowerField;
4605		- JTree jTree;
	5100	+ cTree jTree;
4606	5101	//ObjectUI parent;
4607	5102
4608	5103	cNumberSlider normalpushField;
	5104	+
	5105	+ private MenuItem importGFDItem;
	5106	+ private MenuItem importVRMLX3DItem;
	5107	+ private MenuItem import3DSItem;
	5108	+ private MenuItem importOBJItem;
4609	5109	}