~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -34,6 +34,7 @@
34	34	iSendInfo
35	35	//KeyListener
36	36	{
	37	+ public cToggleButton pinButton;
37	38	boolean timeline;
38	39	boolean wasFullScreen;
39	40
..	..	@@ -296,11 +297,13 @@
296	297	client = inClient;
297	298	copy = client;
298	299
299		- if (copy.versions == null)
300		- {
301		- copy.versions = new byte[100][];
302		- copy.versionindex = -1;
303		- }
	300	+// if (copy.versionlist == null)
	301	+// {
	302	+// copy.versionlist = new Object3D[100];
	303	+// copy.versionindex = -1;
	304	+//
	305	+// callee.Save(true);
	306	+// }
304	307
305	308	// "this" is not called: SetupUI2(objEditor);
306	309	}
..	..	@@ -315,10 +318,12 @@
315	318	client = inClient;
316	319	copy = client;
317	320
318		- if (copy.versions == null)
	321	+ if (copy.versionlist == null)
319	322	{
320		- copy.versions = new byte[100][];
	323	+ copy.versionlist = new Object3D[100];
321	324	copy.versionindex = -1;
	325	+
	326	+// Save(true);
322	327	}
323	328
324	329	SetupUI2(callee.GetEditor());
..	..	@@ -353,11 +358,13 @@
353	358	copy = localCopy;
354	359	copy.editWindow = this;
355	360
356		- if (copy.versions == null)
357		- {
358		-// copy.versions = new byte[100][];
	361	+// if (copy.versionlist == null)
	362	+// {
	363	+// copy.versionlist = new Object3D[100];
359	364	// copy.versionindex = -1;
360		- }
	365	+//
	366	+// Save(true);
	367	+// }
361	368
362	369	SetupMenu();
363	370
..	..	@@ -426,6 +433,8 @@
426	433
427	434	ChangeListener changeListener = new ChangeListener()
428	435	{
	436	+ String name;
	437	+
429	438	public void stateChanged(ChangeEvent changeEvent)
430	439	{
431	440	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -444,7 +453,36 @@
444	453	// EditSelection(false);
445	454	// }
446	455
447		- refreshContents(false); // To refresh Info tab
	456	+ if (objectPanel.getSelectedIndex() == 4)
	457	+ {
	458	+ name = copy.skyboxname;
	459	+
	460	+ if (name == null)
	461	+ {
	462	+ name = "";
	463	+ }
	464	+
	465	+ copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	466	+ copy.skyboxext = "jpg";
	467	+ }
	468	+ else
	469	+ {
	470	+ if (name != null)
	471	+ {
	472	+ if (name.equals(""))
	473	+ {
	474	+ copy.skyboxname = null;
	475	+ copy.skyboxext = null;
	476	+ }
	477	+ else
	478	+ {
	479	+ copy.skyboxname = name;
	480	+ }
	481	+ }
	482	+ }
	483	+
	484	+// refreshContents(false); // To refresh Info tab
	485	+ cameraView.repaint();
448	486	}
449	487	};
450	488	objectPanel.addChangeListener(changeListener);
..	..	@@ -467,7 +505,9 @@
467	505	toolboxPanel = new cGridBag().setVertical(true);
468	506	//toolboxPanel.setName("Toolbox");
469	507
470		- materialPanel = new cGridBag().setVertical(true);
	508	+ skyboxPanel = new cGridBag().setVertical(true);
	509	+
	510	+ materialPanel = new cGridBag().setVertical(false);
471	511	//materialPanel.setName("Material");
472	512
473	513	/JTextPane/
..	..	@@ -751,6 +791,7 @@
751	791	boolean maximized;
752	792
753	793	cButton fullscreenLayout;
	794	+ cButton expandedLayout;
754	795
755	796	void Minimize()
756	797	{
..	..	@@ -790,10 +831,12 @@
790	831	cButton minButton;
791	832	cButton maxButton;
792	833	cButton fullButton;
	834	+ cButton collapseButton;
	835	+ cButton maximize3DButton;
793	836
794	837	void ToggleFullScreen()
795	838	{
796		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	839	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797	840
798	841	cameraView.ToggleFullScreen();
799	842
..	..	@@ -814,13 +857,13 @@
814	857	// X frame.getContentPane().remove(/"Center",/bigThree);
815	858	// X framePanel.add(bigThree);
816	859	// X frame.getContentPane().add(/"Center",/framePanel);
817		- framePanel.setDividerLocation(46);
	860	+// framePanel.setDividerLocation(46); // icons are 24x24
818	861
819	862	//frame.setVisible(true);
820		- radio.layout = keepButton;
	863	+// radio.layout = keepButton;
821	864	//theFrame = null;
822	865	keepButton = null;
823		- radio.layout.doClick();
	866	+// radio.layout.doClick();
824	867
825	868	} else
826	869	{
..	..	@@ -841,31 +884,42 @@
841	884	// X frame.getContentPane().remove(/"Center",/framePanel);
842	885	// X framePanel.remove(bigThree);
843	886	// X frame.getContentPane().add(/"Center",/bigThree);
844		- framePanel.setDividerLocation(0);
	887	+// framePanel.setDividerLocation(0);
845	888
846		- radio.layout = fullscreenLayout;
847		- radio.layout.doClick();
	889	+// radio.layout = fullscreenLayout;
	890	+// radio.layout.doClick();
848	891	//frame.setVisible(true);
849	892	}
850	893	frame.validate();
	894	+
	895	+ cameraView.requestFocusInWindow();
851	896	}
852	897
853		- private byte[] CompressCopy()
	898	+ void CollapseToolbar()
	899	+ {
	900	+ framePanel.setDividerLocation(0);
	901	+ //frame.validate();
	902	+
	903	+ cameraView.requestFocusInWindow();
	904	+ }
	905	+
	906	+ private Object3D Duplicate(Object3D object)
854	907	{
855	908	boolean temp = CameraPane.SWITCH;
856	909	CameraPane.SWITCH = false;
857	910
858		- copy.ExtractBigData(versiontable);
	911	+ object.ExtractBigData(versiontable);
859	912	// if (copy == client)
860	913
861		- byte[] versions[] = copy.versions;
862		- copy.versions = null;
	914	+ Object3D versions[] = object.versionlist;
	915	+ object.versionlist = null;
863	916
864		- byte[] compress = Compress(copy);
	917	+ //byte[] compress = Compress(copy);
	918	+ Object3D compress = (Object3D)Grafreed.clone(object);
865	919
866		- copy.versions = versions;
	920	+ object.versionlist = versions;
867	921
868		- copy.RestoreBigData(versiontable);
	922	+ object.RestoreBigData(versiontable);
869	923
870	924	CameraPane.SWITCH = temp;
871	925
..	..	@@ -993,6 +1047,7 @@
993	1047	{
994	1048	SetupMaterial(materialPanel);
995	1049	}
	1050	+
996	1051	//SetupName();
997	1052	//SetupViews();
998	1053	}
..	..	@@ -1201,6 +1256,18 @@
1201	1256
1202	1257	namePanel = new cGridBag();
1203	1258
	1259	+ //if (copy.pinned)
	1260	+ {
	1261	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1262	+ pinButton.setSelected(copy.pinned);
	1263	+ cGridBag t = new cGridBag();
	1264	+ t.preferredWidth = 2;
	1265	+ t.add(pinButton);
	1266	+ namePanel.add(t);
	1267	+
	1268	+ pinButton.addItemListener(this);
	1269	+ }
	1270	+
1204	1271	nameField = AddText(namePanel, copy.GetName());
1205	1272	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1206	1273	oe.ctrlPanel.add(namePanel);
..	..	@@ -1550,29 +1617,28 @@
1550	1617	//tmp.setName("Edit");
1551	1618	objectPanel.add(materialPanel);
1552	1619	objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1553		- objectPanel.setToolTipTextAt(0, "Material panel");
	1620	+ objectPanel.setToolTipTextAt(0, "Material");
1554	1621
	1622	+ objectPanel.add(toolboxPanel);
	1623	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1624	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1625	+
	1626	+ objectPanel.add(skyboxPanel);
	1627	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1628	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1629	+
1555	1630	// JPanel north = new JPanel(new BorderLayout());
1556	1631	// north.setName("Edit");
1557	1632	// north.add(ctrlPanel, BorderLayout.NORTH);
1558	1633	// objectPanel.add(north);
1559	1634	objectPanel.add(editPanel);
1560		- objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1561		- objectPanel.setToolTipTextAt(1, "Edit panel");
1562		-
1563		- //if (Globals.ADVANCED)
1564		- objectPanel.add(infoPanel);
1565		- objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1566		- objectPanel.setToolTipTextAt(2, "Info panel");
	1635	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1636	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1567	1637
1568	1638	objectPanel.add(XYZPanel);
1569		- objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1570		- objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
	1639	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1640	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1571	1641
1572		- objectPanel.add(toolboxPanel);
1573		- objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1574		- objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
1575		-
1576	1642	/*
1577	1643	aConstraints.gridx = 0;
1578	1644	aConstraints.gridwidth = 1;
..	..	@@ -1609,6 +1675,11 @@
1609	1675
1610	1676	scenePanel.add(tabbedPane);
1611	1677
	1678	+ //if (Globals.ADVANCED)
	1679	+ tabbedPane.add(infoPanel);
	1680	+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1681	+ tabbedPane.setToolTipTextAt(3, "Information");
	1682	+
1612	1683	/*
1613	1684	cTree jTree = new cTree(null);
1614	1685	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1679,6 +1750,23 @@
1679	1750	// aConstraints.gridheight = 1;
1680	1751
1681	1752	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1753	+
	1754	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1755	+ new java.beans.PropertyChangeListener()
	1756	+ {
	1757	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1758	+ {
	1759	+ if ((Integer)pce.getOldValue() == 1)
	1760	+ {
	1761	+ if (radio.layout != expandedLayout)
	1762	+ {
	1763	+ radio.layout = expandedLayout;
	1764	+ radio.layout.doClick();
	1765	+ }
	1766	+ }
	1767	+ }
	1768	+ });
	1769	+
1682	1770	framePanel.setContinuousLayout(false);
1683	1771	framePanel.setOneTouchExpandable(false);
1684	1772	//.setDividerLocation(0.8);
..	..	@@ -1733,12 +1821,403 @@
1733	1821	ctrlPanel.removeAll();
1734	1822	}
1735	1823
1736		- void SetupMaterial(cGridBag panel)
	1824	+ void SetupMaterial(cGridBag materialpanel)
1737	1825	{
1738		- /*
	1826	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1827	+
	1828	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1829	+ skin.setToolTipText("Skin");
	1830	+ skin.addMouseListener(new MouseAdapter()
	1831	+ {
	1832	+ public void mouseClicked(MouseEvent e)
	1833	+ {
	1834	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1835	+ cMaterial material = object.material;
	1836	+
	1837	+ // Skin
	1838	+ colorField.setFloat(material.color);
	1839	+ saturationField.setFloat(material.modulation);
	1840	+ subsurfaceField.setFloat(material.subsurface);
	1841	+ selfshadowField.setFloat(material.diffuseness);
	1842	+ diffusenessField.setFloat(material.factor);
	1843	+ shininessField.setFloat(material.shininess);
	1844	+ shadowbiasField.setFloat(material.shadowbias);
	1845	+ diffuseField.setFloat(material.diffuse);
	1846	+ specularField.setFloat(material.specular);
	1847	+
	1848	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1849	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1850	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1851	+
	1852	+ materialtouched = true;
	1853	+ applySelf();
	1854	+ }
	1855	+ });
	1856	+ presetpanel.add(skin);
	1857	+
	1858	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1859	+ lambert.setToolTipText("Diffuse");
	1860	+ lambert.addMouseListener(new MouseAdapter()
	1861	+ {
	1862	+ public void mouseClicked(MouseEvent e)
	1863	+ {
	1864	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1865	+ cMaterial material = object.material;
	1866	+
	1867	+ diffusenessField.setFloat(material.factor);
	1868	+ selfshadowField.setFloat(material.diffuseness);
	1869	+
	1870	+ materialtouched = true;
	1871	+ applySelf();
	1872	+ }
	1873	+ });
	1874	+ presetpanel.add(lambert);
	1875	+
	1876	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1877	+ diffuse2.setToolTipText("Diffuse2");
	1878	+ diffuse2.addMouseListener(new MouseAdapter()
	1879	+ {
	1880	+ public void mouseClicked(MouseEvent e)
	1881	+ {
	1882	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1883	+ cMaterial material = object.material;
	1884	+
	1885	+ diffusenessField.setFloat(material.factor);
	1886	+ selfshadowField.setFloat(material.diffuseness);
	1887	+
	1888	+ materialtouched = true;
	1889	+ applySelf();
	1890	+ }
	1891	+ });
	1892	+ presetpanel.add(diffuse2);
	1893	+
	1894	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1895	+ diffusemoon.setToolTipText("Moon");
	1896	+ diffusemoon.addMouseListener(new MouseAdapter()
	1897	+ {
	1898	+ public void mouseClicked(MouseEvent e)
	1899	+ {
	1900	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1901	+ cMaterial material = object.material;
	1902	+
	1903	+ diffusenessField.setFloat(material.factor);
	1904	+ selfshadowField.setFloat(material.diffuseness);
	1905	+
	1906	+ materialtouched = true;
	1907	+ applySelf();
	1908	+ }
	1909	+ });
	1910	+ presetpanel.add(diffusemoon);
	1911	+
	1912	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1913	+ diffusemoon2.setToolTipText("Moon2");
	1914	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1915	+ {
	1916	+ public void mouseClicked(MouseEvent e)
	1917	+ {
	1918	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1919	+ cMaterial material = object.material;
	1920	+
	1921	+ diffusenessField.setFloat(material.factor);
	1922	+ selfshadowField.setFloat(material.diffuseness);
	1923	+
	1924	+ materialtouched = true;
	1925	+ applySelf();
	1926	+ }
	1927	+ });
	1928	+ presetpanel.add(diffusemoon2);
	1929	+
	1930	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1931	+ diffusemoon3.setToolTipText("Moon3");
	1932	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1933	+ {
	1934	+ public void mouseClicked(MouseEvent e)
	1935	+ {
	1936	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1937	+ cMaterial material = object.material;
	1938	+
	1939	+ diffusenessField.setFloat(material.factor);
	1940	+ selfshadowField.setFloat(material.diffuseness);
	1941	+
	1942	+ materialtouched = true;
	1943	+ applySelf();
	1944	+ }
	1945	+ });
	1946	+ presetpanel.add(diffusemoon3);
	1947	+
	1948	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1949	+ diffusesheen.setToolTipText("Sheen");
	1950	+ diffusesheen.addMouseListener(new MouseAdapter()
	1951	+ {
	1952	+ public void mouseClicked(MouseEvent e)
	1953	+ {
	1954	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1955	+ cMaterial material = object.material;
	1956	+
	1957	+ sheenField.setFloat(material.sheen);
	1958	+
	1959	+ materialtouched = true;
	1960	+ applySelf();
	1961	+ }
	1962	+ });
	1963	+ presetpanel.add(diffusesheen);
	1964	+
	1965	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1966	+ rough.setToolTipText("Rough metal");
	1967	+ rough.addMouseListener(new MouseAdapter()
	1968	+ {
	1969	+ public void mouseClicked(MouseEvent e)
	1970	+ {
	1971	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1972	+ cMaterial material = object.material;
	1973	+
	1974	+ shininessField.setFloat(material.shininess);
	1975	+ velvetField.setFloat(material.velvet);
	1976	+
	1977	+ materialtouched = true;
	1978	+ applySelf();
	1979	+ }
	1980	+ });
	1981	+ presetpanel.add(rough);
	1982	+
	1983	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1984	+ rough2.setToolTipText("Medium metal");
	1985	+ rough2.addMouseListener(new MouseAdapter()
	1986	+ {
	1987	+ public void mouseClicked(MouseEvent e)
	1988	+ {
	1989	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1990	+ cMaterial material = object.material;
	1991	+
	1992	+ shininessField.setFloat(material.shininess);
	1993	+ lightareaField.setFloat(material.lightarea);
	1994	+
	1995	+ materialtouched = true;
	1996	+ applySelf();
	1997	+ }
	1998	+ });
	1999	+ presetpanel.add(rough2);
	2000	+
	2001	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2002	+ shini0.setToolTipText("Shiny");
	2003	+ shini0.addMouseListener(new MouseAdapter()
	2004	+ {
	2005	+ public void mouseClicked(MouseEvent e)
	2006	+ {
	2007	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2008	+ cMaterial material = object.material;
	2009	+
	2010	+ shininessField.setFloat(material.shininess);
	2011	+ lightareaField.setFloat(material.lightarea);
	2012	+
	2013	+ materialtouched = true;
	2014	+ applySelf();
	2015	+ }
	2016	+ });
	2017	+ presetpanel.add(shini0);
	2018	+
	2019	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2020	+ shini1.setToolTipText("Shiny2");
	2021	+ shini1.addMouseListener(new MouseAdapter()
	2022	+ {
	2023	+ public void mouseClicked(MouseEvent e)
	2024	+ {
	2025	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2026	+ cMaterial material = object.material;
	2027	+
	2028	+ shininessField.setFloat(material.shininess);
	2029	+ lightareaField.setFloat(material.lightarea);
	2030	+
	2031	+ materialtouched = true;
	2032	+ applySelf();
	2033	+ }
	2034	+ });
	2035	+ presetpanel.add(shini1);
	2036	+
	2037	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2038	+ shini2.setToolTipText("Shiny3");
	2039	+ shini2.addMouseListener(new MouseAdapter()
	2040	+ {
	2041	+ public void mouseClicked(MouseEvent e)
	2042	+ {
	2043	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2044	+ cMaterial material = object.material;
	2045	+
	2046	+ shininessField.setFloat(material.shininess);
	2047	+ lightareaField.setFloat(material.lightarea);
	2048	+
	2049	+ materialtouched = true;
	2050	+ applySelf();
	2051	+ }
	2052	+ });
	2053	+ presetpanel.add(shini2);
	2054	+
	2055	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2056	+ aniso.setToolTipText("AnisoU");
	2057	+ aniso.addMouseListener(new MouseAdapter()
	2058	+ {
	2059	+ public void mouseClicked(MouseEvent e)
	2060	+ {
	2061	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2062	+ cMaterial material = object.material;
	2063	+
	2064	+ anisoField.setFloat(material.aniso);
	2065	+ anisoVField.setFloat(material.anisoV);
	2066	+
	2067	+ materialtouched = true;
	2068	+ applySelf();
	2069	+ }
	2070	+ });
	2071	+ presetpanel.add(aniso);
	2072	+
	2073	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2074	+ aniso2.setToolTipText("AnisoV");
	2075	+ aniso2.addMouseListener(new MouseAdapter()
	2076	+ {
	2077	+ public void mouseClicked(MouseEvent e)
	2078	+ {
	2079	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2080	+ cMaterial material = object.material;
	2081	+
	2082	+ anisoField.setFloat(material.aniso);
	2083	+ anisoVField.setFloat(material.anisoV);
	2084	+
	2085	+ materialtouched = true;
	2086	+ applySelf();
	2087	+ }
	2088	+ });
	2089	+ presetpanel.add(aniso2);
	2090	+
	2091	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2092	+ aniso3.setToolTipText("AnisoUV");
	2093	+ aniso3.addMouseListener(new MouseAdapter()
	2094	+ {
	2095	+ public void mouseClicked(MouseEvent e)
	2096	+ {
	2097	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2098	+ cMaterial material = object.material;
	2099	+
	2100	+ anisoField.setFloat(material.aniso);
	2101	+ anisoVField.setFloat(material.anisoV);
	2102	+
	2103	+ materialtouched = true;
	2104	+ applySelf();
	2105	+ }
	2106	+ });
	2107	+ presetpanel.add(aniso3);
	2108	+
	2109	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2110	+ velvet0.setToolTipText("Velvet");
	2111	+ velvet0.addMouseListener(new MouseAdapter()
	2112	+ {
	2113	+ public void mouseClicked(MouseEvent e)
	2114	+ {
	2115	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2116	+ cMaterial material = object.material;
	2117	+
	2118	+ diffusenessField.setFloat(material.factor);
	2119	+ selfshadowField.setFloat(material.diffuseness);
	2120	+ sheenField.setFloat(material.sheen);
	2121	+ shininessField.setFloat(material.shininess);
	2122	+ velvetField.setFloat(material.velvet);
	2123	+ shiftField.setFloat(material.shift);
	2124	+
	2125	+ materialtouched = true;
	2126	+ applySelf();
	2127	+ }
	2128	+ });
	2129	+ presetpanel.add(velvet0);
	2130	+
	2131	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2132	+ bump0.setToolTipText("Bump texture");
	2133	+ bump0.addMouseListener(new MouseAdapter()
	2134	+ {
	2135	+ public void mouseClicked(MouseEvent e)
	2136	+ {
	2137	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2138	+ cMaterial material = object.material;
	2139	+
	2140	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2141	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2142	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2143	+
	2144	+ materialtouched = true;
	2145	+ applySelf();
	2146	+ }
	2147	+ });
	2148	+ presetpanel.add(bump0);
	2149	+
	2150	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2151	+ halo.setToolTipText("Halo");
	2152	+ halo.addMouseListener(new MouseAdapter()
	2153	+ {
	2154	+ public void mouseClicked(MouseEvent e)
	2155	+ {
	2156	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2157	+ cMaterial material = object.material;
	2158	+
	2159	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2160	+
	2161	+ materialtouched = true;
	2162	+ applySelf();
	2163	+ }
	2164	+ });
	2165	+ presetpanel.add(halo);
	2166	+
	2167	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2168	+ candle.setToolTipText("Candle");
	2169	+ candle.addMouseListener(new MouseAdapter()
	2170	+ {
	2171	+ public void mouseClicked(MouseEvent e)
	2172	+ {
	2173	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2174	+ cMaterial material = object.material;
	2175	+
	2176	+ subsurfaceField.setFloat(material.subsurface);
	2177	+ shadowbiasField.setFloat(material.shadowbias);
	2178	+ ambientField.setFloat(material.ambient);
	2179	+ specularField.setFloat(material.specular);
	2180	+ lightareaField.setFloat(material.lightarea);
	2181	+ shininessField.setFloat(material.shininess);
	2182	+
	2183	+ materialtouched = true;
	2184	+ applySelf();
	2185	+ }
	2186	+ });
	2187	+ presetpanel.add(candle);
	2188	+
	2189	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2190	+ shadowShader.setToolTipText("Shadow");
	2191	+ shadowShader.addMouseListener(new MouseAdapter()
	2192	+ {
	2193	+ public void mouseClicked(MouseEvent e)
	2194	+ {
	2195	+ diffuseField.setFloat(0.001);
	2196	+ ambientField.setFloat(0.001);
	2197	+ cameraField.setFloat(0.001);
	2198	+ specularField.setFloat(0.001);
	2199	+ fakedepthField.setFloat(0.001);
	2200	+ opacityField.setFloat(0.6);
	2201	+
	2202	+ materialtouched = true;
	2203	+ applySelf();
	2204	+ }
	2205	+ });
	2206	+ presetpanel.add(shadowShader);
	2207	+
	2208	+ cGridBag panel = new cGridBag().setVertical(true);
	2209	+
	2210	+ presetpanel.preferredWidth = 1;
	2211	+
	2212	+ materialpanel.add(presetpanel);
	2213	+ materialpanel.add(panel);
	2214	+
	2215	+ panel.preferredWidth = 8;
	2216	+
	2217	+ /*
1739	2218	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1740	2219	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1741		- */
	2220	+ */
1742	2221
1743	2222	cGridBag editBar = new cGridBag().setVertical(false);
1744	2223
..	..	@@ -1775,7 +2254,9 @@
1775	2254
1776	2255	cGridBag huepanel = new cGridBag();
1777	2256	cGridBag huelabel = new cGridBag();
1778		- huelabel.add(GetLabel("icons/hue.png", false));
	2257	+ skin = GetLabel("icons/hue.png", false);
	2258	+ skin.fit = true;
	2259	+ huelabel.add(skin);
1779	2260	huelabel.preferredWidth = 20;
1780	2261	huepanel.add(new cGridBag()); // Label
1781	2262	huepanel.add(huelabel); // Field/slider
..	..	@@ -1796,7 +2277,7 @@
1796	2277	cGridBag modulation = new cGridBag();
1797	2278	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1798	2279	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1799		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2280	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1800	2281	colorSection.add(modulation);
1801	2282
1802	2283	cGridBag opacity = new cGridBag();
..	..	@@ -2989,7 +3470,7 @@
2989	3470
2990	3471	freezematerial = true;
2991	3472	colorField.setFloat(mat.color);
2992		- modulationField.setFloat(mat.modulation);
	3473	+ saturationField.setFloat(mat.modulation);
2993	3474	metalnessField.setFloat(mat.metalness);
2994	3475	diffuseField.setFloat(mat.diffuse);
2995	3476	specularField.setFloat(mat.specular);
..	..	@@ -3196,6 +3677,17 @@
3196	3677	public void itemStateChanged(ItemEvent event)
3197	3678	{
3198	3679	// System.out.println("Propagate = " + propagate);
	3680	+ if (event.getSource() == pinButton)
	3681	+ {
	3682	+ copy.pinned ^= true;
	3683	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3684	+ {
	3685	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3686	+ copy.CloseUI();
	3687	+ //copy.editWindow.refreshContents();
	3688	+ }
	3689	+ }
	3690	+ else
3199	3691	if (event.getSource() == propagateToggle)
3200	3692	{
3201	3693	propagate ^= true;
..	..	@@ -3300,6 +3792,7 @@
3300	3792	} else if (event.getSource() == liveCB)
3301	3793	{
3302	3794	copy.live ^= true;
	3795	+ objEditor.refreshContents(true); // To show item colors
3303	3796	return;
3304	3797	} else if (event.getSource() == selectableCB)
3305	3798	{
..	..	@@ -3309,7 +3802,7 @@
3309	3802	{
3310	3803	copy.hide ^= true;
3311	3804	copy.Touch(); // display list issue
3312		- objEditor.refreshContents();
	3805	+ objEditor.refreshContents(true); // To show item colors
3313	3806	return;
3314	3807	} else if (event.getSource() == link2masterCB)
3315	3808	{
..	..	@@ -3565,6 +4058,7 @@
3565	4058
3566	4059	static public byte[] Compress(Object3D o)
3567	4060	{
	4061	+ // Slower to actually compress.
3568	4062	try
3569	4063	{
3570	4064	ByteArrayOutputStream baos = new ByteArrayOutputStream();
..	..	@@ -3666,6 +4160,7 @@
3666	4160	{
3667	4161	//Save(true);
3668	4162	Replace();
	4163	+ SetVersionStates();
3669	4164	}
3670	4165
3671	4166	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3686,29 +4181,46 @@
3686	4181
3687	4182	java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3688	4183
	4184	+ void DeleteVersion()
	4185	+ {
	4186	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4187	+ {
	4188	+ copy.versionlist[i] = copy.versionlist[i+1];
	4189	+ }
	4190	+
	4191	+ CopyChanged();
	4192	+
	4193	+ SetVersionStates();
	4194	+ }
	4195	+
3689	4196	public boolean Save(boolean user)
3690	4197	{
3691	4198	System.err.println("Save");
	4199	+ Replace();
3692	4200
3693		- cRadio tab = GetCurrentTab();
	4201	+ //cRadio tab = GetCurrentTab();
3694	4202
3695		- byte[] compress = CompressCopy(); // Saved version. No need for "Replace".
	4203	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3696	4204
3697	4205	boolean thesame = false;
3698	4206
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		- }
	4207	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4208	+// {
	4209	+// thesame = true;
	4210	+// }
3704	4211
3705	4212	//EditorFrame.m_MainFrame.requestFocusInWindow();
3706	4213	if (!thesame)
3707	4214	{
	4215	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4216	+ {
	4217	+ copy.versionlist[i] = copy.versionlist[i-1];
	4218	+ }
	4219	+
3708	4220	//tab.user[tab.versionindex] = user;
3709	4221	//boolean increment = true; // tab.graphs[tab.versionindex] == null;
3710	4222
3711		- copy.versions[++copy.versionindex] = compress;
	4223	+ copy.versionlist[++copy.versionindex] = compress;
3712	4224
3713	4225	// if (increment)
3714	4226	// tab.versionindex++;
..	..	@@ -3718,13 +4230,13 @@
3718	4230
3719	4231	//assert(hashtable.isEmpty());
3720	4232
3721		- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3722		- {
3723		- //tab.user[i] = false;
3724		- copy.versions[i] = null;
3725		- }
	4233	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4234	+// {
	4235	+// //tab.user[i] = false;
	4236	+// copy.versionlist[i] = null;
	4237	+// }
3726	4238
3727		- SetUndoStates();
	4239	+ SetVersionStates();
3728	4240
3729	4241	// test save
3730	4242	if (false)
..	..	@@ -3747,10 +4259,44 @@
3747	4259
3748	4260	return !thesame;
3749	4261	}
3750		-
3751		- void CopyChanged(Object3D obj)
	4262	+
	4263	+ boolean flashIt = true;
	4264	+
	4265	+ void RefreshSelection()
3752	4266	{
3753		- SetUndoStates();
	4267	+ Object3D selection = new Object3D();
	4268	+
	4269	+ for (int i = 0; i < copy.selection.size(); i++)
	4270	+ {
	4271	+ Object3D elem = copy.selection.elementAt(i);
	4272	+
	4273	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4274	+
	4275	+ if (obj == null)
	4276	+ {
	4277	+ copy.selection.remove(i--);
	4278	+ }
	4279	+ else
	4280	+ {
	4281	+ selection.add(obj);
	4282	+ copy.selection.setElementAt(obj, i);
	4283	+ }
	4284	+ }
	4285	+
	4286	+ flashIt = false;
	4287	+ GetTree().clearSelection();
	4288	+ for (int i = 0; i < selection.size(); i++)
	4289	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4290	+ flashIt = true;
	4291	+
	4292	+ //refreshContents(false);
	4293	+ }
	4294	+
	4295	+ void CopyChanged()
	4296	+ {
	4297	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4298	+
	4299	+ SetVersionStates();
3754	4300
3755	4301	boolean temp = CameraPane.SWITCH;
3756	4302	CameraPane.SWITCH = false;
..	..	@@ -3771,6 +4317,7 @@
3771	4317
3772	4318	CameraPane.SWITCH = temp;
3773	4319
	4320	+ RefreshSelection();
3774	4321	//assert(hashtable.isEmpty());
3775	4322
3776	4323	copy.Touch();
..	..	@@ -3791,13 +4338,15 @@
3791	4338	}
3792	4339	}
3793	4340
3794		- refreshContents();
	4341	+ refreshContents(true);
3795	4342	}
3796	4343
3797		- cButton undoButton;
	4344	+ cButton previousVersionButton;
3798	4345	cButton restoreButton;
3799	4346	cButton replaceButton;
3800		- cButton redoButton;
	4347	+ cButton nextVersionButton;
	4348	+ cButton saveVersionButton;
	4349	+ cButton deleteVersionButton;
3801	4350
3802	4351	boolean muteSlider;
3803	4352
..	..	@@ -3805,39 +4354,47 @@
3805	4354	{
3806	4355	int count = 0;
3807	4356
3808		- for (int i = copy.versions.length; --i >= 0;)
	4357	+ for (int i = copy.versionlist.length; --i >= 0;)
3809	4358	{
3810		- if (copy.versions[i] != null)
	4359	+ if (copy.versionlist[i] != null)
3811	4360	count++;
3812	4361	}
3813	4362
3814	4363	return count;
3815	4364	}
3816	4365
3817		- void SetUndoStates()
	4366	+ void SetVersionStates()
3818	4367	{
3819		- cRadio tab = GetCurrentTab();
	4368	+ //if (true)
	4369	+ // return;
	4370	+
	4371	+ //cRadio tab = GetCurrentTab();
3820	4372
3821	4373	restoreButton.setEnabled(copy.versionindex != -1);
3822	4374	replaceButton.setEnabled(copy.versionindex != -1);
3823	4375
3824		- undoButton.setEnabled(copy.versionindex > 0);
3825		- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	4376	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4377	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4378	+
	4379	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4380	+ copy.versionlist[copy.versionindex + 1] != null);
3826	4381
3827	4382	muteSlider = true;
	4383	+ versionSlider.setMinimum(0);
3828	4384	versionSlider.setMaximum(VersionCount() - 1);
3829	4385	versionSlider.setInteger(copy.versionindex);
	4386	+ versionSlider.setEnabled(copy.versionindex != -1);
3830	4387	muteSlider = false;
3831	4388	}
3832	4389
3833		- public boolean Undo()
	4390	+ public boolean PreviousVersion()
3834	4391	{
3835	4392	// Option?
3836	4393	Replace();
3837	4394
3838	4395	System.err.println("Undo");
3839	4396
3840		- cRadio tab = GetCurrentTab();
	4397	+ //cRadio tab = GetCurrentTab();
3841	4398
3842	4399	if (copy.versionindex == 0)
3843	4400	{
..	..	@@ -3860,7 +4417,7 @@
3860	4417
3861	4418	copy.versionindex -= 1;
3862	4419
3863		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4420	+ CopyChanged();
3864	4421
3865	4422	return true;
3866	4423	}
..	..	@@ -3869,15 +4426,16 @@
3869	4426	{
3870	4427	System.err.println("Restore");
3871	4428
3872		- cRadio tab = GetCurrentTab();
	4429	+ //cRadio tab = GetCurrentTab();
3873	4430
3874		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4431	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3875	4432	{
3876	4433	java.awt.Toolkit.getDefaultToolkit().beep();
3877	4434	return false;
3878	4435	}
3879	4436
3880		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4437	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4438	+ CopyChanged();
3881	4439
3882	4440	return true;
3883	4441	}
..	..	@@ -3886,27 +4444,27 @@
3886	4444	{
3887	4445	System.err.println("Replace");
3888	4446
3889		- cRadio tab = GetCurrentTab();
	4447	+ //cRadio tab = GetCurrentTab();
3890	4448
3891		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4449	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3892	4450	{
3893	4451	// No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3894	4452	return false;
3895	4453	}
3896	4454
3897		- copy.versions[copy.versionindex] = CompressCopy();
	4455	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
3898	4456
3899	4457	return true;
3900	4458	}
3901	4459
3902		- public void Redo()
	4460	+ public void NextVersion()
3903	4461	{
3904	4462	// Option?
3905	4463	Replace();
3906	4464
3907		- cRadio tab = GetCurrentTab();
	4465	+ //cRadio tab = GetCurrentTab();
3908	4466
3909		- if (copy.versions[copy.versionindex + 1] == null)
	4467	+ if (copy.versionlist[copy.versionindex + 1] == null)
3910	4468	{
3911	4469	java.awt.Toolkit.getDefaultToolkit().beep();
3912	4470	return;
..	..	@@ -3914,7 +4472,7 @@
3914	4472
3915	4473	copy.versionindex += 1;
3916	4474
3917		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4475	+ CopyChanged();
3918	4476
3919	4477	//if (!tab.user[tab.versionindex])
3920	4478	// tab.graphs[tab.versionindex] = null;
..	..	@@ -4128,7 +4686,7 @@
4128	4686	//copy.material = new cMaterial(copy.GetMaterial());
4129	4687
4130	4688	current.color = (float) colorField.getFloat();
4131		- current.modulation = (float) modulationField.getFloat();
	4689	+ current.modulation = (float) saturationField.getFloat();
4132	4690	current.metalness = (float) metalnessField.getFloat();
4133	4691	current.diffuse = (float) diffuseField.getFloat();
4134	4692	current.specular = (float) specularField.getFloat();
..	..	@@ -4161,7 +4719,7 @@
4161	4719	cMaterial mat = copy.material;
4162	4720
4163	4721	colorField.SetToolTipValue((mat.color));
4164		- modulationField.SetToolTipValue((mat.modulation));
	4722	+ saturationField.SetToolTipValue((mat.modulation));
4165	4723	metalnessField.SetToolTipValue((mat.metalness));
4166	4724	diffuseField.SetToolTipValue((mat.diffuse));
4167	4725	specularField.SetToolTipValue((mat.specular));
..	..	@@ -4225,9 +4783,10 @@
4225	4783
4226	4784	int version = versionSlider.getInteger();
4227	4785
4228		- if (copy.versions[version] != null)
	4786	+ if (version != -1 && copy.versionlist[version] != null)
4229	4787	{
4230		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4788	+ copy.versionindex = version;
	4789	+ CopyChanged();
4231	4790	}
4232	4791
4233	4792	return;
..	..	@@ -4267,6 +4826,12 @@
4267	4826	{
4268	4827	//System.out.println("stateChanged = " + this);
4269	4828	materialtouched = true;
	4829	+
	4830	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4831	+ {
	4832	+ saturationField.setFloat(1);
	4833	+ }
	4834	+
4270	4835	applySelf();
4271	4836	//System.out.println("this = " + this);
4272	4837	//System.out.println("PARENT = " + parent);
..	..	@@ -4566,6 +5131,7 @@
4566	5131	{
4567	5132	if (GetTree() != null)
4568	5133	{
	5134	+ GetTree().revalidate();
4569	5135	GetTree().repaint();
4570	5136	}
4571	5137
..	..	@@ -4574,6 +5140,9 @@
4574	5140	ctrlPanel.validate(); // ? new
4575	5141	ctrlPanel.repaint();
4576	5142	}
	5143	+
	5144	+ if (previousVersionButton != null && copy.versionlist != null)
	5145	+ SetVersionStates();
4577	5146	}
4578	5147
4579	5148	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4957,13 +5526,16 @@
4957	5526	c.addChild(csg);
4958	5527	}
4959	5528
4960		- copy.versions = readobj.versions;
	5529	+ copy.versionlist = readobj.versionlist;
4961	5530	copy.versionindex = readobj.versionindex;
4962	5531
4963		- if (copy.versions == null)
	5532	+ if (copy.versionlist == null)
4964	5533	{
4965		- copy.versions = new byte[100][];
	5534	+ // Backward compatibility
	5535	+ copy.versionlist = new Object3D[100];
4966	5536	copy.versionindex = -1;
	5537	+
	5538	+ Save(true);
4967	5539	}
4968	5540
4969	5541	//? SetUndoStates();
..	..	@@ -4978,7 +5550,7 @@
4978	5550	{
4979	5551	if (Grafreed.standAlone)
4980	5552	{
4981		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5553	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4982	5554	browser.show();
4983	5555	String filename = browser.getFile();
4984	5556	if (filename != null && filename.length() > 0)
..	..	@@ -5055,6 +5627,8 @@
5055	5627
5056	5628	void save()
5057	5629	{
	5630	+ Replace();
	5631	+
5058	5632	if (lastname == null)
5059	5633	{
5060	5634	return;
..	..	@@ -5297,6 +5871,7 @@
5297	5871	ButtonGroup buttonGroup;
5298	5872
5299	5873	cGridBag toolboxPanel;
	5874	+ cGridBag skyboxPanel;
5300	5875	cGridBag materialPanel;
5301	5876	cGridBag ctrlPanel;
5302	5877
..	..	@@ -5370,7 +5945,7 @@
5370	5945	JLabel colorLabel;
5371	5946	cNumberSlider colorField;
5372	5947	JLabel modulationLabel;
5373		- cNumberSlider modulationField;
	5948	+ cNumberSlider saturationField;
5374	5949	JLabel metalnessLabel;
5375	5950	cNumberSlider metalnessField;
5376	5951	JLabel diffuseLabel;
..	..	@@ -5401,6 +5976,7 @@
5401	5976	cNumberSlider anisoField;
5402	5977	JLabel anisoVLabel;
5403	5978	cNumberSlider anisoVField;
	5979	+
5404	5980	JLabel cameraLabel;
5405	5981	cNumberSlider cameraField;
5406	5982	JLabel selfshadowLabel;
..	..	@@ -5415,6 +5991,7 @@
5415	5991	cNumberSlider fakedepthField;
5416	5992	JLabel shadowbiasLabel;
5417	5993	cNumberSlider shadowbiasField;
	5994	+
5418	5995	JLabel bumpLabel;
5419	5996	cNumberSlider bumpField;
5420	5997	JLabel noiseLabel;