~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.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -35,6 +39,67 @@
35	39
36	40	GroupEditor callee;
37	41	JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ cButton GetButton(String name, boolean border)
	46	+ {
	47	+ try
	48	+ {
	49	+ ImageIcon icon = GetIcon(name);
	50	+ return new cButton(icon, border);
	51	+ }
	52	+ catch (Exception e)
	53	+ {
	54	+ return new cButton(name, border);
	55	+ }
	56	+ }
	57	+
	58	+ cToggleButton GetToggleButton(String name, boolean border)
	59	+ {
	60	+ try
	61	+ {
	62	+ ImageIcon icon = GetIcon(name);
	63	+ return new cToggleButton(icon, border);
	64	+ }
	65	+ catch (Exception e)
	66	+ {
	67	+ return new cToggleButton(name, border);
	68	+ }
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ try
	74	+ {
	75	+ ImageIcon icon = GetIcon(name);
	76	+ return new cCheckBox(icon, border);
	77	+ }
	78	+ catch (Exception e)
	79	+ {
	80	+ return new cCheckBox(name, border);
	81	+ }
	82	+ }
	83	+
	84	+ private ImageIcon GetIcon(String name) throws IOException
	85	+ {
	86	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	87	+
	88	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	89	+ {
	90	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	91	+ Graphics2D g = resized.createGraphics();
	92	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	93	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	94	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	95	+ g.dispose();
	96	+
	97	+ image = resized;
	98	+ }
	99	+
	100	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	101	+ return icon;
	102	+ }
38	103
39	104	// SCRIPT
40	105
..	..	@@ -145,7 +210,7 @@
145	210
146	211	objEditor.ctrlPanel.remove(namePanel);
147	212
148		- if (!GroupEditor.allparams)
	213	+ if (!allparams)
149	214	return;
150	215
151	216	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -168,7 +233,8 @@
168	233	// objEditor.ctrlPanel.remove(remarkButton);
169	234
170	235	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	236	+ objEditor.ctrlPanel.remove(setupPanel2);
	237	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	238	objEditor.ctrlPanel.remove(pushPanel);
173	239	//objEditor.ctrlPanel.remove(fillPanel);
174	240
..	..	@@ -243,6 +309,7 @@
243	309	//localCopy.parent = null;
244	310
245	311	frame = new JFrame();
	312	+ frame.setUndecorated(false);
246	313	objEditor = this;
247	314	this.callee = callee;
248	315
..	..	@@ -273,28 +340,49 @@
273	340	return frame.action(event, obj);
274	341	}
275	342
	343	+ // Cannot work without static
	344	+ static boolean allparams = true;
	345	+
	346	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	347	+
276	348	void SetupMenu()
277	349	{
278	350	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..."));
	351	+ menuBar.add(fileMenu = new Menu("File"));
	352	+ fileMenu.add(newItem = new MenuItem("New"));
	353	+ fileMenu.add(openItem = new MenuItem("Open..."));
	354	+
	355	+ //oe.menuBar.add(menu = new Menu("Include"));
	356	+ Menu menu = new Menu("Import");
	357	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	358	+ importOBJItem.addActionListener(this);
	359	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	360	+ import3DSItem.addActionListener(this);
	361	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	362	+ importVRMLX3DItem.addActionListener(this);
	363	+ menu.add("-");
	364	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	365	+ importGFDItem.addActionListener(this);
	366	+ fileMenu.add(menu);
	367	+ fileMenu.add("-");
	368	+
	369	+ fileMenu.add(saveItem = new MenuItem("Save"));
	370	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284	371	//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("-");
	372	+ fileMenu.add("-");
	373	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	374	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	375	+ fileMenu.add("-");
289	376	if (client.parent != null)
290	377	{
291		- windowMenu.add(closeItem = new MenuItem("Close"));
	378	+ fileMenu.add(closeItem = new MenuItem("Close"));
292	379	} else
293	380	{
294		- windowMenu.add(closeItem = new MenuItem("Exit"));
	381	+ fileMenu.add(closeItem = new MenuItem("Exit"));
295	382	}
296	383
297		- loadItem.addActionListener(this);
	384	+ newItem.addActionListener(this);
	385	+ openItem.addActionListener(this);
298	386	saveItem.addActionListener(this);
299	387	saveAsItem.addActionListener(this);
300	388	exportAsItem.addActionListener(this);
..	..	@@ -302,87 +390,53 @@
302	390	//povItem.addActionListener(this);
303	391	closeItem.addActionListener(this);
304	392
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		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
323		- toggleSwitchItem.addItemListener(this);
324		- toggleSwitchItem.setState(CameraPane.SWITCH);
325		-
326		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
327		- toggleHandleItem.addItemListener(this);
328		- toggleHandleItem.setState(CameraPane.HANDLES);
329		-
330		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
331		- togglePaintItem.addItemListener(this);
332		- togglePaintItem.setState(CameraPane.PAINTMODE);
333		-
334		- if (Globals.ADVANCED)
335		- {
336		- cameraMenu.add("-");
337		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
338		- toggleLiveItem.addItemListener(this);
339		- toggleLiveItem.setState(Globals.isLIVE());
340		-
341		- cameraMenu.add(stepItem = new MenuItem("Step"));
342		- stepItem.addActionListener(this);
343		- // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
344		- // toggleDLItem.addItemListener(this);
345		- // toggleDLItem.setState(false);
346		-
347		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
348		- toggleRenderItem.addItemListener(this);
349		- toggleRenderItem.setState(!CameraPane.frozen);
350		-
351		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
352		- toggleDebugItem.addItemListener(this);
353		- toggleDebugItem.setState(CameraPane.DEBUG);
354		-
355		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
356		- toggleFrustumItem.addItemListener(this);
357		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
358		-
359		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
360		- toggleFootContactItem.addItemListener(this);
361		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
362		-
363		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
364		- toggleTimelineItem.addItemListener(this);
365		- }
366		-
367		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
368		-// toggleRootItem.addItemListener(this);
369		-// toggleRootItem.setState(false);
370		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
371		-// animationItem.addItemListener(this);
372		-// animationItem.setState(CameraPane.ANIMATION);
373		- cameraMenu.add("-");
374		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
375		- editCameraItem.addActionListener(this);
376		-
377	393	objectPanel = new JTabbedPane();
	394	+
	395	+ ChangeListener changeListener = new ChangeListener()
	396	+ {
	397	+ public void stateChanged(ChangeEvent changeEvent)
	398	+ {
	399	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	400	+// {
	401	+// if (latestObject != null)
	402	+// {
	403	+// refreshContents(true);
	404	+// SetMaterial(latestObject);
	405	+// }
	406	+//
	407	+// materialFlushed = true;
	408	+// }
	409	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	410	+// {
	411	+// if (listUI.size() == 0)
	412	+// EditSelection(false);
	413	+// }
	414	+
	415	+ refreshContents(false); // To refresh Info tab
	416	+ }
	417	+ };
	418	+ objectPanel.addChangeListener(changeListener);
	419	+
378	420	toolbarPanel = new JPanel();
379	421	toolbarPanel.setName("Toolbar");
380	422	treePanel = new cGridBag();
381	423	treePanel.setName("Tree");
	424	+
	425	+ editPanel = new cGridBag().setVertical(true);
	426	+ editPanel.setName("Edit");
	427	+
382	428	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
383		- ctrlPanel.setName("Edit");
	429	+
	430	+ editCommandsPanel = new cGridBag();
	431	+ editPanel.add(editCommandsPanel);
	432	+ editPanel.add(ctrlPanel);
	433	+
	434	+ toolboxPanel = new cGridBag().setVertical(false);
	435	+ toolboxPanel.setName("Toolbox");
	436	+
384	437	materialPanel = new cGridBag().setVertical(true);
385	438	materialPanel.setName("Material");
	439	+
386	440	/JTextPane/
387	441	infoarea = createTextPane();
388	442	doc = infoarea.getStyledDocument();
..	..	@@ -395,7 +449,7 @@
395	449	// TEXTAREA infoarea.setLineWrap(true);
396	450	// TEXTAREA infoarea.setWrapStyleWord(true);
397	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
398		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ infoPanel.setPreferredSize(new Dimension(1, 1));
399	453	infoPanel.setName("Info");
400	454	//infoPanel.setLayout(new BorderLayout());
401	455	//infoPanel.add(createTextPane());
..	..	@@ -407,7 +461,14 @@
407	461	mainPanel.setDividerSize(9);
408	462	mainPanel.setDividerLocation(0.5); //1.0);
409	463	mainPanel.setResizeWeight(0.5);
410		-
	464	+
	465	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	466	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	467	+ divider.setDividerSize(15);
	468	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	469	+
	470	+ mainPanel.setUI(new BasicSplitPaneUI());
	471	+
411	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
412	473	//mainPanel.setLayout(new GridBagLayout());
413	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -475,10 +536,10 @@
475	536	e.printStackTrace();
476	537	}
477	538
478		- String selection = infoarea.getText();
479		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
480		- java.awt.datatransfer.Clipboard clipboard =
481		- Toolkit.getDefaultToolkit().getSystemClipboard();
	539	+// String selection = infoarea.getText();
	540	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	541	+// java.awt.datatransfer.Clipboard clipboard =
	542	+// Toolkit.getDefaultToolkit().getSystemClipboard();
482	543	//clipboard.setContents(data, data);
483	544	}
484	545
..	..	@@ -501,13 +562,13 @@
501	562	//SendInfo("Name:", "bold");
502	563	if (sel.GetTextures() != null \|\| debug)
503	564	{
504		- si.SendInfo(sel.toString(), "bold");
	565	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
505	566	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
506	567	if (sel.Size() > 0)
507	568	{
508	569	si.SendInfo("#children = " + sel.Size(), "regular");
509	570	}
510		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	571	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
511	572	if (debug)
512	573	{
513	574	try
..	..	@@ -549,7 +610,7 @@
549	610	}
550	611	if (sel.support != null)
551	612	{
552		- si.SendInfo(" support: " + sel.support, "regular");
	613	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
553	614	}
554	615	if (sel.scriptnode != null)
555	616	{
..	..	@@ -638,21 +699,144 @@
638	699	}
639	700	}
640	701
	702	+//static GraphicsDevice device = GraphicsEnvironment
	703	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	704	+
	705	+ Rectangle keeprect;
	706	+ cRadio radio;
	707	+
	708	+cButton keepButton;
	709	+ cButton twoButton; // Full 3D
	710	+ cButton sixButton;
	711	+ cButton threeButton;
	712	+ cButton sevenButton;
	713	+ cButton fourButton; // full panel
	714	+ cButton oneButton; // full XYZ
	715	+ //cButton currentLayout;
	716	+
	717	+ boolean maximized;
	718	+
	719	+ cButton fullscreenLayout;
	720	+
	721	+ void Minimize()
	722	+ {
	723	+ frame.setState(Frame.ICONIFIED);
	724	+ frame.validate();
	725	+ }
	726	+
	727	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	728	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	729	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	730	+ void Maximize()
	731	+ {
	732	+ if (CameraPane.FULLSCREEN)
	733	+ {
	734	+ ToggleFullScreen();
	735	+ }
	736	+
	737	+ if (maximized)
	738	+ {
	739	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	740	+ }
	741	+ else
	742	+ {
	743	+ keeprect = frame.getBounds();
	744	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	745	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	746	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	747	+// frame.setState(Frame.MAXIMIZED_BOTH);
	748	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	749	+ }
	750	+
	751	+ maximized ^= true;
	752	+
	753	+ frame.validate();
	754	+ }
	755	+
	756	+ cButton minButton;
	757	+ cButton maxButton;
	758	+ cButton fullButton;
	759	+
641	760	void ToggleFullScreen()
642	761	{
643		- if (CameraPane.FULLSCREEN)
	762	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	763	+
	764	+ cameraView.ToggleFullScreen();
	765	+
	766	+ if (!CameraPane.FULLSCREEN)
644	767	{
645		- frame.getContentPane().remove(/"Center",/bigThree);
646		- framePanel.add(bigThree);
647		- frame.getContentPane().add(/"Center",/framePanel);
	768	+ device.setFullScreenWindow(null);
	769	+ frame.dispose();
	770	+ frame.setUndecorated(false);
	771	+ frame.validate();
	772	+ frame.setVisible(true);
	773	+
	774	+ //frame.setVisible(false);
	775	+// frame.removeNotify();
	776	+// frame.setUndecorated(false);
	777	+// frame.addNotify();
	778	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	779	+
	780	+// X frame.getContentPane().remove(/"Center",/bigThree);
	781	+// X framePanel.add(bigThree);
	782	+// X frame.getContentPane().add(/"Center",/framePanel);
	783	+ framePanel.setDividerLocation(46);
	784	+
	785	+ //frame.setVisible(true);
	786	+ radio.layout = keepButton;
	787	+ //theFrame = null;
	788	+ keepButton = null;
	789	+ radio.layout.doClick();
	790	+
648	791	} else
649	792	{
650		- frame.getContentPane().remove(/"Center",/framePanel);
651		- framePanel.remove(bigThree);
652		- frame.getContentPane().add(/"Center",/bigThree);
	793	+ keepButton = radio.layout;
	794	+ //keeprect = frame.getBounds();
	795	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	796	+// frame.getToolkit().getScreenSize().height);
	797	+ //frame.setVisible(false);
	798	+
	799	+ frame.dispose();
	800	+ frame.setUndecorated(true);
	801	+ device.setFullScreenWindow(frame);
	802	+ frame.validate();
	803	+ frame.setVisible(true);
	804	+// frame.removeNotify();
	805	+// frame.setUndecorated(true);
	806	+// frame.addNotify();
	807	+// X frame.getContentPane().remove(/"Center",/framePanel);
	808	+// X framePanel.remove(bigThree);
	809	+// X frame.getContentPane().add(/"Center",/bigThree);
	810	+ framePanel.setDividerLocation(0);
	811	+
	812	+ radio.layout = fullscreenLayout;
	813	+ radio.layout.doClick();
	814	+ //frame.setVisible(true);
653	815	}
654		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
655	817	}
	818	+
	819	+ private byte[] CompressCopy()
	820	+ {
	821	+ boolean temp = CameraPane.SWITCH;
	822	+ CameraPane.SWITCH = false;
	823	+
	824	+ copy.ExtractBigData(versiontable);
	825	+ // if (copy == client)
	826	+
	827	+ byte[] versions[] = copy.versions;
	828	+ copy.versions = null;
	829	+
	830	+ byte[] compress = Compress(copy);
	831	+
	832	+ copy.versions = versions;
	833	+
	834	+ copy.RestoreBigData(versiontable);
	835	+
	836	+ CameraPane.SWITCH = temp;
	837	+
	838	+ return compress;
	839	+ }
656	840
657	841	private JTextPane createTextPane()
658	842	{
..	..	@@ -752,7 +936,7 @@
752	936	protected static ImageIcon createImageIcon(String path,
753	937	String description)
754	938	{
755		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	939	+ java.net.URL imgURL = Grafreed.class.getResource(path);
756	940	if (imgURL != null)
757	941	{
758	942	return new ImageIcon(imgURL, description);
..	..	@@ -784,6 +968,7 @@
784	968	// NumberSlider vDivsField;
785	969	// JCheckBox endcaps;
786	970	JCheckBox liveCB;
	971	+ JCheckBox selectCB;
787	972	JCheckBox hideCB;
788	973	JCheckBox link2masterCB;
789	974	JCheckBox markCB;
..	..	@@ -791,7 +976,12 @@
791	976	JCheckBox speedupCB;
792	977	JCheckBox rewindCB;
793	978	JCheckBox flipVCB;
	979	+
	980	+ cCheckBox toggleTextureCB;
	981	+ cCheckBox toggleSwitchCB;
	982	+
794	983	JComboBox texresMenu;
	984	+
795	985	JButton resetButton;
796	986	JButton stepButton;
797	987	JButton stepAllButton;
..	..	@@ -800,9 +990,13 @@
800	990	JButton fasterButton;
801	991	JButton remarkButton;
802	992
	993	+ cGridBag editPanel;
	994	+ cGridBag editCommandsPanel;
	995	+
803	996	cGridBag namePanel;
804	997	cGridBag setupPanel;
805		- cGridBag commandsPanel;
	998	+ cGridBag setupPanel2;
	999	+ cGridBag objectCommandsPanel;
806	1000	cGridBag pushPanel;
807	1001	cGridBag fillPanel;
808	1002
..	..	@@ -974,61 +1168,68 @@
974	1168	namePanel = new cGridBag();
975	1169
976	1170	nameField = AddText(namePanel, copy.GetName());
977		- namePanel.add(nameField);
	1171	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
978	1172	oe.ctrlPanel.add(namePanel);
979	1173
980	1174	oe.ctrlPanel.Return();
981	1175
982		- if (!GroupEditor.allparams)
	1176	+ if (!allparams)
983	1177	return;
984	1178
985	1179	setupPanel = new cGridBag().setVertical(false);
986	1180
987	1181	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
988	1182	liveCB.setToolTipText("Animate object");
	1183	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1184	+ selectCB.setToolTipText("Make object selectable");
	1185	+// Return();
989	1186	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
990	1187	hideCB.setToolTipText("Hide object");
991		-// Return();
992	1188	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
993		- markCB.setToolTipText("Set the animation target transform");
	1189	+ markCB.setToolTipText("As animation target transform");
994	1190
995		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1191	+ setupPanel2 = new cGridBag().setVertical(false);
	1192	+
	1193	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
996	1194	rewindCB.setToolTipText("Rewind animation");
997	1195
998		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
999		- randomCB.setToolTipText("Option for switch node");
	1196	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1197	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1000	1198
	1199	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1200	+ link2masterCB.setToolTipText("Attach to support");
	1201	+
1001	1202	if (Globals.ADVANCED)
1002	1203	{
1003		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1004		- link2masterCB.setToolTipText("Attach to support");
1005		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1204	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1006	1205	speedupCB.setToolTipText("Option motion capture");
1007	1206	}
1008	1207
1009	1208	oe.ctrlPanel.add(setupPanel);
1010	1209	oe.ctrlPanel.Return();
	1210	+ oe.ctrlPanel.add(setupPanel2);
	1211	+ oe.ctrlPanel.Return();
1011	1212
1012		- commandsPanel = new cGridBag().setVertical(false);
	1213	+ objectCommandsPanel = new cGridBag().setVertical(false);
1013	1214
1014		- resetButton = AddButton(commandsPanel, "Reset");
	1215	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1015	1216	resetButton.setToolTipText("Jump to frame zero");
1016		- stepButton = AddButton(commandsPanel, "Step");
	1217	+ stepButton = AddButton(objectCommandsPanel, "Step");
1017	1218	stepButton.setToolTipText("Step one frame");
1018	1219	// resetAllButton = AddButton(oe, "Reset All");
1019	1220	// stepAllButton = AddButton(oe, "Step All");
1020	1221	// Return();
1021		- slowerButton = AddButton(commandsPanel, "Slow");
	1222	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1022	1223	slowerButton.setToolTipText("Decrease animation speed");
1023		- fasterButton = AddButton(commandsPanel, "Fast");
	1224	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1024	1225	fasterButton.setToolTipText("Increase animation speed");
1025		- remarkButton = AddButton(commandsPanel, "Remark");
	1226	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1026	1227	remarkButton.setToolTipText("Set the current transform as the target");
1027	1228
1028		- oe.ctrlPanel.add(commandsPanel);
	1229	+ oe.ctrlPanel.add(objectCommandsPanel);
1029	1230	oe.ctrlPanel.Return();
1030	1231
1031		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1232	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1032	1233	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1033	1234	//Return();
1034	1235
..	..	@@ -1231,8 +1432,11 @@
1231	1432	//worldPanel.setName("World");
1232	1433	centralPanel = new cGridBag();
1233	1434	centralPanel.preferredWidth = 20;
1234		- timelinePanel = new JPanel(new BorderLayout());
1235		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1435	+
	1436	+ if (Globals.ADVANCED)
	1437	+ {
	1438	+ timelinePanel = new JPanel(new BorderLayout());
	1439	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1236	1440
1237	1441	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1238	1442	cameraPanel.setContinuousLayout(true);
..	..	@@ -1241,7 +1445,10 @@
1241	1445	// cameraPanel.setDividerSize(9);
1242	1446	cameraPanel.setResizeWeight(1.0);
1243	1447
	1448	+ }
	1449	+
1244	1450	centralPanel.add(cameraView);
	1451	+ centralPanel.setFocusable(true);
1245	1452	//frame.setJMenuBar(timelineMenubar);
1246	1453	//centralPanel.add(timelinePanel);
1247	1454
..	..	@@ -1308,8 +1515,12 @@
1308	1515	// north.setName("Edit");
1309	1516	// north.add(ctrlPanel, BorderLayout.NORTH);
1310	1517	// objectPanel.add(north);
1311		- objectPanel.add(ctrlPanel);
1312		- objectPanel.add(infoPanel);
	1518	+ objectPanel.add(editPanel);
	1519	+
	1520	+ //if (Globals.ADVANCED)
	1521	+ objectPanel.add(infoPanel);
	1522	+
	1523	+ objectPanel.add(toolboxPanel);
1313	1524
1314	1525	/*
1315	1526	aConstraints.gridx = 0;
..	..	@@ -1318,7 +1529,7 @@
1318	1529	aConstraints.gridy += 1;
1319	1530	aConstraints.gridwidth = 1;
1320	1531	mainPanel.add(objectPanel, aConstraints);
1321		- */
	1532	+ */
1322	1533
1323	1534	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1324	1535	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1335,9 +1546,7 @@
1335	1546	JTabbedPane tabbedPane = new JTabbedPane();
1336	1547	tabbedPane.add(scrollpane);
1337	1548
1338		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1339		-
1340		- optionsPanel = new cGridBag().setVertical(true);
	1549	+ optionsPanel = new cGridBag().setVertical(false);
1341	1550
1342	1551	optionsPanel.setName("Options");
1343	1552
..	..	@@ -1345,6 +1554,8 @@
1345	1554
1346	1555	tabbedPane.add(optionsPanel);
1347	1556
	1557	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1558	+
1348	1559	scenePanel.add(tabbedPane);
1349	1560
1350	1561	/*
..	..	@@ -1417,9 +1628,9 @@
1417	1628	// aConstraints.gridheight = 1;
1418	1629
1419	1630	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1420		- framePanel.setContinuousLayout(true);
1421		- framePanel.setOneTouchExpandable(true);
1422		- framePanel.setDividerLocation(0.8);
	1631	+ framePanel.setContinuousLayout(false);
	1632	+ framePanel.setOneTouchExpandable(false);
	1633	+ //.setDividerLocation(0.8);
1423	1634	//framePanel.setDividerSize(15);
1424	1635	//framePanel.setResizeWeight(0.15);
1425	1636	framePanel.setName("Frame");
..	..	@@ -1437,9 +1648,14 @@
1437	1648	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1438	1649
1439	1650	frame.setSize(1280, 860);
1440		- frame.setVisible(true);
1441		-
	1651	+
	1652	+ cameraView.requestFocusInWindow();
	1653	+
1442	1654	gridPanel.setDividerLocation(1.0);
	1655	+
	1656	+ frame.validate();
	1657	+
	1658	+ frame.setVisible(true);
1443	1659
1444	1660	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1445	1661	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1476,19 +1692,19 @@
1476	1692
1477	1693	cGridBag editBar = new cGridBag().setVertical(false);
1478	1694
1479		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1695	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1480	1696	createMaterialButton.setToolTipText("Create material");
1481	1697
1482	1698	/*
1483	1699	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1484	1700	*/
1485	1701
1486		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1702	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1487	1703	clearMaterialButton.setToolTipText("Clear material");
1488	1704
1489	1705	if (Globals.ADVANCED)
1490	1706	{
1491		- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1707	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
1492	1708	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1493	1709	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1494	1710	}
..	..	@@ -1525,24 +1741,6 @@
1525	1741	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1526	1742	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1527	1743	colorSection.add(texture);
1528		-
1529		- cGridBag anisoU = new cGridBag();
1530		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1531		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1532		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1533		- colorSection.add(anisoU);
1534		-
1535		- cGridBag anisoV = new cGridBag();
1536		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1537		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1538		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1539		- colorSection.add(anisoV);
1540		-
1541		- cGridBag shadowbias = new cGridBag();
1542		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1543		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1544		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1545		- colorSection.add(shadowbias);
1546	1744
1547	1745	panel.add(new JSeparator());
1548	1746
..	..	@@ -1594,6 +1792,12 @@
1594	1792	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1595	1793	diffuseSection.add(fakedepth);
1596	1794
	1795	+ cGridBag shadowbias = new cGridBag();
	1796	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1797	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1798	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1799	+ diffuseSection.add(shadowbias);
	1800	+
1597	1801	panel.add(new JSeparator());
1598	1802
1599	1803	panel.add(diffuseSection);
..	..	@@ -1644,6 +1848,18 @@
1644	1848	// aConstraints.gridy += 1;
1645	1849	// aConstraints.gridwidth = 1;
1646	1850
	1851	+ cGridBag anisoU = new cGridBag();
	1852	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1853	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1854	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1855	+ specularSection.add(anisoU);
	1856	+
	1857	+ cGridBag anisoV = new cGridBag();
	1858	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1859	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1860	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1861	+ specularSection.add(anisoV);
	1862	+
1647	1863
1648	1864	panel.add(new JSeparator());
1649	1865
..	..	@@ -1651,35 +1867,35 @@
1651	1867
1652	1868	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1653	1869
1654		- cGridBag globalSection = new cGridBag().setVertical(true);
	1870	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1655	1871
1656	1872	cGridBag camera = new cGridBag();
1657	1873	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1658	1874	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1659	1875	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1660		- globalSection.add(camera);
	1876	+ colorSection.add(camera);
1661	1877
1662	1878	cGridBag ambient = new cGridBag();
1663	1879	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1664	1880	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1665	1881	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1666		- globalSection.add(ambient);
	1882	+ colorSection.add(ambient);
1667	1883
1668	1884	cGridBag backlit = new cGridBag();
1669	1885	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1670	1886	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1671	1887	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1672		- globalSection.add(backlit);
	1888	+ colorSection.add(backlit);
1673	1889
1674	1890	cGridBag opacity = new cGridBag();
1675	1891	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1676	1892	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1677	1893	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1678		- globalSection.add(opacity);
	1894	+ colorSection.add(opacity);
1679	1895
1680		- panel.add(new JSeparator());
	1896	+ //panel.add(new JSeparator());
1681	1897
1682		- panel.add(globalSection);
	1898	+ //panel.add(globalSection);
1683	1899
1684	1900	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1685	1901
..	..	@@ -1786,8 +2002,9 @@
1786	2002	// 3D models
1787	2003	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1788	2004	{
1789		- lastConverter = new com.jmex.model.converters.MaxToJme();
1790		- LoadFile(filename, lastConverter);
	2005	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2006	+ //LoadFile(filename, lastConverter);
	2007	+ LoadObjFile(filename); // New 3ds loader
1791	2008	continue;
1792	2009	}
1793	2010	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1939,7 +2156,7 @@
1939	2156
1940	2157	//? flashIt = false;
1941	2158	CameraPane pane = (CameraPane) cameraView;
1942		- pane.clickStart(location.x, location.y, 0);
	2159	+ pane.clickStart(location.x, location.y, 0, 0);
1943	2160	pane.clickEnd(location.x, location.y, 0, true);
1944	2161
1945	2162	if (group.selection.size() == 1)
..	..	@@ -1988,6 +2205,7 @@
1988	2205	e2.printStackTrace();
1989	2206	}
1990	2207	}
	2208	+
1991	2209	LoadJMEThread loadThread;
1992	2210
1993	2211	class LoadJMEThread extends Thread
..	..	@@ -2045,6 +2263,7 @@
2045	2263	//LoadFile0(filename, converter);
2046	2264	}
2047	2265	}
	2266	+
2048	2267	LoadOBJThread loadObjThread;
2049	2268
2050	2269	class LoadOBJThread extends Thread
..	..	@@ -2123,19 +2342,19 @@
2123	2342
2124	2343	void LoadObjFile(String fullname)
2125	2344	{
2126		- /*
	2345	+ System.out.println("Loading " + fullname);
	2346	+ /**/
2127	2347	//lastFilename = fullname;
2128	2348	if(loadObjThread == null)
2129	2349	{
2130		- loadObjThread = new LoadOBJThread();
2131		- loadObjThread.start();
	2350	+ loadObjThread = new LoadOBJThread();
	2351	+ loadObjThread.start();
2132	2352	}
2133	2353
2134	2354	loadObjThread.add(fullname);
2135		- */
	2355	+ /**/
2136	2356
2137		- System.out.println("Loading " + fullname);
2138		- makeSomething(new FileObject(fullname, true), true);
	2357	+ //makeSomething(new FileObject(fullname, true), true);
2139	2358	}
2140	2359
2141	2360	void LoadGFDFile(String fullname)
..	..	@@ -2396,11 +2615,11 @@
2396	2615
2397	2616	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2398	2617	{
2399		- if (GrafreeD.standAlone)
	2618	+ if (Grafreed.standAlone)
2400	2619	{
2401	2620	/**/
2402	2621	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2403		- browser.show();
	2622	+ browser.setVisible(true);
2404	2623	String filename = browser.getFile();
2405	2624	if (filename != null && filename.length() > 0)
2406	2625	{
..	..	@@ -2511,6 +2730,7 @@
2511	2730	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2512	2731	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2513	2732	}
	2733	+
2514	2734	//cJME.count++;
2515	2735	//cJME.count %= 12;
2516	2736	if (gc)
..	..	@@ -2694,6 +2914,7 @@
2694	2914	}
2695	2915	}
2696	2916	}
	2917	+
2697	2918	cFileSystemPane FSPane;
2698	2919
2699	2920	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2747,11 +2968,14 @@
2747	2968	}
2748	2969	}
2749	2970	}
	2971	+
2750	2972	freezematerial = false;
2751	2973	}
2752	2974
2753	2975	void SetMaterial(Object3D object)
2754	2976	{
	2977	+ latestObject = object;
	2978	+
2755	2979	cMaterial mat = object.material;
2756	2980
2757	2981	if (mat == null)
..	..	@@ -2863,12 +3087,17 @@
2863	3087	// }
2864	3088
2865	3089	/**/
2866		- if (deselect)
	3090	+ if (deselect \|\| child == null)
2867	3091	{
2868	3092	//group.deselectAll();
2869	3093	//freeze = true;
2870	3094	GetTree().clearSelection();
2871	3095	//freeze = false;
	3096	+
	3097	+ if (child == null)
	3098	+ {
	3099	+ return;
	3100	+ }
2872	3101	}
2873	3102
2874	3103	//group.addSelectee(child);
..	..	@@ -2937,7 +3166,7 @@
2937	3166	cameraView.ToggleDL();
2938	3167	cameraView.repaint();
2939	3168	return;
2940		- } else if (event.getSource() == toggleTextureItem)
	3169	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2941	3170	{
2942	3171	cameraView.ToggleTexture();
2943	3172	// june 2013 copy.HardTouch();
..	..	@@ -2976,9 +3205,9 @@
2976	3205	frame.validate();
2977	3206
2978	3207	return;
2979		- } else if (event.getSource() == toggleSwitchItem)
	3208	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2980	3209	{
2981		- cameraView.ToggleRandom();
	3210	+ cameraView.ToggleSwitch();
2982	3211	cameraView.repaint();
2983	3212	return;
2984	3213	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3006,6 +3235,10 @@
3006	3235	} else if (event.getSource() == liveCB)
3007	3236	{
3008	3237	copy.live ^= true;
	3238	+ return;
	3239	+ } else if (event.getSource() == selectCB)
	3240	+ {
	3241	+ copy.dontselect ^= true;
3009	3242	return;
3010	3243	} else if (event.getSource() == hideCB)
3011	3244	{
..	..	@@ -3045,8 +3278,9 @@
3045	3278
3046	3279	public void actionPerformed(ActionEvent event)
3047	3280	{
	3281	+ Object source = event.getSource();
3048	3282	// SCRIPT DIALOG
3049		- if (event.getSource() == okbutton)
	3283	+ if (source == okbutton)
3050	3284	{
3051	3285	textpanel.setVisible(false);
3052	3286	textpanel.remove(textarea);
..	..	@@ -3058,7 +3292,7 @@
3058	3292	textarea = null;
3059	3293	textpanel = null;
3060	3294	}
3061		- if (event.getSource() == cancelbutton)
	3295	+ if (source == cancelbutton)
3062	3296	{
3063	3297	textpanel.setVisible(false);
3064	3298	textpanel.remove(textarea);
..	..	@@ -3070,50 +3304,50 @@
3070	3304	//applySelf();
3071	3305	//client.refreshEditWindow();
3072	3306	//refreshContents();
3073		- if (event.getSource() == nameField)
	3307	+ if (source == nameField)
3074	3308	{
3075	3309	//System.out.println("ObjEditor " + event);
3076	3310	applySelf0(true);
3077	3311	//parent.applySelf();
3078	3312	objEditor.refreshContents();
3079		- } else if (event.getSource() == resetButton)
	3313	+ } else if (source == resetButton)
3080	3314	{
3081	3315	CameraPane.fullreset = true;
3082	3316	copy.Reset(); // ResetMeshes();
3083	3317	copy.Touch();
3084	3318	objEditor.refreshContents();
3085		- } else if (event.getSource() == stepItem)
	3319	+ } else if (source == stepItem)
3086	3320	{
3087	3321	//cameraView.ONESTEP = true;
3088	3322	Globals.ONESTEP = true;
3089	3323	cameraView.repaint();
3090	3324	return;
3091		- } else if (event.getSource() == stepButton)
	3325	+ } else if (source == stepButton)
3092	3326	{
3093	3327	copy.Step();
3094	3328	copy.Touch();
3095	3329	objEditor.refreshContents();
3096		- } else if (event.getSource() == slowerButton)
	3330	+ } else if (source == slowerButton)
3097	3331	{
3098	3332	copy.Slower();
3099	3333	copy.Touch();
3100	3334	objEditor.refreshContents();
3101		- } else if (event.getSource() == fasterButton)
	3335	+ } else if (source == fasterButton)
3102	3336	{
3103	3337	copy.Faster();
3104	3338	copy.Touch();
3105	3339	objEditor.refreshContents();
3106		- } else if (event.getSource() == remarkButton)
	3340	+ } else if (source == remarkButton)
3107	3341	{
3108	3342	copy.Remark();
3109	3343	copy.Touch();
3110	3344	objEditor.refreshContents();
3111		- } else if (event.getSource() == stepAllButton)
	3345	+ } else if (source == stepAllButton)
3112	3346	{
3113	3347	copy.StepAll();
3114	3348	copy.Touch();
3115	3349	objEditor.refreshContents();
3116		- } else if (event.getSource() == resetAllButton)
	3350	+ } else if (source == resetAllButton)
3117	3351	{
3118	3352	//CameraPane.fullreset = true;
3119	3353	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3146,53 +3380,79 @@
3146	3380	// Close();
3147	3381	// }
3148	3382	// else
3149		- if (event.getSource() == resetSlidersButton)
	3383	+ if (source == resetSlidersButton)
3150	3384	{
3151	3385	ResetSliders();
3152		- } else if (event.getSource() == clearMaterialButton)
	3386	+ } else if (source == clearMaterialButton)
3153	3387	{
3154	3388	ClearMaterial();
3155		- } else if (event.getSource() == createMaterialButton)
	3389	+ } else if (source == createMaterialButton)
3156	3390	{
3157	3391	CreateMaterial();
3158		- } else if (event.getSource() == clearPanelButton)
	3392	+ } else if (source == clearPanelButton)
3159	3393	{
3160	3394	copy.ClearUI();
3161	3395	refreshContents(true);
3162		- } /*
3163		- }
3164		-
3165		- public boolean action(Event event, Object arg)
3166		- {
3167		- */ else if (event.getSource() == closeItem)
	3396	+ } else if (source == importGFDItem)
	3397	+ {
	3398	+ ImportGFD();
	3399	+ } else
	3400	+ if (source == importVRMLX3DItem)
	3401	+ {
	3402	+ ImportVRMLX3D();
	3403	+ } else
	3404	+ if (source == import3DSItem)
	3405	+ {
	3406	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3407	+ } else
	3408	+ if (source == importOBJItem)
	3409	+ {
	3410	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3411	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3412	+ browser.setVisible(true);
	3413	+ String filename = browser.getFile();
	3414	+ if (filename != null && filename.length() > 0)
	3415	+ {
	3416	+ String fullname = browser.getDirectory() + filename;
	3417	+ makeSomething(ReadOBJ(fullname), true);
	3418	+ }
	3419	+ } else
	3420	+ if (source == closeItem)
3168	3421	{
3169	3422	Close();
3170	3423	//return true;
3171		- } else if (event.getSource() == loadItem)
	3424	+ } else if (source == openItem)
3172	3425	{
3173		- load();
	3426	+ Open();
3174	3427	//return true;
3175		- } else if (event.getSource() == saveItem)
	3428	+ } else if (source == newItem)
	3429	+ {
	3430	+ New();
	3431	+ } else if (source == saveItem)
3176	3432	{
3177	3433	save();
3178	3434	//return true;
3179		- } else if (event.getSource() == saveAsItem)
	3435	+ } else if (source == saveAsItem)
3180	3436	{
3181	3437	saveAs();
3182	3438	//return true;
3183		- } else if (event.getSource() == reexportItem)
	3439	+ } else if (source == reexportItem)
3184	3440	{
3185	3441	reexport();
3186	3442	//return true;
3187		- } else if (event.getSource() == exportAsItem)
	3443	+ } else if (source == exportAsItem)
3188	3444	{
3189	3445	export();
3190	3446	//return true;
3191		- } else if (event.getSource() == povItem)
	3447	+ } else if (source == povItem)
3192	3448	{
3193	3449	generatePOV();
3194	3450	//return true;
3195		- } else if (event.getSource() == zBufferItem)
	3451	+ } else if (event.getSource() == archiveItem)
	3452	+ {
	3453	+ cTools.Archive(frame);
	3454	+ return;
	3455	+ } else if (source == zBufferItem)
3196	3456	{
3197	3457	try
3198	3458	{
..	..	@@ -3214,21 +3474,8 @@
3214	3474	cameraView.repaint();
3215	3475	//return true;
3216	3476	}
3217		- */ else if (event.getSource() == editCameraItem)
3218		- {
3219		- cameraView.ProtectCamera();
3220		- cameraView.repaint();
3221		- return;
3222		- } else if (event.getSource() == revertCameraItem)
3223		- {
3224		- cameraView.RevertCamera();
3225		- cameraView.repaint();
3226		- return;
3227		-// } else if (event.getSource() == textureButton)
3228		-// {
3229		-// return; // true;
3230		- } else // combos...
3231		- if (event.getSource() == texresMenu)
	3477	+ */ else // combos...
	3478	+ if (source == texresMenu)
3232	3479	{
3233	3480	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3234	3481	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3240,6 +3487,376 @@
3240	3487	}
3241	3488	}
3242	3489
	3490	+ void New()
	3491	+ {
	3492	+ while (copy.Size() > 1)
	3493	+ {
	3494	+ copy.remove(1);
	3495	+ }
	3496	+
	3497	+ ResetModel();
	3498	+ objEditor.refreshContents();
	3499	+ }
	3500	+
	3501	+ static public byte[] Compress(Object3D o)
	3502	+ {
	3503	+ try
	3504	+ {
	3505	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3506	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3507	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3508	+
	3509	+ Object3D parent = o.parent;
	3510	+ o.parent = null;
	3511	+
	3512	+ out.writeObject(o);
	3513	+
	3514	+ o.parent = parent;
	3515	+
	3516	+ out.flush();
	3517	+
	3518	+ baos //zstream
	3519	+ .close();
	3520	+ out.close();
	3521	+
	3522	+ byte[] bytes = baos.toByteArray();
	3523	+
	3524	+ System.out.println("save #bytes = " + bytes.length);
	3525	+ return bytes;
	3526	+ } catch (Exception e)
	3527	+ {
	3528	+ System.err.println(e);
	3529	+ return null;
	3530	+ }
	3531	+ }
	3532	+
	3533	+ static public Object Uncompress(byte[] bytes)
	3534	+ {
	3535	+ System.out.println("restore #bytes = " + bytes.length);
	3536	+ try
	3537	+ {
	3538	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3539	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3540	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3541	+ Object obj = in.readObject();
	3542	+
	3543	+ bais //istream
	3544	+ .close();
	3545	+ in.close();
	3546	+
	3547	+ return obj;
	3548	+ } catch (Exception e)
	3549	+ {
	3550	+ System.err.println(e);
	3551	+ return null;
	3552	+ }
	3553	+ }
	3554	+
	3555	+ static public Object clone(Object o)
	3556	+ {
	3557	+ try
	3558	+ {
	3559	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3560	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3561	+
	3562	+ out.writeObject(o);
	3563	+
	3564	+ out.flush();
	3565	+ out.close();
	3566	+
	3567	+ byte[] bytes = baos.toByteArray();
	3568	+
	3569	+ System.out.println("clone = " + bytes.length);
	3570	+
	3571	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3572	+ ObjectInputStream in = new ObjectInputStream(bais);
	3573	+ Object obj = in.readObject();
	3574	+ in.close();
	3575	+
	3576	+ return obj;
	3577	+ } catch (Exception e)
	3578	+ {
	3579	+ System.err.println(e);
	3580	+ return null;
	3581	+ }
	3582	+ }
	3583	+
	3584	+ cRadio GetCurrentTab()
	3585	+ {
	3586	+ cRadio ab;
	3587	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3588	+ {
	3589	+ ab = (cRadio)e.nextElement();
	3590	+ if(ab.GetObject() == copy)
	3591	+ {
	3592	+ return ab;
	3593	+ }
	3594	+ }
	3595	+
	3596	+ return null;
	3597	+ }
	3598	+
	3599	+
	3600	+ public void Save()
	3601	+ {
	3602	+ //Save(true);
	3603	+ Replace();
	3604	+ }
	3605	+
	3606	+ private boolean Equal(byte[] compress, byte[] name)
	3607	+ {
	3608	+ if (compress.length != name.length)
	3609	+ {
	3610	+ return false;
	3611	+ }
	3612	+
	3613	+ for (int i=compress.length; --i>=0;)
	3614	+ {
	3615	+ if (compress[i] != name[i])
	3616	+ return false;
	3617	+ }
	3618	+
	3619	+ return true;
	3620	+ }
	3621	+
	3622	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3623	+
	3624	+ public boolean Save(boolean user)
	3625	+ {
	3626	+ System.err.println("Save");
	3627	+
	3628	+ cRadio tab = GetCurrentTab();
	3629	+
	3630	+ byte[] compress = CompressCopy();
	3631	+
	3632	+ boolean thesame = false;
	3633	+
	3634	+ // Quick heuristic using length. Works only when stream is compressed.
	3635	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3636	+ {
	3637	+ thesame = true;
	3638	+ }
	3639	+
	3640	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3641	+ if (!thesame)
	3642	+ {
	3643	+ //tab.user[tab.versionindex] = user;
	3644	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3645	+
	3646	+ copy.versions[++copy.versionindex] = compress;
	3647	+
	3648	+ // if (increment)
	3649	+ // tab.versionindex++;
	3650	+ }
	3651	+
	3652	+ //copy.RestoreBigData(versiontable);
	3653	+
	3654	+ //assert(hashtable.isEmpty());
	3655	+
	3656	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3657	+ {
	3658	+ //tab.user[i] = false;
	3659	+ copy.versions[i] = null;
	3660	+ }
	3661	+
	3662	+ SetUndoStates();
	3663	+
	3664	+ // test save
	3665	+ if (false)
	3666	+ {
	3667	+ try
	3668	+ {
	3669	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	3670	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3671	+
	3672	+ p.writeObject(copy);
	3673	+
	3674	+ p.flush();
	3675	+
	3676	+ ostream.close();
	3677	+ } catch (Exception e)
	3678	+ {
	3679	+ e.printStackTrace();
	3680	+ }
	3681	+ }
	3682	+
	3683	+ return !thesame;
	3684	+ }
	3685	+
	3686	+ void CopyChanged(Object3D obj)
	3687	+ {
	3688	+ SetUndoStates();
	3689	+
	3690	+ boolean temp = CameraPane.SWITCH;
	3691	+ CameraPane.SWITCH = false;
	3692	+
	3693	+ copy.ExtractBigData(versiontable);
	3694	+
	3695	+ copy.clear();
	3696	+
	3697	+ for (int i=0; i<obj.Size(); i++)
	3698	+ {
	3699	+ copy.add(obj.get(i));
	3700	+ }
	3701	+
	3702	+ copy.RestoreBigData(versiontable);
	3703	+
	3704	+ CameraPane.SWITCH = temp;
	3705	+
	3706	+ //assert(hashtable.isEmpty());
	3707	+
	3708	+ copy.Touch();
	3709	+
	3710	+ ResetModel();
	3711	+ copy.HardTouch(); // recompile?
	3712	+
	3713	+ cRadio ab;
	3714	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3715	+ {
	3716	+ ab = (cRadio)e.nextElement();
	3717	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3718	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3719	+ if (test != null)
	3720	+ {
	3721	+ test.editWindow = ab.object.editWindow;
	3722	+ ab.object = test;
	3723	+ }
	3724	+ }
	3725	+
	3726	+ refreshContents();
	3727	+ }
	3728	+
	3729	+ cButton undoButton;
	3730	+ cButton restoreButton;
	3731	+ cButton replaceButton;
	3732	+ cButton redoButton;
	3733	+
	3734	+ void SetUndoStates()
	3735	+ {
	3736	+ cRadio tab = GetCurrentTab();
	3737	+
	3738	+ restoreButton.setEnabled(copy.versionindex != -1);
	3739	+ replaceButton.setEnabled(copy.versionindex != -1);
	3740	+ undoButton.setEnabled(copy.versionindex > 0);
	3741	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3742	+ }
	3743	+
	3744	+ public boolean Undo()
	3745	+ {
	3746	+ System.err.println("Undo");
	3747	+
	3748	+ cRadio tab = GetCurrentTab();
	3749	+
	3750	+ if (copy.versionindex == 0)
	3751	+ {
	3752	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3753	+ return false;
	3754	+ }
	3755	+
	3756	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3757	+// {
	3758	+// if (Save(false))
	3759	+// tab.versionindex -= 1;
	3760	+// else
	3761	+// {
	3762	+// if (tab.versionindex <= 0)
	3763	+// return false;
	3764	+// else
	3765	+// tab.versionindex -= 1;
	3766	+// }
	3767	+// }
	3768	+
	3769	+ copy.versionindex -= 1;
	3770	+
	3771	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3772	+
	3773	+ return true;
	3774	+ }
	3775	+
	3776	+ public boolean Restore()
	3777	+ {
	3778	+ System.err.println("Restore");
	3779	+
	3780	+ cRadio tab = GetCurrentTab();
	3781	+
	3782	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3783	+ {
	3784	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3785	+ return false;
	3786	+ }
	3787	+
	3788	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3789	+
	3790	+ return true;
	3791	+ }
	3792	+
	3793	+ public boolean Replace()
	3794	+ {
	3795	+ System.err.println("Replace");
	3796	+
	3797	+ cRadio tab = GetCurrentTab();
	3798	+
	3799	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3800	+ {
	3801	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3802	+ return false;
	3803	+ }
	3804	+
	3805	+ copy.versions[copy.versionindex] = CompressCopy();
	3806	+
	3807	+ return true;
	3808	+ }
	3809	+
	3810	+ public void Redo()
	3811	+ {
	3812	+ cRadio tab = GetCurrentTab();
	3813	+
	3814	+ if (copy.versions[copy.versionindex + 1] == null)
	3815	+ {
	3816	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3817	+ return;
	3818	+ }
	3819	+
	3820	+ copy.versionindex += 1;
	3821	+
	3822	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3823	+
	3824	+ //if (!tab.user[tab.versionindex])
	3825	+ // tab.graphs[tab.versionindex] = null;
	3826	+ }
	3827	+
	3828	+ void ImportGFD()
	3829	+ {
	3830	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3831	+ browser.show();
	3832	+ String filename = browser.getFile();
	3833	+ if (filename != null && filename.length() > 0)
	3834	+ {
	3835	+ String fullname = browser.getDirectory() + filename;
	3836	+
	3837	+ //Object3D readobj =
	3838	+ objEditor.ReadGFD(fullname, objEditor);
	3839	+ //makeSomething(readobj);
	3840	+ }
	3841	+ }
	3842	+
	3843	+ void ImportVRMLX3D()
	3844	+ {
	3845	+ if (Grafreed.standAlone)
	3846	+ {
	3847	+ /**/
	3848	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3849	+ browser.show();
	3850	+ String filename = browser.getFile();
	3851	+ if (filename != null && filename.length() > 0)
	3852	+ {
	3853	+ String fullname = browser.getDirectory() + filename;
	3854	+ LoadVRMLX3D(fullname);
	3855	+ }
	3856	+ /**/
	3857	+ }
	3858	+ }
	3859	+
3243	3860	void ToggleAnimation()
3244	3861	{
3245	3862	if (!Globals.ANIMATION)
..	..	@@ -3255,8 +3872,8 @@
3255	3872
3256	3873	Globals.ANIMATION ^= true;
3257	3874
3258		- GrafreeD.wav.cursor = 0;
3259		- GrafreeD.wav.loop = 0;
	3875	+ Grafreed.wav.cursor = 0;
	3876	+ Grafreed.wav.loop = 0;
3260	3877	}
3261	3878	} else
3262	3879	{
..	..	@@ -3357,7 +3974,7 @@
3357	3974	assert false;
3358	3975	}
3359	3976
3360		- void EditSelection()
	3977	+ void EditSelection(boolean newWindow)
3361	3978	{
3362	3979	}
3363	3980
..	..	@@ -3443,6 +4060,36 @@
3443	4060	{
3444	4061	//System.out.println("Propagate = " + propagate);
3445	4062	copy.UpdateMaterial(anchor, current, propagate);
	4063	+
	4064	+ if (copy.material != null)
	4065	+ {
	4066	+ cMaterial mat = copy.material;
	4067	+
	4068	+ colorField.SetToolTipValue((mat.color));
	4069	+ modulationField.SetToolTipValue((mat.modulation));
	4070	+ metalnessField.SetToolTipValue((mat.metalness));
	4071	+ diffuseField.SetToolTipValue((mat.diffuse));
	4072	+ specularField.SetToolTipValue((mat.specular));
	4073	+ shininessField.SetToolTipValue((mat.shininess));
	4074	+ shiftField.SetToolTipValue((mat.shift));
	4075	+ ambientField.SetToolTipValue((mat.ambient));
	4076	+ lightareaField.SetToolTipValue((mat.lightarea));
	4077	+ diffusenessField.SetToolTipValue((mat.factor));
	4078	+ velvetField.SetToolTipValue((mat.velvet));
	4079	+ sheenField.SetToolTipValue((mat.sheen));
	4080	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4081	+ backlitField.SetToolTipValue((mat.bump));
	4082	+ anisoField.SetToolTipValue((mat.aniso));
	4083	+ anisoVField.SetToolTipValue((mat.anisoV));
	4084	+ cameraField.SetToolTipValue((mat.cameralight));
	4085	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4086	+ shadowField.SetToolTipValue((mat.shadow));
	4087	+ textureField.SetToolTipValue((mat.texture));
	4088	+ opacityField.SetToolTipValue((mat.opacity));
	4089	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4090	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4091	+ }
	4092	+
3446	4093	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3447	4094	{
3448	4095	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3471,9 +4118,22 @@
3471	4118	//copy.Touch();
3472	4119	}
3473	4120
	4121	+ cNumberSlider versionField;
	4122	+
3474	4123	public void stateChanged(ChangeEvent e)
3475	4124	{
3476	4125	// assert(false);
	4126	+ if (e.getSource() == versionField)
	4127	+ {
	4128	+ int version = versionField.getInteger();
	4129	+
	4130	+ if (copy.versions[version] != null)
	4131	+ {
	4132	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4133	+ }
	4134	+
	4135	+ return;
	4136	+ }
3477	4137
3478	4138	if (freezematerial)
3479	4139	{
..	..	@@ -3558,7 +4218,7 @@
3558	4218	}
3559	4219
3560	4220	if (normalpushField != null)
3561		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4221	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3562	4222	}
3563	4223
3564	4224	void SnapObject()
..	..	@@ -3822,6 +4482,8 @@
3822	4482
3823	4483	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3824	4484	{
	4485	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4486	+ Save();
3825	4487	//Tween.set(thing, 0).target(1).start(tweenManager);
3826	4488	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3827	4489	// if (thing instanceof GenericJointDemo)
..	..	@@ -3908,6 +4570,12 @@
3908	4570	{
3909	4571	ResetModel();
3910	4572	Select(thing.GetTreePath(), true, false); // unselect... false);
	4573	+
	4574	+ if (thing.Size() == 0)
	4575	+ {
	4576	+ //EditSelection(false);
	4577	+ }
	4578	+
3911	4579	refreshContents();
3912	4580	}
3913	4581
..	..	@@ -4025,6 +4693,7 @@
4025	4693	}
4026	4694	}
4027	4695	}
	4696	+
4028	4697	LoadGFDThread loadGFDThread;
4029	4698
4030	4699	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4044,8 +4713,10 @@
4044	4713
4045	4714	try
4046	4715	{
	4716	+ // Try compressed version first.
4047	4717	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4048		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4718	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4719	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4049	4720
4050	4721	readobj = (Object3D) p.readObject();
4051	4722	istream.close();
..	..	@@ -4053,7 +4724,20 @@
4053	4724	readobj.ResetDisplayList();
4054	4725	} catch (Exception e)
4055	4726	{
4056		- e.printStackTrace();
	4727	+ //e.printStackTrace();
	4728	+ try
	4729	+ {
	4730	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4731	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4732	+
	4733	+ readobj = (Object3D) p.readObject();
	4734	+ istream.close();
	4735	+
	4736	+ readobj.ResetDisplayList();
	4737	+ } catch (Exception e2)
	4738	+ {
	4739	+ e2.printStackTrace();
	4740	+ }
4057	4741	}
4058	4742	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4059	4743	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4099,6 +4783,12 @@
4099	4783
4100	4784	void LoadIt(Object obj)
4101	4785	{
	4786	+ if (obj == null)
	4787	+ {
	4788	+ // Invalid file
	4789	+ return;
	4790	+ }
	4791	+
4102	4792	System.out.println("Loaded " + obj);
4103	4793	//new Exception().printStackTrace();
4104	4794	Object3D readobj = (Object3D) obj;
..	..	@@ -4108,6 +4798,8 @@
4108	4798
4109	4799	if (readobj != null)
4110	4800	{
	4801	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4802	+ // Save();
4111	4803	try
4112	4804	{
4113	4805	//readobj.deepCopySelf(copy);
..	..	@@ -4162,15 +4854,20 @@
4162	4854	c.addChild(csg);
4163	4855	}
4164	4856
	4857	+ copy.versions = readobj.versions;
	4858	+ copy.versionindex = readobj.versionindex;
	4859	+
	4860	+ SetUndoStates();
	4861	+
4165	4862	ResetModel();
4166	4863	copy.HardTouch(); // recompile?
4167	4864	refreshContents();
4168	4865	}
4169	4866	}
4170	4867
4171		- void load() // throws ClassNotFoundException
	4868	+ void Open() // throws ClassNotFoundException
4172	4869	{
4173		- if (GrafreeD.standAlone)
	4870	+ if (Grafreed.standAlone)
4174	4871	{
4175	4872	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4176	4873	browser.show();
..	..	@@ -4257,11 +4954,13 @@
4257	4954	try
4258	4955	{
4259	4956	FileOutputStream ostream = new FileOutputStream(lastname);
4260		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4957	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4958	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4261	4959
4262	4960	p.writeObject(copy);
4263	4961	p.flush();
4264	4962
	4963	+ zstream.close();
4265	4964	ostream.close();
4266	4965
4267	4966	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4271,17 +4970,20 @@
4271	4970	{
4272	4971	}
4273	4972	}
	4973	+
4274	4974	String lastname;
4275	4975
4276	4976	void saveAs()
4277	4977	{
4278		- if (GrafreeD.standAlone)
	4978	+ if (Grafreed.standAlone)
4279	4979	{
4280	4980	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4281	4981	browser.setVisible(true);
4282	4982	String filename = browser.getFile();
4283	4983	if (filename != null && filename.length() > 0)
4284	4984	{
	4985	+ if (!filename.endsWith(".gfd"))
	4986	+ filename += ".gfd";
4285	4987	lastname = browser.getDirectory() + filename;
4286	4988	save();
4287	4989	}
..	..	@@ -4380,13 +5082,13 @@
4380	5082	try
4381	5083	{
4382	5084	FileOutputStream ostream = new FileOutputStream(filename);
4383		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4384		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5085	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5086	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4385	5087
4386	5088	Object3D objectparent = obj.parent;
4387	5089	obj.parent = null;
4388	5090
4389		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5091	+ Object3D object = (Object3D) Grafreed.clone(obj);
4390	5092
4391	5093	obj.parent = objectparent;
4392	5094
..	..	@@ -4398,8 +5100,8 @@
4398	5100	p.writeObject(object);
4399	5101	p.flush();
4400	5102
	5103	+ zstream.close();
4401	5104	ostream.close();
4402		- // zstream.close();
4403	5105
4404	5106	// group.selection.get(0).parent = parent;
4405	5107	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4420,7 +5122,7 @@
4420	5122	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4421	5123	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4422	5124	copy.generatePOV(buffer);
4423		- if (GrafreeD.standAlone)
	5125	+ if (Grafreed.standAlone)
4424	5126	{
4425	5127	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4426	5128	browser.show();
..	..	@@ -4446,19 +5148,18 @@
4446	5148	Object3D client;
4447	5149	Object3D copy;
4448	5150	MenuBar menuBar;
4449		- Menu windowMenu;
4450		- MenuItem loadItem;
	5151	+ Menu fileMenu;
	5152	+ MenuItem newItem;
	5153	+ MenuItem openItem;
4451	5154	MenuItem saveItem;
4452	5155	MenuItem saveAsItem;
4453	5156	MenuItem exportAsItem;
4454	5157	MenuItem reexportItem;
4455	5158	MenuItem povItem;
4456	5159	MenuItem closeItem;
4457		- Menu cameraMenu;
	5160	+
4458	5161	CheckboxMenuItem zBufferItem;
4459	5162	//MenuItem normalLensItem;
4460		- MenuItem editCameraItem;
4461		- MenuItem revertCameraItem;
4462	5163	MenuItem stepItem;
4463	5164	CheckboxMenuItem toggleLiveItem;
4464	5165	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4472,22 +5173,36 @@
4472	5173	CheckboxMenuItem toggleSwitchItem;
4473	5174	CheckboxMenuItem toggleRootItem;
4474	5175	CheckboxMenuItem animationItem;
	5176	+ MenuItem archiveItem;
4475	5177	CheckboxMenuItem toggleHandleItem;
4476	5178	CheckboxMenuItem togglePaintItem;
4477	5179	JSplitPane mainPanel;
4478	5180	JScrollPane scrollpane;
	5181	+
4479	5182	JPanel toolbarPanel;
	5183	+
4480	5184	cGridBag treePanel;
	5185	+
4481	5186	JPanel radioPanel;
4482	5187	ButtonGroup buttonGroup;
4483		- cGridBag ctrlPanel;
	5188	+
	5189	+ cGridBag toolboxPanel;
4484	5190	cGridBag materialPanel;
	5191	+ cGridBag ctrlPanel;
	5192	+
4485	5193	JScrollPane infoPanel;
	5194	+
4486	5195	cGridBag optionsPanel;
	5196	+
4487	5197	JTabbedPane objectPanel;
	5198	+ boolean materialFlushed;
	5199	+ Object3D latestObject;
	5200	+
4488	5201	cGridBag XYZPanel;
	5202	+
4489	5203	JSplitPane gridPanel;
4490	5204	JSplitPane bigPanel;
	5205	+
4491	5206	cGridBag bigThree;
4492	5207	cGridBag scenePanel;
4493	5208	cGridBag centralPanel;
..	..	@@ -4602,8 +5317,13 @@
4602	5317	cNumberSlider fogField;
4603	5318	JLabel opacityPowerLabel;
4604	5319	cNumberSlider opacityPowerField;
4605		- JTree jTree;
	5320	+ cTree jTree;
4606	5321	//ObjectUI parent;
4607	5322
4608	5323	cNumberSlider normalpushField;
	5324	+
	5325	+ private MenuItem importGFDItem;
	5326	+ private MenuItem importVRMLX3DItem;
	5327	+ private MenuItem import3DSItem;
	5328	+ private MenuItem importOBJItem;
4609	5329	}