~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -143,6 +143,8 @@
143	143	//nameField.removeActionListener(this);
144	144	// objEditor.ctrlPanel.remove(nameField);
145	145
	146	+ objEditor.ctrlPanel.remove(namePanel);
	147	+
146	148	if (!GroupEditor.allparams)
147	149	return;
148	150
..	..	@@ -165,8 +167,8 @@
165	167	// objEditor.ctrlPanel.remove(fasterButton);
166	168	// objEditor.ctrlPanel.remove(remarkButton);
167	169
168		- objEditor.ctrlPanel.remove(namePanel);
169	170	objEditor.ctrlPanel.remove(setupPanel);
	171	+ objEditor.ctrlPanel.remove(setupPanel2);
170	172	objEditor.ctrlPanel.remove(commandsPanel);
171	173	objEditor.ctrlPanel.remove(pushPanel);
172	174	//objEditor.ctrlPanel.remove(fillPanel);
..	..	@@ -275,24 +277,40 @@
275	277	void SetupMenu()
276	278	{
277	279	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..."));
	280	+ menuBar.add(fileMenu = new Menu("File"));
	281	+ fileMenu.add(newItem = new MenuItem("New"));
	282	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	283	+
	284	+ //oe.menuBar.add(menu = new Menu("Include"));
	285	+ Menu menu = new Menu("Import");
	286	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	287	+ importOBJItem.addActionListener(this);
	288	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	289	+ import3DSItem.addActionListener(this);
	290	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	291	+ importVRMLX3DItem.addActionListener(this);
	292	+ menu.add("-");
	293	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	294	+ importGFDItem.addActionListener(this);
	295	+ fileMenu.add(menu);
	296	+ fileMenu.add("-");
	297	+
	298	+ fileMenu.add(saveItem = new MenuItem("Save"));
	299	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
283	300	//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("-");
	301	+ fileMenu.add("-");
	302	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	303	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	304	+ fileMenu.add("-");
288	305	if (client.parent != null)
289	306	{
290		- windowMenu.add(closeItem = new MenuItem("Close"));
	307	+ fileMenu.add(closeItem = new MenuItem("Close"));
291	308	} else
292	309	{
293		- windowMenu.add(closeItem = new MenuItem("Exit"));
	310	+ fileMenu.add(closeItem = new MenuItem("Exit"));
294	311	}
295	312
	313	+ newItem.addActionListener(this);
296	314	loadItem.addActionListener(this);
297	315	saveItem.addActionListener(this);
298	316	saveAsItem.addActionListener(this);
..	..	@@ -301,65 +319,10 @@
301	319	//povItem.addActionListener(this);
302	320	closeItem.addActionListener(this);
303	321
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	322	objectPanel = new JTabbedPane();
360	323	toolbarPanel = new JPanel();
361	324	toolbarPanel.setName("Toolbar");
362		- treePanel = new JPanel();
	325	+ treePanel = new cGridBag();
363	326	treePanel.setName("Tree");
364	327	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
365	328	ctrlPanel.setName("Edit");
..	..	@@ -367,13 +330,15 @@
367	330	materialPanel.setName("Material");
368	331	/JTextPane/
369	332	infoarea = createTextPane();
	333	+ doc = infoarea.getStyledDocument();
	334	+
370	335	infoarea.setEditable(true);
371	336	SetText();
372	337	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
373	338	// infoarea.setOpaque(false);
374	339	// //infoarea.setForeground(textcolor);
375		- infoarea.setLineWrap(true);
376		- infoarea.setWrapStyleWord(true);
	340	+// TEXTAREA infoarea.setLineWrap(true);
	341	+// TEXTAREA infoarea.setWrapStyleWord(true);
377	342	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
378	343	infoPanel.setPreferredSize(new Dimension(50, 200));
379	344	infoPanel.setName("Info");
..	..	@@ -384,14 +349,14 @@
384	349	mainPanel.setName("Main");
385	350	mainPanel.setContinuousLayout(true);
386	351	mainPanel.setOneTouchExpandable(true);
387		- mainPanel.setDividerLocation(1.0);
388	352	mainPanel.setDividerSize(9);
389		- mainPanel.setResizeWeight(0);
	353	+ mainPanel.setDividerLocation(0.5); //1.0);
	354	+ mainPanel.setResizeWeight(0.5);
390	355
391	356	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
392	357	//mainPanel.setLayout(new GridBagLayout());
393	358	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
394		- treePanel.setLayout(new GridBagLayout());
	359	+// treePanel.setLayout(new GridBagLayout());
395	360	//ctrlPanel.setLayout(new GridBagLayout());
396	361	//materialPanel.setLayout(new GridBagLayout());
397	362
..	..	@@ -432,7 +397,7 @@
432	397	static String newline = "\n";
433	398	protected static final String buttonString = "JButton";
434	399	StyledDocument doc;
435		- JTextArea infoarea;
	400	+ JTextPane infoarea;
436	401
437	402	void ClearInfo()
438	403	{
..	..	@@ -455,10 +420,10 @@
455	420	e.printStackTrace();
456	421	}
457	422
458		- String selection = infoarea.getText();
459		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
460		- java.awt.datatransfer.Clipboard clipboard =
461		- Toolkit.getDefaultToolkit().getSystemClipboard();
	423	+// String selection = infoarea.getText();
	424	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	425	+// java.awt.datatransfer.Clipboard clipboard =
	426	+// Toolkit.getDefaultToolkit().getSystemClipboard();
462	427	//clipboard.setContents(data, data);
463	428	}
464	429
..	..	@@ -481,13 +446,13 @@
481	446	//SendInfo("Name:", "bold");
482	447	if (sel.GetTextures() != null \|\| debug)
483	448	{
484		- si.SendInfo(sel.toString(), "bold");
	449	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
485	450	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
486	451	if (sel.Size() > 0)
487	452	{
488	453	si.SendInfo("#children = " + sel.Size(), "regular");
489	454	}
490		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	455	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
491	456	if (debug)
492	457	{
493	458	try
..	..	@@ -499,7 +464,10 @@
499	464	}
500	465
501	466	if (full)
502		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	467	+ {
	468	+ si.SendInfo(" BBox min: " + minima, "regular");
	469	+ si.SendInfo(" BBox max: " + maxima, "regular");
	470	+ }
503	471
504	472	if (sel.bRep != null)
505	473	{
..	..	@@ -526,7 +494,7 @@
526	494	}
527	495	if (sel.support != null)
528	496	{
529		- si.SendInfo(" support: " + sel.support, "regular");
	497	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
530	498	}
531	499	if (sel.scriptnode != null)
532	500	{
..	..	@@ -597,6 +565,9 @@
597	565	{
598	566	CameraPane.pointflow = (PointFlow) sel;
599	567	}
	568	+
	569	+ si.SendInfo("_____________________", "regular");
	570	+ si.SendInfo("", "regular");
600	571	}
601	572	}
602	573
..	..	@@ -628,52 +599,52 @@
628	599	cameraView.ToggleFullScreen();
629	600	}
630	601
631		- private JTextArea createTextPane()
	602	+ private JTextPane createTextPane()
632	603	{
633		- String[] initString =
634		- {
635		- "This is an editable JTextPane, ", //regular
636		- "another ", //italic
637		- "styled ", //bold
638		- "text ", //small
639		- "component, ", //large
640		- "which supports embedded components..." + newline,//regular
641		- " " + newline, //button
642		- "...and embedded icons..." + newline, //regular
643		- " ", //icon
644		- newline + "JTextPane is a subclass of JEditorPane that "
645		- + "uses a StyledEditorKit and StyledDocument, and provides "
646		- + "cover methods for interacting with those objects."
647		- };
	604	+// TEXTAREA String[] initString =
	605	+// {
	606	+// "This is an editable JTextPane, ", //regular
	607	+// "another ", //italic
	608	+// "styled ", //bold
	609	+// "text ", //small
	610	+// "component, ", //large
	611	+// "which supports embedded components..." + newline,//regular
	612	+// " " + newline, //button
	613	+// "...and embedded icons..." + newline, //regular
	614	+// " ", //icon
	615	+// newline + "JTextPane is a subclass of JEditorPane that "
	616	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	617	+// + "cover methods for interacting with those objects."
	618	+// };
	619	+//
	620	+// String[] initStyles =
	621	+// {
	622	+// "regular", "italic", "bold", "small", "large",
	623	+// "regular", "button", "regular", "icon",
	624	+// "regular"
	625	+// };
	626	+//
	627	+// JTextPane textPane = new JTextPane();
	628	+// textPane.setEditable(true);
	629	+// /StyledDocument/ doc = textPane.getStyledDocument();
	630	+// addStylesToDocument(doc);
	631	+//
	632	+// try
	633	+// {
	634	+// for (int j = 0; j < 2; j++)
	635	+// {
	636	+// for (int i = 0; i < initString.length; i++)
	637	+// {
	638	+// doc.insertString(doc.getLength(), initString[i],
	639	+// doc.getStyle(initStyles[i]));
	640	+// }
	641	+// }
	642	+// } catch (BadLocationException ble)
	643	+// {
	644	+// System.err.println("Couldn't insert initial text into text pane.");
	645	+// }
648	646
649		- String[] initStyles =
650		- {
651		- "regular", "italic", "bold", "small", "large",
652		- "regular", "button", "regular", "icon",
653		- "regular"
654		- };
655		-
656		- JTextPane textPane = new JTextPane();
657		- textPane.setEditable(true);
658		- /StyledDocument/ doc = textPane.getStyledDocument();
659		- addStylesToDocument(doc);
660		-
661		- try
662		- {
663		- for (int j = 0; j < 2; j++)
664		- {
665		- for (int i = 0; i < initString.length; i++)
666		- {
667		- doc.insertString(doc.getLength(), initString[i],
668		- doc.getStyle(initStyles[i]));
669		- }
670		- }
671		- } catch (BadLocationException ble)
672		- {
673		- System.err.println("Couldn't insert initial text into text pane.");
674		- }
675		-
676		- return new JTextArea(); // textPane;
	647	+ return new JTextPane(); // textPane;
677	648	}
678	649
679	650	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -726,7 +697,7 @@
726	697	protected static ImageIcon createImageIcon(String path,
727	698	String description)
728	699	{
729		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	700	+ java.net.URL imgURL = Grafreed.class.getResource(path);
730	701	if (imgURL != null)
731	702	{
732	703	return new ImageIcon(imgURL, description);
..	..	@@ -758,6 +729,7 @@
758	729	// NumberSlider vDivsField;
759	730	// JCheckBox endcaps;
760	731	JCheckBox liveCB;
	732	+ JCheckBox selectCB;
761	733	JCheckBox hideCB;
762	734	JCheckBox link2masterCB;
763	735	JCheckBox markCB;
..	..	@@ -776,6 +748,7 @@
776	748
777	749	cGridBag namePanel;
778	750	cGridBag setupPanel;
	751	+ cGridBag setupPanel2;
779	752	cGridBag commandsPanel;
780	753	cGridBag pushPanel;
781	754	cGridBag fillPanel;
..	..	@@ -943,10 +916,6 @@
943	916
944	917	void SetupUI2(ObjEditor oe)
945	918	{
946		-// oe.aConstraints.weightx = 0;
947		-// oe.aConstraints.weighty = 0;
948		-// oe.aConstraints.gridx = 0;
949		-// oe.aConstraints.gridy = 0;
950	919	//SetupName(oe);
951	920
952	921	namePanel = new cGridBag();
..	..	@@ -963,32 +932,56 @@
963	932	setupPanel = new cGridBag().setVertical(false);
964	933
965	934	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
966		- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
967		- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	935	+ liveCB.setToolTipText("Animate object");
	936	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	937	+ selectCB.setToolTipText("Make object selectable");
968	938	// Return();
	939	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	940	+ hideCB.setToolTipText("Hide object");
969	941	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
970		- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
971		- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	942	+ markCB.setToolTipText("Set the animation target transform");
	943	+
	944	+ setupPanel2 = new cGridBag().setVertical(false);
	945	+
	946	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	947	+ rewindCB.setToolTipText("Rewind animation");
	948	+
	949	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	950	+ randomCB.setToolTipText("Rewind or Go back and forth randomly");
972	951
	952	+ if (Globals.ADVANCED)
	953	+ {
	954	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	955	+ link2masterCB.setToolTipText("Attach to support");
	956	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	957	+ speedupCB.setToolTipText("Option motion capture");
	958	+ }
	959	+
973	960	oe.ctrlPanel.add(setupPanel);
	961	+ oe.ctrlPanel.Return();
	962	+ oe.ctrlPanel.add(setupPanel2);
974	963	oe.ctrlPanel.Return();
975	964
976	965	commandsPanel = new cGridBag().setVertical(false);
977	966
978	967	resetButton = AddButton(commandsPanel, "Reset");
	968	+ resetButton.setToolTipText("Jump to frame zero");
979	969	stepButton = AddButton(commandsPanel, "Step");
	970	+ stepButton.setToolTipText("Step one frame");
980	971	// resetAllButton = AddButton(oe, "Reset All");
981	972	// stepAllButton = AddButton(oe, "Step All");
982		- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
983	973	// Return();
984	974	slowerButton = AddButton(commandsPanel, "Slow");
	975	+ slowerButton.setToolTipText("Decrease animation speed");
985	976	fasterButton = AddButton(commandsPanel, "Fast");
	977	+ fasterButton.setToolTipText("Increase animation speed");
986	978	remarkButton = AddButton(commandsPanel, "Remark");
	979	+ remarkButton.setToolTipText("Set the current transform as the target");
987	980
988	981	oe.ctrlPanel.add(commandsPanel);
989	982	oe.ctrlPanel.Return();
990	983
991		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	984	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
992	985	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
993	986	//Return();
994	987
..	..	@@ -1290,7 +1283,7 @@
1290	1283	scrollpane.addMouseWheelListener(this); // Default not fast enough
1291	1284
1292	1285	/JTabbedPane/ scenePanel = new cGridBag();
1293		- scenePanel.preferredWidth = 7;
	1286	+ scenePanel.preferredWidth = 6;
1294	1287
1295	1288	JTabbedPane tabbedPane = new JTabbedPane();
1296	1289	tabbedPane.add(scrollpane);
..	..	@@ -1396,8 +1389,8 @@
1396	1389
1397	1390	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1398	1391
1399		- frame.setSize(1024, 768);
1400		- frame.show();
	1392	+ frame.setSize(1280, 860);
	1393	+ frame.setVisible(true);
1401	1394
1402	1395	gridPanel.setDividerLocation(1.0);
1403	1396
..	..	@@ -1436,17 +1429,25 @@
1436	1429
1437	1430	cGridBag editBar = new cGridBag().setVertical(false);
1438	1431
1439		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	1432	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1433	+ createMaterialButton.setToolTipText("Create material");
1440	1434
1441	1435	/*
1442	1436	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1443	1437	*/
1444	1438
1445		- editBar.add(clearMaterialButton = new cButton("Clear")); // , aConstraints);
1446		- editBar.add(resetSlidersButton = new cButton("Reset")); // , aConstraints);
1447		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1448		- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1439	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1440	+ clearMaterialButton.setToolTipText("Clear material");
	1441	+
	1442	+ if (Globals.ADVANCED)
	1443	+ {
	1444	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1445	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1446	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1447	+ }
1449	1448
	1449	+ editBar.preferredHeight = 15;
	1450	+
1450	1451	panel.add(editBar);
1451	1452
1452	1453	/**/
..	..	@@ -1712,12 +1713,15 @@
1712	1713	opacityPowerField.addChangeListener(this);
1713	1714	/**/
1714	1715
1715		- resetSlidersButton.addActionListener(this);
1716	1716	clearMaterialButton.addActionListener(this);
1717	1717	createMaterialButton.addActionListener(this);
1718		-
1719		- propagateToggle.addItemListener(this);
1720		- multiplyToggle.addItemListener(this);
	1718	+
	1719	+ if (Globals.ADVANCED)
	1720	+ {
	1721	+ resetSlidersButton.addActionListener(this);
	1722	+ propagateToggle.addItemListener(this);
	1723	+ multiplyToggle.addItemListener(this);
	1724	+ }
1721	1725	}
1722	1726
1723	1727	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1888,7 +1892,7 @@
1888	1892
1889	1893	//? flashIt = false;
1890	1894	CameraPane pane = (CameraPane) cameraView;
1891		- pane.clickStart(location.x, location.y, 0);
	1895	+ pane.clickStart(location.x, location.y, 0, 0);
1892	1896	pane.clickEnd(location.x, location.y, 0, true);
1893	1897
1894	1898	if (group.selection.size() == 1)
..	..	@@ -1937,6 +1941,7 @@
1937	1941	e2.printStackTrace();
1938	1942	}
1939	1943	}
	1944	+
1940	1945	LoadJMEThread loadThread;
1941	1946
1942	1947	class LoadJMEThread extends Thread
..	..	@@ -1994,6 +1999,7 @@
1994	1999	//LoadFile0(filename, converter);
1995	2000	}
1996	2001	}
	2002	+
1997	2003	LoadOBJThread loadObjThread;
1998	2004
1999	2005	class LoadOBJThread extends Thread
..	..	@@ -2072,19 +2078,19 @@
2072	2078
2073	2079	void LoadObjFile(String fullname)
2074	2080	{
2075		- /*
	2081	+ System.out.println("Loading " + fullname);
	2082	+ /**/
2076	2083	//lastFilename = fullname;
2077	2084	if(loadObjThread == null)
2078	2085	{
2079		- loadObjThread = new LoadOBJThread();
2080		- loadObjThread.start();
	2086	+ loadObjThread = new LoadOBJThread();
	2087	+ loadObjThread.start();
2081	2088	}
2082	2089
2083	2090	loadObjThread.add(fullname);
2084		- */
	2091	+ /**/
2085	2092
2086		- System.out.println("Loading " + fullname);
2087		- makeSomething(new FileObject(fullname, true), true);
	2093	+ //makeSomething(new FileObject(fullname, true), true);
2088	2094	}
2089	2095
2090	2096	void LoadGFDFile(String fullname)
..	..	@@ -2345,11 +2351,11 @@
2345	2351
2346	2352	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2347	2353	{
2348		- if (GrafreeD.standAlone)
	2354	+ if (Grafreed.standAlone)
2349	2355	{
2350	2356	/**/
2351	2357	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2352		- browser.show();
	2358	+ browser.setVisible(true);
2353	2359	String filename = browser.getFile();
2354	2360	if (filename != null && filename.length() > 0)
2355	2361	{
..	..	@@ -2709,7 +2715,8 @@
2709	2715	return;
2710	2716	}
2711	2717
2712		- multiplyToggle.setSelected(mat.multiply);
	2718	+ if (multiplyToggle != null)
	2719	+ multiplyToggle.setSelected(mat.multiply);
2713	2720
2714	2721	assert (object.projectedVertices != null);
2715	2722
..	..	@@ -2924,9 +2931,9 @@
2924	2931	frame.validate();
2925	2932
2926	2933	return;
2927		- } else if (event.getSource() == toggleRandomItem)
	2934	+ } else if (event.getSource() == toggleSwitchItem)
2928	2935	{
2929		- cameraView.ToggleRandom();
	2936	+ cameraView.ToggleSwitch();
2930	2937	cameraView.repaint();
2931	2938	return;
2932	2939	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2955,6 +2962,10 @@
2955	2962	{
2956	2963	copy.live ^= true;
2957	2964	return;
	2965	+ } else if (event.getSource() == selectCB)
	2966	+ {
	2967	+ copy.dontselect ^= true;
	2968	+ return;
2958	2969	} else if (event.getSource() == hideCB)
2959	2970	{
2960	2971	copy.hide ^= true;
..	..	@@ -2969,6 +2980,7 @@
2969	2980	if (event.getSource() == randomCB)
2970	2981	{
2971	2982	copy.random ^= true;
	2983	+ objEditor.refreshContents();
2972	2984	return;
2973	2985	}
2974	2986	if (event.getSource() == speedupCB)
..	..	@@ -2992,8 +3004,9 @@
2992	3004
2993	3005	public void actionPerformed(ActionEvent event)
2994	3006	{
	3007	+ Object source = event.getSource();
2995	3008	// SCRIPT DIALOG
2996		- if (event.getSource() == okbutton)
	3009	+ if (source == okbutton)
2997	3010	{
2998	3011	textpanel.setVisible(false);
2999	3012	textpanel.remove(textarea);
..	..	@@ -3005,7 +3018,7 @@
3005	3018	textarea = null;
3006	3019	textpanel = null;
3007	3020	}
3008		- if (event.getSource() == cancelbutton)
	3021	+ if (source == cancelbutton)
3009	3022	{
3010	3023	textpanel.setVisible(false);
3011	3024	textpanel.remove(textarea);
..	..	@@ -3017,50 +3030,50 @@
3017	3030	//applySelf();
3018	3031	//client.refreshEditWindow();
3019	3032	//refreshContents();
3020		- if (event.getSource() == nameField)
	3033	+ if (source == nameField)
3021	3034	{
3022	3035	//System.out.println("ObjEditor " + event);
3023	3036	applySelf0(true);
3024	3037	//parent.applySelf();
3025	3038	objEditor.refreshContents();
3026		- } else if (event.getSource() == resetButton)
	3039	+ } else if (source == resetButton)
3027	3040	{
3028	3041	CameraPane.fullreset = true;
3029	3042	copy.Reset(); // ResetMeshes();
3030	3043	copy.Touch();
3031	3044	objEditor.refreshContents();
3032		- } else if (event.getSource() == stepItem)
	3045	+ } else if (source == stepItem)
3033	3046	{
3034	3047	//cameraView.ONESTEP = true;
3035	3048	Globals.ONESTEP = true;
3036	3049	cameraView.repaint();
3037	3050	return;
3038		- } else if (event.getSource() == stepButton)
	3051	+ } else if (source == stepButton)
3039	3052	{
3040	3053	copy.Step();
3041	3054	copy.Touch();
3042	3055	objEditor.refreshContents();
3043		- } else if (event.getSource() == slowerButton)
	3056	+ } else if (source == slowerButton)
3044	3057	{
3045	3058	copy.Slower();
3046	3059	copy.Touch();
3047	3060	objEditor.refreshContents();
3048		- } else if (event.getSource() == fasterButton)
	3061	+ } else if (source == fasterButton)
3049	3062	{
3050	3063	copy.Faster();
3051	3064	copy.Touch();
3052	3065	objEditor.refreshContents();
3053		- } else if (event.getSource() == remarkButton)
	3066	+ } else if (source == remarkButton)
3054	3067	{
3055	3068	copy.Remark();
3056	3069	copy.Touch();
3057	3070	objEditor.refreshContents();
3058		- } else if (event.getSource() == stepAllButton)
	3071	+ } else if (source == stepAllButton)
3059	3072	{
3060	3073	copy.StepAll();
3061	3074	copy.Touch();
3062	3075	objEditor.refreshContents();
3063		- } else if (event.getSource() == resetAllButton)
	3076	+ } else if (source == resetAllButton)
3064	3077	{
3065	3078	//CameraPane.fullreset = true;
3066	3079	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3093,53 +3106,75 @@
3093	3106	// Close();
3094	3107	// }
3095	3108	// else
3096		- if (event.getSource() == resetSlidersButton)
	3109	+ if (source == resetSlidersButton)
3097	3110	{
3098	3111	ResetSliders();
3099		- } else if (event.getSource() == clearMaterialButton)
	3112	+ } else if (source == clearMaterialButton)
3100	3113	{
3101	3114	ClearMaterial();
3102		- } else if (event.getSource() == createMaterialButton)
	3115	+ } else if (source == createMaterialButton)
3103	3116	{
3104	3117	CreateMaterial();
3105		- } else if (event.getSource() == clearPanelButton)
	3118	+ } else if (source == clearPanelButton)
3106	3119	{
3107	3120	copy.ClearUI();
3108	3121	refreshContents(true);
3109		- } /*
3110		- }
3111		-
3112		- public boolean action(Event event, Object arg)
3113		- {
3114		- */ else if (event.getSource() == closeItem)
	3122	+ } else if (source == importGFDItem)
	3123	+ {
	3124	+ ImportGFD();
	3125	+ } else
	3126	+ if (source == importVRMLX3DItem)
	3127	+ {
	3128	+ ImportVRMLX3D();
	3129	+ } else
	3130	+ if (source == import3DSItem)
	3131	+ {
	3132	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3133	+ } else
	3134	+ if (source == importOBJItem)
	3135	+ {
	3136	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3137	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3138	+ browser.setVisible(true);
	3139	+ String filename = browser.getFile();
	3140	+ if (filename != null && filename.length() > 0)
	3141	+ {
	3142	+ String fullname = browser.getDirectory() + filename;
	3143	+ makeSomething(ReadOBJ(fullname), true);
	3144	+ }
	3145	+ } else
	3146	+ if (source == closeItem)
3115	3147	{
3116	3148	Close();
3117	3149	//return true;
3118		- } else if (event.getSource() == loadItem)
	3150	+ } else if (source == loadItem)
3119	3151	{
3120	3152	load();
3121	3153	//return true;
3122		- } else if (event.getSource() == saveItem)
	3154	+ } else if (source == newItem)
	3155	+ {
	3156	+ New();
	3157	+ } else if (source == saveItem)
3123	3158	{
3124	3159	save();
3125	3160	//return true;
3126		- } else if (event.getSource() == saveAsItem)
	3161	+ } else if (source == saveAsItem)
3127	3162	{
3128	3163	saveAs();
3129	3164	//return true;
3130		- } else if (event.getSource() == reexportItem)
	3165	+ } else if (source == reexportItem)
3131	3166	{
3132	3167	reexport();
3133	3168	//return true;
3134		- } else if (event.getSource() == exportAsItem)
	3169	+ } else if (source == exportAsItem)
3135	3170	{
3136	3171	export();
3137	3172	//return true;
3138		- } else if (event.getSource() == povItem)
	3173	+ } else if (source == povItem)
3139	3174	{
3140	3175	generatePOV();
3141	3176	//return true;
3142		- } else if (event.getSource() == zBufferItem)
	3177	+ } else if (source == zBufferItem)
3143	3178	{
3144	3179	try
3145	3180	{
..	..	@@ -3161,21 +3196,8 @@
3161	3196	cameraView.repaint();
3162	3197	//return true;
3163	3198	}
3164		- */ else if (event.getSource() == editCameraItem)
3165		- {
3166		- cameraView.ProtectCamera();
3167		- cameraView.repaint();
3168		- return;
3169		- } else if (event.getSource() == revertCameraItem)
3170		- {
3171		- cameraView.RevertCamera();
3172		- cameraView.repaint();
3173		- return;
3174		-// } else if (event.getSource() == textureButton)
3175		-// {
3176		-// return; // true;
3177		- } else // combos...
3178		- if (event.getSource() == texresMenu)
	3199	+ */ else // combos...
	3200	+ if (source == texresMenu)
3179	3201	{
3180	3202	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3181	3203	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3187,12 +3209,268 @@
3187	3209	}
3188	3210	}
3189	3211
	3212	+ void New()
	3213	+ {
	3214	+ while (copy.Size() > 1)
	3215	+ {
	3216	+ copy.remove(1);
	3217	+ }
	3218	+
	3219	+ ResetModel();
	3220	+ objEditor.refreshContents();
	3221	+ }
	3222	+
	3223	+ static public byte[] Compress(Object3D o)
	3224	+ {
	3225	+ try
	3226	+ {
	3227	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3228	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3229	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3230	+
	3231	+ Object3D parent = o.parent;
	3232	+ o.parent = null;
	3233	+
	3234	+ out.writeObject(o);
	3235	+
	3236	+ o.parent = parent;
	3237	+
	3238	+ out.flush();
	3239	+
	3240	+ zstream.close();
	3241	+ out.close();
	3242	+
	3243	+ return baos.toByteArray();
	3244	+ } catch (Exception e)
	3245	+ {
	3246	+ System.err.println(e);
	3247	+ return null;
	3248	+ }
	3249	+ }
	3250	+
	3251	+ static public Object Uncompress(byte[] bytes)
	3252	+ {
	3253	+ System.out.println("#bytes = " + bytes.length);
	3254	+ try
	3255	+ {
	3256	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3257	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3258	+ ObjectInputStream in = new ObjectInputStream(istream);
	3259	+ Object obj = in.readObject();
	3260	+ in.close();
	3261	+
	3262	+ return obj;
	3263	+ } catch (Exception e)
	3264	+ {
	3265	+ System.err.println(e);
	3266	+ return null;
	3267	+ }
	3268	+ }
	3269	+
	3270	+ static public Object clone(Object o)
	3271	+ {
	3272	+ try
	3273	+ {
	3274	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3275	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3276	+
	3277	+ out.writeObject(o);
	3278	+
	3279	+ out.flush();
	3280	+ out.close();
	3281	+
	3282	+ byte[] bytes = baos.toByteArray();
	3283	+
	3284	+ System.out.println("clone = " + bytes.length);
	3285	+
	3286	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3287	+ ObjectInputStream in = new ObjectInputStream(bais);
	3288	+ Object obj = in.readObject();
	3289	+ in.close();
	3290	+
	3291	+ return obj;
	3292	+ } catch (Exception e)
	3293	+ {
	3294	+ System.err.println(e);
	3295	+ return null;
	3296	+ }
	3297	+ }
	3298	+
	3299	+ cRadio GetCurrentTab()
	3300	+ {
	3301	+ cRadio ab;
	3302	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3303	+ {
	3304	+ ab = (cRadio)e.nextElement();
	3305	+ if(ab.GetObject() == copy)
	3306	+ {
	3307	+ return ab;
	3308	+ }
	3309	+ }
	3310	+
	3311	+ return null;
	3312	+ }
	3313	+
	3314	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3315	+
	3316	+ public void Save()
	3317	+ {
	3318	+ cRadio tab = GetCurrentTab();
	3319	+
	3320	+ boolean temp = CameraPane.SWITCH;
	3321	+ CameraPane.SWITCH = false;
	3322	+
	3323	+ copy.ExtractBigData(hashtable);
	3324	+
	3325	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3326	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3327	+
	3328	+ copy.RestoreBigData(hashtable);
	3329	+
	3330	+ CameraPane.SWITCH = temp;
	3331	+
	3332	+ //assert(hashtable.isEmpty());
	3333	+
	3334	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3335	+ {
	3336	+ tab.graphs[i] = null;
	3337	+ }
	3338	+
	3339	+ // test save
	3340	+ if (false)
	3341	+ {
	3342	+ try
	3343	+ {
	3344	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3345	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3346	+
	3347	+ p.writeObject(copy);
	3348	+
	3349	+ p.flush();
	3350	+
	3351	+ ostream.close();
	3352	+ } catch (Exception e)
	3353	+ {
	3354	+ e.printStackTrace();
	3355	+ }
	3356	+ }
	3357	+ }
	3358	+
	3359	+ void CopyChanged(Object3D obj)
	3360	+ {
	3361	+ boolean temp = CameraPane.SWITCH;
	3362	+ CameraPane.SWITCH = false;
	3363	+
	3364	+ copy.ExtractBigData(hashtable);
	3365	+
	3366	+ copy.clear();
	3367	+
	3368	+ for (int i=0; i<obj.Size(); i++)
	3369	+ {
	3370	+ copy.add(obj.get(i));
	3371	+ }
	3372	+
	3373	+ copy.RestoreBigData(hashtable);
	3374	+
	3375	+ CameraPane.SWITCH = temp;
	3376	+
	3377	+ //assert(hashtable.isEmpty());
	3378	+
	3379	+ copy.Touch();
	3380	+
	3381	+ ResetModel();
	3382	+ copy.HardTouch(); // recompile?
	3383	+
	3384	+ cRadio ab;
	3385	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3386	+ {
	3387	+ ab = (cRadio)e.nextElement();
	3388	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3389	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3390	+ if (test != null)
	3391	+ {
	3392	+ test.editWindow = ab.object.editWindow;
	3393	+ ab.object = test;
	3394	+ }
	3395	+ }
	3396	+
	3397	+ refreshContents();
	3398	+ }
	3399	+
	3400	+ public void Undo()
	3401	+ {
	3402	+ cRadio tab = GetCurrentTab();
	3403	+
	3404	+ if (tab.undoindex == 0)
	3405	+ {
	3406	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3407	+ return;
	3408	+ }
	3409	+
	3410	+ if (tab.graphs[tab.undoindex] == null)
	3411	+ {
	3412	+ Save();
	3413	+ tab.undoindex -= 1;
	3414	+ }
	3415	+
	3416	+ tab.undoindex -= 1;
	3417	+
	3418	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3419	+ }
	3420	+
	3421	+ public void Redo()
	3422	+ {
	3423	+ cRadio tab = GetCurrentTab();
	3424	+
	3425	+ if (tab.graphs[tab.undoindex + 1] == null)
	3426	+ {
	3427	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3428	+ return;
	3429	+ }
	3430	+
	3431	+ tab.undoindex += 1;
	3432	+
	3433	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3434	+ }
	3435	+
	3436	+ void ImportGFD()
	3437	+ {
	3438	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3439	+ browser.show();
	3440	+ String filename = browser.getFile();
	3441	+ if (filename != null && filename.length() > 0)
	3442	+ {
	3443	+ String fullname = browser.getDirectory() + filename;
	3444	+
	3445	+ //Object3D readobj =
	3446	+ objEditor.ReadGFD(fullname, objEditor);
	3447	+ //makeSomething(readobj);
	3448	+ }
	3449	+ }
	3450	+
	3451	+ void ImportVRMLX3D()
	3452	+ {
	3453	+ if (Grafreed.standAlone)
	3454	+ {
	3455	+ /**/
	3456	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3457	+ browser.show();
	3458	+ String filename = browser.getFile();
	3459	+ if (filename != null && filename.length() > 0)
	3460	+ {
	3461	+ String fullname = browser.getDirectory() + filename;
	3462	+ LoadVRMLX3D(fullname);
	3463	+ }
	3464	+ /**/
	3465	+ }
	3466	+ }
	3467	+
3190	3468	void ToggleAnimation()
3191	3469	{
3192	3470	if (!Globals.ANIMATION)
3193	3471	{
3194	3472	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3195		- browser.show();
	3473	+ browser.setVisible(true);
3196	3474	String filename = browser.getFile();
3197	3475	if (filename != null && filename.length() > 0)
3198	3476	{
..	..	@@ -3202,8 +3480,8 @@
3202	3480
3203	3481	Globals.ANIMATION ^= true;
3204	3482
3205		- GrafreeD.wav.cursor = 0;
3206		- GrafreeD.wav.loop = 0;
	3483	+ Grafreed.wav.cursor = 0;
	3484	+ Grafreed.wav.loop = 0;
3207	3485	}
3208	3486	} else
3209	3487	{
..	..	@@ -3224,7 +3502,6 @@
3224	3502	callee.refreshContents();
3225	3503	} else
3226	3504	{
3227		- new Exception().printStackTrace();
3228	3505	System.exit(0);
3229	3506	}
3230	3507	}
..	..	@@ -3254,7 +3531,7 @@
3254	3531	void CreateMaterial()
3255	3532	{
3256	3533	//copy.ClearMaterial(); // PATCH
3257		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3534	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3258	3535	if (copy.selection.size() > 0)
3259	3536	//SetMaterial(copy);
3260	3537	{
..	..	@@ -3313,11 +3590,11 @@
3313	3590	{
3314	3591	copy.ResetBlockLoop(); // temporary problem
3315	3592
3316		- boolean random = CameraPane.RANDOM;
3317		- CameraPane.RANDOM = false; // parse everything
	3593	+ boolean random = CameraPane.SWITCH;
	3594	+ CameraPane.SWITCH = false; // parse everything
3318	3595	copy.ResetDisplayList();
3319	3596	copy.HardTouch();
3320		- CameraPane.RANDOM = random;
	3597	+ CameraPane.SWITCH = random;
3321	3598	}
3322	3599
3323	3600	// public void applySelf()
..	..	@@ -3391,6 +3668,36 @@
3391	3668	{
3392	3669	//System.out.println("Propagate = " + propagate);
3393	3670	copy.UpdateMaterial(anchor, current, propagate);
	3671	+
	3672	+ if (copy.material != null)
	3673	+ {
	3674	+ cMaterial mat = copy.material;
	3675	+
	3676	+ colorField.SetToolTipValue((mat.color));
	3677	+ modulationField.SetToolTipValue((mat.modulation));
	3678	+ metalnessField.SetToolTipValue((mat.metalness));
	3679	+ diffuseField.SetToolTipValue((mat.diffuse));
	3680	+ specularField.SetToolTipValue((mat.specular));
	3681	+ shininessField.SetToolTipValue((mat.shininess));
	3682	+ shiftField.SetToolTipValue((mat.shift));
	3683	+ ambientField.SetToolTipValue((mat.ambient));
	3684	+ lightareaField.SetToolTipValue((mat.lightarea));
	3685	+ diffusenessField.SetToolTipValue((mat.factor));
	3686	+ velvetField.SetToolTipValue((mat.velvet));
	3687	+ sheenField.SetToolTipValue((mat.sheen));
	3688	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3689	+ backlitField.SetToolTipValue((mat.bump));
	3690	+ anisoField.SetToolTipValue((mat.aniso));
	3691	+ anisoVField.SetToolTipValue((mat.anisoV));
	3692	+ cameraField.SetToolTipValue((mat.cameralight));
	3693	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3694	+ shadowField.SetToolTipValue((mat.shadow));
	3695	+ textureField.SetToolTipValue((mat.texture));
	3696	+ opacityField.SetToolTipValue((mat.opacity));
	3697	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3698	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3699	+ }
	3700	+
3394	3701	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3395	3702	{
3396	3703	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3506,7 +3813,7 @@
3506	3813	}
3507	3814
3508	3815	if (normalpushField != null)
3509		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3816	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3510	3817	}
3511	3818
3512	3819	void SnapObject()
..	..	@@ -3770,6 +4077,7 @@
3770	4077
3771	4078	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3772	4079	{
	4080	+ Save();
3773	4081	//Tween.set(thing, 0).target(1).start(tweenManager);
3774	4082	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3775	4083	// if (thing instanceof GenericJointDemo)
..	..	@@ -3973,6 +4281,7 @@
3973	4281	}
3974	4282	}
3975	4283	}
	4284	+
3976	4285	LoadGFDThread loadGFDThread;
3977	4286
3978	4287	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3992,8 +4301,10 @@
3992	4301
3993	4302	try
3994	4303	{
	4304	+ // Try compressed version first.
3995	4305	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3996		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4306	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4307	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3997	4308
3998	4309	readobj = (Object3D) p.readObject();
3999	4310	istream.close();
..	..	@@ -4001,7 +4312,20 @@
4001	4312	readobj.ResetDisplayList();
4002	4313	} catch (Exception e)
4003	4314	{
4004		- e.printStackTrace();
	4315	+ //e.printStackTrace();
	4316	+ try
	4317	+ {
	4318	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4319	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4320	+
	4321	+ readobj = (Object3D) p.readObject();
	4322	+ istream.close();
	4323	+
	4324	+ readobj.ResetDisplayList();
	4325	+ } catch (Exception e2)
	4326	+ {
	4327	+ e2.printStackTrace();
	4328	+ }
4005	4329	}
4006	4330	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4007	4331	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4047,6 +4371,12 @@
4047	4371
4048	4372	void LoadIt(Object obj)
4049	4373	{
	4374	+ if (obj == null)
	4375	+ {
	4376	+ // Invalid file
	4377	+ return;
	4378	+ }
	4379	+
4050	4380	System.out.println("Loaded " + obj);
4051	4381	//new Exception().printStackTrace();
4052	4382	Object3D readobj = (Object3D) obj;
..	..	@@ -4056,6 +4386,7 @@
4056	4386
4057	4387	if (readobj != null)
4058	4388	{
	4389	+ Save();
4059	4390	try
4060	4391	{
4061	4392	//readobj.deepCopySelf(copy);
..	..	@@ -4118,7 +4449,7 @@
4118	4449
4119	4450	void load() // throws ClassNotFoundException
4120	4451	{
4121		- if (GrafreeD.standAlone)
	4452	+ if (Grafreed.standAlone)
4122	4453	{
4123	4454	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4124	4455	browser.show();
..	..	@@ -4205,11 +4536,13 @@
4205	4536	try
4206	4537	{
4207	4538	FileOutputStream ostream = new FileOutputStream(lastname);
4208		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4539	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4540	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4209	4541
4210	4542	p.writeObject(copy);
4211	4543	p.flush();
4212	4544
	4545	+ zstream.close();
4213	4546	ostream.close();
4214	4547
4215	4548	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4219,11 +4552,12 @@
4219	4552	{
4220	4553	}
4221	4554	}
	4555	+
4222	4556	String lastname;
4223	4557
4224	4558	void saveAs()
4225	4559	{
4226		- if (GrafreeD.standAlone)
	4560	+ if (Grafreed.standAlone)
4227	4561	{
4228	4562	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4229	4563	browser.setVisible(true);
..	..	@@ -4328,13 +4662,13 @@
4328	4662	try
4329	4663	{
4330	4664	FileOutputStream ostream = new FileOutputStream(filename);
4331		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4332		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4665	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4666	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4333	4667
4334	4668	Object3D objectparent = obj.parent;
4335	4669	obj.parent = null;
4336	4670
4337		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4671	+ Object3D object = (Object3D) Grafreed.clone(obj);
4338	4672
4339	4673	obj.parent = objectparent;
4340	4674
..	..	@@ -4346,8 +4680,8 @@
4346	4680	p.writeObject(object);
4347	4681	p.flush();
4348	4682
	4683	+ zstream.close();
4349	4684	ostream.close();
4350		- // zstream.close();
4351	4685
4352	4686	// group.selection.get(0).parent = parent;
4353	4687	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4368,7 +4702,7 @@
4368	4702	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4369	4703	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4370	4704	copy.generatePOV(buffer);
4371		- if (GrafreeD.standAlone)
	4705	+ if (Grafreed.standAlone)
4372	4706	{
4373	4707	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4374	4708	browser.show();
..	..	@@ -4394,7 +4728,8 @@
4394	4728	Object3D client;
4395	4729	Object3D copy;
4396	4730	MenuBar menuBar;
4397		- Menu windowMenu;
	4731	+ Menu fileMenu;
	4732	+ MenuItem newItem;
4398	4733	MenuItem loadItem;
4399	4734	MenuItem saveItem;
4400	4735	MenuItem saveAsItem;
..	..	@@ -4402,11 +4737,9 @@
4402	4737	MenuItem reexportItem;
4403	4738	MenuItem povItem;
4404	4739	MenuItem closeItem;
4405		- Menu cameraMenu;
	4740	+
4406	4741	CheckboxMenuItem zBufferItem;
4407	4742	//MenuItem normalLensItem;
4408		- MenuItem editCameraItem;
4409		- MenuItem revertCameraItem;
4410	4743	MenuItem stepItem;
4411	4744	CheckboxMenuItem toggleLiveItem;
4412	4745	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4417,7 +4750,7 @@
4417	4750	CheckboxMenuItem toggleFootContactItem;
4418	4751	CheckboxMenuItem toggleDLItem;
4419	4752	CheckboxMenuItem toggleTextureItem;
4420		- CheckboxMenuItem toggleRandomItem;
	4753	+ CheckboxMenuItem toggleSwitchItem;
4421	4754	CheckboxMenuItem toggleRootItem;
4422	4755	CheckboxMenuItem animationItem;
4423	4756	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4425,7 +4758,7 @@
4425	4758	JSplitPane mainPanel;
4426	4759	JScrollPane scrollpane;
4427	4760	JPanel toolbarPanel;
4428		- JPanel treePanel;
	4761	+ cGridBag treePanel;
4429	4762	JPanel radioPanel;
4430	4763	ButtonGroup buttonGroup;
4431	4764	cGridBag ctrlPanel;
..	..	@@ -4554,4 +4887,9 @@
4554	4887	//ObjectUI parent;
4555	4888
4556	4889	cNumberSlider normalpushField;
	4890	+
	4891	+ private MenuItem importGFDItem;
	4892	+ private MenuItem importVRMLX3DItem;
	4893	+ private MenuItem import3DSItem;
	4894	+ private MenuItem importOBJItem;
4557	4895	}