~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,9 +813,30 @@
763	813	radio.layout.doClick();
764	814	//frame.setVisible(true);
765	815	}
766		-
767		- cameraView.ToggleFullScreen();
	816	+ frame.validate();
768	817	}
	818	+
	819	+ private byte[] CompressCopy()
	820	+ {
	821	+ boolean temp = CameraPane.SWITCH;
	822	+ CameraPane.SWITCH = false;
	823	+
	824	+ copy.ExtractBigData(versiontable);
	825	+ // if (copy == client)
	826	+
	827	+ byte[] versions[] = copy.versions;
	828	+ copy.versions = null;
	829	+
	830	+ byte[] compress = Compress(copy);
	831	+
	832	+ copy.versions = versions;
	833	+
	834	+ copy.RestoreBigData(versiontable);
	835	+
	836	+ CameraPane.SWITCH = temp;
	837	+
	838	+ return compress;
	839	+ }
769	840
770	841	private JTextPane createTextPane()
771	842	{
..	..	@@ -1097,12 +1168,12 @@
1097	1168	namePanel = new cGridBag();
1098	1169
1099	1170	nameField = AddText(namePanel, copy.GetName());
1100		- namePanel.add(nameField);
	1171	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1101	1172	oe.ctrlPanel.add(namePanel);
1102	1173
1103	1174	oe.ctrlPanel.Return();
1104	1175
1105		- if (!GroupEditor.allparams)
	1176	+ if (!allparams)
1106	1177	return;
1107	1178
1108	1179	setupPanel = new cGridBag().setVertical(false);
..	..	@@ -1115,20 +1186,21 @@
1115	1186	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1116	1187	hideCB.setToolTipText("Hide object");
1117	1188	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1118		- markCB.setToolTipText("Set the animation target transform");
	1189	+ markCB.setToolTipText("As animation target transform");
1119	1190
1120	1191	setupPanel2 = new cGridBag().setVertical(false);
1121	1192
1122	1193	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1123	1194	rewindCB.setToolTipText("Rewind animation");
1124	1195
1125		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1126		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1196	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1197	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1127	1198
	1199	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1200	+ link2masterCB.setToolTipText("Attach to support");
	1201	+
1128	1202	if (Globals.ADVANCED)
1129	1203	{
1130		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1131		- link2masterCB.setToolTipText("Attach to support");
1132	1204	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1133	1205	speedupCB.setToolTipText("Option motion capture");
1134	1206	}
..	..	@@ -1439,13 +1511,16 @@
1439	1511	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1440	1512	//tmp.setName("Edit");
1441	1513	objectPanel.add(materialPanel);
1442		- objectPanel.add(toolboxPanel);
1443	1514	// JPanel north = new JPanel(new BorderLayout());
1444	1515	// north.setName("Edit");
1445	1516	// north.add(ctrlPanel, BorderLayout.NORTH);
1446	1517	// objectPanel.add(north);
1447	1518	objectPanel.add(editPanel);
1448		- objectPanel.add(infoPanel);
	1519	+
	1520	+ //if (Globals.ADVANCED)
	1521	+ objectPanel.add(infoPanel);
	1522	+
	1523	+ objectPanel.add(toolboxPanel);
1449	1524
1450	1525	/*
1451	1526	aConstraints.gridx = 0;
..	..	@@ -1454,7 +1529,7 @@
1454	1529	aConstraints.gridy += 1;
1455	1530	aConstraints.gridwidth = 1;
1456	1531	mainPanel.add(objectPanel, aConstraints);
1457		- */
	1532	+ */
1458	1533
1459	1534	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1460	1535	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1553,9 +1628,9 @@
1553	1628	// aConstraints.gridheight = 1;
1554	1629
1555	1630	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1556		- framePanel.setContinuousLayout(true);
1557		- framePanel.setOneTouchExpandable(true);
1558		- framePanel.setDividerLocation(0.8);
	1631	+ framePanel.setContinuousLayout(false);
	1632	+ framePanel.setOneTouchExpandable(false);
	1633	+ //.setDividerLocation(0.8);
1559	1634	//framePanel.setDividerSize(15);
1560	1635	//framePanel.setResizeWeight(0.15);
1561	1636	framePanel.setName("Frame");
..	..	@@ -1574,12 +1649,13 @@
1574	1649
1575	1650	frame.setSize(1280, 860);
1576	1651
1577		- frame.validate();
1578		- frame.setVisible(true);
1579		-
1580	1652	cameraView.requestFocusInWindow();
1581	1653
1582	1654	gridPanel.setDividerLocation(1.0);
	1655	+
	1656	+ frame.validate();
	1657	+
	1658	+ frame.setVisible(true);
1583	1659
1584	1660	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1585	1661	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1666,24 +1742,6 @@
1666	1742	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1667	1743	colorSection.add(texture);
1668	1744
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	1745	panel.add(new JSeparator());
1688	1746
1689	1747	panel.add(colorSection);
..	..	@@ -1733,6 +1791,12 @@
1733	1791	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1734	1792	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1735	1793	diffuseSection.add(fakedepth);
	1794	+
	1795	+ cGridBag shadowbias = new cGridBag();
	1796	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1797	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1798	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1799	+ diffuseSection.add(shadowbias);
1736	1800
1737	1801	panel.add(new JSeparator());
1738	1802
..	..	@@ -1784,6 +1848,18 @@
1784	1848	// aConstraints.gridy += 1;
1785	1849	// aConstraints.gridwidth = 1;
1786	1850
	1851	+ cGridBag anisoU = new cGridBag();
	1852	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1853	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1854	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1855	+ specularSection.add(anisoU);
	1856	+
	1857	+ cGridBag anisoV = new cGridBag();
	1858	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1859	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1860	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1861	+ specularSection.add(anisoV);
	1862	+
1787	1863
1788	1864	panel.add(new JSeparator());
1789	1865
..	..	@@ -1791,35 +1867,35 @@
1791	1867
1792	1868	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1793	1869
1794		- cGridBag globalSection = new cGridBag().setVertical(true);
	1870	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1795	1871
1796	1872	cGridBag camera = new cGridBag();
1797	1873	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1798	1874	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1799	1875	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1800		- globalSection.add(camera);
	1876	+ colorSection.add(camera);
1801	1877
1802	1878	cGridBag ambient = new cGridBag();
1803	1879	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1804	1880	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1805	1881	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1806		- globalSection.add(ambient);
	1882	+ colorSection.add(ambient);
1807	1883
1808	1884	cGridBag backlit = new cGridBag();
1809	1885	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1810	1886	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1811	1887	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1812		- globalSection.add(backlit);
	1888	+ colorSection.add(backlit);
1813	1889
1814	1890	cGridBag opacity = new cGridBag();
1815	1891	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1816	1892	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1817	1893	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1818		- globalSection.add(opacity);
	1894	+ colorSection.add(opacity);
1819	1895
1820		- panel.add(new JSeparator());
	1896	+ //panel.add(new JSeparator());
1821	1897
1822		- panel.add(globalSection);
	1898	+ //panel.add(globalSection);
1823	1899
1824	1900	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1825	1901
..	..	@@ -1926,8 +2002,9 @@
1926	2002	// 3D models
1927	2003	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1928	2004	{
1929		- lastConverter = new com.jmex.model.converters.MaxToJme();
1930		- LoadFile(filename, lastConverter);
	2005	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2006	+ //LoadFile(filename, lastConverter);
	2007	+ LoadObjFile(filename); // New 3ds loader
1931	2008	continue;
1932	2009	}
1933	2010	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2653,6 +2730,7 @@
2653	2730	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2654	2731	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2655	2732	}
	2733	+
2656	2734	//cJME.count++;
2657	2735	//cJME.count %= 12;
2658	2736	if (gc)
..	..	@@ -2836,6 +2914,7 @@
2836	2914	}
2837	2915	}
2838	2916	}
	2917	+
2839	2918	cFileSystemPane FSPane;
2840	2919
2841	2920	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2889,6 +2968,7 @@
2889	2968	}
2890	2969	}
2891	2970	}
	2971	+
2892	2972	freezematerial = false;
2893	2973	}
2894	2974
..	..	@@ -3007,12 +3087,17 @@
3007	3087	// }
3008	3088
3009	3089	/**/
3010		- if (deselect)
	3090	+ if (deselect \|\| child == null)
3011	3091	{
3012	3092	//group.deselectAll();
3013	3093	//freeze = true;
3014	3094	GetTree().clearSelection();
3015	3095	//freeze = false;
	3096	+
	3097	+ if (child == null)
	3098	+ {
	3099	+ return;
	3100	+ }
3016	3101	}
3017	3102
3018	3103	//group.addSelectee(child);
..	..	@@ -3336,9 +3421,9 @@
3336	3421	{
3337	3422	Close();
3338	3423	//return true;
3339		- } else if (source == loadItem)
	3424	+ } else if (source == openItem)
3340	3425	{
3341		- load();
	3426	+ Open();
3342	3427	//return true;
3343	3428	} else if (source == newItem)
3344	3429	{
..	..	@@ -3363,6 +3448,10 @@
3363	3448	{
3364	3449	generatePOV();
3365	3450	//return true;
	3451	+ } else if (event.getSource() == archiveItem)
	3452	+ {
	3453	+ cTools.Archive(frame);
	3454	+ return;
3366	3455	} else if (source == zBufferItem)
3367	3456	{
3368	3457	try
..	..	@@ -3414,8 +3503,8 @@
3414	3503	try
3415	3504	{
3416	3505	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3417		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3418		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3506	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3507	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3419	3508
3420	3509	Object3D parent = o.parent;
3421	3510	o.parent = null;
..	..	@@ -3426,10 +3515,14 @@
3426	3515
3427	3516	out.flush();
3428	3517
3429		- zstream.close();
	3518	+ baos //zstream
	3519	+ .close();
3430	3520	out.close();
3431	3521
3432		- return baos.toByteArray();
	3522	+ byte[] bytes = baos.toByteArray();
	3523	+
	3524	+ System.out.println("save #bytes = " + bytes.length);
	3525	+ return bytes;
3433	3526	} catch (Exception e)
3434	3527	{
3435	3528	System.err.println(e);
..	..	@@ -3439,13 +3532,16 @@
3439	3532
3440	3533	static public Object Uncompress(byte[] bytes)
3441	3534	{
3442		- System.out.println("#bytes = " + bytes.length);
	3535	+ System.out.println("restore #bytes = " + bytes.length);
3443	3536	try
3444	3537	{
3445	3538	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3446		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3447		- ObjectInputStream in = new ObjectInputStream(istream);
	3539	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3540	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3448	3541	Object obj = in.readObject();
	3542	+
	3543	+ bais //istream
	3544	+ .close();
3449	3545	in.close();
3450	3546
3451	3547	return obj;
..	..	@@ -3500,39 +3596,77 @@
3500	3596	return null;
3501	3597	}
3502	3598
3503		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3504	3599
3505	3600	public void Save()
	3601	+ {
	3602	+ //Save(true);
	3603	+ Replace();
	3604	+ }
	3605	+
	3606	+ private boolean Equal(byte[] compress, byte[] name)
	3607	+ {
	3608	+ if (compress.length != name.length)
	3609	+ {
	3610	+ return false;
	3611	+ }
	3612	+
	3613	+ for (int i=compress.length; --i>=0;)
	3614	+ {
	3615	+ if (compress[i] != name[i])
	3616	+ return false;
	3617	+ }
	3618	+
	3619	+ return true;
	3620	+ }
	3621	+
	3622	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3623	+
	3624	+ public boolean Save(boolean user)
3506	3625	{
3507	3626	System.err.println("Save");
3508	3627
3509	3628	cRadio tab = GetCurrentTab();
3510	3629
3511		- boolean temp = CameraPane.SWITCH;
3512		- CameraPane.SWITCH = false;
	3630	+ byte[] compress = CompressCopy();
3513	3631
3514		- copy.ExtractBigData(hashtable);
	3632	+ boolean thesame = false;
	3633	+
	3634	+ // Quick heuristic using length. Works only when stream is compressed.
	3635	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3636	+ {
	3637	+ thesame = true;
	3638	+ }
3515	3639
3516	3640	//EditorFrame.m_MainFrame.requestFocusInWindow();
3517		- tab.graphs[tab.undoindex++] = Compress(copy);
3518		-
3519		- copy.RestoreBigData(hashtable);
3520		-
3521		- CameraPane.SWITCH = temp;
3522		-
3523		- //assert(hashtable.isEmpty());
3524		-
3525		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3641	+ if (!thesame)
3526	3642	{
3527		- tab.graphs[i] = null;
	3643	+ //tab.user[tab.versionindex] = user;
	3644	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3645	+
	3646	+ copy.versions[++copy.versionindex] = compress;
	3647	+
	3648	+ // if (increment)
	3649	+ // tab.versionindex++;
3528	3650	}
3529	3651
	3652	+ //copy.RestoreBigData(versiontable);
	3653	+
	3654	+ //assert(hashtable.isEmpty());
	3655	+
	3656	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3657	+ {
	3658	+ //tab.user[i] = false;
	3659	+ copy.versions[i] = null;
	3660	+ }
	3661	+
	3662	+ SetUndoStates();
	3663	+
3530	3664	// test save
3531	3665	if (false)
3532	3666	{
3533	3667	try
3534	3668	{
3535		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3669	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3536	3670	ObjectOutputStream p = new ObjectOutputStream(ostream);
3537	3671
3538	3672	p.writeObject(copy);
..	..	@@ -3545,14 +3679,18 @@
3545	3679	e.printStackTrace();
3546	3680	}
3547	3681	}
	3682	+
	3683	+ return !thesame;
3548	3684	}
3549	3685
3550	3686	void CopyChanged(Object3D obj)
3551	3687	{
	3688	+ SetUndoStates();
	3689	+
3552	3690	boolean temp = CameraPane.SWITCH;
3553	3691	CameraPane.SWITCH = false;
3554	3692
3555		- copy.ExtractBigData(hashtable);
	3693	+ copy.ExtractBigData(versiontable);
3556	3694
3557	3695	copy.clear();
3558	3696
..	..	@@ -3561,7 +3699,7 @@
3561	3699	copy.add(obj.get(i));
3562	3700	}
3563	3701
3564		- copy.RestoreBigData(hashtable);
	3702	+ copy.RestoreBigData(versiontable);
3565	3703
3566	3704	CameraPane.SWITCH = temp;
3567	3705
..	..	@@ -3588,42 +3726,103 @@
3588	3726	refreshContents();
3589	3727	}
3590	3728
3591		- public void Undo()
	3729	+ cButton undoButton;
	3730	+ cButton restoreButton;
	3731	+ cButton replaceButton;
	3732	+ cButton redoButton;
	3733	+
	3734	+ void SetUndoStates()
	3735	+ {
	3736	+ cRadio tab = GetCurrentTab();
	3737	+
	3738	+ restoreButton.setEnabled(copy.versionindex != -1);
	3739	+ replaceButton.setEnabled(copy.versionindex != -1);
	3740	+ undoButton.setEnabled(copy.versionindex > 0);
	3741	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3742	+ }
	3743	+
	3744	+ public boolean Undo()
3592	3745	{
3593	3746	System.err.println("Undo");
3594	3747
3595	3748	cRadio tab = GetCurrentTab();
3596	3749
3597		- if (tab.undoindex == 0)
	3750	+ if (copy.versionindex == 0)
3598	3751	{
3599	3752	java.awt.Toolkit.getDefaultToolkit().beep();
3600		- return;
	3753	+ return false;
3601	3754	}
3602	3755
3603		- if (tab.graphs[tab.undoindex] == null)
	3756	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3757	+// {
	3758	+// if (Save(false))
	3759	+// tab.versionindex -= 1;
	3760	+// else
	3761	+// {
	3762	+// if (tab.versionindex <= 0)
	3763	+// return false;
	3764	+// else
	3765	+// tab.versionindex -= 1;
	3766	+// }
	3767	+// }
	3768	+
	3769	+ copy.versionindex -= 1;
	3770	+
	3771	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3772	+
	3773	+ return true;
	3774	+ }
	3775	+
	3776	+ public boolean Restore()
	3777	+ {
	3778	+ System.err.println("Restore");
	3779	+
	3780	+ cRadio tab = GetCurrentTab();
	3781	+
	3782	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
3604	3783	{
3605		- Save();
3606		- tab.undoindex -= 1;
	3784	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3785	+ return false;
3607	3786	}
3608	3787
3609		- tab.undoindex -= 1;
	3788	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3789	+
	3790	+ return true;
	3791	+ }
3610	3792
3611		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3793	+ public boolean Replace()
	3794	+ {
	3795	+ System.err.println("Replace");
	3796	+
	3797	+ cRadio tab = GetCurrentTab();
	3798	+
	3799	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3800	+ {
	3801	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3802	+ return false;
	3803	+ }
	3804	+
	3805	+ copy.versions[copy.versionindex] = CompressCopy();
	3806	+
	3807	+ return true;
3612	3808	}
3613	3809
3614	3810	public void Redo()
3615	3811	{
3616	3812	cRadio tab = GetCurrentTab();
3617	3813
3618		- if (tab.graphs[tab.undoindex + 1] == null)
	3814	+ if (copy.versions[copy.versionindex + 1] == null)
3619	3815	{
3620	3816	java.awt.Toolkit.getDefaultToolkit().beep();
3621	3817	return;
3622	3818	}
3623	3819
3624		- tab.undoindex += 1;
	3820	+ copy.versionindex += 1;
3625	3821
3626		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3822	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3823	+
	3824	+ //if (!tab.user[tab.versionindex])
	3825	+ // tab.graphs[tab.versionindex] = null;
3627	3826	}
3628	3827
3629	3828	void ImportGFD()
..	..	@@ -3919,9 +4118,22 @@
3919	4118	//copy.Touch();
3920	4119	}
3921	4120
	4121	+ cNumberSlider versionField;
	4122	+
3922	4123	public void stateChanged(ChangeEvent e)
3923	4124	{
3924	4125	// assert(false);
	4126	+ if (e.getSource() == versionField)
	4127	+ {
	4128	+ int version = versionField.getInteger();
	4129	+
	4130	+ if (copy.versions[version] != null)
	4131	+ {
	4132	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4133	+ }
	4134	+
	4135	+ return;
	4136	+ }
3925	4137
3926	4138	if (freezematerial)
3927	4139	{
..	..	@@ -4270,7 +4482,7 @@
4270	4482
4271	4483	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4272	4484	{
4273		- if (Globals.SAVEONMAKE) // && resetmodel)
	4485	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4274	4486	Save();
4275	4487	//Tween.set(thing, 0).target(1).start(tweenManager);
4276	4488	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4586,8 +4798,8 @@
4586	4798
4587	4799	if (readobj != null)
4588	4800	{
4589		- if (Globals.SAVEONMAKE)
4590		- Save();
	4801	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4802	+ // Save();
4591	4803	try
4592	4804	{
4593	4805	//readobj.deepCopySelf(copy);
..	..	@@ -4642,13 +4854,18 @@
4642	4854	c.addChild(csg);
4643	4855	}
4644	4856
	4857	+ copy.versions = readobj.versions;
	4858	+ copy.versionindex = readobj.versionindex;
	4859	+
	4860	+ SetUndoStates();
	4861	+
4645	4862	ResetModel();
4646	4863	copy.HardTouch(); // recompile?
4647	4864	refreshContents();
4648	4865	}
4649	4866	}
4650	4867
4651		- void load() // throws ClassNotFoundException
	4868	+ void Open() // throws ClassNotFoundException
4652	4869	{
4653	4870	if (Grafreed.standAlone)
4654	4871	{
..	..	@@ -4765,6 +4982,8 @@
4765	4982	String filename = browser.getFile();
4766	4983	if (filename != null && filename.length() > 0)
4767	4984	{
	4985	+ if (!filename.endsWith(".gfd"))
	4986	+ filename += ".gfd";
4768	4987	lastname = browser.getDirectory() + filename;
4769	4988	save();
4770	4989	}
..	..	@@ -4931,7 +5150,7 @@
4931	5150	MenuBar menuBar;
4932	5151	Menu fileMenu;
4933	5152	MenuItem newItem;
4934		- MenuItem loadItem;
	5153	+ MenuItem openItem;
4935	5154	MenuItem saveItem;
4936	5155	MenuItem saveAsItem;
4937	5156	MenuItem exportAsItem;
..	..	@@ -4954,6 +5173,7 @@
4954	5173	CheckboxMenuItem toggleSwitchItem;
4955	5174	CheckboxMenuItem toggleRootItem;
4956	5175	CheckboxMenuItem animationItem;
	5176	+ MenuItem archiveItem;
4957	5177	CheckboxMenuItem toggleHandleItem;
4958	5178	CheckboxMenuItem togglePaintItem;
4959	5179	JSplitPane mainPanel;