~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -41,64 +41,78 @@
41	41	JFrame frame;
42	42
43	43	static ObjEditor theFrame;
	44	+
	45	+ public cGridBag GetSeparator()
	46	+ {
	47	+ cGridBag separator = new cGridBag();
	48	+ separator.add(new JSeparator());
	49	+ separator.preferredHeight = 5;
	50	+ return separator;
	51	+ }
44	52
45	53	cButton GetButton(String name, boolean border)
46	54	{
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		- }
	55	+ ImageIcon icon = GetIcon(name);
	56	+ return new cButton(icon, border);
	57	+ }
	58	+
	59	+ cLabel GetLabel(String name, boolean border)
	60	+ {
	61	+ //ImageIcon icon = GetIcon(name);
	62	+ return new cLabel(GetImage(name), border);
56	63	}
57	64
58	65	cToggleButton GetToggleButton(String name, boolean border)
59	66	{
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		- }
	67	+ ImageIcon icon = GetIcon(name);
	68	+ return new cToggleButton(icon, border);
69	69	}
70	70
71	71	cCheckBox GetCheckBox(String name, boolean border)
72	72	{
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
73	79	try
74	80	{
75		- ImageIcon icon = GetIcon(name);
76		- return new cCheckBox(icon, border);
	81	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	82	+
	83	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	84	+// {
	85	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	86	+// Graphics2D g = resized.createGraphics();
	87	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	88	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	89	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	90	+// g.dispose();
	91	+//
	92	+// image = resized;
	93	+// }
	94	+
	95	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	96	+ return icon;
77	97	}
78	98	catch (Exception e)
79	99	{
80		- return new cCheckBox(name, border);
	100	+ return null;
81	101	}
82	102	}
83		-
84		- private ImageIcon GetIcon(String name) throws IOException
	103	+
	104	+ BufferedImage GetImage(String name)
85	105	{
86		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87		-
88		- if (image.getWidth() != 24 && image.getHeight() != 24)
	106	+ try
89	107	{
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;
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
98	111	}
99		-
100		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101		- return icon;
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
102	116	}
103	117
104	118	// SCRIPT
..	..	@@ -282,6 +296,12 @@
282	296	client = inClient;
283	297	copy = client;
284	298
	299	+ if (copy.versions == null)
	300	+ {
	301	+ copy.versions = new Object3D[100];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
285	305	// "this" is not called: SetupUI2(objEditor);
286	306	}
287	307
..	..	@@ -295,6 +315,12 @@
295	315	client = inClient;
296	316	copy = client;
297	317
	318	+ if (copy.versions == null)
	319	+ {
	320	+ copy.versions = new Object3D[100];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
298	324	SetupUI2(callee.GetEditor());
299	325	}
300	326
..	..	@@ -327,6 +353,12 @@
327	353	copy = localCopy;
328	354	copy.editWindow = this;
329	355
	356	+ if (copy.versions == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
330	362	SetupMenu();
331	363
332	364	//SetupName(objEditor); // new
..	..	@@ -419,11 +451,12 @@
419	451
420	452	toolbarPanel = new JPanel();
421	453	toolbarPanel.setName("Toolbar");
	454	+
422	455	treePanel = new cGridBag();
423	456	treePanel.setName("Tree");
424	457
425	458	editPanel = new cGridBag().setVertical(true);
426		- editPanel.setName("Edit");
	459	+ //editPanel.setName("Edit");
427	460
428	461	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429	462
..	..	@@ -431,11 +464,11 @@
431	464	editPanel.add(editCommandsPanel);
432	465	editPanel.add(ctrlPanel);
433	466
434		- toolboxPanel = new cGridBag().setVertical(false);
435		- toolboxPanel.setName("Toolbox");
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
436	469
437	470	materialPanel = new cGridBag().setVertical(true);
438		- materialPanel.setName("Material");
	471	+ //materialPanel.setName("Material");
439	472
440	473	/JTextPane/
441	474	infoarea = createTextPane();
..	..	@@ -443,6 +476,7 @@
443	476
444	477	infoarea.setEditable(true);
445	478	SetText();
	479	+
446	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447	481	// infoarea.setOpaque(false);
448	482	// //infoarea.setForeground(textcolor);
..	..	@@ -450,7 +484,7 @@
450	484	// TEXTAREA infoarea.setWrapStyleWord(true);
451	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452	486	infoPanel.setPreferredSize(new Dimension(1, 1));
453		- infoPanel.setName("Info");
	487	+ //infoPanel.setName("Info");
454	488	//infoPanel.setLayout(new BorderLayout());
455	489	//infoPanel.add(createTextPane());
456	490
..	..	@@ -816,6 +850,29 @@
816	850	frame.validate();
817	851	}
818	852
	853	+ private Object3D CompressCopy()
	854	+ {
	855	+ boolean temp = CameraPane.SWITCH;
	856	+ CameraPane.SWITCH = false;
	857	+
	858	+ copy.ExtractBigData(versiontable);
	859	+ // if (copy == client)
	860	+
	861	+ Object3D versions[] = copy.versions;
	862	+ copy.versions = null;
	863	+
	864	+ //byte[] compress = Compress(copy);
	865	+ Object3D compress = (Object3D)Grafreed.clone(copy);
	866	+
	867	+ copy.versions = versions;
	868	+
	869	+ copy.RestoreBigData(versiontable);
	870	+
	871	+ CameraPane.SWITCH = temp;
	872	+
	873	+ return compress;
	874	+ }
	875	+
819	876	private JTextPane createTextPane()
820	877	{
821	878	// TEXTAREA String[] initString =
..	..	@@ -946,7 +1003,7 @@
946	1003	// NumberSlider vDivsField;
947	1004	// JCheckBox endcaps;
948	1005	JCheckBox liveCB;
949		- JCheckBox selectCB;
	1006	+ JCheckBox selectableCB;
950	1007	JCheckBox hideCB;
951	1008	JCheckBox link2masterCB;
952	1009	JCheckBox markCB;
..	..	@@ -1158,13 +1215,16 @@
1158	1215
1159	1216	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1160	1217	liveCB.setToolTipText("Animate object");
1161		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1162		- selectCB.setToolTipText("Make object selectable");
	1218	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1219	+ selectableCB.setToolTipText("Make object selectable");
1163	1220	// Return();
	1221	+
1164	1222	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1165	1223	hideCB.setToolTipText("Hide object");
1166	1224	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1167	1225	markCB.setToolTipText("As animation target transform");
	1226	+
	1227	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1168	1228
1169	1229	setupPanel2 = new cGridBag().setVertical(false);
1170	1230
..	..	@@ -1174,10 +1234,11 @@
1174	1234	randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1175	1235	randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1176	1236
	1237	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1238	+ link2masterCB.setToolTipText("Attach to support");
	1239	+
1177	1240	if (Globals.ADVANCED)
1178	1241	{
1179		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1180		- link2masterCB.setToolTipText("Attach to support");
1181	1242	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1182	1243	speedupCB.setToolTipText("Option motion capture");
1183	1244	}
..	..	@@ -1451,6 +1512,7 @@
1451	1512	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1452	1513	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1453	1514	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1515	+ //XYZPanel.setName("XYZ");
1454	1516
1455	1517	/*
1456	1518	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1488,16 +1550,29 @@
1488	1550	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1489	1551	//tmp.setName("Edit");
1490	1552	objectPanel.add(materialPanel);
	1553	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1554	+ objectPanel.setToolTipTextAt(0, "Material panel");
	1555	+
1491	1556	// JPanel north = new JPanel(new BorderLayout());
1492	1557	// north.setName("Edit");
1493	1558	// north.add(ctrlPanel, BorderLayout.NORTH);
1494	1559	// objectPanel.add(north);
1495	1560	objectPanel.add(editPanel);
	1561	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1562	+ objectPanel.setToolTipTextAt(1, "Edit panel");
1496	1563
1497	1564	//if (Globals.ADVANCED)
1498	1565	objectPanel.add(infoPanel);
	1566	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1567	+ objectPanel.setToolTipTextAt(2, "Info panel");
	1568	+
	1569	+ objectPanel.add(XYZPanel);
	1570	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1571	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
1499	1572
1500	1573	objectPanel.add(toolboxPanel);
	1574	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1575	+ objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
1501	1576
1502	1577	/*
1503	1578	aConstraints.gridx = 0;
..	..	@@ -1518,7 +1593,7 @@
1518	1593	scrollpane.addMouseWheelListener(this); // Default not fast enough
1519	1594
1520	1595	/JTabbedPane/ scenePanel = new cGridBag();
1521		- scenePanel.preferredWidth = 6;
	1596	+ scenePanel.preferredWidth = 5;
1522	1597
1523	1598	JTabbedPane tabbedPane = new JTabbedPane();
1524	1599	tabbedPane.add(scrollpane);
..	..	@@ -1596,7 +1671,7 @@
1596	1671	bigThree = new cGridBag();
1597	1672	bigThree.addComponent(scenePanel);
1598	1673	bigThree.addComponent(centralPanel);
1599		- bigThree.addComponent(XYZPanel);
	1674	+ //bigThree.addComponent(XYZPanel);
1600	1675
1601	1676	// // SIDE EFFECT!!!
1602	1677	// aConstraints.gridx = 0;
..	..	@@ -1637,7 +1712,6 @@
1637	1712	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1638	1713	frame.addWindowListener(new WindowAdapter()
1639	1714	{
1640		-
1641	1715	public void windowClosing(WindowEvent e)
1642	1716	{
1643	1717	Close();
..	..	@@ -1699,27 +1773,48 @@
1699	1773	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1700	1774
1701	1775	cGridBag colorSection = new cGridBag().setVertical(true);
	1776	+
	1777	+ cGridBag huepanel = new cGridBag();
	1778	+ cGridBag huelabel = new cGridBag();
	1779	+ huelabel.add(GetLabel("icons/hue.png", false));
	1780	+ huelabel.preferredWidth = 20;
	1781	+ huepanel.add(new cGridBag()); // Label
	1782	+ huepanel.add(huelabel); // Field/slider
	1783	+
	1784	+ huepanel.preferredHeight = 7;
	1785	+
	1786	+ colorSection.add(huepanel);
1702	1787
1703	1788	cGridBag color = new cGridBag();
1704		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1705		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1789	+
	1790	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1791	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1792	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1793	+
1707	1794	//colorField.preferredWidth = 200;
1708	1795	colorSection.add(color);
1709	1796
1710	1797	cGridBag modulation = new cGridBag();
1711	1798	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1712	1799	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1713		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1800	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1714	1801	colorSection.add(modulation);
1715	1802
	1803	+ cGridBag opacity = new cGridBag();
	1804	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1805	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1806	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1807	+ colorSection.add(opacity);
	1808	+
	1809	+ colorSection.add(GetSeparator());
	1810	+
1716	1811	cGridBag texture = new cGridBag();
1717	1812	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1718	1813	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1719	1814	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1720	1815	colorSection.add(texture);
1721	1816
1722		- panel.add(new JSeparator());
	1817	+ panel.add(GetSeparator());
1723	1818
1724	1819	panel.add(colorSection);
1725	1820
..	..	@@ -1775,7 +1870,7 @@
1775	1870	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1776	1871	diffuseSection.add(shadowbias);
1777	1872
1778		- panel.add(new JSeparator());
	1873	+ panel.add(GetSeparator());
1779	1874
1780	1875	panel.add(diffuseSection);
1781	1876
..	..	@@ -1838,7 +1933,7 @@
1838	1933	specularSection.add(anisoV);
1839	1934
1840	1935
1841		- panel.add(new JSeparator());
	1936	+ panel.add(GetSeparator());
1842	1937
1843	1938	panel.add(specularSection);
1844	1939
..	..	@@ -1863,12 +1958,6 @@
1863	1958	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1864	1959	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1865	1960	colorSection.add(backlit);
1866		-
1867		- cGridBag opacity = new cGridBag();
1868		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1869		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1870		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1871		- colorSection.add(opacity);
1872	1961
1873	1962	//panel.add(new JSeparator());
1874	1963
..	..	@@ -1914,7 +2003,7 @@
1914	2003	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1915	2004	textureSection.add(opacityPower);
1916	2005
1917		- panel.add(new JSeparator());
	2006	+ panel.add(GetSeparator());
1918	2007
1919	2008	panel.add(textureSection);
1920	2009
..	..	@@ -1979,8 +2068,9 @@
1979	2068	// 3D models
1980	2069	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1981	2070	{
1982		- lastConverter = new com.jmex.model.converters.MaxToJme();
1983		- LoadFile(filename, lastConverter);
	2071	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2072	+ //LoadFile(filename, lastConverter);
	2073	+ LoadObjFile(filename); // New 3ds loader
1984	2074	continue;
1985	2075	}
1986	2076	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2706,6 +2796,7 @@
2706	2796	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2707	2797	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2708	2798	}
	2799	+
2709	2800	//cJME.count++;
2710	2801	//cJME.count %= 12;
2711	2802	if (gc)
..	..	@@ -2889,6 +2980,7 @@
2889	2980	}
2890	2981	}
2891	2982	}
	2983	+
2892	2984	cFileSystemPane FSPane;
2893	2985
2894	2986	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2942,6 +3034,7 @@
2942	3034	}
2943	3035	}
2944	3036	}
	3037	+
2945	3038	freezematerial = false;
2946	3039	}
2947	3040
..	..	@@ -3209,7 +3302,7 @@
3209	3302	{
3210	3303	copy.live ^= true;
3211	3304	return;
3212		- } else if (event.getSource() == selectCB)
	3305	+ } else if (event.getSource() == selectableCB)
3213	3306	{
3214	3307	copy.dontselect ^= true;
3215	3308	return;
..	..	@@ -3473,11 +3566,12 @@
3473	3566
3474	3567	static public byte[] Compress(Object3D o)
3475	3568	{
	3569	+ // Slower to actually compress.
3476	3570	try
3477	3571	{
3478	3572	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3479		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3480		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3573	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3574	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3481	3575
3482	3576	Object3D parent = o.parent;
3483	3577	o.parent = null;
..	..	@@ -3488,10 +3582,14 @@
3488	3582
3489	3583	out.flush();
3490	3584
3491		- zstream.close();
	3585	+ baos //zstream
	3586	+ .close();
3492	3587	out.close();
3493	3588
3494		- return baos.toByteArray();
	3589	+ byte[] bytes = baos.toByteArray();
	3590	+
	3591	+ System.out.println("save #bytes = " + bytes.length);
	3592	+ return bytes;
3495	3593	} catch (Exception e)
3496	3594	{
3497	3595	System.err.println(e);
..	..	@@ -3501,13 +3599,16 @@
3501	3599
3502	3600	static public Object Uncompress(byte[] bytes)
3503	3601	{
3504		- System.out.println("#bytes = " + bytes.length);
	3602	+ System.out.println("restore #bytes = " + bytes.length);
3505	3603	try
3506	3604	{
3507	3605	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3508		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3509		- ObjectInputStream in = new ObjectInputStream(istream);
	3606	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3607	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3510	3608	Object obj = in.readObject();
	3609	+
	3610	+ bais //istream
	3611	+ .close();
3511	3612	in.close();
3512	3613
3513	3614	return obj;
..	..	@@ -3562,33 +3663,66 @@
3562	3663	return null;
3563	3664	}
3564	3665
3565		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3566	3666
3567	3667	public void Save()
	3668	+ {
	3669	+ //Save(true);
	3670	+ Replace();
	3671	+ }
	3672	+
	3673	+ private boolean Equal(byte[] compress, byte[] name)
	3674	+ {
	3675	+ if (compress.length != name.length)
	3676	+ {
	3677	+ return false;
	3678	+ }
	3679	+
	3680	+ for (int i=compress.length; --i>=0;)
	3681	+ {
	3682	+ if (compress[i] != name[i])
	3683	+ return false;
	3684	+ }
	3685	+
	3686	+ return true;
	3687	+ }
	3688	+
	3689	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3690	+
	3691	+ public boolean Save(boolean user)
3568	3692	{
3569	3693	System.err.println("Save");
3570	3694
3571	3695	cRadio tab = GetCurrentTab();
3572	3696
3573		- boolean temp = CameraPane.SWITCH;
3574		- CameraPane.SWITCH = false;
	3697	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
3575	3698
3576		- copy.ExtractBigData(hashtable);
	3699	+ boolean thesame = false;
3577	3700
3578		- byte[] compress = Compress(copy);
	3701	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3702	+// {
	3703	+// thesame = true;
	3704	+// }
3579	3705
3580	3706	//EditorFrame.m_MainFrame.requestFocusInWindow();
3581		- tab.graphs[tab.undoindex++] = compress;
	3707	+ if (!thesame)
	3708	+ {
	3709	+ //tab.user[tab.versionindex] = user;
	3710	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3711	+
	3712	+ copy.versions[++copy.versionindex] = compress;
	3713	+
	3714	+ // if (increment)
	3715	+ // tab.versionindex++;
	3716	+ }
3582	3717
3583		- copy.RestoreBigData(hashtable);
	3718	+ //copy.RestoreBigData(versiontable);
3584	3719
3585		- CameraPane.SWITCH = temp;
3586		-
3587	3720	//assert(hashtable.isEmpty());
3588	3721
3589		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3722	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3590	3723	{
3591		- tab.graphs[i] = null;
	3724	+ //tab.user[i] = false;
	3725	+ copy.versions[i] = null;
3592	3726	}
3593	3727
3594	3728	SetUndoStates();
..	..	@@ -3598,7 +3732,7 @@
3598	3732	{
3599	3733	try
3600	3734	{
3601		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3735	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3602	3736	ObjectOutputStream p = new ObjectOutputStream(ostream);
3603	3737
3604	3738	p.writeObject(copy);
..	..	@@ -3611,6 +3745,8 @@
3611	3745	e.printStackTrace();
3612	3746	}
3613	3747	}
	3748	+
	3749	+ return !thesame;
3614	3750	}
3615	3751
3616	3752	void CopyChanged(Object3D obj)
..	..	@@ -3620,16 +3756,19 @@
3620	3756	boolean temp = CameraPane.SWITCH;
3621	3757	CameraPane.SWITCH = false;
3622	3758
3623		- copy.ExtractBigData(hashtable);
	3759	+ copy.ExtractBigData(versiontable);
3624	3760
3625	3761	copy.clear();
3626	3762
	3763	+ copy.skyboxname = obj.skyboxname;
	3764	+ copy.skyboxext = obj.skyboxext;
	3765	+
3627	3766	for (int i=0; i<obj.Size(); i++)
3628	3767	{
3629	3768	copy.add(obj.get(i));
3630	3769	}
3631	3770
3632		- copy.RestoreBigData(hashtable);
	3771	+ copy.RestoreBigData(versiontable);
3633	3772
3634	3773	CameraPane.SWITCH = temp;
3635	3774
..	..	@@ -3657,52 +3796,130 @@
3657	3796	}
3658	3797
3659	3798	cButton undoButton;
	3799	+ cButton restoreButton;
	3800	+ cButton replaceButton;
3660	3801	cButton redoButton;
3661	3802
	3803	+ boolean muteSlider;
	3804	+
	3805	+ int VersionCount()
	3806	+ {
	3807	+ int count = 0;
	3808	+
	3809	+ for (int i = copy.versions.length; --i >= 0;)
	3810	+ {
	3811	+ if (copy.versions[i] != null)
	3812	+ count++;
	3813	+ }
	3814	+
	3815	+ return count;
	3816	+ }
	3817	+
3662	3818	void SetUndoStates()
3663	3819	{
3664	3820	cRadio tab = GetCurrentTab();
3665	3821
3666		- undoButton.setEnabled(tab.undoindex > 0);
3667		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3822	+ restoreButton.setEnabled(copy.versionindex != -1);
	3823	+ replaceButton.setEnabled(copy.versionindex != -1);
	3824	+
	3825	+ undoButton.setEnabled(copy.versionindex > 0);
	3826	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3827	+
	3828	+ muteSlider = true;
	3829	+ versionSlider.setMaximum(VersionCount() - 1);
	3830	+ versionSlider.setInteger(copy.versionindex);
	3831	+ muteSlider = false;
3668	3832	}
3669	3833
3670		- public void Undo()
	3834	+ public boolean Undo()
3671	3835	{
	3836	+ // Option?
	3837	+ Replace();
	3838	+
3672	3839	System.err.println("Undo");
3673	3840
3674	3841	cRadio tab = GetCurrentTab();
3675	3842
3676		- if (tab.undoindex == 0)
	3843	+ if (copy.versionindex == 0)
3677	3844	{
3678	3845	java.awt.Toolkit.getDefaultToolkit().beep();
3679		- return;
	3846	+ return false;
3680	3847	}
3681	3848
3682		- if (tab.graphs[tab.undoindex] == null)
	3849	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3850	+// {
	3851	+// if (Save(false))
	3852	+// tab.versionindex -= 1;
	3853	+// else
	3854	+// {
	3855	+// if (tab.versionindex <= 0)
	3856	+// return false;
	3857	+// else
	3858	+// tab.versionindex -= 1;
	3859	+// }
	3860	+// }
	3861	+
	3862	+ copy.versionindex -= 1;
	3863	+
	3864	+ CopyChanged((Object3D)copy.versions[copy.versionindex]);
	3865	+
	3866	+ return true;
	3867	+ }
	3868	+
	3869	+ public boolean Restore()
	3870	+ {
	3871	+ System.err.println("Restore");
	3872	+
	3873	+ cRadio tab = GetCurrentTab();
	3874	+
	3875	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
3683	3876	{
3684		- Save();
3685		- tab.undoindex -= 1;
	3877	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3878	+ return false;
3686	3879	}
3687	3880
3688		- tab.undoindex -= 1;
	3881	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3882	+ CopyChanged(copy.versions[copy.versionindex]);
	3883	+
	3884	+ return true;
	3885	+ }
3689	3886
3690		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3887	+ public boolean Replace()
	3888	+ {
	3889	+ System.err.println("Replace");
	3890	+
	3891	+ cRadio tab = GetCurrentTab();
	3892	+
	3893	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3894	+ {
	3895	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3896	+ return false;
	3897	+ }
	3898	+
	3899	+ copy.versions[copy.versionindex] = CompressCopy();
	3900	+
	3901	+ return true;
3691	3902	}
3692	3903
3693	3904	public void Redo()
3694	3905	{
	3906	+ // Option?
	3907	+ Replace();
	3908	+
3695	3909	cRadio tab = GetCurrentTab();
3696	3910
3697		- if (tab.graphs[tab.undoindex + 1] == null)
	3911	+ if (copy.versions[copy.versionindex + 1] == null)
3698	3912	{
3699	3913	java.awt.Toolkit.getDefaultToolkit().beep();
3700	3914	return;
3701	3915	}
3702	3916
3703		- tab.undoindex += 1;
	3917	+ copy.versionindex += 1;
3704	3918
3705		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3919	+ CopyChanged(copy.versions[copy.versionindex]);
	3920	+
	3921	+ //if (!tab.user[tab.versionindex])
	3922	+ // tab.graphs[tab.versionindex] = null;
3706	3923	}
3707	3924
3708	3925	void ImportGFD()
..	..	@@ -3998,9 +4215,25 @@
3998	4215	//copy.Touch();
3999	4216	}
4000	4217
	4218	+ cNumberSlider versionSlider;
	4219	+
4001	4220	public void stateChanged(ChangeEvent e)
4002	4221	{
4003	4222	// assert(false);
	4223	+ if (e.getSource() == versionSlider)
	4224	+ {
	4225	+ if (muteSlider)
	4226	+ return;
	4227	+
	4228	+ int version = versionSlider.getInteger();
	4229	+
	4230	+ if (copy.versions[version] != null)
	4231	+ {
	4232	+ CopyChanged(copy.versions[copy.versionindex = version]);
	4233	+ }
	4234	+
	4235	+ return;
	4236	+ }
4004	4237
4005	4238	if (freezematerial)
4006	4239	{
..	..	@@ -4349,7 +4582,7 @@
4349	4582
4350	4583	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4351	4584	{
4352		- if (Globals.SAVEONMAKE) // && resetmodel)
	4585	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4353	4586	Save();
4354	4587	//Tween.set(thing, 0).target(1).start(tweenManager);
4355	4588	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4591,7 +4824,9 @@
4591	4824	readobj.ResetDisplayList();
4592	4825	} catch (Exception e)
4593	4826	{
4594		- //e.printStackTrace();
	4827	+ if (!e.toString().contains("GZIP"))
	4828	+ e.printStackTrace();
	4829	+
4595	4830	try
4596	4831	{
4597	4832	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4665,12 +4900,14 @@
4665	4900
4666	4901	if (readobj != null)
4667	4902	{
4668		- if (Globals.SAVEONMAKE)
4669		- Save();
	4903	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4904	+ // Save();
4670	4905	try
4671	4906	{
4672	4907	//readobj.deepCopySelf(copy);
4673	4908	copy.clear(); // june 2014
	4909	+ copy.skyboxname = readobj.skyboxname;
	4910	+ copy.skyboxext = readobj.skyboxext;
4674	4911	for (int i = 0; i < readobj.size(); i++)
4675	4912	{
4676	4913	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4711,6 +4948,7 @@
4711	4948	}
4712	4949	} catch (ClassCastException e)
4713	4950	{
	4951	+ e.printStackTrace();
4714	4952	assert (false);
4715	4953	Composite c = (Composite) copy;
4716	4954	c.children.clear();
..	..	@@ -4721,6 +4959,17 @@
4721	4959	c.addChild(csg);
4722	4960	}
4723	4961
	4962	+ copy.versions = readobj.versions;
	4963	+ copy.versionindex = readobj.versionindex;
	4964	+
	4965	+ if (copy.versions == null)
	4966	+ {
	4967	+ copy.versions = new Object3D[100];
	4968	+ copy.versionindex = -1;
	4969	+ }
	4970	+
	4971	+ //? SetUndoStates();
	4972	+
4724	4973	ResetModel();
4725	4974	copy.HardTouch(); // recompile?
4726	4975	refreshContents();
..	..	@@ -4830,6 +5079,7 @@
4830	5079	//ps.print(buffer.toString());
4831	5080	} catch (IOException e)
4832	5081	{
	5082	+ e.printStackTrace();
4833	5083	}
4834	5084	}
4835	5085