~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -15,6 +15,9 @@
15	15	//import javax.swing.plaf.ColorUIResource;
16	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
17	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
18	21	//import javax.media.opengl.GLCanvas;
19	22
20	23	import //weka.core.
..	..	@@ -207,7 +210,7 @@
207	210
208	211	objEditor.ctrlPanel.remove(namePanel);
209	212
210		- if (!GroupEditor.allparams)
	213	+ if (!allparams)
211	214	return;
212	215
213	216	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -306,7 +309,7 @@
306	309	//localCopy.parent = null;
307	310
308	311	frame = new JFrame();
309		- frame.setUndecorated(true);
	312	+ frame.setUndecorated(false);
310	313	objEditor = this;
311	314	this.callee = callee;
312	315
..	..	@@ -337,12 +340,17 @@
337	340	return frame.action(event, obj);
338	341	}
339	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	+
340	348	void SetupMenu()
341	349	{
342	350	frame.setMenuBar(menuBar = new MenuBar());
343	351	menuBar.add(fileMenu = new Menu("File"));
344	352	fileMenu.add(newItem = new MenuItem("New"));
345		- fileMenu.add(loadItem = new MenuItem("Open..."));
	353	+ fileMenu.add(openItem = new MenuItem("Open..."));
346	354
347	355	//oe.menuBar.add(menu = new Menu("Include"));
348	356	Menu menu = new Menu("Import");
..	..	@@ -374,7 +382,7 @@
374	382	}
375	383
376	384	newItem.addActionListener(this);
377		- loadItem.addActionListener(this);
	385	+ openItem.addActionListener(this);
378	386	saveItem.addActionListener(this);
379	387	saveAsItem.addActionListener(this);
380	388	exportAsItem.addActionListener(this);
..	..	@@ -397,6 +405,11 @@
397	405	// }
398	406	//
399	407	// materialFlushed = true;
	408	+// }
	409	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	410	+// {
	411	+// if (listUI.size() == 0)
	412	+// EditSelection(false);
400	413	// }
401	414
402	415	refreshContents(false); // To refresh Info tab
..	..	@@ -436,7 +449,7 @@
436	449	// TEXTAREA infoarea.setLineWrap(true);
437	450	// TEXTAREA infoarea.setWrapStyleWord(true);
438	451	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
439		- infoPanel.setPreferredSize(new Dimension(50, 200));
	452	+ infoPanel.setPreferredSize(new Dimension(1, 1));
440	453	infoPanel.setName("Info");
441	454	//infoPanel.setLayout(new BorderLayout());
442	455	//infoPanel.add(createTextPane());
..	..	@@ -448,7 +461,14 @@
448	461	mainPanel.setDividerSize(9);
449	462	mainPanel.setDividerLocation(0.5); //1.0);
450	463	mainPanel.setResizeWeight(0.5);
451		-
	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	+
452	472	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
453	473	//mainPanel.setLayout(new GridBagLayout());
454	474	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -679,8 +699,8 @@
679	699	}
680	700	}
681	701
682		-static GraphicsDevice device = GraphicsEnvironment
683		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	702	+//static GraphicsDevice device = GraphicsEnvironment
	703	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
684	704
685	705	Rectangle keeprect;
686	706	cRadio radio;
..	..	@@ -701,10 +721,19 @@
701	721	void Minimize()
702	722	{
703	723	frame.setState(Frame.ICONIFIED);
	724	+ frame.validate();
704	725	}
705	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={}
706	730	void Maximize()
707	731	{
	732	+ if (CameraPane.FULLSCREEN)
	733	+ {
	734	+ ToggleFullScreen();
	735	+ }
	736	+
708	737	if (maximized)
709	738	{
710	739	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -712,20 +741,36 @@
712	741	else
713	742	{
714	743	keeprect = frame.getBounds();
715		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
716		- Dimension rect2 = frame.getToolkit().getScreenSize();
717		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	744	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	745	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	746	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
718	747	// frame.setState(Frame.MAXIMIZED_BOTH);
	748	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
719	749	}
720	750
721	751	maximized ^= true;
	752	+
	753	+ frame.validate();
722	754	}
	755	+
	756	+ cButton minButton;
	757	+ cButton maxButton;
	758	+ cButton fullButton;
723	759
724	760	void ToggleFullScreen()
725	761	{
726		- if (CameraPane.FULLSCREEN)
	762	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	763	+
	764	+ cameraView.ToggleFullScreen();
	765	+
	766	+ if (!CameraPane.FULLSCREEN)
727	767	{
728	768	device.setFullScreenWindow(null);
	769	+ frame.dispose();
	770	+ frame.setUndecorated(false);
	771	+ frame.validate();
	772	+ frame.setVisible(true);
	773	+
729	774	//frame.setVisible(false);
730	775	// frame.removeNotify();
731	776	// frame.setUndecorated(false);
..	..	@@ -735,7 +780,7 @@
735	780	// X frame.getContentPane().remove(/"Center",/bigThree);
736	781	// X framePanel.add(bigThree);
737	782	// X frame.getContentPane().add(/"Center",/framePanel);
738		- framePanel.setDividerLocation(1);
	783	+ framePanel.setDividerLocation(46);
739	784
740	785	//frame.setVisible(true);
741	786	radio.layout = keepButton;
..	..	@@ -750,7 +795,12 @@
750	795	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
751	796	// frame.getToolkit().getScreenSize().height);
752	797	//frame.setVisible(false);
	798	+
	799	+ frame.dispose();
	800	+ frame.setUndecorated(true);
753	801	device.setFullScreenWindow(frame);
	802	+ frame.validate();
	803	+ frame.setVisible(true);
754	804	// frame.removeNotify();
755	805	// frame.setUndecorated(true);
756	806	// frame.addNotify();
..	..	@@ -763,8 +813,7 @@
763	813	radio.layout.doClick();
764	814	//frame.setVisible(true);
765	815	}
766		-
767		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
768	817	}
769	818
770	819	private JTextPane createTextPane()
..	..	@@ -1097,12 +1146,12 @@
1097	1146	namePanel = new cGridBag();
1098	1147
1099	1148	nameField = AddText(namePanel, copy.GetName());
1100		- namePanel.add(nameField);
	1149	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1101	1150	oe.ctrlPanel.add(namePanel);
1102	1151
1103	1152	oe.ctrlPanel.Return();
1104	1153
1105		- if (!GroupEditor.allparams)
	1154	+ if (!allparams)
1106	1155	return;
1107	1156
1108	1157	setupPanel = new cGridBag().setVertical(false);
..	..	@@ -1115,20 +1164,21 @@
1115	1164	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1116	1165	hideCB.setToolTipText("Hide object");
1117	1166	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1118		- markCB.setToolTipText("Set the animation target transform");
	1167	+ markCB.setToolTipText("As animation target transform");
1119	1168
1120	1169	setupPanel2 = new cGridBag().setVertical(false);
1121	1170
1122	1171	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1123	1172	rewindCB.setToolTipText("Rewind animation");
1124	1173
1125		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1126		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1174	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1175	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1127	1176
	1177	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1178	+ link2masterCB.setToolTipText("Attach to support");
	1179	+
1128	1180	if (Globals.ADVANCED)
1129	1181	{
1130		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1131		- link2masterCB.setToolTipText("Attach to support");
1132	1182	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1133	1183	speedupCB.setToolTipText("Option motion capture");
1134	1184	}
..	..	@@ -1439,13 +1489,16 @@
1439	1489	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1440	1490	//tmp.setName("Edit");
1441	1491	objectPanel.add(materialPanel);
1442		- objectPanel.add(toolboxPanel);
1443	1492	// JPanel north = new JPanel(new BorderLayout());
1444	1493	// north.setName("Edit");
1445	1494	// north.add(ctrlPanel, BorderLayout.NORTH);
1446	1495	// objectPanel.add(north);
1447	1496	objectPanel.add(editPanel);
1448		- objectPanel.add(infoPanel);
	1497	+
	1498	+ //if (Globals.ADVANCED)
	1499	+ objectPanel.add(infoPanel);
	1500	+
	1501	+ objectPanel.add(toolboxPanel);
1449	1502
1450	1503	/*
1451	1504	aConstraints.gridx = 0;
..	..	@@ -1454,7 +1507,7 @@
1454	1507	aConstraints.gridy += 1;
1455	1508	aConstraints.gridwidth = 1;
1456	1509	mainPanel.add(objectPanel, aConstraints);
1457		- */
	1510	+ */
1458	1511
1459	1512	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1460	1513	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1553,9 +1606,9 @@
1553	1606	// aConstraints.gridheight = 1;
1554	1607
1555	1608	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1556		- framePanel.setContinuousLayout(true);
1557		- framePanel.setOneTouchExpandable(true);
1558		- framePanel.setDividerLocation(0.8);
	1609	+ framePanel.setContinuousLayout(false);
	1610	+ framePanel.setOneTouchExpandable(false);
	1611	+ //.setDividerLocation(0.8);
1559	1612	//framePanel.setDividerSize(15);
1560	1613	//framePanel.setResizeWeight(0.15);
1561	1614	framePanel.setName("Frame");
..	..	@@ -1574,12 +1627,13 @@
1574	1627
1575	1628	frame.setSize(1280, 860);
1576	1629
1577		- frame.validate();
1578		- frame.setVisible(true);
1579		-
1580	1630	cameraView.requestFocusInWindow();
1581	1631
1582	1632	gridPanel.setDividerLocation(1.0);
	1633	+
	1634	+ frame.validate();
	1635	+
	1636	+ frame.setVisible(true);
1583	1637
1584	1638	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1585	1639	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1666,24 +1720,6 @@
1666	1720	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1667	1721	colorSection.add(texture);
1668	1722
1669		- cGridBag anisoU = new cGridBag();
1670		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1671		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1672		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1673		- colorSection.add(anisoU);
1674		-
1675		- cGridBag anisoV = new cGridBag();
1676		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1677		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1678		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1679		- colorSection.add(anisoV);
1680		-
1681		- cGridBag shadowbias = new cGridBag();
1682		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1683		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1684		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1685		- colorSection.add(shadowbias);
1686		-
1687	1723	panel.add(new JSeparator());
1688	1724
1689	1725	panel.add(colorSection);
..	..	@@ -1733,6 +1769,12 @@
1733	1769	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1734	1770	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1735	1771	diffuseSection.add(fakedepth);
	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);
1736	1778
1737	1779	panel.add(new JSeparator());
1738	1780
..	..	@@ -1784,6 +1826,18 @@
1784	1826	// aConstraints.gridy += 1;
1785	1827	// aConstraints.gridwidth = 1;
1786	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	+
1787	1841
1788	1842	panel.add(new JSeparator());
1789	1843
..	..	@@ -1791,35 +1845,35 @@
1791	1845
1792	1846	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1793	1847
1794		- cGridBag globalSection = new cGridBag().setVertical(true);
	1848	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1795	1849
1796	1850	cGridBag camera = new cGridBag();
1797	1851	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1798	1852	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1799	1853	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1800		- globalSection.add(camera);
	1854	+ colorSection.add(camera);
1801	1855
1802	1856	cGridBag ambient = new cGridBag();
1803	1857	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1804	1858	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1805	1859	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1806		- globalSection.add(ambient);
	1860	+ colorSection.add(ambient);
1807	1861
1808	1862	cGridBag backlit = new cGridBag();
1809	1863	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1810	1864	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1811	1865	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1812		- globalSection.add(backlit);
	1866	+ colorSection.add(backlit);
1813	1867
1814	1868	cGridBag opacity = new cGridBag();
1815	1869	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1816	1870	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1817	1871	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1818		- globalSection.add(opacity);
	1872	+ colorSection.add(opacity);
1819	1873
1820		- panel.add(new JSeparator());
	1874	+ //panel.add(new JSeparator());
1821	1875
1822		- panel.add(globalSection);
	1876	+ //panel.add(globalSection);
1823	1877
1824	1878	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1825	1879
..	..	@@ -1926,8 +1980,9 @@
1926	1980	// 3D models
1927	1981	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1928	1982	{
1929		- lastConverter = new com.jmex.model.converters.MaxToJme();
1930		- LoadFile(filename, lastConverter);
	1983	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	1984	+ //LoadFile(filename, lastConverter);
	1985	+ LoadObjFile(filename); // New 3ds loader
1931	1986	continue;
1932	1987	}
1933	1988	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2653,6 +2708,7 @@
2653	2708	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2654	2709	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2655	2710	}
	2711	+
2656	2712	//cJME.count++;
2657	2713	//cJME.count %= 12;
2658	2714	if (gc)
..	..	@@ -2836,6 +2892,7 @@
2836	2892	}
2837	2893	}
2838	2894	}
	2895	+
2839	2896	cFileSystemPane FSPane;
2840	2897
2841	2898	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2889,6 +2946,7 @@
2889	2946	}
2890	2947	}
2891	2948	}
	2949	+
2892	2950	freezematerial = false;
2893	2951	}
2894	2952
..	..	@@ -3007,12 +3065,17 @@
3007	3065	// }
3008	3066
3009	3067	/**/
3010		- if (deselect)
	3068	+ if (deselect \|\| child == null)
3011	3069	{
3012	3070	//group.deselectAll();
3013	3071	//freeze = true;
3014	3072	GetTree().clearSelection();
3015	3073	//freeze = false;
	3074	+
	3075	+ if (child == null)
	3076	+ {
	3077	+ return;
	3078	+ }
3016	3079	}
3017	3080
3018	3081	//group.addSelectee(child);
..	..	@@ -3336,9 +3399,9 @@
3336	3399	{
3337	3400	Close();
3338	3401	//return true;
3339		- } else if (source == loadItem)
	3402	+ } else if (source == openItem)
3340	3403	{
3341		- load();
	3404	+ Open();
3342	3405	//return true;
3343	3406	} else if (source == newItem)
3344	3407	{
..	..	@@ -3363,6 +3426,10 @@
3363	3426	{
3364	3427	generatePOV();
3365	3428	//return true;
	3429	+ } else if (event.getSource() == archiveItem)
	3430	+ {
	3431	+ cTools.Archive(frame);
	3432	+ return;
3366	3433	} else if (source == zBufferItem)
3367	3434	{
3368	3435	try
..	..	@@ -3414,8 +3481,8 @@
3414	3481	try
3415	3482	{
3416	3483	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3417		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3418		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3484	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3485	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3419	3486
3420	3487	Object3D parent = o.parent;
3421	3488	o.parent = null;
..	..	@@ -3426,10 +3493,14 @@
3426	3493
3427	3494	out.flush();
3428	3495
3429		- zstream.close();
	3496	+ baos //zstream
	3497	+ .close();
3430	3498	out.close();
3431	3499
3432		- return baos.toByteArray();
	3500	+ byte[] bytes = baos.toByteArray();
	3501	+
	3502	+ System.out.println("save #bytes = " + bytes.length);
	3503	+ return bytes;
3433	3504	} catch (Exception e)
3434	3505	{
3435	3506	System.err.println(e);
..	..	@@ -3439,13 +3510,16 @@
3439	3510
3440	3511	static public Object Uncompress(byte[] bytes)
3441	3512	{
3442		- System.out.println("#bytes = " + bytes.length);
	3513	+ System.out.println("restore #bytes = " + bytes.length);
3443	3514	try
3444	3515	{
3445	3516	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3446		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3447		- ObjectInputStream in = new ObjectInputStream(istream);
	3517	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3518	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3448	3519	Object obj = in.readObject();
	3520	+
	3521	+ bais //istream
	3522	+ .close();
3449	3523	in.close();
3450	3524
3451	3525	return obj;
..	..	@@ -3504,6 +3578,27 @@
3504	3578
3505	3579	public void Save()
3506	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	+ {
3507	3602	System.err.println("Save");
3508	3603
3509	3604	cRadio tab = GetCurrentTab();
..	..	@@ -3513,20 +3608,42 @@
3513	3608
3514	3609	copy.ExtractBigData(hashtable);
3515	3610
3516		- //EditorFrame.m_MainFrame.requestFocusInWindow();
3517		- tab.graphs[tab.undoindex++] = Compress(copy);
3518		-
3519		- copy.RestoreBigData(hashtable);
	3611	+ byte[] compress = Compress(copy);
3520	3612
3521	3613	CameraPane.SWITCH = temp;
3522	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	+
3523	3637	//assert(hashtable.isEmpty());
3524	3638
3525	3639	for (int i = tab.undoindex; i < tab.graphs.length; i++)
3526	3640	{
3527		- tab.graphs[i] = null;
	3641	+ //tab.user[i] = false;
	3642	+ // tab.graphs[i] = null;
3528	3643	}
3529	3644
	3645	+ SetUndoStates();
	3646	+
3530	3647	// test save
3531	3648	if (false)
3532	3649	{
..	..	@@ -3545,10 +3662,14 @@
3545	3662	e.printStackTrace();
3546	3663	}
3547	3664	}
	3665	+
	3666	+ return !thesame;
3548	3667	}
3549	3668
3550	3669	void CopyChanged(Object3D obj)
3551	3670	{
	3671	+ SetUndoStates();
	3672	+
3552	3673	boolean temp = CameraPane.SWITCH;
3553	3674	CameraPane.SWITCH = false;
3554	3675
..	..	@@ -3588,7 +3709,18 @@
3588	3709	refreshContents();
3589	3710	}
3590	3711
3591		- public void Undo()
	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()
3592	3724	{
3593	3725	System.err.println("Undo");
3594	3726
..	..	@@ -3597,18 +3729,27 @@
3597	3729	if (tab.undoindex == 0)
3598	3730	{
3599	3731	java.awt.Toolkit.getDefaultToolkit().beep();
3600		- return;
	3732	+ return false;
3601	3733	}
3602	3734
3603		- if (tab.graphs[tab.undoindex] == null)
	3735	+ if (tab.graphs[tab.undoindex] == null) // \|\| !tab.user[tab.undoindex])
3604	3736	{
3605		- Save();
3606		- tab.undoindex -= 1;
	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	+ }
3607	3746	}
3608	3747
3609	3748	tab.undoindex -= 1;
3610	3749
3611	3750	CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3751	+
	3752	+ return true;
3612	3753	}
3613	3754
3614	3755	public void Redo()
..	..	@@ -3624,6 +3765,9 @@
3624	3765	tab.undoindex += 1;
3625	3766
3626	3767	CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3768	+
	3769	+ //if (!tab.user[tab.undoindex])
	3770	+ // tab.graphs[tab.undoindex] = null;
3627	3771	}
3628	3772
3629	3773	void ImportGFD()
..	..	@@ -4586,8 +4730,8 @@
4586	4730
4587	4731	if (readobj != null)
4588	4732	{
4589		- if (Globals.SAVEONMAKE)
4590		- Save();
	4733	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4734	+ // Save();
4591	4735	try
4592	4736	{
4593	4737	//readobj.deepCopySelf(copy);
..	..	@@ -4648,7 +4792,7 @@
4648	4792	}
4649	4793	}
4650	4794
4651		- void load() // throws ClassNotFoundException
	4795	+ void Open() // throws ClassNotFoundException
4652	4796	{
4653	4797	if (Grafreed.standAlone)
4654	4798	{
..	..	@@ -4765,6 +4909,8 @@
4765	4909	String filename = browser.getFile();
4766	4910	if (filename != null && filename.length() > 0)
4767	4911	{
	4912	+ if (!filename.endsWith(".gfd"))
	4913	+ filename += ".gfd";
4768	4914	lastname = browser.getDirectory() + filename;
4769	4915	save();
4770	4916	}
..	..	@@ -4931,7 +5077,7 @@
4931	5077	MenuBar menuBar;
4932	5078	Menu fileMenu;
4933	5079	MenuItem newItem;
4934		- MenuItem loadItem;
	5080	+ MenuItem openItem;
4935	5081	MenuItem saveItem;
4936	5082	MenuItem saveAsItem;
4937	5083	MenuItem exportAsItem;
..	..	@@ -4954,6 +5100,7 @@
4954	5100	CheckboxMenuItem toggleSwitchItem;
4955	5101	CheckboxMenuItem toggleRootItem;
4956	5102	CheckboxMenuItem animationItem;
	5103	+ MenuItem archiveItem;
4957	5104	CheckboxMenuItem toggleHandleItem;
4958	5105	CheckboxMenuItem togglePaintItem;
4959	5106	JSplitPane mainPanel;