~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,68 @@
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
	1177	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1178	+ link2masterCB.setToolTipText("Attach to support");
	1179	+
984	1180	if (Globals.ADVANCED)
985	1181	{
986		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
987		- link2masterCB.setToolTipText("Attach to support");
988		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1182	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
989	1183	speedupCB.setToolTipText("Option motion capture");
990	1184	}
991	1185
992	1186	oe.ctrlPanel.add(setupPanel);
993	1187	oe.ctrlPanel.Return();
	1188	+ oe.ctrlPanel.add(setupPanel2);
	1189	+ oe.ctrlPanel.Return();
994	1190
995		- commandsPanel = new cGridBag().setVertical(false);
	1191	+ objectCommandsPanel = new cGridBag().setVertical(false);
996	1192
997		- resetButton = AddButton(commandsPanel, "Reset");
	1193	+ resetButton = AddButton(objectCommandsPanel, "Reset");
998	1194	resetButton.setToolTipText("Jump to frame zero");
999		- stepButton = AddButton(commandsPanel, "Step");
	1195	+ stepButton = AddButton(objectCommandsPanel, "Step");
1000	1196	stepButton.setToolTipText("Step one frame");
1001	1197	// resetAllButton = AddButton(oe, "Reset All");
1002	1198	// stepAllButton = AddButton(oe, "Step All");
1003	1199	// Return();
1004		- slowerButton = AddButton(commandsPanel, "Slow");
	1200	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1005	1201	slowerButton.setToolTipText("Decrease animation speed");
1006		- fasterButton = AddButton(commandsPanel, "Fast");
	1202	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1007	1203	fasterButton.setToolTipText("Increase animation speed");
1008		- remarkButton = AddButton(commandsPanel, "Remark");
	1204	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1009	1205	remarkButton.setToolTipText("Set the current transform as the target");
1010	1206
1011		- oe.ctrlPanel.add(commandsPanel);
	1207	+ oe.ctrlPanel.add(objectCommandsPanel);
1012	1208	oe.ctrlPanel.Return();
1013	1209
1014		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1210	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1015	1211	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1016	1212	//Return();
1017	1213
..	..	@@ -1214,8 +1410,11 @@
1214	1410	//worldPanel.setName("World");
1215	1411	centralPanel = new cGridBag();
1216	1412	centralPanel.preferredWidth = 20;
1217		- timelinePanel = new JPanel(new BorderLayout());
1218		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1413	+
	1414	+ if (Globals.ADVANCED)
	1415	+ {
	1416	+ timelinePanel = new JPanel(new BorderLayout());
	1417	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1219	1418
1220	1419	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1221	1420	cameraPanel.setContinuousLayout(true);
..	..	@@ -1224,7 +1423,10 @@
1224	1423	// cameraPanel.setDividerSize(9);
1225	1424	cameraPanel.setResizeWeight(1.0);
1226	1425
	1426	+ }
	1427	+
1227	1428	centralPanel.add(cameraView);
	1429	+ centralPanel.setFocusable(true);
1228	1430	//frame.setJMenuBar(timelineMenubar);
1229	1431	//centralPanel.add(timelinePanel);
1230	1432
..	..	@@ -1291,8 +1493,12 @@
1291	1493	// north.setName("Edit");
1292	1494	// north.add(ctrlPanel, BorderLayout.NORTH);
1293	1495	// objectPanel.add(north);
1294		- objectPanel.add(ctrlPanel);
1295		- objectPanel.add(infoPanel);
	1496	+ objectPanel.add(editPanel);
	1497	+
	1498	+ //if (Globals.ADVANCED)
	1499	+ objectPanel.add(infoPanel);
	1500	+
	1501	+ objectPanel.add(toolboxPanel);
1296	1502
1297	1503	/*
1298	1504	aConstraints.gridx = 0;
..	..	@@ -1301,7 +1507,7 @@
1301	1507	aConstraints.gridy += 1;
1302	1508	aConstraints.gridwidth = 1;
1303	1509	mainPanel.add(objectPanel, aConstraints);
1304		- */
	1510	+ */
1305	1511
1306	1512	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1307	1513	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1313,14 +1519,12 @@
1313	1519	scrollpane.addMouseWheelListener(this); // Default not fast enough
1314	1520
1315	1521	/JTabbedPane/ scenePanel = new cGridBag();
1316		- scenePanel.preferredWidth = 7;
	1522	+ scenePanel.preferredWidth = 6;
1317	1523
1318	1524	JTabbedPane tabbedPane = new JTabbedPane();
1319	1525	tabbedPane.add(scrollpane);
1320	1526
1321		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1322		-
1323		- optionsPanel = new cGridBag().setVertical(true);
	1527	+ optionsPanel = new cGridBag().setVertical(false);
1324	1528
1325	1529	optionsPanel.setName("Options");
1326	1530
..	..	@@ -1328,6 +1532,8 @@
1328	1532
1329	1533	tabbedPane.add(optionsPanel);
1330	1534
	1535	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1536	+
1331	1537	scenePanel.add(tabbedPane);
1332	1538
1333	1539	/*
..	..	@@ -1400,9 +1606,9 @@
1400	1606	// aConstraints.gridheight = 1;
1401	1607
1402	1608	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1403		- framePanel.setContinuousLayout(true);
1404		- framePanel.setOneTouchExpandable(true);
1405		- framePanel.setDividerLocation(0.8);
	1609	+ framePanel.setContinuousLayout(false);
	1610	+ framePanel.setOneTouchExpandable(false);
	1611	+ //.setDividerLocation(0.8);
1406	1612	//framePanel.setDividerSize(15);
1407	1613	//framePanel.setResizeWeight(0.15);
1408	1614	framePanel.setName("Frame");
..	..	@@ -1419,10 +1625,15 @@
1419	1625
1420	1626	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1421	1627
1422		- frame.setSize(1024, 768);
1423		- frame.show();
1424		-
	1628	+ frame.setSize(1280, 860);
	1629	+
	1630	+ cameraView.requestFocusInWindow();
	1631	+
1425	1632	gridPanel.setDividerLocation(1.0);
	1633	+
	1634	+ frame.validate();
	1635	+
	1636	+ frame.setVisible(true);
1426	1637
1427	1638	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1428	1639	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1459,19 +1670,22 @@
1459	1670
1460	1671	cGridBag editBar = new cGridBag().setVertical(false);
1461	1672
1462		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1673	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1463	1674	createMaterialButton.setToolTipText("Create material");
1464	1675
1465	1676	/*
1466	1677	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1467	1678	*/
1468	1679
1469		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1680	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1470	1681	clearMaterialButton.setToolTipText("Clear material");
1471	1682
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);
	1683	+ if (Globals.ADVANCED)
	1684	+ {
	1685	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1686	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1687	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1688	+ }
1475	1689
1476	1690	editBar.preferredHeight = 15;
1477	1691
..	..	@@ -1505,24 +1719,6 @@
1505	1719	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1506	1720	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1507	1721	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	1722
1527	1723	panel.add(new JSeparator());
1528	1724
..	..	@@ -1574,6 +1770,12 @@
1574	1770	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1575	1771	diffuseSection.add(fakedepth);
1576	1772
	1773	+ cGridBag shadowbias = new cGridBag();
	1774	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1775	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1776	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1777	+ diffuseSection.add(shadowbias);
	1778	+
1577	1779	panel.add(new JSeparator());
1578	1780
1579	1781	panel.add(diffuseSection);
..	..	@@ -1624,6 +1826,18 @@
1624	1826	// aConstraints.gridy += 1;
1625	1827	// aConstraints.gridwidth = 1;
1626	1828
	1829	+ cGridBag anisoU = new cGridBag();
	1830	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1831	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1832	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1833	+ specularSection.add(anisoU);
	1834	+
	1835	+ cGridBag anisoV = new cGridBag();
	1836	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1837	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1838	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1839	+ specularSection.add(anisoV);
	1840	+
1627	1841
1628	1842	panel.add(new JSeparator());
1629	1843
..	..	@@ -1631,35 +1845,35 @@
1631	1845
1632	1846	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1633	1847
1634		- cGridBag globalSection = new cGridBag().setVertical(true);
	1848	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1635	1849
1636	1850	cGridBag camera = new cGridBag();
1637	1851	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1638	1852	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1639	1853	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1640		- globalSection.add(camera);
	1854	+ colorSection.add(camera);
1641	1855
1642	1856	cGridBag ambient = new cGridBag();
1643	1857	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1644	1858	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1645	1859	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1646		- globalSection.add(ambient);
	1860	+ colorSection.add(ambient);
1647	1861
1648	1862	cGridBag backlit = new cGridBag();
1649	1863	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1650	1864	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651	1865	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1652		- globalSection.add(backlit);
	1866	+ colorSection.add(backlit);
1653	1867
1654	1868	cGridBag opacity = new cGridBag();
1655	1869	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1656	1870	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1657	1871	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1658		- globalSection.add(opacity);
	1872	+ colorSection.add(opacity);
1659	1873
1660		- panel.add(new JSeparator());
	1874	+ //panel.add(new JSeparator());
1661	1875
1662		- panel.add(globalSection);
	1876	+ //panel.add(globalSection);
1663	1877
1664	1878	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1665	1879
..	..	@@ -1740,12 +1954,15 @@
1740	1954	opacityPowerField.addChangeListener(this);
1741	1955	/**/
1742	1956
1743		- resetSlidersButton.addActionListener(this);
1744	1957	clearMaterialButton.addActionListener(this);
1745	1958	createMaterialButton.addActionListener(this);
1746		-
1747		- propagateToggle.addItemListener(this);
1748		- multiplyToggle.addItemListener(this);
	1959	+
	1960	+ if (Globals.ADVANCED)
	1961	+ {
	1962	+ resetSlidersButton.addActionListener(this);
	1963	+ propagateToggle.addItemListener(this);
	1964	+ multiplyToggle.addItemListener(this);
	1965	+ }
1749	1966	}
1750	1967
1751	1968	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1763,8 +1980,9 @@
1763	1980	// 3D models
1764	1981	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1765	1982	{
1766		- lastConverter = new com.jmex.model.converters.MaxToJme();
1767		- LoadFile(filename, lastConverter);
	1983	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	1984	+ //LoadFile(filename, lastConverter);
	1985	+ LoadObjFile(filename); // New 3ds loader
1768	1986	continue;
1769	1987	}
1770	1988	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1916,7 +2134,7 @@
1916	2134
1917	2135	//? flashIt = false;
1918	2136	CameraPane pane = (CameraPane) cameraView;
1919		- pane.clickStart(location.x, location.y, 0);
	2137	+ pane.clickStart(location.x, location.y, 0, 0);
1920	2138	pane.clickEnd(location.x, location.y, 0, true);
1921	2139
1922	2140	if (group.selection.size() == 1)
..	..	@@ -1965,6 +2183,7 @@
1965	2183	e2.printStackTrace();
1966	2184	}
1967	2185	}
	2186	+
1968	2187	LoadJMEThread loadThread;
1969	2188
1970	2189	class LoadJMEThread extends Thread
..	..	@@ -2022,6 +2241,7 @@
2022	2241	//LoadFile0(filename, converter);
2023	2242	}
2024	2243	}
	2244	+
2025	2245	LoadOBJThread loadObjThread;
2026	2246
2027	2247	class LoadOBJThread extends Thread
..	..	@@ -2100,19 +2320,19 @@
2100	2320
2101	2321	void LoadObjFile(String fullname)
2102	2322	{
2103		- /*
	2323	+ System.out.println("Loading " + fullname);
	2324	+ /**/
2104	2325	//lastFilename = fullname;
2105	2326	if(loadObjThread == null)
2106	2327	{
2107		- loadObjThread = new LoadOBJThread();
2108		- loadObjThread.start();
	2328	+ loadObjThread = new LoadOBJThread();
	2329	+ loadObjThread.start();
2109	2330	}
2110	2331
2111	2332	loadObjThread.add(fullname);
2112		- */
	2333	+ /**/
2113	2334
2114		- System.out.println("Loading " + fullname);
2115		- makeSomething(new FileObject(fullname, true), true);
	2335	+ //makeSomething(new FileObject(fullname, true), true);
2116	2336	}
2117	2337
2118	2338	void LoadGFDFile(String fullname)
..	..	@@ -2373,11 +2593,11 @@
2373	2593
2374	2594	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2375	2595	{
2376		- if (GrafreeD.standAlone)
	2596	+ if (Grafreed.standAlone)
2377	2597	{
2378	2598	/**/
2379	2599	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2380		- browser.show();
	2600	+ browser.setVisible(true);
2381	2601	String filename = browser.getFile();
2382	2602	if (filename != null && filename.length() > 0)
2383	2603	{
..	..	@@ -2488,6 +2708,7 @@
2488	2708	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2489	2709	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2490	2710	}
	2711	+
2491	2712	//cJME.count++;
2492	2713	//cJME.count %= 12;
2493	2714	if (gc)
..	..	@@ -2671,6 +2892,7 @@
2671	2892	}
2672	2893	}
2673	2894	}
	2895	+
2674	2896	cFileSystemPane FSPane;
2675	2897
2676	2898	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2724,11 +2946,14 @@
2724	2946	}
2725	2947	}
2726	2948	}
	2949	+
2727	2950	freezematerial = false;
2728	2951	}
2729	2952
2730	2953	void SetMaterial(Object3D object)
2731	2954	{
	2955	+ latestObject = object;
	2956	+
2732	2957	cMaterial mat = object.material;
2733	2958
2734	2959	if (mat == null)
..	..	@@ -2737,7 +2962,8 @@
2737	2962	return;
2738	2963	}
2739	2964
2740		- multiplyToggle.setSelected(mat.multiply);
	2965	+ if (multiplyToggle != null)
	2966	+ multiplyToggle.setSelected(mat.multiply);
2741	2967
2742	2968	assert (object.projectedVertices != null);
2743	2969
..	..	@@ -2839,12 +3065,17 @@
2839	3065	// }
2840	3066
2841	3067	/**/
2842		- if (deselect)
	3068	+ if (deselect \|\| child == null)
2843	3069	{
2844	3070	//group.deselectAll();
2845	3071	//freeze = true;
2846	3072	GetTree().clearSelection();
2847	3073	//freeze = false;
	3074	+
	3075	+ if (child == null)
	3076	+ {
	3077	+ return;
	3078	+ }
2848	3079	}
2849	3080
2850	3081	//group.addSelectee(child);
..	..	@@ -2913,7 +3144,7 @@
2913	3144	cameraView.ToggleDL();
2914	3145	cameraView.repaint();
2915	3146	return;
2916		- } else if (event.getSource() == toggleTextureItem)
	3147	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2917	3148	{
2918	3149	cameraView.ToggleTexture();
2919	3150	// june 2013 copy.HardTouch();
..	..	@@ -2952,9 +3183,9 @@
2952	3183	frame.validate();
2953	3184
2954	3185	return;
2955		- } else if (event.getSource() == toggleRandomItem)
	3186	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2956	3187	{
2957		- cameraView.ToggleRandom();
	3188	+ cameraView.ToggleSwitch();
2958	3189	cameraView.repaint();
2959	3190	return;
2960	3191	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2982,6 +3213,10 @@
2982	3213	} else if (event.getSource() == liveCB)
2983	3214	{
2984	3215	copy.live ^= true;
	3216	+ return;
	3217	+ } else if (event.getSource() == selectCB)
	3218	+ {
	3219	+ copy.dontselect ^= true;
2985	3220	return;
2986	3221	} else if (event.getSource() == hideCB)
2987	3222	{
..	..	@@ -3021,8 +3256,9 @@
3021	3256
3022	3257	public void actionPerformed(ActionEvent event)
3023	3258	{
	3259	+ Object source = event.getSource();
3024	3260	// SCRIPT DIALOG
3025		- if (event.getSource() == okbutton)
	3261	+ if (source == okbutton)
3026	3262	{
3027	3263	textpanel.setVisible(false);
3028	3264	textpanel.remove(textarea);
..	..	@@ -3034,7 +3270,7 @@
3034	3270	textarea = null;
3035	3271	textpanel = null;
3036	3272	}
3037		- if (event.getSource() == cancelbutton)
	3273	+ if (source == cancelbutton)
3038	3274	{
3039	3275	textpanel.setVisible(false);
3040	3276	textpanel.remove(textarea);
..	..	@@ -3046,50 +3282,50 @@
3046	3282	//applySelf();
3047	3283	//client.refreshEditWindow();
3048	3284	//refreshContents();
3049		- if (event.getSource() == nameField)
	3285	+ if (source == nameField)
3050	3286	{
3051	3287	//System.out.println("ObjEditor " + event);
3052	3288	applySelf0(true);
3053	3289	//parent.applySelf();
3054	3290	objEditor.refreshContents();
3055		- } else if (event.getSource() == resetButton)
	3291	+ } else if (source == resetButton)
3056	3292	{
3057	3293	CameraPane.fullreset = true;
3058	3294	copy.Reset(); // ResetMeshes();
3059	3295	copy.Touch();
3060	3296	objEditor.refreshContents();
3061		- } else if (event.getSource() == stepItem)
	3297	+ } else if (source == stepItem)
3062	3298	{
3063	3299	//cameraView.ONESTEP = true;
3064	3300	Globals.ONESTEP = true;
3065	3301	cameraView.repaint();
3066	3302	return;
3067		- } else if (event.getSource() == stepButton)
	3303	+ } else if (source == stepButton)
3068	3304	{
3069	3305	copy.Step();
3070	3306	copy.Touch();
3071	3307	objEditor.refreshContents();
3072		- } else if (event.getSource() == slowerButton)
	3308	+ } else if (source == slowerButton)
3073	3309	{
3074	3310	copy.Slower();
3075	3311	copy.Touch();
3076	3312	objEditor.refreshContents();
3077		- } else if (event.getSource() == fasterButton)
	3313	+ } else if (source == fasterButton)
3078	3314	{
3079	3315	copy.Faster();
3080	3316	copy.Touch();
3081	3317	objEditor.refreshContents();
3082		- } else if (event.getSource() == remarkButton)
	3318	+ } else if (source == remarkButton)
3083	3319	{
3084	3320	copy.Remark();
3085	3321	copy.Touch();
3086	3322	objEditor.refreshContents();
3087		- } else if (event.getSource() == stepAllButton)
	3323	+ } else if (source == stepAllButton)
3088	3324	{
3089	3325	copy.StepAll();
3090	3326	copy.Touch();
3091	3327	objEditor.refreshContents();
3092		- } else if (event.getSource() == resetAllButton)
	3328	+ } else if (source == resetAllButton)
3093	3329	{
3094	3330	//CameraPane.fullreset = true;
3095	3331	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3122,53 +3358,79 @@
3122	3358	// Close();
3123	3359	// }
3124	3360	// else
3125		- if (event.getSource() == resetSlidersButton)
	3361	+ if (source == resetSlidersButton)
3126	3362	{
3127	3363	ResetSliders();
3128		- } else if (event.getSource() == clearMaterialButton)
	3364	+ } else if (source == clearMaterialButton)
3129	3365	{
3130	3366	ClearMaterial();
3131		- } else if (event.getSource() == createMaterialButton)
	3367	+ } else if (source == createMaterialButton)
3132	3368	{
3133	3369	CreateMaterial();
3134		- } else if (event.getSource() == clearPanelButton)
	3370	+ } else if (source == clearPanelButton)
3135	3371	{
3136	3372	copy.ClearUI();
3137	3373	refreshContents(true);
3138		- } /*
3139		- }
3140		-
3141		- public boolean action(Event event, Object arg)
3142		- {
3143		- */ else if (event.getSource() == closeItem)
	3374	+ } else if (source == importGFDItem)
	3375	+ {
	3376	+ ImportGFD();
	3377	+ } else
	3378	+ if (source == importVRMLX3DItem)
	3379	+ {
	3380	+ ImportVRMLX3D();
	3381	+ } else
	3382	+ if (source == import3DSItem)
	3383	+ {
	3384	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3385	+ } else
	3386	+ if (source == importOBJItem)
	3387	+ {
	3388	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3389	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3390	+ browser.setVisible(true);
	3391	+ String filename = browser.getFile();
	3392	+ if (filename != null && filename.length() > 0)
	3393	+ {
	3394	+ String fullname = browser.getDirectory() + filename;
	3395	+ makeSomething(ReadOBJ(fullname), true);
	3396	+ }
	3397	+ } else
	3398	+ if (source == closeItem)
3144	3399	{
3145	3400	Close();
3146	3401	//return true;
3147		- } else if (event.getSource() == loadItem)
	3402	+ } else if (source == openItem)
3148	3403	{
3149		- load();
	3404	+ Open();
3150	3405	//return true;
3151		- } else if (event.getSource() == saveItem)
	3406	+ } else if (source == newItem)
	3407	+ {
	3408	+ New();
	3409	+ } else if (source == saveItem)
3152	3410	{
3153	3411	save();
3154	3412	//return true;
3155		- } else if (event.getSource() == saveAsItem)
	3413	+ } else if (source == saveAsItem)
3156	3414	{
3157	3415	saveAs();
3158	3416	//return true;
3159		- } else if (event.getSource() == reexportItem)
	3417	+ } else if (source == reexportItem)
3160	3418	{
3161	3419	reexport();
3162	3420	//return true;
3163		- } else if (event.getSource() == exportAsItem)
	3421	+ } else if (source == exportAsItem)
3164	3422	{
3165	3423	export();
3166	3424	//return true;
3167		- } else if (event.getSource() == povItem)
	3425	+ } else if (source == povItem)
3168	3426	{
3169	3427	generatePOV();
3170	3428	//return true;
3171		- } else if (event.getSource() == zBufferItem)
	3429	+ } else if (event.getSource() == archiveItem)
	3430	+ {
	3431	+ cTools.Archive(frame);
	3432	+ return;
	3433	+ } else if (source == zBufferItem)
3172	3434	{
3173	3435	try
3174	3436	{
..	..	@@ -3190,21 +3452,8 @@
3190	3452	cameraView.repaint();
3191	3453	//return true;
3192	3454	}
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)
	3455	+ */ else // combos...
	3456	+ if (source == texresMenu)
3208	3457	{
3209	3458	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3210	3459	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3216,6 +3465,343 @@
3216	3465	}
3217	3466	}
3218	3467
	3468	+ void New()
	3469	+ {
	3470	+ while (copy.Size() > 1)
	3471	+ {
	3472	+ copy.remove(1);
	3473	+ }
	3474	+
	3475	+ ResetModel();
	3476	+ objEditor.refreshContents();
	3477	+ }
	3478	+
	3479	+ static public byte[] Compress(Object3D o)
	3480	+ {
	3481	+ try
	3482	+ {
	3483	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3484	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3485	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3486	+
	3487	+ Object3D parent = o.parent;
	3488	+ o.parent = null;
	3489	+
	3490	+ out.writeObject(o);
	3491	+
	3492	+ o.parent = parent;
	3493	+
	3494	+ out.flush();
	3495	+
	3496	+ baos //zstream
	3497	+ .close();
	3498	+ out.close();
	3499	+
	3500	+ byte[] bytes = baos.toByteArray();
	3501	+
	3502	+ System.out.println("save #bytes = " + bytes.length);
	3503	+ return bytes;
	3504	+ } catch (Exception e)
	3505	+ {
	3506	+ System.err.println(e);
	3507	+ return null;
	3508	+ }
	3509	+ }
	3510	+
	3511	+ static public Object Uncompress(byte[] bytes)
	3512	+ {
	3513	+ System.out.println("restore #bytes = " + bytes.length);
	3514	+ try
	3515	+ {
	3516	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3517	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3518	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3519	+ Object obj = in.readObject();
	3520	+
	3521	+ bais //istream
	3522	+ .close();
	3523	+ in.close();
	3524	+
	3525	+ return obj;
	3526	+ } catch (Exception e)
	3527	+ {
	3528	+ System.err.println(e);
	3529	+ return null;
	3530	+ }
	3531	+ }
	3532	+
	3533	+ static public Object clone(Object o)
	3534	+ {
	3535	+ try
	3536	+ {
	3537	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3538	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3539	+
	3540	+ out.writeObject(o);
	3541	+
	3542	+ out.flush();
	3543	+ out.close();
	3544	+
	3545	+ byte[] bytes = baos.toByteArray();
	3546	+
	3547	+ System.out.println("clone = " + bytes.length);
	3548	+
	3549	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3550	+ ObjectInputStream in = new ObjectInputStream(bais);
	3551	+ Object obj = in.readObject();
	3552	+ in.close();
	3553	+
	3554	+ return obj;
	3555	+ } catch (Exception e)
	3556	+ {
	3557	+ System.err.println(e);
	3558	+ return null;
	3559	+ }
	3560	+ }
	3561	+
	3562	+ cRadio GetCurrentTab()
	3563	+ {
	3564	+ cRadio ab;
	3565	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3566	+ {
	3567	+ ab = (cRadio)e.nextElement();
	3568	+ if(ab.GetObject() == copy)
	3569	+ {
	3570	+ return ab;
	3571	+ }
	3572	+ }
	3573	+
	3574	+ return null;
	3575	+ }
	3576	+
	3577	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3578	+
	3579	+ public void Save()
	3580	+ {
	3581	+ Save(true);
	3582	+ }
	3583	+
	3584	+ private boolean Equal(byte[] compress, byte[] name)
	3585	+ {
	3586	+ if (compress.length != name.length)
	3587	+ {
	3588	+ return false;
	3589	+ }
	3590	+
	3591	+ for (int i=compress.length; --i>=0;)
	3592	+ {
	3593	+ if (compress[i] != name[i])
	3594	+ return false;
	3595	+ }
	3596	+
	3597	+ return true;
	3598	+ }
	3599	+
	3600	+ public boolean Save(boolean user)
	3601	+ {
	3602	+ System.err.println("Save");
	3603	+
	3604	+ cRadio tab = GetCurrentTab();
	3605	+
	3606	+ boolean temp = CameraPane.SWITCH;
	3607	+ CameraPane.SWITCH = false;
	3608	+
	3609	+ copy.ExtractBigData(hashtable);
	3610	+
	3611	+ byte[] compress = Compress(copy);
	3612	+
	3613	+ CameraPane.SWITCH = temp;
	3614	+
	3615	+ boolean thesame = false;
	3616	+
	3617	+ // Quick heuristic using length. Works only when stream is compressed.
	3618	+ if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
	3619	+ {
	3620	+ thesame = true;
	3621	+ }
	3622	+
	3623	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3624	+ if (!thesame)
	3625	+ {
	3626	+ //tab.user[tab.undoindex] = user;
	3627	+ boolean increment = tab.graphs[tab.undoindex] == null;
	3628	+
	3629	+ tab.graphs[tab.undoindex] = compress;
	3630	+
	3631	+ if (increment)
	3632	+ tab.undoindex++;
	3633	+ }
	3634	+
	3635	+ copy.RestoreBigData(hashtable);
	3636	+
	3637	+ //assert(hashtable.isEmpty());
	3638	+
	3639	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3640	+ {
	3641	+ //tab.user[i] = false;
	3642	+ // tab.graphs[i] = null;
	3643	+ }
	3644	+
	3645	+ SetUndoStates();
	3646	+
	3647	+ // test save
	3648	+ if (false)
	3649	+ {
	3650	+ try
	3651	+ {
	3652	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3653	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3654	+
	3655	+ p.writeObject(copy);
	3656	+
	3657	+ p.flush();
	3658	+
	3659	+ ostream.close();
	3660	+ } catch (Exception e)
	3661	+ {
	3662	+ e.printStackTrace();
	3663	+ }
	3664	+ }
	3665	+
	3666	+ return !thesame;
	3667	+ }
	3668	+
	3669	+ void CopyChanged(Object3D obj)
	3670	+ {
	3671	+ SetUndoStates();
	3672	+
	3673	+ boolean temp = CameraPane.SWITCH;
	3674	+ CameraPane.SWITCH = false;
	3675	+
	3676	+ copy.ExtractBigData(hashtable);
	3677	+
	3678	+ copy.clear();
	3679	+
	3680	+ for (int i=0; i<obj.Size(); i++)
	3681	+ {
	3682	+ copy.add(obj.get(i));
	3683	+ }
	3684	+
	3685	+ copy.RestoreBigData(hashtable);
	3686	+
	3687	+ CameraPane.SWITCH = temp;
	3688	+
	3689	+ //assert(hashtable.isEmpty());
	3690	+
	3691	+ copy.Touch();
	3692	+
	3693	+ ResetModel();
	3694	+ copy.HardTouch(); // recompile?
	3695	+
	3696	+ cRadio ab;
	3697	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3698	+ {
	3699	+ ab = (cRadio)e.nextElement();
	3700	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3701	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3702	+ if (test != null)
	3703	+ {
	3704	+ test.editWindow = ab.object.editWindow;
	3705	+ ab.object = test;
	3706	+ }
	3707	+ }
	3708	+
	3709	+ refreshContents();
	3710	+ }
	3711	+
	3712	+ cButton undoButton;
	3713	+ cButton redoButton;
	3714	+
	3715	+ void SetUndoStates()
	3716	+ {
	3717	+ cRadio tab = GetCurrentTab();
	3718	+
	3719	+ undoButton.setEnabled(tab.undoindex > 0);
	3720	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3721	+ }
	3722	+
	3723	+ public boolean Undo()
	3724	+ {
	3725	+ System.err.println("Undo");
	3726	+
	3727	+ cRadio tab = GetCurrentTab();
	3728	+
	3729	+ if (tab.undoindex == 0)
	3730	+ {
	3731	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3732	+ return false;
	3733	+ }
	3734	+
	3735	+ if (tab.graphs[tab.undoindex] == null) // \|\| !tab.user[tab.undoindex])
	3736	+ {
	3737	+ if (Save(false))
	3738	+ tab.undoindex -= 1;
	3739	+ else
	3740	+ {
	3741	+ if (tab.undoindex <= 0)
	3742	+ return false;
	3743	+ else
	3744	+ tab.undoindex -= 1;
	3745	+ }
	3746	+ }
	3747	+
	3748	+ tab.undoindex -= 1;
	3749	+
	3750	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3751	+
	3752	+ return true;
	3753	+ }
	3754	+
	3755	+ public void Redo()
	3756	+ {
	3757	+ cRadio tab = GetCurrentTab();
	3758	+
	3759	+ if (tab.graphs[tab.undoindex + 1] == null)
	3760	+ {
	3761	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3762	+ return;
	3763	+ }
	3764	+
	3765	+ tab.undoindex += 1;
	3766	+
	3767	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3768	+
	3769	+ //if (!tab.user[tab.undoindex])
	3770	+ // tab.graphs[tab.undoindex] = null;
	3771	+ }
	3772	+
	3773	+ void ImportGFD()
	3774	+ {
	3775	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3776	+ browser.show();
	3777	+ String filename = browser.getFile();
	3778	+ if (filename != null && filename.length() > 0)
	3779	+ {
	3780	+ String fullname = browser.getDirectory() + filename;
	3781	+
	3782	+ //Object3D readobj =
	3783	+ objEditor.ReadGFD(fullname, objEditor);
	3784	+ //makeSomething(readobj);
	3785	+ }
	3786	+ }
	3787	+
	3788	+ void ImportVRMLX3D()
	3789	+ {
	3790	+ if (Grafreed.standAlone)
	3791	+ {
	3792	+ /**/
	3793	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3794	+ browser.show();
	3795	+ String filename = browser.getFile();
	3796	+ if (filename != null && filename.length() > 0)
	3797	+ {
	3798	+ String fullname = browser.getDirectory() + filename;
	3799	+ LoadVRMLX3D(fullname);
	3800	+ }
	3801	+ /**/
	3802	+ }
	3803	+ }
	3804	+
3219	3805	void ToggleAnimation()
3220	3806	{
3221	3807	if (!Globals.ANIMATION)
..	..	@@ -3231,8 +3817,8 @@
3231	3817
3232	3818	Globals.ANIMATION ^= true;
3233	3819
3234		- GrafreeD.wav.cursor = 0;
3235		- GrafreeD.wav.loop = 0;
	3820	+ Grafreed.wav.cursor = 0;
	3821	+ Grafreed.wav.loop = 0;
3236	3822	}
3237	3823	} else
3238	3824	{
..	..	@@ -3253,7 +3839,6 @@
3253	3839	callee.refreshContents();
3254	3840	} else
3255	3841	{
3256		- new Exception().printStackTrace();
3257	3842	System.exit(0);
3258	3843	}
3259	3844	}
..	..	@@ -3283,7 +3868,7 @@
3283	3868	void CreateMaterial()
3284	3869	{
3285	3870	//copy.ClearMaterial(); // PATCH
3286		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3871	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3287	3872	if (copy.selection.size() > 0)
3288	3873	//SetMaterial(copy);
3289	3874	{
..	..	@@ -3334,7 +3919,7 @@
3334	3919	assert false;
3335	3920	}
3336	3921
3337		- void EditSelection()
	3922	+ void EditSelection(boolean newWindow)
3338	3923	{
3339	3924	}
3340	3925
..	..	@@ -3342,11 +3927,11 @@
3342	3927	{
3343	3928	copy.ResetBlockLoop(); // temporary problem
3344	3929
3345		- boolean random = CameraPane.RANDOM;
3346		- CameraPane.RANDOM = false; // parse everything
	3930	+ boolean random = CameraPane.SWITCH;
	3931	+ CameraPane.SWITCH = false; // parse everything
3347	3932	copy.ResetDisplayList();
3348	3933	copy.HardTouch();
3349		- CameraPane.RANDOM = random;
	3934	+ CameraPane.SWITCH = random;
3350	3935	}
3351	3936
3352	3937	// public void applySelf()
..	..	@@ -3420,6 +4005,36 @@
3420	4005	{
3421	4006	//System.out.println("Propagate = " + propagate);
3422	4007	copy.UpdateMaterial(anchor, current, propagate);
	4008	+
	4009	+ if (copy.material != null)
	4010	+ {
	4011	+ cMaterial mat = copy.material;
	4012	+
	4013	+ colorField.SetToolTipValue((mat.color));
	4014	+ modulationField.SetToolTipValue((mat.modulation));
	4015	+ metalnessField.SetToolTipValue((mat.metalness));
	4016	+ diffuseField.SetToolTipValue((mat.diffuse));
	4017	+ specularField.SetToolTipValue((mat.specular));
	4018	+ shininessField.SetToolTipValue((mat.shininess));
	4019	+ shiftField.SetToolTipValue((mat.shift));
	4020	+ ambientField.SetToolTipValue((mat.ambient));
	4021	+ lightareaField.SetToolTipValue((mat.lightarea));
	4022	+ diffusenessField.SetToolTipValue((mat.factor));
	4023	+ velvetField.SetToolTipValue((mat.velvet));
	4024	+ sheenField.SetToolTipValue((mat.sheen));
	4025	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4026	+ backlitField.SetToolTipValue((mat.bump));
	4027	+ anisoField.SetToolTipValue((mat.aniso));
	4028	+ anisoVField.SetToolTipValue((mat.anisoV));
	4029	+ cameraField.SetToolTipValue((mat.cameralight));
	4030	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4031	+ shadowField.SetToolTipValue((mat.shadow));
	4032	+ textureField.SetToolTipValue((mat.texture));
	4033	+ opacityField.SetToolTipValue((mat.opacity));
	4034	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4035	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	4036	+ }
	4037	+
3423	4038	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3424	4039	{
3425	4040	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3535,7 +4150,7 @@
3535	4150	}
3536	4151
3537	4152	if (normalpushField != null)
3538		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4153	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3539	4154	}
3540	4155
3541	4156	void SnapObject()
..	..	@@ -3799,6 +4414,8 @@
3799	4414
3800	4415	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3801	4416	{
	4417	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4418	+ Save();
3802	4419	//Tween.set(thing, 0).target(1).start(tweenManager);
3803	4420	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3804	4421	// if (thing instanceof GenericJointDemo)
..	..	@@ -3885,6 +4502,12 @@
3885	4502	{
3886	4503	ResetModel();
3887	4504	Select(thing.GetTreePath(), true, false); // unselect... false);
	4505	+
	4506	+ if (thing.Size() == 0)
	4507	+ {
	4508	+ //EditSelection(false);
	4509	+ }
	4510	+
3888	4511	refreshContents();
3889	4512	}
3890	4513
..	..	@@ -4002,6 +4625,7 @@
4002	4625	}
4003	4626	}
4004	4627	}
	4628	+
4005	4629	LoadGFDThread loadGFDThread;
4006	4630
4007	4631	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4021,8 +4645,10 @@
4021	4645
4022	4646	try
4023	4647	{
	4648	+ // Try compressed version first.
4024	4649	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4025		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4650	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4651	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4026	4652
4027	4653	readobj = (Object3D) p.readObject();
4028	4654	istream.close();
..	..	@@ -4030,7 +4656,20 @@
4030	4656	readobj.ResetDisplayList();
4031	4657	} catch (Exception e)
4032	4658	{
4033		- e.printStackTrace();
	4659	+ //e.printStackTrace();
	4660	+ try
	4661	+ {
	4662	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4663	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4664	+
	4665	+ readobj = (Object3D) p.readObject();
	4666	+ istream.close();
	4667	+
	4668	+ readobj.ResetDisplayList();
	4669	+ } catch (Exception e2)
	4670	+ {
	4671	+ e2.printStackTrace();
	4672	+ }
4034	4673	}
4035	4674	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4036	4675	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4076,6 +4715,12 @@
4076	4715
4077	4716	void LoadIt(Object obj)
4078	4717	{
	4718	+ if (obj == null)
	4719	+ {
	4720	+ // Invalid file
	4721	+ return;
	4722	+ }
	4723	+
4079	4724	System.out.println("Loaded " + obj);
4080	4725	//new Exception().printStackTrace();
4081	4726	Object3D readobj = (Object3D) obj;
..	..	@@ -4085,6 +4730,8 @@
4085	4730
4086	4731	if (readobj != null)
4087	4732	{
	4733	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4734	+ // Save();
4088	4735	try
4089	4736	{
4090	4737	//readobj.deepCopySelf(copy);
..	..	@@ -4145,9 +4792,9 @@
4145	4792	}
4146	4793	}
4147	4794
4148		- void load() // throws ClassNotFoundException
	4795	+ void Open() // throws ClassNotFoundException
4149	4796	{
4150		- if (GrafreeD.standAlone)
	4797	+ if (Grafreed.standAlone)
4151	4798	{
4152	4799	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4153	4800	browser.show();
..	..	@@ -4234,11 +4881,13 @@
4234	4881	try
4235	4882	{
4236	4883	FileOutputStream ostream = new FileOutputStream(lastname);
4237		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4884	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4885	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4238	4886
4239	4887	p.writeObject(copy);
4240	4888	p.flush();
4241	4889
	4890	+ zstream.close();
4242	4891	ostream.close();
4243	4892
4244	4893	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4248,17 +4897,20 @@
4248	4897	{
4249	4898	}
4250	4899	}
	4900	+
4251	4901	String lastname;
4252	4902
4253	4903	void saveAs()
4254	4904	{
4255		- if (GrafreeD.standAlone)
	4905	+ if (Grafreed.standAlone)
4256	4906	{
4257	4907	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4258	4908	browser.setVisible(true);
4259	4909	String filename = browser.getFile();
4260	4910	if (filename != null && filename.length() > 0)
4261	4911	{
	4912	+ if (!filename.endsWith(".gfd"))
	4913	+ filename += ".gfd";
4262	4914	lastname = browser.getDirectory() + filename;
4263	4915	save();
4264	4916	}
..	..	@@ -4357,13 +5009,13 @@
4357	5009	try
4358	5010	{
4359	5011	FileOutputStream ostream = new FileOutputStream(filename);
4360		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4361		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5012	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5013	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4362	5014
4363	5015	Object3D objectparent = obj.parent;
4364	5016	obj.parent = null;
4365	5017
4366		- Object3D object = (Object3D) GrafreeD.clone(obj);
	5018	+ Object3D object = (Object3D) Grafreed.clone(obj);
4367	5019
4368	5020	obj.parent = objectparent;
4369	5021
..	..	@@ -4375,8 +5027,8 @@
4375	5027	p.writeObject(object);
4376	5028	p.flush();
4377	5029
	5030	+ zstream.close();
4378	5031	ostream.close();
4379		- // zstream.close();
4380	5032
4381	5033	// group.selection.get(0).parent = parent;
4382	5034	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4397,7 +5049,7 @@
4397	5049	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4398	5050	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4399	5051	copy.generatePOV(buffer);
4400		- if (GrafreeD.standAlone)
	5052	+ if (Grafreed.standAlone)
4401	5053	{
4402	5054	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4403	5055	browser.show();
..	..	@@ -4423,19 +5075,18 @@
4423	5075	Object3D client;
4424	5076	Object3D copy;
4425	5077	MenuBar menuBar;
4426		- Menu windowMenu;
4427		- MenuItem loadItem;
	5078	+ Menu fileMenu;
	5079	+ MenuItem newItem;
	5080	+ MenuItem openItem;
4428	5081	MenuItem saveItem;
4429	5082	MenuItem saveAsItem;
4430	5083	MenuItem exportAsItem;
4431	5084	MenuItem reexportItem;
4432	5085	MenuItem povItem;
4433	5086	MenuItem closeItem;
4434		- Menu cameraMenu;
	5087	+
4435	5088	CheckboxMenuItem zBufferItem;
4436	5089	//MenuItem normalLensItem;
4437		- MenuItem editCameraItem;
4438		- MenuItem revertCameraItem;
4439	5090	MenuItem stepItem;
4440	5091	CheckboxMenuItem toggleLiveItem;
4441	5092	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4446,25 +5097,39 @@
4446	5097	CheckboxMenuItem toggleFootContactItem;
4447	5098	CheckboxMenuItem toggleDLItem;
4448	5099	CheckboxMenuItem toggleTextureItem;
4449		- CheckboxMenuItem toggleRandomItem;
	5100	+ CheckboxMenuItem toggleSwitchItem;
4450	5101	CheckboxMenuItem toggleRootItem;
4451	5102	CheckboxMenuItem animationItem;
	5103	+ MenuItem archiveItem;
4452	5104	CheckboxMenuItem toggleHandleItem;
4453	5105	CheckboxMenuItem togglePaintItem;
4454	5106	JSplitPane mainPanel;
4455	5107	JScrollPane scrollpane;
	5108	+
4456	5109	JPanel toolbarPanel;
	5110	+
4457	5111	cGridBag treePanel;
	5112	+
4458	5113	JPanel radioPanel;
4459	5114	ButtonGroup buttonGroup;
4460		- cGridBag ctrlPanel;
	5115	+
	5116	+ cGridBag toolboxPanel;
4461	5117	cGridBag materialPanel;
	5118	+ cGridBag ctrlPanel;
	5119	+
4462	5120	JScrollPane infoPanel;
	5121	+
4463	5122	cGridBag optionsPanel;
	5123	+
4464	5124	JTabbedPane objectPanel;
	5125	+ boolean materialFlushed;
	5126	+ Object3D latestObject;
	5127	+
4465	5128	cGridBag XYZPanel;
	5129	+
4466	5130	JSplitPane gridPanel;
4467	5131	JSplitPane bigPanel;
	5132	+
4468	5133	cGridBag bigThree;
4469	5134	cGridBag scenePanel;
4470	5135	cGridBag centralPanel;
..	..	@@ -4579,8 +5244,13 @@
4579	5244	cNumberSlider fogField;
4580	5245	JLabel opacityPowerLabel;
4581	5246	cNumberSlider opacityPowerField;
4582		- JTree jTree;
	5247	+ cTree jTree;
4583	5248	//ObjectUI parent;
4584	5249
4585	5250	cNumberSlider normalpushField;
	5251	+
	5252	+ private MenuItem importGFDItem;
	5253	+ private MenuItem importVRMLX3DItem;
	5254	+ private MenuItem import3DSItem;
	5255	+ private MenuItem importOBJItem;
4586	5256	}