~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.versionlist == null)
	300	+ {
	301	+ copy.versionlist = 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.versionlist == null)
	319	+ {
	320	+ copy.versionlist = 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.versionlist == 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		- materialPanel = new cGridBag().setVertical(true);
438		- materialPanel.setName("Material");
	470	+ materialPanel = new cGridBag().setVertical(false);
	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
..	..	@@ -814,7 +848,32 @@
814	848	//frame.setVisible(true);
815	849	}
816	850	frame.validate();
	851	+
	852	+ cameraView.requestFocusInWindow();
817	853	}
	854	+
	855	+ private Object3D CompressCopy()
	856	+ {
	857	+ boolean temp = CameraPane.SWITCH;
	858	+ CameraPane.SWITCH = false;
	859	+
	860	+ copy.ExtractBigData(versiontable);
	861	+ // if (copy == client)
	862	+
	863	+ Object3D versions[] = copy.versionlist;
	864	+ copy.versionlist = null;
	865	+
	866	+ //byte[] compress = Compress(copy);
	867	+ Object3D compress = (Object3D)Grafreed.clone(copy);
	868	+
	869	+ copy.versionlist = versions;
	870	+
	871	+ copy.RestoreBigData(versiontable);
	872	+
	873	+ CameraPane.SWITCH = temp;
	874	+
	875	+ return compress;
	876	+ }
818	877
819	878	private JTextPane createTextPane()
820	879	{
..	..	@@ -937,6 +996,7 @@
937	996	{
938	997	SetupMaterial(materialPanel);
939	998	}
	999	+
940	1000	//SetupName();
941	1001	//SetupViews();
942	1002	}
..	..	@@ -946,7 +1006,7 @@
946	1006	// NumberSlider vDivsField;
947	1007	// JCheckBox endcaps;
948	1008	JCheckBox liveCB;
949		- JCheckBox selectCB;
	1009	+ JCheckBox selectableCB;
950	1010	JCheckBox hideCB;
951	1011	JCheckBox link2masterCB;
952	1012	JCheckBox markCB;
..	..	@@ -1158,13 +1218,16 @@
1158	1218
1159	1219	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1160	1220	liveCB.setToolTipText("Animate object");
1161		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1162		- selectCB.setToolTipText("Make object selectable");
	1221	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1222	+ selectableCB.setToolTipText("Make object selectable");
1163	1223	// Return();
	1224	+
1164	1225	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1165	1226	hideCB.setToolTipText("Hide object");
1166	1227	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1167	1228	markCB.setToolTipText("As animation target transform");
	1229	+
	1230	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1168	1231
1169	1232	setupPanel2 = new cGridBag().setVertical(false);
1170	1233
..	..	@@ -1452,6 +1515,7 @@
1452	1515	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1453	1516	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1454	1517	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1518	+ //XYZPanel.setName("XYZ");
1455	1519
1456	1520	/*
1457	1521	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1489,17 +1553,30 @@
1489	1553	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1490	1554	//tmp.setName("Edit");
1491	1555	objectPanel.add(materialPanel);
	1556	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1557	+ objectPanel.setToolTipTextAt(0, "Material");
	1558	+
	1559	+ objectPanel.add(toolboxPanel);
	1560	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1561	+ objectPanel.setToolTipTextAt(1, "Objects & backgrounds");
	1562	+
1492	1563	// JPanel north = new JPanel(new BorderLayout());
1493	1564	// north.setName("Edit");
1494	1565	// north.add(ctrlPanel, BorderLayout.NORTH);
1495	1566	// objectPanel.add(north);
1496	1567	objectPanel.add(editPanel);
	1568	+ objectPanel.setIconAt(2, GetIcon("icons/write.png"));
	1569	+ objectPanel.setToolTipTextAt(2, "Edit controls");
1497	1570
1498	1571	//if (Globals.ADVANCED)
1499	1572	objectPanel.add(infoPanel);
	1573	+ objectPanel.setIconAt(3, GetIcon("icons/info.png"));
	1574	+ objectPanel.setToolTipTextAt(3, "Information");
1500	1575
1501		- objectPanel.add(toolboxPanel);
1502		-
	1576	+ objectPanel.add(XYZPanel);
	1577	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1578	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1579	+
1503	1580	/*
1504	1581	aConstraints.gridx = 0;
1505	1582	aConstraints.gridwidth = 1;
..	..	@@ -1519,7 +1596,7 @@
1519	1596	scrollpane.addMouseWheelListener(this); // Default not fast enough
1520	1597
1521	1598	/JTabbedPane/ scenePanel = new cGridBag();
1522		- scenePanel.preferredWidth = 6;
	1599	+ scenePanel.preferredWidth = 5;
1523	1600
1524	1601	JTabbedPane tabbedPane = new JTabbedPane();
1525	1602	tabbedPane.add(scrollpane);
..	..	@@ -1597,7 +1674,7 @@
1597	1674	bigThree = new cGridBag();
1598	1675	bigThree.addComponent(scenePanel);
1599	1676	bigThree.addComponent(centralPanel);
1600		- bigThree.addComponent(XYZPanel);
	1677	+ //bigThree.addComponent(XYZPanel);
1601	1678
1602	1679	// // SIDE EFFECT!!!
1603	1680	// aConstraints.gridx = 0;
..	..	@@ -1638,7 +1715,6 @@
1638	1715	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1639	1716	frame.addWindowListener(new WindowAdapter()
1640	1717	{
1641		-
1642	1718	public void windowClosing(WindowEvent e)
1643	1719	{
1644	1720	Close();
..	..	@@ -1661,12 +1737,384 @@
1661	1737	ctrlPanel.removeAll();
1662	1738	}
1663	1739
1664		- void SetupMaterial(cGridBag panel)
	1740	+ void SetupMaterial(cGridBag materialpanel)
1665	1741	{
1666		- /*
	1742	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1743	+
	1744	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1745	+ skin.setToolTipText("Skin");
	1746	+ skin.addMouseListener(new MouseAdapter()
	1747	+ {
	1748	+ public void mouseClicked(MouseEvent e)
	1749	+ {
	1750	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1751	+ cMaterial material = object.material;
	1752	+
	1753	+ // Skin
	1754	+ colorField.setFloat(material.color);
	1755	+ saturationField.setFloat(material.modulation);
	1756	+ subsurfaceField.setFloat(material.subsurface);
	1757	+ selfshadowField.setFloat(material.diffuseness);
	1758	+ diffusenessField.setFloat(material.factor);
	1759	+ shininessField.setFloat(material.shininess);
	1760	+ shadowbiasField.setFloat(material.shadowbias);
	1761	+ diffuseField.setFloat(material.diffuse);
	1762	+ specularField.setFloat(material.specular);
	1763	+
	1764	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1765	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1766	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1767	+
	1768	+ materialtouched = true;
	1769	+ applySelf();
	1770	+ }
	1771	+ });
	1772	+ presetpanel.add(skin);
	1773	+
	1774	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1775	+ lambert.setToolTipText("Diffuse");
	1776	+ lambert.addMouseListener(new MouseAdapter()
	1777	+ {
	1778	+ public void mouseClicked(MouseEvent e)
	1779	+ {
	1780	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1781	+ cMaterial material = object.material;
	1782	+
	1783	+ diffusenessField.setFloat(material.factor);
	1784	+ selfshadowField.setFloat(material.diffuseness);
	1785	+
	1786	+ materialtouched = true;
	1787	+ applySelf();
	1788	+ }
	1789	+ });
	1790	+ presetpanel.add(lambert);
	1791	+
	1792	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1793	+ diffuse2.setToolTipText("Diffuse2");
	1794	+ diffuse2.addMouseListener(new MouseAdapter()
	1795	+ {
	1796	+ public void mouseClicked(MouseEvent e)
	1797	+ {
	1798	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1799	+ cMaterial material = object.material;
	1800	+
	1801	+ diffusenessField.setFloat(material.factor);
	1802	+ selfshadowField.setFloat(material.diffuseness);
	1803	+
	1804	+ materialtouched = true;
	1805	+ applySelf();
	1806	+ }
	1807	+ });
	1808	+ presetpanel.add(diffuse2);
	1809	+
	1810	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1811	+ diffusemoon.setToolTipText("Moon");
	1812	+ diffusemoon.addMouseListener(new MouseAdapter()
	1813	+ {
	1814	+ public void mouseClicked(MouseEvent e)
	1815	+ {
	1816	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1817	+ cMaterial material = object.material;
	1818	+
	1819	+ diffusenessField.setFloat(material.factor);
	1820	+ selfshadowField.setFloat(material.diffuseness);
	1821	+
	1822	+ materialtouched = true;
	1823	+ applySelf();
	1824	+ }
	1825	+ });
	1826	+ presetpanel.add(diffusemoon);
	1827	+
	1828	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1829	+ diffusemoon2.setToolTipText("Moon2");
	1830	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1831	+ {
	1832	+ public void mouseClicked(MouseEvent e)
	1833	+ {
	1834	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1835	+ cMaterial material = object.material;
	1836	+
	1837	+ diffusenessField.setFloat(material.factor);
	1838	+ selfshadowField.setFloat(material.diffuseness);
	1839	+
	1840	+ materialtouched = true;
	1841	+ applySelf();
	1842	+ }
	1843	+ });
	1844	+ presetpanel.add(diffusemoon2);
	1845	+
	1846	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1847	+ diffusemoon3.setToolTipText("Moon3");
	1848	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1849	+ {
	1850	+ public void mouseClicked(MouseEvent e)
	1851	+ {
	1852	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1853	+ cMaterial material = object.material;
	1854	+
	1855	+ diffusenessField.setFloat(material.factor);
	1856	+ selfshadowField.setFloat(material.diffuseness);
	1857	+
	1858	+ materialtouched = true;
	1859	+ applySelf();
	1860	+ }
	1861	+ });
	1862	+ presetpanel.add(diffusemoon3);
	1863	+
	1864	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1865	+ diffusesheen.setToolTipText("Sheen");
	1866	+ diffusesheen.addMouseListener(new MouseAdapter()
	1867	+ {
	1868	+ public void mouseClicked(MouseEvent e)
	1869	+ {
	1870	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1871	+ cMaterial material = object.material;
	1872	+
	1873	+ sheenField.setFloat(material.sheen);
	1874	+
	1875	+ materialtouched = true;
	1876	+ applySelf();
	1877	+ }
	1878	+ });
	1879	+ presetpanel.add(diffusesheen);
	1880	+
	1881	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1882	+ rough.setToolTipText("Rough metal");
	1883	+ rough.addMouseListener(new MouseAdapter()
	1884	+ {
	1885	+ public void mouseClicked(MouseEvent e)
	1886	+ {
	1887	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1888	+ cMaterial material = object.material;
	1889	+
	1890	+ shininessField.setFloat(material.shininess);
	1891	+ velvetField.setFloat(material.velvet);
	1892	+
	1893	+ materialtouched = true;
	1894	+ applySelf();
	1895	+ }
	1896	+ });
	1897	+ presetpanel.add(rough);
	1898	+
	1899	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1900	+ rough2.setToolTipText("Medium metal");
	1901	+ rough2.addMouseListener(new MouseAdapter()
	1902	+ {
	1903	+ public void mouseClicked(MouseEvent e)
	1904	+ {
	1905	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1906	+ cMaterial material = object.material;
	1907	+
	1908	+ shininessField.setFloat(material.shininess);
	1909	+ lightareaField.setFloat(material.lightarea);
	1910	+
	1911	+ materialtouched = true;
	1912	+ applySelf();
	1913	+ }
	1914	+ });
	1915	+ presetpanel.add(rough2);
	1916	+
	1917	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	1918	+ shini0.setToolTipText("Shiny");
	1919	+ shini0.addMouseListener(new MouseAdapter()
	1920	+ {
	1921	+ public void mouseClicked(MouseEvent e)
	1922	+ {
	1923	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	1924	+ cMaterial material = object.material;
	1925	+
	1926	+ shininessField.setFloat(material.shininess);
	1927	+ lightareaField.setFloat(material.lightarea);
	1928	+
	1929	+ materialtouched = true;
	1930	+ applySelf();
	1931	+ }
	1932	+ });
	1933	+ presetpanel.add(shini0);
	1934	+
	1935	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	1936	+ shini1.setToolTipText("Shiny2");
	1937	+ shini1.addMouseListener(new MouseAdapter()
	1938	+ {
	1939	+ public void mouseClicked(MouseEvent e)
	1940	+ {
	1941	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	1942	+ cMaterial material = object.material;
	1943	+
	1944	+ shininessField.setFloat(material.shininess);
	1945	+ lightareaField.setFloat(material.lightarea);
	1946	+
	1947	+ materialtouched = true;
	1948	+ applySelf();
	1949	+ }
	1950	+ });
	1951	+ presetpanel.add(shini1);
	1952	+
	1953	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	1954	+ shini2.setToolTipText("Shiny3");
	1955	+ shini2.addMouseListener(new MouseAdapter()
	1956	+ {
	1957	+ public void mouseClicked(MouseEvent e)
	1958	+ {
	1959	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	1960	+ cMaterial material = object.material;
	1961	+
	1962	+ shininessField.setFloat(material.shininess);
	1963	+ lightareaField.setFloat(material.lightarea);
	1964	+
	1965	+ materialtouched = true;
	1966	+ applySelf();
	1967	+ }
	1968	+ });
	1969	+ presetpanel.add(shini2);
	1970	+
	1971	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	1972	+ aniso.setToolTipText("AnisoU");
	1973	+ aniso.addMouseListener(new MouseAdapter()
	1974	+ {
	1975	+ public void mouseClicked(MouseEvent e)
	1976	+ {
	1977	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	1978	+ cMaterial material = object.material;
	1979	+
	1980	+ anisoField.setFloat(material.aniso);
	1981	+ anisoVField.setFloat(material.anisoV);
	1982	+
	1983	+ materialtouched = true;
	1984	+ applySelf();
	1985	+ }
	1986	+ });
	1987	+ presetpanel.add(aniso);
	1988	+
	1989	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	1990	+ aniso2.setToolTipText("AnisoV");
	1991	+ aniso2.addMouseListener(new MouseAdapter()
	1992	+ {
	1993	+ public void mouseClicked(MouseEvent e)
	1994	+ {
	1995	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	1996	+ cMaterial material = object.material;
	1997	+
	1998	+ anisoField.setFloat(material.aniso);
	1999	+ anisoVField.setFloat(material.anisoV);
	2000	+
	2001	+ materialtouched = true;
	2002	+ applySelf();
	2003	+ }
	2004	+ });
	2005	+ presetpanel.add(aniso2);
	2006	+
	2007	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2008	+ aniso3.setToolTipText("AnisoUV");
	2009	+ aniso3.addMouseListener(new MouseAdapter()
	2010	+ {
	2011	+ public void mouseClicked(MouseEvent e)
	2012	+ {
	2013	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2014	+ cMaterial material = object.material;
	2015	+
	2016	+ anisoField.setFloat(material.aniso);
	2017	+ anisoVField.setFloat(material.anisoV);
	2018	+
	2019	+ materialtouched = true;
	2020	+ applySelf();
	2021	+ }
	2022	+ });
	2023	+ presetpanel.add(aniso3);
	2024	+
	2025	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2026	+ velvet0.setToolTipText("Velvet");
	2027	+ velvet0.addMouseListener(new MouseAdapter()
	2028	+ {
	2029	+ public void mouseClicked(MouseEvent e)
	2030	+ {
	2031	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2032	+ cMaterial material = object.material;
	2033	+
	2034	+ diffusenessField.setFloat(material.factor);
	2035	+ selfshadowField.setFloat(material.diffuseness);
	2036	+ sheenField.setFloat(material.sheen);
	2037	+ shininessField.setFloat(material.shininess);
	2038	+ velvetField.setFloat(material.velvet);
	2039	+ shiftField.setFloat(material.shift);
	2040	+
	2041	+ materialtouched = true;
	2042	+ applySelf();
	2043	+ }
	2044	+ });
	2045	+ presetpanel.add(velvet0);
	2046	+
	2047	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2048	+ bump0.setToolTipText("Bump texture");
	2049	+ bump0.addMouseListener(new MouseAdapter()
	2050	+ {
	2051	+ public void mouseClicked(MouseEvent e)
	2052	+ {
	2053	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2054	+ cMaterial material = object.material;
	2055	+
	2056	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2057	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2058	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2059	+
	2060	+ materialtouched = true;
	2061	+ applySelf();
	2062	+ }
	2063	+ });
	2064	+ presetpanel.add(bump0);
	2065	+
	2066	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2067	+ halo.setToolTipText("Halo");
	2068	+ halo.addMouseListener(new MouseAdapter()
	2069	+ {
	2070	+ public void mouseClicked(MouseEvent e)
	2071	+ {
	2072	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2073	+ cMaterial material = object.material;
	2074	+
	2075	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2076	+
	2077	+ materialtouched = true;
	2078	+ applySelf();
	2079	+ }
	2080	+ });
	2081	+ presetpanel.add(halo);
	2082	+
	2083	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2084	+ candle.setToolTipText("Candle");
	2085	+ candle.addMouseListener(new MouseAdapter()
	2086	+ {
	2087	+ public void mouseClicked(MouseEvent e)
	2088	+ {
	2089	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2090	+ cMaterial material = object.material;
	2091	+
	2092	+ subsurfaceField.setFloat(material.subsurface);
	2093	+ shadowbiasField.setFloat(material.shadowbias);
	2094	+ ambientField.setFloat(material.ambient);
	2095	+ specularField.setFloat(material.specular);
	2096	+ lightareaField.setFloat(material.lightarea);
	2097	+ shininessField.setFloat(material.shininess);
	2098	+
	2099	+ materialtouched = true;
	2100	+ applySelf();
	2101	+ }
	2102	+ });
	2103	+ presetpanel.add(candle);
	2104	+
	2105	+ cGridBag panel = new cGridBag().setVertical(true);
	2106	+
	2107	+ presetpanel.preferredWidth = 1;
	2108	+
	2109	+ materialpanel.add(presetpanel);
	2110	+ materialpanel.add(panel);
	2111	+
	2112	+ panel.preferredWidth = 8;
	2113	+
	2114	+ /*
1667	2115	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1668	2116	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1669		- */
	2117	+ */
1670	2118
1671	2119	cGridBag editBar = new cGridBag().setVertical(false);
1672	2120
..	..	@@ -1700,27 +2148,50 @@
1700	2148	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1701	2149
1702	2150	cGridBag colorSection = new cGridBag().setVertical(true);
	2151	+
	2152	+ cGridBag huepanel = new cGridBag();
	2153	+ cGridBag huelabel = new cGridBag();
	2154	+ skin = GetLabel("icons/hue.png", false);
	2155	+ skin.fit = true;
	2156	+ huelabel.add(skin);
	2157	+ huelabel.preferredWidth = 20;
	2158	+ huepanel.add(new cGridBag()); // Label
	2159	+ huepanel.add(huelabel); // Field/slider
	2160	+
	2161	+ huepanel.preferredHeight = 7;
	2162	+
	2163	+ colorSection.add(huepanel);
1703	2164
1704	2165	cGridBag color = new cGridBag();
1705		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1706		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1707		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2166	+
	2167	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2168	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2169	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2170	+
1708	2171	//colorField.preferredWidth = 200;
1709	2172	colorSection.add(color);
1710	2173
1711	2174	cGridBag modulation = new cGridBag();
1712	2175	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1713	2176	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1714		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2177	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1715	2178	colorSection.add(modulation);
1716	2179
	2180	+ cGridBag opacity = new cGridBag();
	2181	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2182	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2183	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2184	+ colorSection.add(opacity);
	2185	+
	2186	+ colorSection.add(GetSeparator());
	2187	+
1717	2188	cGridBag texture = new cGridBag();
1718	2189	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1719	2190	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1720	2191	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1721	2192	colorSection.add(texture);
1722	2193
1723		- panel.add(new JSeparator());
	2194	+ panel.add(GetSeparator());
1724	2195
1725	2196	panel.add(colorSection);
1726	2197
..	..	@@ -1776,7 +2247,7 @@
1776	2247	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1777	2248	diffuseSection.add(shadowbias);
1778	2249
1779		- panel.add(new JSeparator());
	2250	+ panel.add(GetSeparator());
1780	2251
1781	2252	panel.add(diffuseSection);
1782	2253
..	..	@@ -1839,7 +2310,7 @@
1839	2310	specularSection.add(anisoV);
1840	2311
1841	2312
1842		- panel.add(new JSeparator());
	2313	+ panel.add(GetSeparator());
1843	2314
1844	2315	panel.add(specularSection);
1845	2316
..	..	@@ -1864,12 +2335,6 @@
1864	2335	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1865	2336	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1866	2337	colorSection.add(backlit);
1867		-
1868		- cGridBag opacity = new cGridBag();
1869		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1870		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1871		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1872		- colorSection.add(opacity);
1873	2338
1874	2339	//panel.add(new JSeparator());
1875	2340
..	..	@@ -1915,7 +2380,7 @@
1915	2380	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1916	2381	textureSection.add(opacityPower);
1917	2382
1918		- panel.add(new JSeparator());
	2383	+ panel.add(GetSeparator());
1919	2384
1920	2385	panel.add(textureSection);
1921	2386
..	..	@@ -2902,7 +3367,7 @@
2902	3367
2903	3368	freezematerial = true;
2904	3369	colorField.setFloat(mat.color);
2905		- modulationField.setFloat(mat.modulation);
	3370	+ saturationField.setFloat(mat.modulation);
2906	3371	metalnessField.setFloat(mat.metalness);
2907	3372	diffuseField.setFloat(mat.diffuse);
2908	3373	specularField.setFloat(mat.specular);
..	..	@@ -3213,8 +3678,9 @@
3213	3678	} else if (event.getSource() == liveCB)
3214	3679	{
3215	3680	copy.live ^= true;
	3681	+ objEditor.refreshContents(true); // To show item colors
3216	3682	return;
3217		- } else if (event.getSource() == selectCB)
	3683	+ } else if (event.getSource() == selectableCB)
3218	3684	{
3219	3685	copy.dontselect ^= true;
3220	3686	return;
..	..	@@ -3222,7 +3688,7 @@
3222	3688	{
3223	3689	copy.hide ^= true;
3224	3690	copy.Touch(); // display list issue
3225		- objEditor.refreshContents();
	3691	+ objEditor.refreshContents(true); // To show item colors
3226	3692	return;
3227	3693	} else if (event.getSource() == link2masterCB)
3228	3694	{
..	..	@@ -3478,6 +3944,7 @@
3478	3944
3479	3945	static public byte[] Compress(Object3D o)
3480	3946	{
	3947	+ // Slower to actually compress.
3481	3948	try
3482	3949	{
3483	3950	ByteArrayOutputStream baos = new ByteArrayOutputStream();
..	..	@@ -3574,11 +4041,12 @@
3574	4041	return null;
3575	4042	}
3576	4043
3577		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3578	4044
3579	4045	public void Save()
3580	4046	{
3581		- Save(true);
	4047	+ //Save(true);
	4048	+ Replace();
	4049	+ SetUndoStates();
3582	4050	}
3583	4051
3584	4052	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3597,50 +4065,62 @@
3597	4065	return true;
3598	4066	}
3599	4067
	4068	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4069	+
	4070	+ void DeleteVersion()
	4071	+ {
	4072	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4073	+ {
	4074	+ copy.versionlist[i] = copy.versionlist[i+1];
	4075	+ }
	4076	+
	4077	+ CopyChanged();
	4078	+
	4079	+ SetUndoStates();
	4080	+ }
	4081	+
3600	4082	public boolean Save(boolean user)
3601	4083	{
3602	4084	System.err.println("Save");
	4085	+ //Replace();
3603	4086
3604	4087	cRadio tab = GetCurrentTab();
3605	4088
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;
	4089	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
3614	4090
3615	4091	boolean thesame = false;
3616	4092
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		- }
	4093	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4094	+// {
	4095	+// thesame = true;
	4096	+// }
3622	4097
3623	4098	//EditorFrame.m_MainFrame.requestFocusInWindow();
3624	4099	if (!thesame)
3625	4100	{
3626		- //tab.user[tab.undoindex] = user;
3627		- boolean increment = tab.graphs[tab.undoindex] == null;
	4101	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4102	+ {
	4103	+ copy.versionlist[i] = copy.versionlist[i-1];
	4104	+ }
3628	4105
3629		- tab.graphs[tab.undoindex] = compress;
	4106	+ //tab.user[tab.versionindex] = user;
	4107	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
3630	4108
3631		- if (increment)
3632		- tab.undoindex++;
	4109	+ copy.versionlist[++copy.versionindex] = compress;
	4110	+
	4111	+ // if (increment)
	4112	+ // tab.versionindex++;
3633	4113	}
3634	4114
3635		- copy.RestoreBigData(hashtable);
	4115	+ //copy.RestoreBigData(versiontable);
3636	4116
3637	4117	//assert(hashtable.isEmpty());
3638	4118
3639		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
3640		- {
3641		- //tab.user[i] = false;
3642		- // tab.graphs[i] = null;
3643		- }
	4119	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4120	+// {
	4121	+// //tab.user[i] = false;
	4122	+// copy.versionlist[i] = null;
	4123	+// }
3644	4124
3645	4125	SetUndoStates();
3646	4126
..	..	@@ -3649,7 +4129,7 @@
3649	4129	{
3650	4130	try
3651	4131	{
3652		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4132	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3653	4133	ObjectOutputStream p = new ObjectOutputStream(ostream);
3654	4134
3655	4135	p.writeObject(copy);
..	..	@@ -3665,27 +4145,65 @@
3665	4145
3666	4146	return !thesame;
3667	4147	}
3668		-
3669		- void CopyChanged(Object3D obj)
	4148	+
	4149	+ boolean flashIt = true;
	4150	+
	4151	+ void RefreshSelection()
3670	4152	{
	4153	+ Object3D selection = new Object3D();
	4154	+
	4155	+ for (int i = 0; i < copy.selection.size(); i++)
	4156	+ {
	4157	+ Object3D elem = copy.selection.elementAt(i);
	4158	+
	4159	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4160	+
	4161	+ if (obj == null)
	4162	+ {
	4163	+ copy.selection.remove(i--);
	4164	+ }
	4165	+ else
	4166	+ {
	4167	+ selection.add(obj);
	4168	+ copy.selection.setElementAt(obj, i);
	4169	+ }
	4170	+ }
	4171	+
	4172	+ flashIt = false;
	4173	+ GetTree().clearSelection();
	4174	+ for (int i = 0; i < selection.size(); i++)
	4175	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4176	+ flashIt = true;
	4177	+
	4178	+ //refreshContents(false);
	4179	+ }
	4180	+
	4181	+ void CopyChanged()
	4182	+ {
	4183	+ Object3D obj = copy.versionlist[copy.versionindex];
	4184	+
3671	4185	SetUndoStates();
3672	4186
3673	4187	boolean temp = CameraPane.SWITCH;
3674	4188	CameraPane.SWITCH = false;
3675	4189
3676		- copy.ExtractBigData(hashtable);
	4190	+ copy.ExtractBigData(versiontable);
3677	4191
3678	4192	copy.clear();
3679	4193
	4194	+ copy.skyboxname = obj.skyboxname;
	4195	+ copy.skyboxext = obj.skyboxext;
	4196	+
3680	4197	for (int i=0; i<obj.Size(); i++)
3681	4198	{
3682	4199	copy.add(obj.get(i));
3683	4200	}
3684	4201
3685		- copy.RestoreBigData(hashtable);
	4202	+ copy.RestoreBigData(versiontable);
3686	4203
3687	4204	CameraPane.SWITCH = temp;
3688	4205
	4206	+ RefreshSelection();
3689	4207	//assert(hashtable.isEmpty());
3690	4208
3691	4209	copy.Touch();
..	..	@@ -3706,68 +4224,139 @@
3706	4224	}
3707	4225	}
3708	4226
3709		- refreshContents();
	4227	+ refreshContents(true);
3710	4228	}
3711	4229
3712		- cButton undoButton;
3713		- cButton redoButton;
	4230	+ cButton previousVersionButton;
	4231	+ cButton restoreButton;
	4232	+ cButton replaceButton;
	4233	+ cButton nextVersionButton;
	4234	+ cButton saveVersionButton;
	4235	+ cButton deleteVersionButton;
3714	4236
	4237	+ boolean muteSlider;
	4238	+
	4239	+ int VersionCount()
	4240	+ {
	4241	+ int count = 0;
	4242	+
	4243	+ for (int i = copy.versionlist.length; --i >= 0;)
	4244	+ {
	4245	+ if (copy.versionlist[i] != null)
	4246	+ count++;
	4247	+ }
	4248	+
	4249	+ return count;
	4250	+ }
	4251	+
3715	4252	void SetUndoStates()
3716	4253	{
3717	4254	cRadio tab = GetCurrentTab();
3718	4255
3719		- undoButton.setEnabled(tab.undoindex > 0);
3720		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	4256	+ restoreButton.setEnabled(true); // copy.versionindex != -1);
	4257	+ replaceButton.setEnabled(true); // copy.versionindex != -1);
	4258	+
	4259	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4260	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4261	+
	4262	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4263	+ copy.versionlist[copy.versionindex + 1] != null);
	4264	+
	4265	+ muteSlider = true;
	4266	+ versionSlider.setMaximum(VersionCount() - 1);
	4267	+ versionSlider.setInteger(copy.versionindex);
	4268	+ muteSlider = false;
3721	4269	}
3722	4270
3723		- public boolean Undo()
	4271	+ public boolean PreviousVersion()
3724	4272	{
	4273	+ // Option?
	4274	+ Replace();
	4275	+
3725	4276	System.err.println("Undo");
3726	4277
3727	4278	cRadio tab = GetCurrentTab();
3728	4279
3729		- if (tab.undoindex == 0)
	4280	+ if (copy.versionindex == 0)
3730	4281	{
3731	4282	java.awt.Toolkit.getDefaultToolkit().beep();
3732	4283	return false;
3733	4284	}
3734	4285
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		- }
	4286	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4287	+// {
	4288	+// if (Save(false))
	4289	+// tab.versionindex -= 1;
	4290	+// else
	4291	+// {
	4292	+// if (tab.versionindex <= 0)
	4293	+// return false;
	4294	+// else
	4295	+// tab.versionindex -= 1;
	4296	+// }
	4297	+// }
3747	4298
3748		- tab.undoindex -= 1;
	4299	+ copy.versionindex -= 1;
3749	4300
3750		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4301	+ CopyChanged();
3751	4302
3752	4303	return true;
3753	4304	}
3754	4305
3755		- public void Redo()
	4306	+ public boolean Restore()
3756	4307	{
	4308	+ System.err.println("Restore");
	4309	+
3757	4310	cRadio tab = GetCurrentTab();
3758	4311
3759		- if (tab.graphs[tab.undoindex + 1] == null)
	4312	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4313	+ {
	4314	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4315	+ return false;
	4316	+ }
	4317	+
	4318	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4319	+ CopyChanged();
	4320	+
	4321	+ return true;
	4322	+ }
	4323	+
	4324	+ public boolean Replace()
	4325	+ {
	4326	+ System.err.println("Replace");
	4327	+
	4328	+ cRadio tab = GetCurrentTab();
	4329	+
	4330	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4331	+ {
	4332	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4333	+ return false;
	4334	+ }
	4335	+
	4336	+ copy.versionlist[copy.versionindex] = CompressCopy();
	4337	+
	4338	+ return true;
	4339	+ }
	4340	+
	4341	+ public void NextVersion()
	4342	+ {
	4343	+ // Option?
	4344	+ Replace();
	4345	+
	4346	+ cRadio tab = GetCurrentTab();
	4347	+
	4348	+ if (copy.versionlist[copy.versionindex + 1] == null)
3760	4349	{
3761	4350	java.awt.Toolkit.getDefaultToolkit().beep();
3762	4351	return;
3763	4352	}
3764	4353
3765		- tab.undoindex += 1;
	4354	+ copy.versionindex += 1;
3766	4355
3767		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4356	+ CopyChanged();
3768	4357
3769		- //if (!tab.user[tab.undoindex])
3770		- // tab.graphs[tab.undoindex] = null;
	4358	+ //if (!tab.user[tab.versionindex])
	4359	+ // tab.graphs[tab.versionindex] = null;
3771	4360	}
3772	4361
3773	4362	void ImportGFD()
..	..	@@ -3978,7 +4567,7 @@
3978	4567	//copy.material = new cMaterial(copy.GetMaterial());
3979	4568
3980	4569	current.color = (float) colorField.getFloat();
3981		- current.modulation = (float) modulationField.getFloat();
	4570	+ current.modulation = (float) saturationField.getFloat();
3982	4571	current.metalness = (float) metalnessField.getFloat();
3983	4572	current.diffuse = (float) diffuseField.getFloat();
3984	4573	current.specular = (float) specularField.getFloat();
..	..	@@ -4011,7 +4600,7 @@
4011	4600	cMaterial mat = copy.material;
4012	4601
4013	4602	colorField.SetToolTipValue((mat.color));
4014		- modulationField.SetToolTipValue((mat.modulation));
	4603	+ saturationField.SetToolTipValue((mat.modulation));
4015	4604	metalnessField.SetToolTipValue((mat.metalness));
4016	4605	diffuseField.SetToolTipValue((mat.diffuse));
4017	4606	specularField.SetToolTipValue((mat.specular));
..	..	@@ -4063,9 +4652,26 @@
4063	4652	//copy.Touch();
4064	4653	}
4065	4654
	4655	+ cNumberSlider versionSlider;
	4656	+
4066	4657	public void stateChanged(ChangeEvent e)
4067	4658	{
4068	4659	// assert(false);
	4660	+ if (e.getSource() == versionSlider)
	4661	+ {
	4662	+ if (muteSlider)
	4663	+ return;
	4664	+
	4665	+ int version = versionSlider.getInteger();
	4666	+
	4667	+ if (copy.versionlist[version] != null)
	4668	+ {
	4669	+ copy.versionindex = version;
	4670	+ CopyChanged();
	4671	+ }
	4672	+
	4673	+ return;
	4674	+ }
4069	4675
4070	4676	if (freezematerial)
4071	4677	{
..	..	@@ -4101,6 +4707,12 @@
4101	4707	{
4102	4708	//System.out.println("stateChanged = " + this);
4103	4709	materialtouched = true;
	4710	+
	4711	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4712	+ {
	4713	+ saturationField.setFloat(1);
	4714	+ }
	4715	+
4104	4716	applySelf();
4105	4717	//System.out.println("this = " + this);
4106	4718	//System.out.println("PARENT = " + parent);
..	..	@@ -4400,6 +5012,7 @@
4400	5012	{
4401	5013	if (GetTree() != null)
4402	5014	{
	5015	+ GetTree().revalidate();
4403	5016	GetTree().repaint();
4404	5017	}
4405	5018
..	..	@@ -4408,13 +5021,16 @@
4408	5021	ctrlPanel.validate(); // ? new
4409	5022	ctrlPanel.repaint();
4410	5023	}
	5024	+
	5025	+ if (previousVersionButton != null && copy.versionlist != null)
	5026	+ SetUndoStates();
4411	5027	}
4412	5028
4413	5029	static TweenManager tweenManager = new TweenManager();
4414	5030
4415	5031	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4416	5032	{
4417		- if (Globals.SAVEONMAKE) // && resetmodel)
	5033	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4418	5034	Save();
4419	5035	//Tween.set(thing, 0).target(1).start(tweenManager);
4420	5036	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4656,7 +5272,9 @@
4656	5272	readobj.ResetDisplayList();
4657	5273	} catch (Exception e)
4658	5274	{
4659		- //e.printStackTrace();
	5275	+ if (!e.toString().contains("GZIP"))
	5276	+ e.printStackTrace();
	5277	+
4660	5278	try
4661	5279	{
4662	5280	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4736,6 +5354,8 @@
4736	5354	{
4737	5355	//readobj.deepCopySelf(copy);
4738	5356	copy.clear(); // june 2014
	5357	+ copy.skyboxname = readobj.skyboxname;
	5358	+ copy.skyboxext = readobj.skyboxext;
4739	5359	for (int i = 0; i < readobj.size(); i++)
4740	5360	{
4741	5361	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4776,6 +5396,7 @@
4776	5396	}
4777	5397	} catch (ClassCastException e)
4778	5398	{
	5399	+ e.printStackTrace();
4779	5400	assert (false);
4780	5401	Composite c = (Composite) copy;
4781	5402	c.children.clear();
..	..	@@ -4786,6 +5407,17 @@
4786	5407	c.addChild(csg);
4787	5408	}
4788	5409
	5410	+ copy.versionlist = readobj.versionlist;
	5411	+ copy.versionindex = readobj.versionindex;
	5412	+
	5413	+ if (copy.versionlist == null)
	5414	+ {
	5415	+ copy.versionlist = new Object3D[100];
	5416	+ copy.versionindex = -1;
	5417	+ }
	5418	+
	5419	+ //? SetUndoStates();
	5420	+
4789	5421	ResetModel();
4790	5422	copy.HardTouch(); // recompile?
4791	5423	refreshContents();
..	..	@@ -4796,7 +5428,7 @@
4796	5428	{
4797	5429	if (Grafreed.standAlone)
4798	5430	{
4799		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5431	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4800	5432	browser.show();
4801	5433	String filename = browser.getFile();
4802	5434	if (filename != null && filename.length() > 0)
..	..	@@ -4895,6 +5527,7 @@
4895	5527	//ps.print(buffer.toString());
4896	5528	} catch (IOException e)
4897	5529	{
	5530	+ e.printStackTrace();
4898	5531	}
4899	5532	}
4900	5533
..	..	@@ -5187,7 +5820,7 @@
5187	5820	JLabel colorLabel;
5188	5821	cNumberSlider colorField;
5189	5822	JLabel modulationLabel;
5190		- cNumberSlider modulationField;
	5823	+ cNumberSlider saturationField;
5191	5824	JLabel metalnessLabel;
5192	5825	cNumberSlider metalnessField;
5193	5826	JLabel diffuseLabel;