~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -41,11 +41,25 @@
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	55	ImageIcon icon = GetIcon(name);
48	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);
49	63	}
50	64
51	65	cToggleButton GetToggleButton(String name, boolean border)
..	..	@@ -60,26 +74,40 @@
60	74	return new cCheckBox(icon, border);
61	75	}
62	76
63		- private ImageIcon GetIcon(String name)
	77	+ ImageIcon GetIcon(String name)
64	78	{
65	79	try
66	80	{
67	81	BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
68	82
69		- if (image.getWidth() != 24 && image.getHeight() != 24)
70		- {
71		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
72		- Graphics2D g = resized.createGraphics();
73		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
74		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
75		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
76		- g.dispose();
77		-
78		- image = resized;
79		- }
	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	+// }
80	94
81	95	javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
82	96	return icon;
	97	+ }
	98	+ catch (Exception e)
	99	+ {
	100	+ return null;
	101	+ }
	102	+ }
	103	+
	104	+ BufferedImage GetImage(String name)
	105	+ {
	106	+ try
	107	+ {
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
83	111	}
84	112	catch (Exception e)
85	113	{
..	..	@@ -268,9 +296,9 @@
268	296	client = inClient;
269	297	copy = client;
270	298
271		- if (copy.versions == null)
	299	+ if (copy.versionlist == null)
272	300	{
273		- copy.versions = new byte[100][];
	301	+ copy.versionlist = new Object3D[100];
274	302	copy.versionindex = -1;
275	303	}
276	304
..	..	@@ -287,9 +315,9 @@
287	315	client = inClient;
288	316	copy = client;
289	317
290		- if (copy.versions == null)
	318	+ if (copy.versionlist == null)
291	319	{
292		- copy.versions = new byte[100][];
	320	+ copy.versionlist = new Object3D[100];
293	321	copy.versionindex = -1;
294	322	}
295	323
..	..	@@ -325,7 +353,7 @@
325	353	copy = localCopy;
326	354	copy.editWindow = this;
327	355
328		- if (copy.versions == null)
	356	+ if (copy.versionlist == null)
329	357	{
330	358	// copy.versions = new byte[100][];
331	359	// copy.versionindex = -1;
..	..	@@ -436,10 +464,10 @@
436	464	editPanel.add(editCommandsPanel);
437	465	editPanel.add(ctrlPanel);
438	466
439		- toolboxPanel = new cGridBag().setVertical(false);
	467	+ toolboxPanel = new cGridBag().setVertical(true);
440	468	//toolboxPanel.setName("Toolbox");
441	469
442		- materialPanel = new cGridBag().setVertical(true);
	470	+ materialPanel = new cGridBag().setVertical(false);
443	471	//materialPanel.setName("Material");
444	472
445	473	/JTextPane/
..	..	@@ -820,9 +848,11 @@
820	848	//frame.setVisible(true);
821	849	}
822	850	frame.validate();
	851	+
	852	+ cameraView.requestFocusInWindow();
823	853	}
824	854
825		- private byte[] CompressCopy()
	855	+ private Object3D CompressCopy()
826	856	{
827	857	boolean temp = CameraPane.SWITCH;
828	858	CameraPane.SWITCH = false;
..	..	@@ -830,12 +860,13 @@
830	860	copy.ExtractBigData(versiontable);
831	861	// if (copy == client)
832	862
833		- byte[] versions[] = copy.versions;
834		- copy.versions = null;
	863	+ Object3D versions[] = copy.versionlist;
	864	+ copy.versionlist = null;
835	865
836		- byte[] compress = Compress(copy);
	866	+ //byte[] compress = Compress(copy);
	867	+ Object3D compress = (Object3D)Grafreed.clone(copy);
837	868
838		- copy.versions = versions;
	869	+ copy.versionlist = versions;
839	870
840	871	copy.RestoreBigData(versiontable);
841	872
..	..	@@ -965,6 +996,7 @@
965	996	{
966	997	SetupMaterial(materialPanel);
967	998	}
	999	+
968	1000	//SetupName();
969	1001	//SetupViews();
970	1002	}
..	..	@@ -1194,6 +1226,8 @@
1194	1226	hideCB.setToolTipText("Hide object");
1195	1227	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1196	1228	markCB.setToolTipText("As animation target transform");
	1229	+
	1230	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1197	1231
1198	1232	setupPanel2 = new cGridBag().setVertical(false);
1199	1233
..	..	@@ -1520,23 +1554,29 @@
1520	1554	//tmp.setName("Edit");
1521	1555	objectPanel.add(materialPanel);
1522	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	+
1523	1563	// JPanel north = new JPanel(new BorderLayout());
1524	1564	// north.setName("Edit");
1525	1565	// north.add(ctrlPanel, BorderLayout.NORTH);
1526	1566	// objectPanel.add(north);
1527	1567	objectPanel.add(editPanel);
1528		- objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1568	+ objectPanel.setIconAt(2, GetIcon("icons/write.png"));
	1569	+ objectPanel.setToolTipTextAt(2, "Edit controls");
1529	1570
1530	1571	//if (Globals.ADVANCED)
1531	1572	objectPanel.add(infoPanel);
1532		- objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1573	+ objectPanel.setIconAt(3, GetIcon("icons/info.png"));
	1574	+ objectPanel.setToolTipTextAt(3, "Information");
1533	1575
1534	1576	objectPanel.add(XYZPanel);
1535		- objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1577	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1578	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1536	1579
1537		- objectPanel.add(toolboxPanel);
1538		- objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1539		-
1540	1580	/*
1541	1581	aConstraints.gridx = 0;
1542	1582	aConstraints.gridwidth = 1;
..	..	@@ -1675,7 +1715,6 @@
1675	1715	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1676	1716	frame.addWindowListener(new WindowAdapter()
1677	1717	{
1678		-
1679	1718	public void windowClosing(WindowEvent e)
1680	1719	{
1681	1720	Close();
..	..	@@ -1698,12 +1737,384 @@
1698	1737	ctrlPanel.removeAll();
1699	1738	}
1700	1739
1701		- void SetupMaterial(cGridBag panel)
	1740	+ void SetupMaterial(cGridBag materialpanel)
1702	1741	{
1703		- /*
	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	+ /*
1704	2115	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1705	2116	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706		- */
	2117	+ */
1707	2118
1708	2119	cGridBag editBar = new cGridBag().setVertical(false);
1709	2120
..	..	@@ -1737,27 +2148,50 @@
1737	2148	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1738	2149
1739	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);
1740	2164
1741	2165	cGridBag color = new cGridBag();
1742		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1743		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1744		- 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	+
1745	2171	//colorField.preferredWidth = 200;
1746	2172	colorSection.add(color);
1747	2173
1748	2174	cGridBag modulation = new cGridBag();
1749	2175	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1750	2176	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1751		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2177	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1752	2178	colorSection.add(modulation);
1753	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	+
1754	2188	cGridBag texture = new cGridBag();
1755	2189	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1756	2190	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1757	2191	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1758	2192	colorSection.add(texture);
1759	2193
1760		- panel.add(new JSeparator());
	2194	+ panel.add(GetSeparator());
1761	2195
1762	2196	panel.add(colorSection);
1763	2197
..	..	@@ -1813,7 +2247,7 @@
1813	2247	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1814	2248	diffuseSection.add(shadowbias);
1815	2249
1816		- panel.add(new JSeparator());
	2250	+ panel.add(GetSeparator());
1817	2251
1818	2252	panel.add(diffuseSection);
1819	2253
..	..	@@ -1876,7 +2310,7 @@
1876	2310	specularSection.add(anisoV);
1877	2311
1878	2312
1879		- panel.add(new JSeparator());
	2313	+ panel.add(GetSeparator());
1880	2314
1881	2315	panel.add(specularSection);
1882	2316
..	..	@@ -1901,12 +2335,6 @@
1901	2335	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1902	2336	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1903	2337	colorSection.add(backlit);
1904		-
1905		- cGridBag opacity = new cGridBag();
1906		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1907		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1908		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1909		- colorSection.add(opacity);
1910	2338
1911	2339	//panel.add(new JSeparator());
1912	2340
..	..	@@ -1952,7 +2380,7 @@
1952	2380	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1953	2381	textureSection.add(opacityPower);
1954	2382
1955		- panel.add(new JSeparator());
	2383	+ panel.add(GetSeparator());
1956	2384
1957	2385	panel.add(textureSection);
1958	2386
..	..	@@ -2939,7 +3367,7 @@
2939	3367
2940	3368	freezematerial = true;
2941	3369	colorField.setFloat(mat.color);
2942		- modulationField.setFloat(mat.modulation);
	3370	+ saturationField.setFloat(mat.modulation);
2943	3371	metalnessField.setFloat(mat.metalness);
2944	3372	diffuseField.setFloat(mat.diffuse);
2945	3373	specularField.setFloat(mat.specular);
..	..	@@ -3250,6 +3678,7 @@
3250	3678	} else if (event.getSource() == liveCB)
3251	3679	{
3252	3680	copy.live ^= true;
	3681	+ objEditor.refreshContents(true); // To show item colors
3253	3682	return;
3254	3683	} else if (event.getSource() == selectableCB)
3255	3684	{
..	..	@@ -3259,7 +3688,7 @@
3259	3688	{
3260	3689	copy.hide ^= true;
3261	3690	copy.Touch(); // display list issue
3262		- objEditor.refreshContents();
	3691	+ objEditor.refreshContents(true); // To show item colors
3263	3692	return;
3264	3693	} else if (event.getSource() == link2masterCB)
3265	3694	{
..	..	@@ -3515,6 +3944,7 @@
3515	3944
3516	3945	static public byte[] Compress(Object3D o)
3517	3946	{
	3947	+ // Slower to actually compress.
3518	3948	try
3519	3949	{
3520	3950	ByteArrayOutputStream baos = new ByteArrayOutputStream();
..	..	@@ -3616,6 +4046,7 @@
3616	4046	{
3617	4047	//Save(true);
3618	4048	Replace();
	4049	+ SetUndoStates();
3619	4050	}
3620	4051
3621	4052	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3636,29 +4067,46 @@
3636	4067
3637	4068	java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3638	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	+
3639	4082	public boolean Save(boolean user)
3640	4083	{
3641	4084	System.err.println("Save");
	4085	+ //Replace();
3642	4086
3643	4087	cRadio tab = GetCurrentTab();
3644	4088
3645		- byte[] compress = CompressCopy();
	4089	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
3646	4090
3647	4091	boolean thesame = false;
3648	4092
3649		- // Quick heuristic using length. Works only when stream is compressed.
3650		- if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3651		- {
3652		- thesame = true;
3653		- }
	4093	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4094	+// {
	4095	+// thesame = true;
	4096	+// }
3654	4097
3655	4098	//EditorFrame.m_MainFrame.requestFocusInWindow();
3656	4099	if (!thesame)
3657	4100	{
	4101	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4102	+ {
	4103	+ copy.versionlist[i] = copy.versionlist[i-1];
	4104	+ }
	4105	+
3658	4106	//tab.user[tab.versionindex] = user;
3659	4107	//boolean increment = true; // tab.graphs[tab.versionindex] == null;
3660	4108
3661		- copy.versions[++copy.versionindex] = compress;
	4109	+ copy.versionlist[++copy.versionindex] = compress;
3662	4110
3663	4111	// if (increment)
3664	4112	// tab.versionindex++;
..	..	@@ -3668,11 +4116,11 @@
3668	4116
3669	4117	//assert(hashtable.isEmpty());
3670	4118
3671		- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3672		- {
3673		- //tab.user[i] = false;
3674		- copy.versions[i] = null;
3675		- }
	4119	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4120	+// {
	4121	+// //tab.user[i] = false;
	4122	+// copy.versionlist[i] = null;
	4123	+// }
3676	4124
3677	4125	SetUndoStates();
3678	4126
..	..	@@ -3697,9 +4145,43 @@
3697	4145
3698	4146	return !thesame;
3699	4147	}
3700		-
3701		- void CopyChanged(Object3D obj)
	4148	+
	4149	+ boolean flashIt = true;
	4150	+
	4151	+ void RefreshSelection()
3702	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	+
3703	4185	SetUndoStates();
3704	4186
3705	4187	boolean temp = CameraPane.SWITCH;
..	..	@@ -3709,6 +4191,9 @@
3709	4191
3710	4192	copy.clear();
3711	4193
	4194	+ copy.skyboxname = obj.skyboxname;
	4195	+ copy.skyboxext = obj.skyboxext;
	4196	+
3712	4197	for (int i=0; i<obj.Size(); i++)
3713	4198	{
3714	4199	copy.add(obj.get(i));
..	..	@@ -3718,6 +4203,7 @@
3718	4203
3719	4204	CameraPane.SWITCH = temp;
3720	4205
	4206	+ RefreshSelection();
3721	4207	//assert(hashtable.isEmpty());
3722	4208
3723	4209	copy.Touch();
..	..	@@ -3738,13 +4224,15 @@
3738	4224	}
3739	4225	}
3740	4226
3741		- refreshContents();
	4227	+ refreshContents(true);
3742	4228	}
3743	4229
3744		- cButton undoButton;
	4230	+ cButton previousVersionButton;
3745	4231	cButton restoreButton;
3746	4232	cButton replaceButton;
3747		- cButton redoButton;
	4233	+ cButton nextVersionButton;
	4234	+ cButton saveVersionButton;
	4235	+ cButton deleteVersionButton;
3748	4236
3749	4237	boolean muteSlider;
3750	4238
..	..	@@ -3752,9 +4240,9 @@
3752	4240	{
3753	4241	int count = 0;
3754	4242
3755		- for (int i = copy.versions.length; --i >= 0;)
	4243	+ for (int i = copy.versionlist.length; --i >= 0;)
3756	4244	{
3757		- if (copy.versions[i] != null)
	4245	+ if (copy.versionlist[i] != null)
3758	4246	count++;
3759	4247	}
3760	4248
..	..	@@ -3765,11 +4253,14 @@
3765	4253	{
3766	4254	cRadio tab = GetCurrentTab();
3767	4255
3768		- restoreButton.setEnabled(copy.versionindex != -1);
3769		- replaceButton.setEnabled(copy.versionindex != -1);
	4256	+ restoreButton.setEnabled(true); // copy.versionindex != -1);
	4257	+ replaceButton.setEnabled(true); // copy.versionindex != -1);
3770	4258
3771		- undoButton.setEnabled(copy.versionindex > 0);
3772		- 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);
3773	4264
3774	4265	muteSlider = true;
3775	4266	versionSlider.setMaximum(VersionCount() - 1);
..	..	@@ -3777,7 +4268,7 @@
3777	4268	muteSlider = false;
3778	4269	}
3779	4270
3780		- public boolean Undo()
	4271	+ public boolean PreviousVersion()
3781	4272	{
3782	4273	// Option?
3783	4274	Replace();
..	..	@@ -3807,7 +4298,7 @@
3807	4298
3808	4299	copy.versionindex -= 1;
3809	4300
3810		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4301	+ CopyChanged();
3811	4302
3812	4303	return true;
3813	4304	}
..	..	@@ -3818,13 +4309,14 @@
3818	4309
3819	4310	cRadio tab = GetCurrentTab();
3820	4311
3821		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4312	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3822	4313	{
3823	4314	java.awt.Toolkit.getDefaultToolkit().beep();
3824	4315	return false;
3825	4316	}
3826	4317
3827		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4318	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4319	+ CopyChanged();
3828	4320
3829	4321	return true;
3830	4322	}
..	..	@@ -3835,25 +4327,25 @@
3835	4327
3836	4328	cRadio tab = GetCurrentTab();
3837	4329
3838		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4330	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3839	4331	{
3840	4332	// No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3841	4333	return false;
3842	4334	}
3843	4335
3844		- copy.versions[copy.versionindex] = CompressCopy();
	4336	+ copy.versionlist[copy.versionindex] = CompressCopy();
3845	4337
3846	4338	return true;
3847	4339	}
3848	4340
3849		- public void Redo()
	4341	+ public void NextVersion()
3850	4342	{
3851	4343	// Option?
3852	4344	Replace();
3853	4345
3854	4346	cRadio tab = GetCurrentTab();
3855	4347
3856		- if (copy.versions[copy.versionindex + 1] == null)
	4348	+ if (copy.versionlist[copy.versionindex + 1] == null)
3857	4349	{
3858	4350	java.awt.Toolkit.getDefaultToolkit().beep();
3859	4351	return;
..	..	@@ -3861,7 +4353,7 @@
3861	4353
3862	4354	copy.versionindex += 1;
3863	4355
3864		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4356	+ CopyChanged();
3865	4357
3866	4358	//if (!tab.user[tab.versionindex])
3867	4359	// tab.graphs[tab.versionindex] = null;
..	..	@@ -4075,7 +4567,7 @@
4075	4567	//copy.material = new cMaterial(copy.GetMaterial());
4076	4568
4077	4569	current.color = (float) colorField.getFloat();
4078		- current.modulation = (float) modulationField.getFloat();
	4570	+ current.modulation = (float) saturationField.getFloat();
4079	4571	current.metalness = (float) metalnessField.getFloat();
4080	4572	current.diffuse = (float) diffuseField.getFloat();
4081	4573	current.specular = (float) specularField.getFloat();
..	..	@@ -4108,7 +4600,7 @@
4108	4600	cMaterial mat = copy.material;
4109	4601
4110	4602	colorField.SetToolTipValue((mat.color));
4111		- modulationField.SetToolTipValue((mat.modulation));
	4603	+ saturationField.SetToolTipValue((mat.modulation));
4112	4604	metalnessField.SetToolTipValue((mat.metalness));
4113	4605	diffuseField.SetToolTipValue((mat.diffuse));
4114	4606	specularField.SetToolTipValue((mat.specular));
..	..	@@ -4172,9 +4664,10 @@
4172	4664
4173	4665	int version = versionSlider.getInteger();
4174	4666
4175		- if (copy.versions[version] != null)
	4667	+ if (copy.versionlist[version] != null)
4176	4668	{
4177		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4669	+ copy.versionindex = version;
	4670	+ CopyChanged();
4178	4671	}
4179	4672
4180	4673	return;
..	..	@@ -4214,6 +4707,12 @@
4214	4707	{
4215	4708	//System.out.println("stateChanged = " + this);
4216	4709	materialtouched = true;
	4710	+
	4711	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4712	+ {
	4713	+ saturationField.setFloat(1);
	4714	+ }
	4715	+
4217	4716	applySelf();
4218	4717	//System.out.println("this = " + this);
4219	4718	//System.out.println("PARENT = " + parent);
..	..	@@ -4513,6 +5012,7 @@
4513	5012	{
4514	5013	if (GetTree() != null)
4515	5014	{
	5015	+ GetTree().revalidate();
4516	5016	GetTree().repaint();
4517	5017	}
4518	5018
..	..	@@ -4521,6 +5021,9 @@
4521	5021	ctrlPanel.validate(); // ? new
4522	5022	ctrlPanel.repaint();
4523	5023	}
	5024	+
	5025	+ if (previousVersionButton != null && copy.versionlist != null)
	5026	+ SetUndoStates();
4524	5027	}
4525	5028
4526	5029	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4769,7 +5272,9 @@
4769	5272	readobj.ResetDisplayList();
4770	5273	} catch (Exception e)
4771	5274	{
4772		- e.printStackTrace();
	5275	+ if (!e.toString().contains("GZIP"))
	5276	+ e.printStackTrace();
	5277	+
4773	5278	try
4774	5279	{
4775	5280	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4849,6 +5354,8 @@
4849	5354	{
4850	5355	//readobj.deepCopySelf(copy);
4851	5356	copy.clear(); // june 2014
	5357	+ copy.skyboxname = readobj.skyboxname;
	5358	+ copy.skyboxext = readobj.skyboxext;
4852	5359	for (int i = 0; i < readobj.size(); i++)
4853	5360	{
4854	5361	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4889,6 +5396,7 @@
4889	5396	}
4890	5397	} catch (ClassCastException e)
4891	5398	{
	5399	+ e.printStackTrace();
4892	5400	assert (false);
4893	5401	Composite c = (Composite) copy;
4894	5402	c.children.clear();
..	..	@@ -4899,12 +5407,12 @@
4899	5407	c.addChild(csg);
4900	5408	}
4901	5409
4902		- copy.versions = readobj.versions;
	5410	+ copy.versionlist = readobj.versionlist;
4903	5411	copy.versionindex = readobj.versionindex;
4904	5412
4905		- if (copy.versions == null)
	5413	+ if (copy.versionlist == null)
4906	5414	{
4907		- copy.versions = new byte[100][];
	5415	+ copy.versionlist = new Object3D[100];
4908	5416	copy.versionindex = -1;
4909	5417	}
4910	5418
..	..	@@ -4920,7 +5428,7 @@
4920	5428	{
4921	5429	if (Grafreed.standAlone)
4922	5430	{
4923		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5431	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4924	5432	browser.show();
4925	5433	String filename = browser.getFile();
4926	5434	if (filename != null && filename.length() > 0)
..	..	@@ -5312,7 +5820,7 @@
5312	5820	JLabel colorLabel;
5313	5821	cNumberSlider colorField;
5314	5822	JLabel modulationLabel;
5315		- cNumberSlider modulationField;
	5823	+ cNumberSlider saturationField;
5316	5824	JLabel metalnessLabel;
5317	5825	cNumberSlider metalnessField;
5318	5826	JLabel diffuseLabel;