~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,70 +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		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
313		- toggleTimelineItem.addItemListener(this);
314		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
315		- toggleFullScreenItem.addItemListener(this);
316		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
317		- cameraMenu.add("-");
318		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
319		- toggleTextureItem.addItemListener(this);
320		- toggleTextureItem.setState(CameraPane.textureon);
321		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
322		- toggleLiveItem.addItemListener(this);
323		- toggleLiveItem.setState(Globals.isLIVE());
324		- cameraMenu.add(stepItem = new MenuItem("Step"));
325		- stepItem.addActionListener(this);
326		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
327		-// toggleDLItem.addItemListener(this);
328		-// toggleDLItem.setState(false);
329		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
330		- toggleRenderItem.addItemListener(this);
331		- toggleRenderItem.setState(!CameraPane.frozen);
332		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
333		- toggleDebugItem.addItemListener(this);
334		- toggleDebugItem.setState(CameraPane.DEBUG);
335		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
336		- toggleFrustumItem.addItemListener(this);
337		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
338		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
339		- toggleFootContactItem.addItemListener(this);
340		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
341		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
342		- toggleRandomItem.addItemListener(this);
343		- toggleRandomItem.setState(CameraPane.RANDOM);
344		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
345		- toggleHandleItem.addItemListener(this);
346		- toggleHandleItem.setState(CameraPane.HANDLES);
347		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
348		- togglePaintItem.addItemListener(this);
349		- togglePaintItem.setState(CameraPane.PAINTMODE);
350		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
351		-// toggleRootItem.addItemListener(this);
352		-// toggleRootItem.setState(false);
353		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
354		-// animationItem.addItemListener(this);
355		-// animationItem.setState(CameraPane.ANIMATION);
356		- cameraMenu.add("-");
357		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
358		- editCameraItem.addActionListener(this);
359		-
360	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	+
361	420	toolbarPanel = new JPanel();
362	421	toolbarPanel.setName("Toolbar");
363	422	treePanel = new cGridBag();
364	423	treePanel.setName("Tree");
	424	+
	425	+ editPanel = new cGridBag().setVertical(true);
	426	+ editPanel.setName("Edit");
	427	+
365	428	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
366		- 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	+
367	437	materialPanel = new cGridBag().setVertical(true);
368	438	materialPanel.setName("Material");
	439	+
369	440	/JTextPane/
370	441	infoarea = createTextPane();
371	442	doc = infoarea.getStyledDocument();
..	..	@@ -378,7 +449,7 @@
378	449	// TEXTAREA infoarea.setLineWrap(true);
379	450	// TEXTAREA infoarea.setWrapStyleWord(true);
380	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
381		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ infoPanel.setPreferredSize(new Dimension(1, 1));
382	453	infoPanel.setName("Info");
383	454	//infoPanel.setLayout(new BorderLayout());
384	455	//infoPanel.add(createTextPane());
..	..	@@ -390,7 +461,14 @@
390	461	mainPanel.setDividerSize(9);
391	462	mainPanel.setDividerLocation(0.5); //1.0);
392	463	mainPanel.setResizeWeight(0.5);
393		-
	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	+
394	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
395	473	//mainPanel.setLayout(new GridBagLayout());
396	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -458,10 +536,10 @@
458	536	e.printStackTrace();
459	537	}
460	538
461		- String selection = infoarea.getText();
462		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
463		- java.awt.datatransfer.Clipboard clipboard =
464		- 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();
465	543	//clipboard.setContents(data, data);
466	544	}
467	545
..	..	@@ -484,13 +562,13 @@
484	562	//SendInfo("Name:", "bold");
485	563	if (sel.GetTextures() != null \|\| debug)
486	564	{
487		- si.SendInfo(sel.toString(), "bold");
	565	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
488	566	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
489	567	if (sel.Size() > 0)
490	568	{
491	569	si.SendInfo("#children = " + sel.Size(), "regular");
492	570	}
493		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	571	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
494	572	if (debug)
495	573	{
496	574	try
..	..	@@ -532,7 +610,7 @@
532	610	}
533	611	if (sel.support != null)
534	612	{
535		- si.SendInfo(" support: " + sel.support, "regular");
	613	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
536	614	}
537	615	if (sel.scriptnode != null)
538	616	{
..	..	@@ -621,20 +699,121 @@
621	699	}
622	700	}
623	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	+
624	760	void ToggleFullScreen()
625	761	{
626		- if (CameraPane.FULLSCREEN)
	762	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	763	+
	764	+ cameraView.ToggleFullScreen();
	765	+
	766	+ if (!CameraPane.FULLSCREEN)
627	767	{
628		- frame.getContentPane().remove(/"Center",/bigThree);
629		- framePanel.add(bigThree);
630		- 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	+
631	791	} else
632	792	{
633		- frame.getContentPane().remove(/"Center",/framePanel);
634		- framePanel.remove(bigThree);
635		- 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);
636	815	}
637		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
638	817	}
639	818
640	819	private JTextPane createTextPane()
..	..	@@ -735,7 +914,7 @@
735	914	protected static ImageIcon createImageIcon(String path,
736	915	String description)
737	916	{
738		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	917	+ java.net.URL imgURL = Grafreed.class.getResource(path);
739	918	if (imgURL != null)
740	919	{
741	920	return new ImageIcon(imgURL, description);
..	..	@@ -767,6 +946,7 @@
767	946	// NumberSlider vDivsField;
768	947	// JCheckBox endcaps;
769	948	JCheckBox liveCB;
	949	+ JCheckBox selectCB;
770	950	JCheckBox hideCB;
771	951	JCheckBox link2masterCB;
772	952	JCheckBox markCB;
..	..	@@ -774,7 +954,12 @@
774	954	JCheckBox speedupCB;
775	955	JCheckBox rewindCB;
776	956	JCheckBox flipVCB;
	957	+
	958	+ cCheckBox toggleTextureCB;
	959	+ cCheckBox toggleSwitchCB;
	960	+
777	961	JComboBox texresMenu;
	962	+
778	963	JButton resetButton;
779	964	JButton stepButton;
780	965	JButton stepAllButton;
..	..	@@ -783,9 +968,13 @@
783	968	JButton fasterButton;
784	969	JButton remarkButton;
785	970
	971	+ cGridBag editPanel;
	972	+ cGridBag editCommandsPanel;
	973	+
786	974	cGridBag namePanel;
787	975	cGridBag setupPanel;
788		- cGridBag commandsPanel;
	976	+ cGridBag setupPanel2;
	977	+ cGridBag objectCommandsPanel;
789	978	cGridBag pushPanel;
790	979	cGridBag fillPanel;
791	980
..	..	@@ -957,61 +1146,67 @@
957	1146	namePanel = new cGridBag();
958	1147
959	1148	nameField = AddText(namePanel, copy.GetName());
960		- namePanel.add(nameField);
	1149	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
961	1150	oe.ctrlPanel.add(namePanel);
962	1151
963	1152	oe.ctrlPanel.Return();
964	1153
965		- if (!GroupEditor.allparams)
	1154	+ if (!allparams)
966	1155	return;
967	1156
968	1157	setupPanel = new cGridBag().setVertical(false);
969	1158
970	1159	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
971	1160	liveCB.setToolTipText("Animate object");
	1161	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1162	+ selectCB.setToolTipText("Make object selectable");
	1163	+// Return();
972	1164	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
973	1165	hideCB.setToolTipText("Hide object");
974		-// Return();
975	1166	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
976		- markCB.setToolTipText("Set the animation target transform");
	1167	+ markCB.setToolTipText("As animation target transform");
977	1168
978		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1169	+ setupPanel2 = new cGridBag().setVertical(false);
	1170	+
	1171	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
979	1172	rewindCB.setToolTipText("Rewind animation");
980	1173
981		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
982		- randomCB.setToolTipText("Option for switch node");
	1174	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1175	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
983	1176
984	1177	if (Globals.ADVANCED)
985	1178	{
986		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	1179	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
987	1180	link2masterCB.setToolTipText("Attach to support");
988		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1181	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
989	1182	speedupCB.setToolTipText("Option motion capture");
990	1183	}
991	1184
992	1185	oe.ctrlPanel.add(setupPanel);
993	1186	oe.ctrlPanel.Return();
	1187	+ oe.ctrlPanel.add(setupPanel2);
	1188	+ oe.ctrlPanel.Return();
994	1189
995		- commandsPanel = new cGridBag().setVertical(false);
	1190	+ objectCommandsPanel = new cGridBag().setVertical(false);
996	1191
997		- resetButton = AddButton(commandsPanel, "Reset");
	1192	+ resetButton = AddButton(objectCommandsPanel, "Reset");
998	1193	resetButton.setToolTipText("Jump to frame zero");
999		- stepButton = AddButton(commandsPanel, "Step");
	1194	+ stepButton = AddButton(objectCommandsPanel, "Step");
1000	1195	stepButton.setToolTipText("Step one frame");
1001	1196	// resetAllButton = AddButton(oe, "Reset All");
1002	1197	// stepAllButton = AddButton(oe, "Step All");
1003	1198	// Return();
1004		- slowerButton = AddButton(commandsPanel, "Slow");
	1199	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1005	1200	slowerButton.setToolTipText("Decrease animation speed");
1006		- fasterButton = AddButton(commandsPanel, "Fast");
	1201	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1007	1202	fasterButton.setToolTipText("Increase animation speed");
1008		- remarkButton = AddButton(commandsPanel, "Remark");
	1203	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1009	1204	remarkButton.setToolTipText("Set the current transform as the target");
1010	1205
1011		- oe.ctrlPanel.add(commandsPanel);
	1206	+ oe.ctrlPanel.add(objectCommandsPanel);
1012	1207	oe.ctrlPanel.Return();
1013	1208
1014		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1209	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1015	1210	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1016	1211	//Return();
1017	1212
..	..	@@ -1214,8 +1409,11 @@
1214	1409	//worldPanel.setName("World");
1215	1410	centralPanel = new cGridBag();
1216	1411	centralPanel.preferredWidth = 20;
1217		- timelinePanel = new JPanel(new BorderLayout());
1218		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1412	+
	1413	+ if (Globals.ADVANCED)
	1414	+ {
	1415	+ timelinePanel = new JPanel(new BorderLayout());
	1416	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1219	1417
1220	1418	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1221	1419	cameraPanel.setContinuousLayout(true);
..	..	@@ -1224,7 +1422,10 @@
1224	1422	// cameraPanel.setDividerSize(9);
1225	1423	cameraPanel.setResizeWeight(1.0);
1226	1424
	1425	+ }
	1426	+
1227	1427	centralPanel.add(cameraView);
	1428	+ centralPanel.setFocusable(true);
1228	1429	//frame.setJMenuBar(timelineMenubar);
1229	1430	//centralPanel.add(timelinePanel);
1230	1431
..	..	@@ -1291,8 +1492,12 @@
1291	1492	// north.setName("Edit");
1292	1493	// north.add(ctrlPanel, BorderLayout.NORTH);
1293	1494	// objectPanel.add(north);
1294		- objectPanel.add(ctrlPanel);
1295		- objectPanel.add(infoPanel);
	1495	+ objectPanel.add(editPanel);
	1496	+
	1497	+ //if (Globals.ADVANCED)
	1498	+ objectPanel.add(infoPanel);
	1499	+
	1500	+ objectPanel.add(toolboxPanel);
1296	1501
1297	1502	/*
1298	1503	aConstraints.gridx = 0;
..	..	@@ -1301,7 +1506,7 @@
1301	1506	aConstraints.gridy += 1;
1302	1507	aConstraints.gridwidth = 1;
1303	1508	mainPanel.add(objectPanel, aConstraints);
1304		- */
	1509	+ */
1305	1510
1306	1511	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1307	1512	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1313,14 +1518,12 @@
1313	1518	scrollpane.addMouseWheelListener(this); // Default not fast enough
1314	1519
1315	1520	/JTabbedPane/ scenePanel = new cGridBag();
1316		- scenePanel.preferredWidth = 7;
	1521	+ scenePanel.preferredWidth = 6;
1317	1522
1318	1523	JTabbedPane tabbedPane = new JTabbedPane();
1319	1524	tabbedPane.add(scrollpane);
1320	1525
1321		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1322		-
1323		- optionsPanel = new cGridBag().setVertical(true);
	1526	+ optionsPanel = new cGridBag().setVertical(false);
1324	1527
1325	1528	optionsPanel.setName("Options");
1326	1529
..	..	@@ -1328,6 +1531,8 @@
1328	1531
1329	1532	tabbedPane.add(optionsPanel);
1330	1533
	1534	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1535	+
1331	1536	scenePanel.add(tabbedPane);
1332	1537
1333	1538	/*
..	..	@@ -1400,9 +1605,9 @@
1400	1605	// aConstraints.gridheight = 1;
1401	1606
1402	1607	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1403		- framePanel.setContinuousLayout(true);
1404		- framePanel.setOneTouchExpandable(true);
1405		- framePanel.setDividerLocation(0.8);
	1608	+ framePanel.setContinuousLayout(false);
	1609	+ framePanel.setOneTouchExpandable(false);
	1610	+ //.setDividerLocation(0.8);
1406	1611	//framePanel.setDividerSize(15);
1407	1612	//framePanel.setResizeWeight(0.15);
1408	1613	framePanel.setName("Frame");
..	..	@@ -1419,10 +1624,15 @@
1419	1624
1420	1625	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1421	1626
1422		- frame.setSize(1024, 768);
1423		- frame.show();
1424		-
	1627	+ frame.setSize(1280, 860);
	1628	+
	1629	+ cameraView.requestFocusInWindow();
	1630	+
1425	1631	gridPanel.setDividerLocation(1.0);
	1632	+
	1633	+ frame.validate();
	1634	+
	1635	+ frame.setVisible(true);
1426	1636
1427	1637	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1428	1638	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1459,19 +1669,22 @@
1459	1669
1460	1670	cGridBag editBar = new cGridBag().setVertical(false);
1461	1671
1462		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1672	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1463	1673	createMaterialButton.setToolTipText("Create material");
1464	1674
1465	1675	/*
1466	1676	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1467	1677	*/
1468	1678
1469		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1679	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1470	1680	clearMaterialButton.setToolTipText("Clear material");
1471	1681
1472		- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1473		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1474		- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1682	+ if (Globals.ADVANCED)
	1683	+ {
	1684	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1685	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1686	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1687	+ }
1475	1688
1476	1689	editBar.preferredHeight = 15;
1477	1690
..	..	@@ -1505,24 +1718,6 @@
1505	1718	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1506	1719	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1507	1720	colorSection.add(texture);
1508		-
1509		- cGridBag anisoU = new cGridBag();
1510		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1511		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1512		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1513		- colorSection.add(anisoU);
1514		-
1515		- cGridBag anisoV = new cGridBag();
1516		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1517		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1518		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1519		- colorSection.add(anisoV);
1520		-
1521		- cGridBag shadowbias = new cGridBag();
1522		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1523		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1524		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1525		- colorSection.add(shadowbias);
1526	1721
1527	1722	panel.add(new JSeparator());
1528	1723
..	..	@@ -1574,6 +1769,12 @@
1574	1769	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1575	1770	diffuseSection.add(fakedepth);
1576	1771
	1772	+ cGridBag shadowbias = new cGridBag();
	1773	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1774	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1775	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1776	+ diffuseSection.add(shadowbias);
	1777	+
1577	1778	panel.add(new JSeparator());
1578	1779
1579	1780	panel.add(diffuseSection);
..	..	@@ -1624,6 +1825,18 @@
1624	1825	// aConstraints.gridy += 1;
1625	1826	// aConstraints.gridwidth = 1;
1626	1827
	1828	+ cGridBag anisoU = new cGridBag();
	1829	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1830	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1831	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1832	+ specularSection.add(anisoU);
	1833	+
	1834	+ cGridBag anisoV = new cGridBag();
	1835	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1836	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1837	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1838	+ specularSection.add(anisoV);
	1839	+
1627	1840
1628	1841	panel.add(new JSeparator());
1629	1842
..	..	@@ -1631,35 +1844,35 @@
1631	1844
1632	1845	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1633	1846
1634		- cGridBag globalSection = new cGridBag().setVertical(true);
	1847	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1635	1848
1636	1849	cGridBag camera = new cGridBag();
1637	1850	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1638	1851	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1639	1852	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1640		- globalSection.add(camera);
	1853	+ colorSection.add(camera);
1641	1854
1642	1855	cGridBag ambient = new cGridBag();
1643	1856	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1644	1857	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1645	1858	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1646		- globalSection.add(ambient);
	1859	+ colorSection.add(ambient);
1647	1860
1648	1861	cGridBag backlit = new cGridBag();
1649	1862	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1650	1863	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651	1864	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1652		- globalSection.add(backlit);
	1865	+ colorSection.add(backlit);
1653	1866
1654	1867	cGridBag opacity = new cGridBag();
1655	1868	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1656	1869	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1657	1870	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1658		- globalSection.add(opacity);
	1871	+ colorSection.add(opacity);
1659	1872
1660		- panel.add(new JSeparator());
	1873	+ //panel.add(new JSeparator());
1661	1874
1662		- panel.add(globalSection);
	1875	+ //panel.add(globalSection);
1663	1876
1664	1877	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1665	1878
..	..	@@ -1740,12 +1953,15 @@
1740	1953	opacityPowerField.addChangeListener(this);
1741	1954	/**/
1742	1955
1743		- resetSlidersButton.addActionListener(this);
1744	1956	clearMaterialButton.addActionListener(this);
1745	1957	createMaterialButton.addActionListener(this);
1746		-
1747		- propagateToggle.addItemListener(this);
1748		- multiplyToggle.addItemListener(this);
	1958	+
	1959	+ if (Globals.ADVANCED)
	1960	+ {
	1961	+ resetSlidersButton.addActionListener(this);
	1962	+ propagateToggle.addItemListener(this);
	1963	+ multiplyToggle.addItemListener(this);
	1964	+ }
1749	1965	}
1750	1966
1751	1967	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1763,8 +1979,9 @@
1763	1979	// 3D models
1764	1980	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1765	1981	{
1766		- lastConverter = new com.jmex.model.converters.MaxToJme();
1767		- LoadFile(filename, lastConverter);
	1982	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	1983	+ //LoadFile(filename, lastConverter);
	1984	+ LoadObjFile(filename); // New 3ds loader
1768	1985	continue;
1769	1986	}
1770	1987	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1916,7 +2133,7 @@
1916	2133
1917	2134	//? flashIt = false;
1918	2135	CameraPane pane = (CameraPane) cameraView;
1919		- pane.clickStart(location.x, location.y, 0);
	2136	+ pane.clickStart(location.x, location.y, 0, 0);
1920	2137	pane.clickEnd(location.x, location.y, 0, true);
1921	2138
1922	2139	if (group.selection.size() == 1)
..	..	@@ -1965,6 +2182,7 @@
1965	2182	e2.printStackTrace();
1966	2183	}
1967	2184	}
	2185	+
1968	2186	LoadJMEThread loadThread;
1969	2187
1970	2188	class LoadJMEThread extends Thread
..	..	@@ -2022,6 +2240,7 @@
2022	2240	//LoadFile0(filename, converter);
2023	2241	}
2024	2242	}
	2243	+
2025	2244	LoadOBJThread loadObjThread;
2026	2245
2027	2246	class LoadOBJThread extends Thread
..	..	@@ -2100,19 +2319,19 @@
2100	2319
2101	2320	void LoadObjFile(String fullname)
2102	2321	{
2103		- /*
	2322	+ System.out.println("Loading " + fullname);
	2323	+ /**/
2104	2324	//lastFilename = fullname;
2105	2325	if(loadObjThread == null)
2106	2326	{
2107		- loadObjThread = new LoadOBJThread();
2108		- loadObjThread.start();
	2327	+ loadObjThread = new LoadOBJThread();
	2328	+ loadObjThread.start();
2109	2329	}
2110	2330
2111	2331	loadObjThread.add(fullname);
2112		- */
	2332	+ /**/
2113	2333
2114		- System.out.println("Loading " + fullname);
2115		- makeSomething(new FileObject(fullname, true), true);
	2334	+ //makeSomething(new FileObject(fullname, true), true);
2116	2335	}
2117	2336
2118	2337	void LoadGFDFile(String fullname)
..	..	@@ -2373,11 +2592,11 @@
2373	2592
2374	2593	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2375	2594	{
2376		- if (GrafreeD.standAlone)
	2595	+ if (Grafreed.standAlone)
2377	2596	{
2378	2597	/**/
2379	2598	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2380		- browser.show();
	2599	+ browser.setVisible(true);
2381	2600	String filename = browser.getFile();
2382	2601	if (filename != null && filename.length() > 0)
2383	2602	{
..	..	@@ -2488,6 +2707,7 @@
2488	2707	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2489	2708	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2490	2709	}
	2710	+
2491	2711	//cJME.count++;
2492	2712	//cJME.count %= 12;
2493	2713	if (gc)
..	..	@@ -2671,6 +2891,7 @@
2671	2891	}
2672	2892	}
2673	2893	}
	2894	+
2674	2895	cFileSystemPane FSPane;
2675	2896
2676	2897	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2724,11 +2945,14 @@
2724	2945	}
2725	2946	}
2726	2947	}
	2948	+
2727	2949	freezematerial = false;
2728	2950	}
2729	2951
2730	2952	void SetMaterial(Object3D object)
2731	2953	{
	2954	+ latestObject = object;
	2955	+
2732	2956	cMaterial mat = object.material;
2733	2957
2734	2958	if (mat == null)
..	..	@@ -2737,7 +2961,8 @@
2737	2961	return;
2738	2962	}
2739	2963
2740		- multiplyToggle.setSelected(mat.multiply);
	2964	+ if (multiplyToggle != null)
	2965	+ multiplyToggle.setSelected(mat.multiply);
2741	2966
2742	2967	assert (object.projectedVertices != null);
2743	2968
..	..	@@ -2839,12 +3064,17 @@
2839	3064	// }
2840	3065
2841	3066	/**/
2842		- if (deselect)
	3067	+ if (deselect \|\| child == null)
2843	3068	{
2844	3069	//group.deselectAll();
2845	3070	//freeze = true;
2846	3071	GetTree().clearSelection();
2847	3072	//freeze = false;
	3073	+
	3074	+ if (child == null)
	3075	+ {
	3076	+ return;
	3077	+ }
2848	3078	}
2849	3079
2850	3080	//group.addSelectee(child);
..	..	@@ -2913,7 +3143,7 @@
2913	3143	cameraView.ToggleDL();
2914	3144	cameraView.repaint();
2915	3145	return;
2916		- } else if (event.getSource() == toggleTextureItem)
	3146	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2917	3147	{
2918	3148	cameraView.ToggleTexture();
2919	3149	// june 2013 copy.HardTouch();
..	..	@@ -2952,9 +3182,9 @@
2952	3182	frame.validate();
2953	3183
2954	3184	return;
2955		- } else if (event.getSource() == toggleRandomItem)
	3185	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2956	3186	{
2957		- cameraView.ToggleRandom();
	3187	+ cameraView.ToggleSwitch();
2958	3188	cameraView.repaint();
2959	3189	return;
2960	3190	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2982,6 +3212,10 @@
2982	3212	} else if (event.getSource() == liveCB)
2983	3213	{
2984	3214	copy.live ^= true;
	3215	+ return;
	3216	+ } else if (event.getSource() == selectCB)
	3217	+ {
	3218	+ copy.dontselect ^= true;
2985	3219	return;
2986	3220	} else if (event.getSource() == hideCB)
2987	3221	{
..	..	@@ -3021,8 +3255,9 @@
3021	3255
3022	3256	public void actionPerformed(ActionEvent event)
3023	3257	{
	3258	+ Object source = event.getSource();
3024	3259	// SCRIPT DIALOG
3025		- if (event.getSource() == okbutton)
	3260	+ if (source == okbutton)
3026	3261	{
3027	3262	textpanel.setVisible(false);
3028	3263	textpanel.remove(textarea);
..	..	@@ -3034,7 +3269,7 @@
3034	3269	textarea = null;
3035	3270	textpanel = null;
3036	3271	}
3037		- if (event.getSource() == cancelbutton)
	3272	+ if (source == cancelbutton)
3038	3273	{
3039	3274	textpanel.setVisible(false);
3040	3275	textpanel.remove(textarea);
..	..	@@ -3046,50 +3281,50 @@
3046	3281	//applySelf();
3047	3282	//client.refreshEditWindow();
3048	3283	//refreshContents();
3049		- if (event.getSource() == nameField)
	3284	+ if (source == nameField)
3050	3285	{
3051	3286	//System.out.println("ObjEditor " + event);
3052	3287	applySelf0(true);
3053	3288	//parent.applySelf();
3054	3289	objEditor.refreshContents();
3055		- } else if (event.getSource() == resetButton)
	3290	+ } else if (source == resetButton)
3056	3291	{
3057	3292	CameraPane.fullreset = true;
3058	3293	copy.Reset(); // ResetMeshes();
3059	3294	copy.Touch();
3060	3295	objEditor.refreshContents();
3061		- } else if (event.getSource() == stepItem)
	3296	+ } else if (source == stepItem)
3062	3297	{
3063	3298	//cameraView.ONESTEP = true;
3064	3299	Globals.ONESTEP = true;
3065	3300	cameraView.repaint();
3066	3301	return;
3067		- } else if (event.getSource() == stepButton)
	3302	+ } else if (source == stepButton)
3068	3303	{
3069	3304	copy.Step();
3070	3305	copy.Touch();
3071	3306	objEditor.refreshContents();
3072		- } else if (event.getSource() == slowerButton)
	3307	+ } else if (source == slowerButton)
3073	3308	{
3074	3309	copy.Slower();
3075	3310	copy.Touch();
3076	3311	objEditor.refreshContents();
3077		- } else if (event.getSource() == fasterButton)
	3312	+ } else if (source == fasterButton)
3078	3313	{
3079	3314	copy.Faster();
3080	3315	copy.Touch();
3081	3316	objEditor.refreshContents();
3082		- } else if (event.getSource() == remarkButton)
	3317	+ } else if (source == remarkButton)
3083	3318	{
3084	3319	copy.Remark();
3085	3320	copy.Touch();
3086	3321	objEditor.refreshContents();
3087		- } else if (event.getSource() == stepAllButton)
	3322	+ } else if (source == stepAllButton)
3088	3323	{
3089	3324	copy.StepAll();
3090	3325	copy.Touch();
3091	3326	objEditor.refreshContents();
3092		- } else if (event.getSource() == resetAllButton)
	3327	+ } else if (source == resetAllButton)
3093	3328	{
3094	3329	//CameraPane.fullreset = true;
3095	3330	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3122,53 +3357,79 @@
3122	3357	// Close();
3123	3358	// }
3124	3359	// else
3125		- if (event.getSource() == resetSlidersButton)
	3360	+ if (source == resetSlidersButton)
3126	3361	{
3127	3362	ResetSliders();
3128		- } else if (event.getSource() == clearMaterialButton)
	3363	+ } else if (source == clearMaterialButton)
3129	3364	{
3130	3365	ClearMaterial();
3131		- } else if (event.getSource() == createMaterialButton)
	3366	+ } else if (source == createMaterialButton)
3132	3367	{
3133	3368	CreateMaterial();
3134		- } else if (event.getSource() == clearPanelButton)
	3369	+ } else if (source == clearPanelButton)
3135	3370	{
3136	3371	copy.ClearUI();
3137	3372	refreshContents(true);
3138		- } /*
3139		- }
3140		-
3141		- public boolean action(Event event, Object arg)
3142		- {
3143		- */ else if (event.getSource() == closeItem)
	3373	+ } else if (source == importGFDItem)
	3374	+ {
	3375	+ ImportGFD();
	3376	+ } else
	3377	+ if (source == importVRMLX3DItem)
	3378	+ {
	3379	+ ImportVRMLX3D();
	3380	+ } else
	3381	+ if (source == import3DSItem)
	3382	+ {
	3383	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3384	+ } else
	3385	+ if (source == importOBJItem)
	3386	+ {
	3387	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3388	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3389	+ browser.setVisible(true);
	3390	+ String filename = browser.getFile();
	3391	+ if (filename != null && filename.length() > 0)
	3392	+ {
	3393	+ String fullname = browser.getDirectory() + filename;
	3394	+ makeSomething(ReadOBJ(fullname), true);
	3395	+ }
	3396	+ } else
	3397	+ if (source == closeItem)
3144	3398	{
3145	3399	Close();
3146	3400	//return true;
3147		- } else if (event.getSource() == loadItem)
	3401	+ } else if (source == openItem)
3148	3402	{
3149		- load();
	3403	+ Open();
3150	3404	//return true;
3151		- } else if (event.getSource() == saveItem)
	3405	+ } else if (source == newItem)
	3406	+ {
	3407	+ New();
	3408	+ } else if (source == saveItem)
3152	3409	{
3153	3410	save();
3154	3411	//return true;
3155		- } else if (event.getSource() == saveAsItem)
	3412	+ } else if (source == saveAsItem)
3156	3413	{
3157	3414	saveAs();
3158	3415	//return true;
3159		- } else if (event.getSource() == reexportItem)
	3416	+ } else if (source == reexportItem)
3160	3417	{
3161	3418	reexport();
3162	3419	//return true;
3163		- } else if (event.getSource() == exportAsItem)
	3420	+ } else if (source == exportAsItem)
3164	3421	{
3165	3422	export();
3166	3423	//return true;
3167		- } else if (event.getSource() == povItem)
	3424	+ } else if (source == povItem)
3168	3425	{
3169	3426	generatePOV();
3170	3427	//return true;
3171		- } else if (event.getSource() == zBufferItem)
	3428	+ } else if (event.getSource() == archiveItem)
	3429	+ {
	3430	+ cTools.Archive(frame);
	3431	+ return;
	3432	+ } else if (source == zBufferItem)
3172	3433	{
3173	3434	try
3174	3435	{
..	..	@@ -3190,21 +3451,8 @@
3190	3451	cameraView.repaint();
3191	3452	//return true;
3192	3453	}
3193		- */ else if (event.getSource() == editCameraItem)
3194		- {
3195		- cameraView.ProtectCamera();
3196		- cameraView.repaint();
3197		- return;
3198		- } else if (event.getSource() == revertCameraItem)
3199		- {
3200		- cameraView.RevertCamera();
3201		- cameraView.repaint();
3202		- return;
3203		-// } else if (event.getSource() == textureButton)
3204		-// {
3205		-// return; // true;
3206		- } else // combos...
3207		- if (event.getSource() == texresMenu)
	3454	+ */ else // combos...
	3455	+ if (source == texresMenu)
3208	3456	{
3209	3457	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3210	3458	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3216,6 +3464,332 @@
3216	3464	}
3217	3465	}
3218	3466
	3467	+ void New()
	3468	+ {
	3469	+ while (copy.Size() > 1)
	3470	+ {
	3471	+ copy.remove(1);
	3472	+ }
	3473	+
	3474	+ ResetModel();
	3475	+ objEditor.refreshContents();
	3476	+ }
	3477	+
	3478	+ static public byte[] Compress(Object3D o)
	3479	+ {
	3480	+ try
	3481	+ {
	3482	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3483	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3484	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3485	+
	3486	+ Object3D parent = o.parent;
	3487	+ o.parent = null;
	3488	+
	3489	+ out.writeObject(o);
	3490	+
	3491	+ o.parent = parent;
	3492	+
	3493	+ out.flush();
	3494	+
	3495	+ zstream.close();
	3496	+ out.close();
	3497	+
	3498	+ return baos.toByteArray();
	3499	+ } catch (Exception e)
	3500	+ {
	3501	+ System.err.println(e);
	3502	+ return null;
	3503	+ }
	3504	+ }
	3505	+
	3506	+ static public Object Uncompress(byte[] bytes)
	3507	+ {
	3508	+ System.out.println("#bytes = " + bytes.length);
	3509	+ try
	3510	+ {
	3511	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3512	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3513	+ ObjectInputStream in = new ObjectInputStream(istream);
	3514	+ Object obj = in.readObject();
	3515	+ in.close();
	3516	+
	3517	+ return obj;
	3518	+ } catch (Exception e)
	3519	+ {
	3520	+ System.err.println(e);
	3521	+ return null;
	3522	+ }
	3523	+ }
	3524	+
	3525	+ static public Object clone(Object o)
	3526	+ {
	3527	+ try
	3528	+ {
	3529	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3530	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3531	+
	3532	+ out.writeObject(o);
	3533	+
	3534	+ out.flush();
	3535	+ out.close();
	3536	+
	3537	+ byte[] bytes = baos.toByteArray();
	3538	+
	3539	+ System.out.println("clone = " + bytes.length);
	3540	+
	3541	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3542	+ ObjectInputStream in = new ObjectInputStream(bais);
	3543	+ Object obj = in.readObject();
	3544	+ in.close();
	3545	+
	3546	+ return obj;
	3547	+ } catch (Exception e)
	3548	+ {
	3549	+ System.err.println(e);
	3550	+ return null;
	3551	+ }
	3552	+ }
	3553	+
	3554	+ cRadio GetCurrentTab()
	3555	+ {
	3556	+ cRadio ab;
	3557	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3558	+ {
	3559	+ ab = (cRadio)e.nextElement();
	3560	+ if(ab.GetObject() == copy)
	3561	+ {
	3562	+ return ab;
	3563	+ }
	3564	+ }
	3565	+
	3566	+ return null;
	3567	+ }
	3568	+
	3569	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3570	+
	3571	+ public void Save()
	3572	+ {
	3573	+ // Default reduces the probability of heuristics errors.
	3574	+ Save(true);
	3575	+ }
	3576	+
	3577	+ private boolean Equal(byte[] compress, byte[] name)
	3578	+ {
	3579	+ if (compress.length != name.length)
	3580	+ {
	3581	+ return false;
	3582	+ }
	3583	+
	3584	+ for (int i=compress.length; --i>=0;)
	3585	+ {
	3586	+ if (compress[i] != name[i])
	3587	+ return false;
	3588	+ }
	3589	+
	3590	+ return true;
	3591	+ }
	3592	+
	3593	+ public boolean Save(boolean user)
	3594	+ {
	3595	+ System.err.println("Save");
	3596	+
	3597	+ cRadio tab = GetCurrentTab();
	3598	+
	3599	+ boolean temp = CameraPane.SWITCH;
	3600	+ CameraPane.SWITCH = false;
	3601	+
	3602	+ copy.ExtractBigData(hashtable);
	3603	+
	3604	+ byte[] compress = Compress(copy);
	3605	+
	3606	+ CameraPane.SWITCH = temp;
	3607	+
	3608	+ boolean thesame = false;
	3609	+
	3610	+ // Quick heuristic using length. Works only when stream is compressed.
	3611	+ if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
	3612	+ {
	3613	+ thesame = true;
	3614	+ }
	3615	+
	3616	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3617	+ if (!thesame)
	3618	+ {
	3619	+ tab.user[tab.undoindex] = user;
	3620	+ tab.graphs[tab.undoindex++] = compress;
	3621	+ }
	3622	+
	3623	+ copy.RestoreBigData(hashtable);
	3624	+
	3625	+ //assert(hashtable.isEmpty());
	3626	+
	3627	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3628	+ {
	3629	+ tab.user[i] = false;
	3630	+ tab.graphs[i] = null;
	3631	+ }
	3632	+
	3633	+ SetUndoStates();
	3634	+
	3635	+ // test save
	3636	+ if (false)
	3637	+ {
	3638	+ try
	3639	+ {
	3640	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3641	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3642	+
	3643	+ p.writeObject(copy);
	3644	+
	3645	+ p.flush();
	3646	+
	3647	+ ostream.close();
	3648	+ } catch (Exception e)
	3649	+ {
	3650	+ e.printStackTrace();
	3651	+ }
	3652	+ }
	3653	+
	3654	+ return !thesame;
	3655	+ }
	3656	+
	3657	+ void CopyChanged(Object3D obj)
	3658	+ {
	3659	+ SetUndoStates();
	3660	+
	3661	+ boolean temp = CameraPane.SWITCH;
	3662	+ CameraPane.SWITCH = false;
	3663	+
	3664	+ copy.ExtractBigData(hashtable);
	3665	+
	3666	+ copy.clear();
	3667	+
	3668	+ for (int i=0; i<obj.Size(); i++)
	3669	+ {
	3670	+ copy.add(obj.get(i));
	3671	+ }
	3672	+
	3673	+ copy.RestoreBigData(hashtable);
	3674	+
	3675	+ CameraPane.SWITCH = temp;
	3676	+
	3677	+ //assert(hashtable.isEmpty());
	3678	+
	3679	+ copy.Touch();
	3680	+
	3681	+ ResetModel();
	3682	+ copy.HardTouch(); // recompile?
	3683	+
	3684	+ cRadio ab;
	3685	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3686	+ {
	3687	+ ab = (cRadio)e.nextElement();
	3688	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3689	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3690	+ if (test != null)
	3691	+ {
	3692	+ test.editWindow = ab.object.editWindow;
	3693	+ ab.object = test;
	3694	+ }
	3695	+ }
	3696	+
	3697	+ refreshContents();
	3698	+ }
	3699	+
	3700	+ cButton undoButton;
	3701	+ cButton redoButton;
	3702	+
	3703	+ void SetUndoStates()
	3704	+ {
	3705	+ cRadio tab = GetCurrentTab();
	3706	+
	3707	+ undoButton.setEnabled(tab.undoindex > 0);
	3708	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3709	+ }
	3710	+
	3711	+ public boolean Undo()
	3712	+ {
	3713	+ System.err.println("Undo");
	3714	+
	3715	+ cRadio tab = GetCurrentTab();
	3716	+
	3717	+ if (tab.undoindex == 0)
	3718	+ {
	3719	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3720	+ return false;
	3721	+ }
	3722	+
	3723	+ if (tab.graphs[tab.undoindex] == null \|\| !tab.user[tab.undoindex])
	3724	+ {
	3725	+ if (Save(false))
	3726	+ tab.undoindex -= 1;
	3727	+ else
	3728	+ {
	3729	+ if (tab.undoindex <= 0)
	3730	+ return false;
	3731	+ else
	3732	+ tab.undoindex -= 1;
	3733	+ }
	3734	+ }
	3735	+
	3736	+ tab.undoindex -= 1;
	3737	+
	3738	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3739	+
	3740	+ return true;
	3741	+ }
	3742	+
	3743	+ public void Redo()
	3744	+ {
	3745	+ cRadio tab = GetCurrentTab();
	3746	+
	3747	+ if (tab.graphs[tab.undoindex + 1] == null)
	3748	+ {
	3749	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3750	+ return;
	3751	+ }
	3752	+
	3753	+ tab.undoindex += 1;
	3754	+
	3755	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3756	+
	3757	+ if (!tab.user[tab.undoindex])
	3758	+ tab.graphs[tab.undoindex] = null;
	3759	+ }
	3760	+
	3761	+ void ImportGFD()
	3762	+ {
	3763	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3764	+ browser.show();
	3765	+ String filename = browser.getFile();
	3766	+ if (filename != null && filename.length() > 0)
	3767	+ {
	3768	+ String fullname = browser.getDirectory() + filename;
	3769	+
	3770	+ //Object3D readobj =
	3771	+ objEditor.ReadGFD(fullname, objEditor);
	3772	+ //makeSomething(readobj);
	3773	+ }
	3774	+ }
	3775	+
	3776	+ void ImportVRMLX3D()
	3777	+ {
	3778	+ if (Grafreed.standAlone)
	3779	+ {
	3780	+ /**/
	3781	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3782	+ browser.show();
	3783	+ String filename = browser.getFile();
	3784	+ if (filename != null && filename.length() > 0)
	3785	+ {
	3786	+ String fullname = browser.getDirectory() + filename;
	3787	+ LoadVRMLX3D(fullname);
	3788	+ }
	3789	+ /**/
	3790	+ }
	3791	+ }
	3792	+
3219	3793	void ToggleAnimation()
3220	3794	{
3221	3795	if (!Globals.ANIMATION)
..	..	@@ -3231,8 +3805,8 @@
3231	3805
3232	3806	Globals.ANIMATION ^= true;
3233	3807
3234		- GrafreeD.wav.cursor = 0;
3235		- GrafreeD.wav.loop = 0;
	3808	+ Grafreed.wav.cursor = 0;
	3809	+ Grafreed.wav.loop = 0;
3236	3810	}
3237	3811	} else
3238	3812	{
..	..	@@ -3253,7 +3827,6 @@
3253	3827	callee.refreshContents();
3254	3828	} else
3255	3829	{
3256		- new Exception().printStackTrace();
3257	3830	System.exit(0);
3258	3831	}
3259	3832	}
..	..	@@ -3283,7 +3856,7 @@
3283	3856	void CreateMaterial()
3284	3857	{
3285	3858	//copy.ClearMaterial(); // PATCH
3286		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3859	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3287	3860	if (copy.selection.size() > 0)
3288	3861	//SetMaterial(copy);
3289	3862	{
..	..	@@ -3334,7 +3907,7 @@
3334	3907	assert false;
3335	3908	}
3336	3909
3337		- void EditSelection()
	3910	+ void EditSelection(boolean newWindow)
3338	3911	{
3339	3912	}
3340	3913
..	..	@@ -3342,11 +3915,11 @@
3342	3915	{
3343	3916	copy.ResetBlockLoop(); // temporary problem
3344	3917
3345		- boolean random = CameraPane.RANDOM;
3346		- CameraPane.RANDOM = false; // parse everything
	3918	+ boolean random = CameraPane.SWITCH;
	3919	+ CameraPane.SWITCH = false; // parse everything
3347	3920	copy.ResetDisplayList();
3348	3921	copy.HardTouch();
3349		- CameraPane.RANDOM = random;
	3922	+ CameraPane.SWITCH = random;
3350	3923	}
3351	3924
3352	3925	// public void applySelf()
..	..	@@ -3420,6 +3993,36 @@
3420	3993	{
3421	3994	//System.out.println("Propagate = " + propagate);
3422	3995	copy.UpdateMaterial(anchor, current, propagate);
	3996	+
	3997	+ if (copy.material != null)
	3998	+ {
	3999	+ cMaterial mat = copy.material;
	4000	+
	4001	+ colorField.SetToolTipValue((mat.color));
	4002	+ modulationField.SetToolTipValue((mat.modulation));
	4003	+ metalnessField.SetToolTipValue((mat.metalness));
	4004	+ diffuseField.SetToolTipValue((mat.diffuse));
	4005	+ specularField.SetToolTipValue((mat.specular));
	4006	+ shininessField.SetToolTipValue((mat.shininess));
	4007	+ shiftField.SetToolTipValue((mat.shift));
	4008	+ ambientField.SetToolTipValue((mat.ambient));
	4009	+ lightareaField.SetToolTipValue((mat.lightarea));
	4010	+ diffusenessField.SetToolTipValue((mat.factor));
	4011	+ velvetField.SetToolTipValue((mat.velvet));
	4012	+ sheenField.SetToolTipValue((mat.sheen));
	4013	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4014	+ backlitField.SetToolTipValue((mat.bump));
	4015	+ anisoField.SetToolTipValue((mat.aniso));
	4016	+ anisoVField.SetToolTipValue((mat.anisoV));
	4017	+ cameraField.SetToolTipValue((mat.cameralight));
	4018	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4019	+ shadowField.SetToolTipValue((mat.shadow));
	4020	+ textureField.SetToolTipValue((mat.texture));
	4021	+ opacityField.SetToolTipValue((mat.opacity));
	4022	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4023	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4024	+ }
	4025	+
3423	4026	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3424	4027	{
3425	4028	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3535,7 +4138,7 @@
3535	4138	}
3536	4139
3537	4140	if (normalpushField != null)
3538		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4141	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3539	4142	}
3540	4143
3541	4144	void SnapObject()
..	..	@@ -3799,6 +4402,8 @@
3799	4402
3800	4403	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3801	4404	{
	4405	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4406	+ Save();
3802	4407	//Tween.set(thing, 0).target(1).start(tweenManager);
3803	4408	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3804	4409	// if (thing instanceof GenericJointDemo)
..	..	@@ -3885,6 +4490,12 @@
3885	4490	{
3886	4491	ResetModel();
3887	4492	Select(thing.GetTreePath(), true, false); // unselect... false);
	4493	+
	4494	+ if (thing.Size() == 0)
	4495	+ {
	4496	+ //EditSelection(false);
	4497	+ }
	4498	+
3888	4499	refreshContents();
3889	4500	}
3890	4501
..	..	@@ -4002,6 +4613,7 @@
4002	4613	}
4003	4614	}
4004	4615	}
	4616	+
4005	4617	LoadGFDThread loadGFDThread;
4006	4618
4007	4619	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4021,8 +4633,10 @@
4021	4633
4022	4634	try
4023	4635	{
	4636	+ // Try compressed version first.
4024	4637	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4025		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4638	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4639	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4026	4640
4027	4641	readobj = (Object3D) p.readObject();
4028	4642	istream.close();
..	..	@@ -4030,7 +4644,20 @@
4030	4644	readobj.ResetDisplayList();
4031	4645	} catch (Exception e)
4032	4646	{
4033		- e.printStackTrace();
	4647	+ //e.printStackTrace();
	4648	+ try
	4649	+ {
	4650	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4651	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4652	+
	4653	+ readobj = (Object3D) p.readObject();
	4654	+ istream.close();
	4655	+
	4656	+ readobj.ResetDisplayList();
	4657	+ } catch (Exception e2)
	4658	+ {
	4659	+ e2.printStackTrace();
	4660	+ }
4034	4661	}
4035	4662	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4036	4663	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4076,6 +4703,12 @@
4076	4703
4077	4704	void LoadIt(Object obj)
4078	4705	{
	4706	+ if (obj == null)
	4707	+ {
	4708	+ // Invalid file
	4709	+ return;
	4710	+ }
	4711	+
4079	4712	System.out.println("Loaded " + obj);
4080	4713	//new Exception().printStackTrace();
4081	4714	Object3D readobj = (Object3D) obj;
..	..	@@ -4085,6 +4718,8 @@
4085	4718
4086	4719	if (readobj != null)
4087	4720	{
	4721	+ if (Globals.SAVEONMAKE)
	4722	+ Save();
4088	4723	try
4089	4724	{
4090	4725	//readobj.deepCopySelf(copy);
..	..	@@ -4145,9 +4780,9 @@
4145	4780	}
4146	4781	}
4147	4782
4148		- void load() // throws ClassNotFoundException
	4783	+ void Open() // throws ClassNotFoundException
4149	4784	{
4150		- if (GrafreeD.standAlone)
	4785	+ if (Grafreed.standAlone)
4151	4786	{
4152	4787	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4153	4788	browser.show();
..	..	@@ -4234,11 +4869,13 @@
4234	4869	try
4235	4870	{
4236	4871	FileOutputStream ostream = new FileOutputStream(lastname);
4237		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4872	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4873	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4238	4874
4239	4875	p.writeObject(copy);
4240	4876	p.flush();
4241	4877
	4878	+ zstream.close();
4242	4879	ostream.close();
4243	4880
4244	4881	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4248,17 +4885,20 @@
4248	4885	{
4249	4886	}
4250	4887	}
	4888	+
4251	4889	String lastname;
4252	4890
4253	4891	void saveAs()
4254	4892	{
4255		- if (GrafreeD.standAlone)
	4893	+ if (Grafreed.standAlone)
4256	4894	{
4257	4895	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4258	4896	browser.setVisible(true);
4259	4897	String filename = browser.getFile();
4260	4898	if (filename != null && filename.length() > 0)
4261	4899	{
	4900	+ if (!filename.endsWith(".gfd"))
	4901	+ filename += ".gfd";
4262	4902	lastname = browser.getDirectory() + filename;
4263	4903	save();
4264	4904	}
..	..	@@ -4357,13 +4997,13 @@
4357	4997	try
4358	4998	{
4359	4999	FileOutputStream ostream = new FileOutputStream(filename);
4360		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4361		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5000	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5001	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4362	5002
4363	5003	Object3D objectparent = obj.parent;
4364	5004	obj.parent = null;
4365	5005
4366		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5006	+ Object3D object = (Object3D) Grafreed.clone(obj);
4367	5007
4368	5008	obj.parent = objectparent;
4369	5009
..	..	@@ -4375,8 +5015,8 @@
4375	5015	p.writeObject(object);
4376	5016	p.flush();
4377	5017
	5018	+ zstream.close();
4378	5019	ostream.close();
4379		- // zstream.close();
4380	5020
4381	5021	// group.selection.get(0).parent = parent;
4382	5022	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4397,7 +5037,7 @@
4397	5037	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4398	5038	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4399	5039	copy.generatePOV(buffer);
4400		- if (GrafreeD.standAlone)
	5040	+ if (Grafreed.standAlone)
4401	5041	{
4402	5042	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4403	5043	browser.show();
..	..	@@ -4423,19 +5063,18 @@
4423	5063	Object3D client;
4424	5064	Object3D copy;
4425	5065	MenuBar menuBar;
4426		- Menu windowMenu;
4427		- MenuItem loadItem;
	5066	+ Menu fileMenu;
	5067	+ MenuItem newItem;
	5068	+ MenuItem openItem;
4428	5069	MenuItem saveItem;
4429	5070	MenuItem saveAsItem;
4430	5071	MenuItem exportAsItem;
4431	5072	MenuItem reexportItem;
4432	5073	MenuItem povItem;
4433	5074	MenuItem closeItem;
4434		- Menu cameraMenu;
	5075	+
4435	5076	CheckboxMenuItem zBufferItem;
4436	5077	//MenuItem normalLensItem;
4437		- MenuItem editCameraItem;
4438		- MenuItem revertCameraItem;
4439	5078	MenuItem stepItem;
4440	5079	CheckboxMenuItem toggleLiveItem;
4441	5080	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4446,25 +5085,39 @@
4446	5085	CheckboxMenuItem toggleFootContactItem;
4447	5086	CheckboxMenuItem toggleDLItem;
4448	5087	CheckboxMenuItem toggleTextureItem;
4449		- CheckboxMenuItem toggleRandomItem;
	5088	+ CheckboxMenuItem toggleSwitchItem;
4450	5089	CheckboxMenuItem toggleRootItem;
4451	5090	CheckboxMenuItem animationItem;
	5091	+ MenuItem archiveItem;
4452	5092	CheckboxMenuItem toggleHandleItem;
4453	5093	CheckboxMenuItem togglePaintItem;
4454	5094	JSplitPane mainPanel;
4455	5095	JScrollPane scrollpane;
	5096	+
4456	5097	JPanel toolbarPanel;
	5098	+
4457	5099	cGridBag treePanel;
	5100	+
4458	5101	JPanel radioPanel;
4459	5102	ButtonGroup buttonGroup;
4460		- cGridBag ctrlPanel;
	5103	+
	5104	+ cGridBag toolboxPanel;
4461	5105	cGridBag materialPanel;
	5106	+ cGridBag ctrlPanel;
	5107	+
4462	5108	JScrollPane infoPanel;
	5109	+
4463	5110	cGridBag optionsPanel;
	5111	+
4464	5112	JTabbedPane objectPanel;
	5113	+ boolean materialFlushed;
	5114	+ Object3D latestObject;
	5115	+
4465	5116	cGridBag XYZPanel;
	5117	+
4466	5118	JSplitPane gridPanel;
4467	5119	JSplitPane bigPanel;
	5120	+
4468	5121	cGridBag bigThree;
4469	5122	cGridBag scenePanel;
4470	5123	cGridBag centralPanel;
..	..	@@ -4579,8 +5232,13 @@
4579	5232	cNumberSlider fogField;
4580	5233	JLabel opacityPowerLabel;
4581	5234	cNumberSlider opacityPowerField;
4582		- JTree jTree;
	5235	+ cTree jTree;
4583	5236	//ObjectUI parent;
4584	5237
4585	5238	cNumberSlider normalpushField;
	5239	+
	5240	+ private MenuItem importGFDItem;
	5241	+ private MenuItem importVRMLX3DItem;
	5242	+ private MenuItem import3DSItem;
	5243	+ private MenuItem importOBJItem;
4586	5244	}