~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -296,9 +296,9 @@
296	296	client = inClient;
297	297	copy = client;
298	298
299		- if (copy.versions == null)
	299	+ if (copy.versionlist == null)
300	300	{
301		- copy.versions = new byte[100][];
	301	+ copy.versionlist = new Object3D[100];
302	302	copy.versionindex = -1;
303	303	}
304	304
..	..	@@ -315,9 +315,9 @@
315	315	client = inClient;
316	316	copy = client;
317	317
318		- if (copy.versions == null)
	318	+ if (copy.versionlist == null)
319	319	{
320		- copy.versions = new byte[100][];
	320	+ copy.versionlist = new Object3D[100];
321	321	copy.versionindex = -1;
322	322	}
323	323
..	..	@@ -353,7 +353,7 @@
353	353	copy = localCopy;
354	354	copy.editWindow = this;
355	355
356		- if (copy.versions == null)
	356	+ if (copy.versionlist == null)
357	357	{
358	358	// copy.versions = new byte[100][];
359	359	// copy.versionindex = -1;
..	..	@@ -467,7 +467,7 @@
467	467	toolboxPanel = new cGridBag().setVertical(true);
468	468	//toolboxPanel.setName("Toolbox");
469	469
470		- materialPanel = new cGridBag().setVertical(true);
	470	+ materialPanel = new cGridBag().setVertical(false);
471	471	//materialPanel.setName("Material");
472	472
473	473	/JTextPane/
..	..	@@ -848,9 +848,11 @@
848	848	//frame.setVisible(true);
849	849	}
850	850	frame.validate();
	851	+
	852	+ cameraView.requestFocusInWindow();
851	853	}
852	854
853		- private byte[] CompressCopy()
	855	+ private Object3D CompressCopy()
854	856	{
855	857	boolean temp = CameraPane.SWITCH;
856	858	CameraPane.SWITCH = false;
..	..	@@ -858,12 +860,13 @@
858	860	copy.ExtractBigData(versiontable);
859	861	// if (copy == client)
860	862
861		- byte[] versions[] = copy.versions;
862		- copy.versions = null;
	863	+ Object3D versions[] = copy.versionlist;
	864	+ copy.versionlist = null;
863	865
864		- byte[] compress = Compress(copy);
	866	+ //byte[] compress = Compress(copy);
	867	+ Object3D compress = (Object3D)Grafreed.clone(copy);
865	868
866		- copy.versions = versions;
	869	+ copy.versionlist = versions;
867	870
868	871	copy.RestoreBigData(versiontable);
869	872
..	..	@@ -993,6 +996,7 @@
993	996	{
994	997	SetupMaterial(materialPanel);
995	998	}
	999	+
996	1000	//SetupName();
997	1001	//SetupViews();
998	1002	}
..	..	@@ -1550,7 +1554,7 @@
1550	1554	//tmp.setName("Edit");
1551	1555	objectPanel.add(materialPanel);
1552	1556	objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1553		- objectPanel.setToolTipTextAt(0, "Material panel");
	1557	+ objectPanel.setToolTipTextAt(0, "Material");
1554	1558
1555	1559	// JPanel north = new JPanel(new BorderLayout());
1556	1560	// north.setName("Edit");
..	..	@@ -1558,20 +1562,20 @@
1558	1562	// objectPanel.add(north);
1559	1563	objectPanel.add(editPanel);
1560	1564	objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1561		- objectPanel.setToolTipTextAt(1, "Edit panel");
	1565	+ objectPanel.setToolTipTextAt(1, "Edit controls");
1562	1566
1563	1567	//if (Globals.ADVANCED)
1564	1568	objectPanel.add(infoPanel);
1565	1569	objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1566		- objectPanel.setToolTipTextAt(2, "Info panel");
	1570	+ objectPanel.setToolTipTextAt(2, "Information");
1567	1571
1568	1572	objectPanel.add(XYZPanel);
1569	1573	objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1570		- objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
	1574	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
1571	1575
1572	1576	objectPanel.add(toolboxPanel);
1573	1577	objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1574		- objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
	1578	+ objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1575	1579
1576	1580	/*
1577	1581	aConstraints.gridx = 0;
..	..	@@ -1733,12 +1737,384 @@
1733	1737	ctrlPanel.removeAll();
1734	1738	}
1735	1739
1736		- void SetupMaterial(cGridBag panel)
	1740	+ void SetupMaterial(cGridBag materialpanel)
1737	1741	{
1738		- /*
	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	+ /*
1739	2115	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1740	2116	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1741		- */
	2117	+ */
1742	2118
1743	2119	cGridBag editBar = new cGridBag().setVertical(false);
1744	2120
..	..	@@ -1775,7 +2151,9 @@
1775	2151
1776	2152	cGridBag huepanel = new cGridBag();
1777	2153	cGridBag huelabel = new cGridBag();
1778		- huelabel.add(GetLabel("icons/hue.png", false));
	2154	+ skin = GetLabel("icons/hue.png", false);
	2155	+ skin.fit = true;
	2156	+ huelabel.add(skin);
1779	2157	huelabel.preferredWidth = 20;
1780	2158	huepanel.add(new cGridBag()); // Label
1781	2159	huepanel.add(huelabel); // Field/slider
..	..	@@ -1796,7 +2174,7 @@
1796	2174	cGridBag modulation = new cGridBag();
1797	2175	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1798	2176	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1799		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2177	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1800	2178	colorSection.add(modulation);
1801	2179
1802	2180	cGridBag opacity = new cGridBag();
..	..	@@ -2989,7 +3367,7 @@
2989	3367
2990	3368	freezematerial = true;
2991	3369	colorField.setFloat(mat.color);
2992		- modulationField.setFloat(mat.modulation);
	3370	+ saturationField.setFloat(mat.modulation);
2993	3371	metalnessField.setFloat(mat.metalness);
2994	3372	diffuseField.setFloat(mat.diffuse);
2995	3373	specularField.setFloat(mat.specular);
..	..	@@ -3300,6 +3678,7 @@
3300	3678	} else if (event.getSource() == liveCB)
3301	3679	{
3302	3680	copy.live ^= true;
	3681	+ objEditor.refreshContents(true); // To show item colors
3303	3682	return;
3304	3683	} else if (event.getSource() == selectableCB)
3305	3684	{
..	..	@@ -3309,7 +3688,7 @@
3309	3688	{
3310	3689	copy.hide ^= true;
3311	3690	copy.Touch(); // display list issue
3312		- objEditor.refreshContents();
	3691	+ objEditor.refreshContents(true); // To show item colors
3313	3692	return;
3314	3693	} else if (event.getSource() == link2masterCB)
3315	3694	{
..	..	@@ -3565,6 +3944,7 @@
3565	3944
3566	3945	static public byte[] Compress(Object3D o)
3567	3946	{
	3947	+ // Slower to actually compress.
3568	3948	try
3569	3949	{
3570	3950	ByteArrayOutputStream baos = new ByteArrayOutputStream();
..	..	@@ -3666,6 +4046,7 @@
3666	4046	{
3667	4047	//Save(true);
3668	4048	Replace();
	4049	+ SetUndoStates();
3669	4050	}
3670	4051
3671	4052	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3686,29 +4067,46 @@
3686	4067
3687	4068	java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3688	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	+
3689	4082	public boolean Save(boolean user)
3690	4083	{
3691	4084	System.err.println("Save");
	4085	+ //Replace();
3692	4086
3693	4087	cRadio tab = GetCurrentTab();
3694	4088
3695		- byte[] compress = CompressCopy(); // Saved version. No need for "Replace".
	4089	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
3696	4090
3697	4091	boolean thesame = false;
3698	4092
3699		- // Quick heuristic using length. Works only when stream is compressed.
3700		- if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3701		- {
3702		- thesame = true;
3703		- }
	4093	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4094	+// {
	4095	+// thesame = true;
	4096	+// }
3704	4097
3705	4098	//EditorFrame.m_MainFrame.requestFocusInWindow();
3706	4099	if (!thesame)
3707	4100	{
	4101	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4102	+ {
	4103	+ copy.versionlist[i] = copy.versionlist[i-1];
	4104	+ }
	4105	+
3708	4106	//tab.user[tab.versionindex] = user;
3709	4107	//boolean increment = true; // tab.graphs[tab.versionindex] == null;
3710	4108
3711		- copy.versions[++copy.versionindex] = compress;
	4109	+ copy.versionlist[++copy.versionindex] = compress;
3712	4110
3713	4111	// if (increment)
3714	4112	// tab.versionindex++;
..	..	@@ -3718,11 +4116,11 @@
3718	4116
3719	4117	//assert(hashtable.isEmpty());
3720	4118
3721		- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3722		- {
3723		- //tab.user[i] = false;
3724		- copy.versions[i] = null;
3725		- }
	4119	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4120	+// {
	4121	+// //tab.user[i] = false;
	4122	+// copy.versionlist[i] = null;
	4123	+// }
3726	4124
3727	4125	SetUndoStates();
3728	4126
..	..	@@ -3747,9 +4145,43 @@
3747	4145
3748	4146	return !thesame;
3749	4147	}
3750		-
3751		- void CopyChanged(Object3D obj)
	4148	+
	4149	+ boolean flashIt = true;
	4150	+
	4151	+ void RefreshSelection()
3752	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	+
3753	4185	SetUndoStates();
3754	4186
3755	4187	boolean temp = CameraPane.SWITCH;
..	..	@@ -3771,6 +4203,7 @@
3771	4203
3772	4204	CameraPane.SWITCH = temp;
3773	4205
	4206	+ RefreshSelection();
3774	4207	//assert(hashtable.isEmpty());
3775	4208
3776	4209	copy.Touch();
..	..	@@ -3791,13 +4224,15 @@
3791	4224	}
3792	4225	}
3793	4226
3794		- refreshContents();
	4227	+ refreshContents(true);
3795	4228	}
3796	4229
3797		- cButton undoButton;
	4230	+ cButton previousVersionButton;
3798	4231	cButton restoreButton;
3799	4232	cButton replaceButton;
3800		- cButton redoButton;
	4233	+ cButton nextVersionButton;
	4234	+ cButton saveVersionButton;
	4235	+ cButton deleteVersionButton;
3801	4236
3802	4237	boolean muteSlider;
3803	4238
..	..	@@ -3805,9 +4240,9 @@
3805	4240	{
3806	4241	int count = 0;
3807	4242
3808		- for (int i = copy.versions.length; --i >= 0;)
	4243	+ for (int i = copy.versionlist.length; --i >= 0;)
3809	4244	{
3810		- if (copy.versions[i] != null)
	4245	+ if (copy.versionlist[i] != null)
3811	4246	count++;
3812	4247	}
3813	4248
..	..	@@ -3818,11 +4253,14 @@
3818	4253	{
3819	4254	cRadio tab = GetCurrentTab();
3820	4255
3821		- restoreButton.setEnabled(copy.versionindex != -1);
3822		- replaceButton.setEnabled(copy.versionindex != -1);
	4256	+ restoreButton.setEnabled(true); // copy.versionindex != -1);
	4257	+ replaceButton.setEnabled(true); // copy.versionindex != -1);
3823	4258
3824		- undoButton.setEnabled(copy.versionindex > 0);
3825		- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	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);
3826	4264
3827	4265	muteSlider = true;
3828	4266	versionSlider.setMaximum(VersionCount() - 1);
..	..	@@ -3830,7 +4268,7 @@
3830	4268	muteSlider = false;
3831	4269	}
3832	4270
3833		- public boolean Undo()
	4271	+ public boolean PreviousVersion()
3834	4272	{
3835	4273	// Option?
3836	4274	Replace();
..	..	@@ -3860,7 +4298,7 @@
3860	4298
3861	4299	copy.versionindex -= 1;
3862	4300
3863		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4301	+ CopyChanged();
3864	4302
3865	4303	return true;
3866	4304	}
..	..	@@ -3871,13 +4309,14 @@
3871	4309
3872	4310	cRadio tab = GetCurrentTab();
3873	4311
3874		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4312	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3875	4313	{
3876	4314	java.awt.Toolkit.getDefaultToolkit().beep();
3877	4315	return false;
3878	4316	}
3879	4317
3880		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4318	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4319	+ CopyChanged();
3881	4320
3882	4321	return true;
3883	4322	}
..	..	@@ -3888,25 +4327,25 @@
3888	4327
3889	4328	cRadio tab = GetCurrentTab();
3890	4329
3891		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4330	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3892	4331	{
3893	4332	// No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3894	4333	return false;
3895	4334	}
3896	4335
3897		- copy.versions[copy.versionindex] = CompressCopy();
	4336	+ copy.versionlist[copy.versionindex] = CompressCopy();
3898	4337
3899	4338	return true;
3900	4339	}
3901	4340
3902		- public void Redo()
	4341	+ public void NextVersion()
3903	4342	{
3904	4343	// Option?
3905	4344	Replace();
3906	4345
3907	4346	cRadio tab = GetCurrentTab();
3908	4347
3909		- if (copy.versions[copy.versionindex + 1] == null)
	4348	+ if (copy.versionlist[copy.versionindex + 1] == null)
3910	4349	{
3911	4350	java.awt.Toolkit.getDefaultToolkit().beep();
3912	4351	return;
..	..	@@ -3914,7 +4353,7 @@
3914	4353
3915	4354	copy.versionindex += 1;
3916	4355
3917		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4356	+ CopyChanged();
3918	4357
3919	4358	//if (!tab.user[tab.versionindex])
3920	4359	// tab.graphs[tab.versionindex] = null;
..	..	@@ -4128,7 +4567,7 @@
4128	4567	//copy.material = new cMaterial(copy.GetMaterial());
4129	4568
4130	4569	current.color = (float) colorField.getFloat();
4131		- current.modulation = (float) modulationField.getFloat();
	4570	+ current.modulation = (float) saturationField.getFloat();
4132	4571	current.metalness = (float) metalnessField.getFloat();
4133	4572	current.diffuse = (float) diffuseField.getFloat();
4134	4573	current.specular = (float) specularField.getFloat();
..	..	@@ -4161,7 +4600,7 @@
4161	4600	cMaterial mat = copy.material;
4162	4601
4163	4602	colorField.SetToolTipValue((mat.color));
4164		- modulationField.SetToolTipValue((mat.modulation));
	4603	+ saturationField.SetToolTipValue((mat.modulation));
4165	4604	metalnessField.SetToolTipValue((mat.metalness));
4166	4605	diffuseField.SetToolTipValue((mat.diffuse));
4167	4606	specularField.SetToolTipValue((mat.specular));
..	..	@@ -4225,9 +4664,10 @@
4225	4664
4226	4665	int version = versionSlider.getInteger();
4227	4666
4228		- if (copy.versions[version] != null)
	4667	+ if (copy.versionlist[version] != null)
4229	4668	{
4230		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4669	+ copy.versionindex = version;
	4670	+ CopyChanged();
4231	4671	}
4232	4672
4233	4673	return;
..	..	@@ -4267,6 +4707,12 @@
4267	4707	{
4268	4708	//System.out.println("stateChanged = " + this);
4269	4709	materialtouched = true;
	4710	+
	4711	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4712	+ {
	4713	+ saturationField.setFloat(1);
	4714	+ }
	4715	+
4270	4716	applySelf();
4271	4717	//System.out.println("this = " + this);
4272	4718	//System.out.println("PARENT = " + parent);
..	..	@@ -4566,6 +5012,7 @@
4566	5012	{
4567	5013	if (GetTree() != null)
4568	5014	{
	5015	+ GetTree().revalidate();
4569	5016	GetTree().repaint();
4570	5017	}
4571	5018
..	..	@@ -4574,6 +5021,9 @@
4574	5021	ctrlPanel.validate(); // ? new
4575	5022	ctrlPanel.repaint();
4576	5023	}
	5024	+
	5025	+ if (previousVersionButton != null && copy.versionlist != null)
	5026	+ SetUndoStates();
4577	5027	}
4578	5028
4579	5029	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4957,12 +5407,12 @@
4957	5407	c.addChild(csg);
4958	5408	}
4959	5409
4960		- copy.versions = readobj.versions;
	5410	+ copy.versionlist = readobj.versionlist;
4961	5411	copy.versionindex = readobj.versionindex;
4962	5412
4963		- if (copy.versions == null)
	5413	+ if (copy.versionlist == null)
4964	5414	{
4965		- copy.versions = new byte[100][];
	5415	+ copy.versionlist = new Object3D[100];
4966	5416	copy.versionindex = -1;
4967	5417	}
4968	5418
..	..	@@ -4978,7 +5428,7 @@
4978	5428	{
4979	5429	if (Grafreed.standAlone)
4980	5430	{
4981		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5431	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4982	5432	browser.show();
4983	5433	String filename = browser.getFile();
4984	5434	if (filename != null && filename.length() > 0)
..	..	@@ -5370,7 +5820,7 @@
5370	5820	JLabel colorLabel;
5371	5821	cNumberSlider colorField;
5372	5822	JLabel modulationLabel;
5373		- cNumberSlider modulationField;
	5823	+ cNumberSlider saturationField;
5374	5824	JLabel metalnessLabel;
5375	5825	cNumberSlider metalnessField;
5376	5826	JLabel diffuseLabel;