~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,9 +297,9 @@
296	297	client = inClient;
297	298	copy = client;
298	299
299		- if (copy.versions == null)
	300	+ if (copy.versionlist == null)
300	301	{
301		- copy.versions = new byte[100][];
	302	+ copy.versionlist = new Object3D[100];
302	303	copy.versionindex = -1;
303	304	}
304	305
..	..	@@ -315,9 +316,9 @@
315	316	client = inClient;
316	317	copy = client;
317	318
318		- if (copy.versions == null)
	319	+ if (copy.versionlist == null)
319	320	{
320		- copy.versions = new byte[100][];
	321	+ copy.versionlist = new Object3D[100];
321	322	copy.versionindex = -1;
322	323	}
323	324
..	..	@@ -353,7 +354,7 @@
353	354	copy = localCopy;
354	355	copy.editWindow = this;
355	356
356		- if (copy.versions == null)
	357	+ if (copy.versionlist == null)
357	358	{
358	359	// copy.versions = new byte[100][];
359	360	// copy.versionindex = -1;
..	..	@@ -467,7 +468,9 @@
467	468	toolboxPanel = new cGridBag().setVertical(true);
468	469	//toolboxPanel.setName("Toolbox");
469	470
470		- materialPanel = new cGridBag().setVertical(true);
	471	+ skyboxPanel = new cGridBag().setVertical(true);
	472	+
	473	+ materialPanel = new cGridBag().setVertical(false);
471	474	//materialPanel.setName("Material");
472	475
473	476	/JTextPane/
..	..	@@ -751,6 +754,7 @@
751	754	boolean maximized;
752	755
753	756	cButton fullscreenLayout;
	757	+ cButton expandedLayout;
754	758
755	759	void Minimize()
756	760	{
..	..	@@ -790,10 +794,12 @@
790	794	cButton minButton;
791	795	cButton maxButton;
792	796	cButton fullButton;
	797	+ cButton collapseButton;
	798	+ cButton maximize3DButton;
793	799
794	800	void ToggleFullScreen()
795	801	{
796		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	802	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797	803
798	804	cameraView.ToggleFullScreen();
799	805
..	..	@@ -814,13 +820,13 @@
814	820	// X frame.getContentPane().remove(/"Center",/bigThree);
815	821	// X framePanel.add(bigThree);
816	822	// X frame.getContentPane().add(/"Center",/framePanel);
817		- framePanel.setDividerLocation(46);
	823	+// framePanel.setDividerLocation(46); // icons are 24x24
818	824
819	825	//frame.setVisible(true);
820		- radio.layout = keepButton;
	826	+// radio.layout = keepButton;
821	827	//theFrame = null;
822	828	keepButton = null;
823		- radio.layout.doClick();
	829	+// radio.layout.doClick();
824	830
825	831	} else
826	832	{
..	..	@@ -841,31 +847,42 @@
841	847	// X frame.getContentPane().remove(/"Center",/framePanel);
842	848	// X framePanel.remove(bigThree);
843	849	// X frame.getContentPane().add(/"Center",/bigThree);
844		- framePanel.setDividerLocation(0);
	850	+// framePanel.setDividerLocation(0);
845	851
846		- radio.layout = fullscreenLayout;
847		- radio.layout.doClick();
	852	+// radio.layout = fullscreenLayout;
	853	+// radio.layout.doClick();
848	854	//frame.setVisible(true);
849	855	}
850	856	frame.validate();
	857	+
	858	+ cameraView.requestFocusInWindow();
851	859	}
852	860
853		- private byte[] CompressCopy()
	861	+ void CollapseToolbar()
	862	+ {
	863	+ framePanel.setDividerLocation(0);
	864	+ //frame.validate();
	865	+
	866	+ cameraView.requestFocusInWindow();
	867	+ }
	868	+
	869	+ private Object3D Duplicate(Object3D object)
854	870	{
855	871	boolean temp = CameraPane.SWITCH;
856	872	CameraPane.SWITCH = false;
857	873
858		- copy.ExtractBigData(versiontable);
	874	+ object.ExtractBigData(versiontable);
859	875	// if (copy == client)
860	876
861		- byte[] versions[] = copy.versions;
862		- copy.versions = null;
	877	+ Object3D versions[] = object.versionlist;
	878	+ object.versionlist = null;
863	879
864		- byte[] compress = Compress(copy);
	880	+ //byte[] compress = Compress(copy);
	881	+ Object3D compress = (Object3D)Grafreed.clone(object);
865	882
866		- copy.versions = versions;
	883	+ object.versionlist = versions;
867	884
868		- copy.RestoreBigData(versiontable);
	885	+ object.RestoreBigData(versiontable);
869	886
870	887	CameraPane.SWITCH = temp;
871	888
..	..	@@ -993,6 +1010,7 @@
993	1010	{
994	1011	SetupMaterial(materialPanel);
995	1012	}
	1013	+
996	1014	//SetupName();
997	1015	//SetupViews();
998	1016	}
..	..	@@ -1201,6 +1219,18 @@
1201	1219
1202	1220	namePanel = new cGridBag();
1203	1221
	1222	+ //if (copy.pinned)
	1223	+ {
	1224	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1225	+ pinButton.setSelected(copy.pinned);
	1226	+ cGridBag t = new cGridBag();
	1227	+ t.preferredWidth = 2;
	1228	+ t.add(pinButton);
	1229	+ namePanel.add(t);
	1230	+
	1231	+ pinButton.addItemListener(this);
	1232	+ }
	1233	+
1204	1234	nameField = AddText(namePanel, copy.GetName());
1205	1235	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1206	1236	oe.ctrlPanel.add(namePanel);
..	..	@@ -1550,29 +1580,28 @@
1550	1580	//tmp.setName("Edit");
1551	1581	objectPanel.add(materialPanel);
1552	1582	objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1553		- objectPanel.setToolTipTextAt(0, "Material panel");
	1583	+ objectPanel.setToolTipTextAt(0, "Material");
1554	1584
	1585	+ objectPanel.add(toolboxPanel);
	1586	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1587	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1588	+
	1589	+ objectPanel.add(skyboxPanel);
	1590	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1591	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1592	+
1555	1593	// JPanel north = new JPanel(new BorderLayout());
1556	1594	// north.setName("Edit");
1557	1595	// north.add(ctrlPanel, BorderLayout.NORTH);
1558	1596	// objectPanel.add(north);
1559	1597	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");
	1598	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1599	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1567	1600
1568	1601	objectPanel.add(XYZPanel);
1569		- objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1570		- objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
	1602	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1603	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1571	1604
1572		- objectPanel.add(toolboxPanel);
1573		- objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1574		- objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
1575		-
1576	1605	/*
1577	1606	aConstraints.gridx = 0;
1578	1607	aConstraints.gridwidth = 1;
..	..	@@ -1609,6 +1638,11 @@
1609	1638
1610	1639	scenePanel.add(tabbedPane);
1611	1640
	1641	+ //if (Globals.ADVANCED)
	1642	+ tabbedPane.add(infoPanel);
	1643	+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1644	+ tabbedPane.setToolTipTextAt(3, "Information");
	1645	+
1612	1646	/*
1613	1647	cTree jTree = new cTree(null);
1614	1648	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1679,6 +1713,23 @@
1679	1713	// aConstraints.gridheight = 1;
1680	1714
1681	1715	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1716	+
	1717	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1718	+ new java.beans.PropertyChangeListener()
	1719	+ {
	1720	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1721	+ {
	1722	+ if ((Integer)pce.getOldValue() == 1)
	1723	+ {
	1724	+ if (radio.layout != expandedLayout)
	1725	+ {
	1726	+ radio.layout = expandedLayout;
	1727	+ radio.layout.doClick();
	1728	+ }
	1729	+ }
	1730	+ }
	1731	+ });
	1732	+
1682	1733	framePanel.setContinuousLayout(false);
1683	1734	framePanel.setOneTouchExpandable(false);
1684	1735	//.setDividerLocation(0.8);
..	..	@@ -1733,12 +1784,403 @@
1733	1784	ctrlPanel.removeAll();
1734	1785	}
1735	1786
1736		- void SetupMaterial(cGridBag panel)
	1787	+ void SetupMaterial(cGridBag materialpanel)
1737	1788	{
1738		- /*
	1789	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1790	+
	1791	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1792	+ skin.setToolTipText("Skin");
	1793	+ skin.addMouseListener(new MouseAdapter()
	1794	+ {
	1795	+ public void mouseClicked(MouseEvent e)
	1796	+ {
	1797	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1798	+ cMaterial material = object.material;
	1799	+
	1800	+ // Skin
	1801	+ colorField.setFloat(material.color);
	1802	+ saturationField.setFloat(material.modulation);
	1803	+ subsurfaceField.setFloat(material.subsurface);
	1804	+ selfshadowField.setFloat(material.diffuseness);
	1805	+ diffusenessField.setFloat(material.factor);
	1806	+ shininessField.setFloat(material.shininess);
	1807	+ shadowbiasField.setFloat(material.shadowbias);
	1808	+ diffuseField.setFloat(material.diffuse);
	1809	+ specularField.setFloat(material.specular);
	1810	+
	1811	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1812	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1813	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1814	+
	1815	+ materialtouched = true;
	1816	+ applySelf();
	1817	+ }
	1818	+ });
	1819	+ presetpanel.add(skin);
	1820	+
	1821	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1822	+ lambert.setToolTipText("Diffuse");
	1823	+ lambert.addMouseListener(new MouseAdapter()
	1824	+ {
	1825	+ public void mouseClicked(MouseEvent e)
	1826	+ {
	1827	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1828	+ cMaterial material = object.material;
	1829	+
	1830	+ diffusenessField.setFloat(material.factor);
	1831	+ selfshadowField.setFloat(material.diffuseness);
	1832	+
	1833	+ materialtouched = true;
	1834	+ applySelf();
	1835	+ }
	1836	+ });
	1837	+ presetpanel.add(lambert);
	1838	+
	1839	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1840	+ diffuse2.setToolTipText("Diffuse2");
	1841	+ diffuse2.addMouseListener(new MouseAdapter()
	1842	+ {
	1843	+ public void mouseClicked(MouseEvent e)
	1844	+ {
	1845	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1846	+ cMaterial material = object.material;
	1847	+
	1848	+ diffusenessField.setFloat(material.factor);
	1849	+ selfshadowField.setFloat(material.diffuseness);
	1850	+
	1851	+ materialtouched = true;
	1852	+ applySelf();
	1853	+ }
	1854	+ });
	1855	+ presetpanel.add(diffuse2);
	1856	+
	1857	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1858	+ diffusemoon.setToolTipText("Moon");
	1859	+ diffusemoon.addMouseListener(new MouseAdapter()
	1860	+ {
	1861	+ public void mouseClicked(MouseEvent e)
	1862	+ {
	1863	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1864	+ cMaterial material = object.material;
	1865	+
	1866	+ diffusenessField.setFloat(material.factor);
	1867	+ selfshadowField.setFloat(material.diffuseness);
	1868	+
	1869	+ materialtouched = true;
	1870	+ applySelf();
	1871	+ }
	1872	+ });
	1873	+ presetpanel.add(diffusemoon);
	1874	+
	1875	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1876	+ diffusemoon2.setToolTipText("Moon2");
	1877	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1878	+ {
	1879	+ public void mouseClicked(MouseEvent e)
	1880	+ {
	1881	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1882	+ cMaterial material = object.material;
	1883	+
	1884	+ diffusenessField.setFloat(material.factor);
	1885	+ selfshadowField.setFloat(material.diffuseness);
	1886	+
	1887	+ materialtouched = true;
	1888	+ applySelf();
	1889	+ }
	1890	+ });
	1891	+ presetpanel.add(diffusemoon2);
	1892	+
	1893	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1894	+ diffusemoon3.setToolTipText("Moon3");
	1895	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1896	+ {
	1897	+ public void mouseClicked(MouseEvent e)
	1898	+ {
	1899	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1900	+ cMaterial material = object.material;
	1901	+
	1902	+ diffusenessField.setFloat(material.factor);
	1903	+ selfshadowField.setFloat(material.diffuseness);
	1904	+
	1905	+ materialtouched = true;
	1906	+ applySelf();
	1907	+ }
	1908	+ });
	1909	+ presetpanel.add(diffusemoon3);
	1910	+
	1911	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1912	+ diffusesheen.setToolTipText("Sheen");
	1913	+ diffusesheen.addMouseListener(new MouseAdapter()
	1914	+ {
	1915	+ public void mouseClicked(MouseEvent e)
	1916	+ {
	1917	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1918	+ cMaterial material = object.material;
	1919	+
	1920	+ sheenField.setFloat(material.sheen);
	1921	+
	1922	+ materialtouched = true;
	1923	+ applySelf();
	1924	+ }
	1925	+ });
	1926	+ presetpanel.add(diffusesheen);
	1927	+
	1928	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1929	+ rough.setToolTipText("Rough metal");
	1930	+ rough.addMouseListener(new MouseAdapter()
	1931	+ {
	1932	+ public void mouseClicked(MouseEvent e)
	1933	+ {
	1934	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1935	+ cMaterial material = object.material;
	1936	+
	1937	+ shininessField.setFloat(material.shininess);
	1938	+ velvetField.setFloat(material.velvet);
	1939	+
	1940	+ materialtouched = true;
	1941	+ applySelf();
	1942	+ }
	1943	+ });
	1944	+ presetpanel.add(rough);
	1945	+
	1946	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1947	+ rough2.setToolTipText("Medium metal");
	1948	+ rough2.addMouseListener(new MouseAdapter()
	1949	+ {
	1950	+ public void mouseClicked(MouseEvent e)
	1951	+ {
	1952	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1953	+ cMaterial material = object.material;
	1954	+
	1955	+ shininessField.setFloat(material.shininess);
	1956	+ lightareaField.setFloat(material.lightarea);
	1957	+
	1958	+ materialtouched = true;
	1959	+ applySelf();
	1960	+ }
	1961	+ });
	1962	+ presetpanel.add(rough2);
	1963	+
	1964	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	1965	+ shini0.setToolTipText("Shiny");
	1966	+ shini0.addMouseListener(new MouseAdapter()
	1967	+ {
	1968	+ public void mouseClicked(MouseEvent e)
	1969	+ {
	1970	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	1971	+ cMaterial material = object.material;
	1972	+
	1973	+ shininessField.setFloat(material.shininess);
	1974	+ lightareaField.setFloat(material.lightarea);
	1975	+
	1976	+ materialtouched = true;
	1977	+ applySelf();
	1978	+ }
	1979	+ });
	1980	+ presetpanel.add(shini0);
	1981	+
	1982	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	1983	+ shini1.setToolTipText("Shiny2");
	1984	+ shini1.addMouseListener(new MouseAdapter()
	1985	+ {
	1986	+ public void mouseClicked(MouseEvent e)
	1987	+ {
	1988	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	1989	+ cMaterial material = object.material;
	1990	+
	1991	+ shininessField.setFloat(material.shininess);
	1992	+ lightareaField.setFloat(material.lightarea);
	1993	+
	1994	+ materialtouched = true;
	1995	+ applySelf();
	1996	+ }
	1997	+ });
	1998	+ presetpanel.add(shini1);
	1999	+
	2000	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2001	+ shini2.setToolTipText("Shiny3");
	2002	+ shini2.addMouseListener(new MouseAdapter()
	2003	+ {
	2004	+ public void mouseClicked(MouseEvent e)
	2005	+ {
	2006	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2007	+ cMaterial material = object.material;
	2008	+
	2009	+ shininessField.setFloat(material.shininess);
	2010	+ lightareaField.setFloat(material.lightarea);
	2011	+
	2012	+ materialtouched = true;
	2013	+ applySelf();
	2014	+ }
	2015	+ });
	2016	+ presetpanel.add(shini2);
	2017	+
	2018	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2019	+ aniso.setToolTipText("AnisoU");
	2020	+ aniso.addMouseListener(new MouseAdapter()
	2021	+ {
	2022	+ public void mouseClicked(MouseEvent e)
	2023	+ {
	2024	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2025	+ cMaterial material = object.material;
	2026	+
	2027	+ anisoField.setFloat(material.aniso);
	2028	+ anisoVField.setFloat(material.anisoV);
	2029	+
	2030	+ materialtouched = true;
	2031	+ applySelf();
	2032	+ }
	2033	+ });
	2034	+ presetpanel.add(aniso);
	2035	+
	2036	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2037	+ aniso2.setToolTipText("AnisoV");
	2038	+ aniso2.addMouseListener(new MouseAdapter()
	2039	+ {
	2040	+ public void mouseClicked(MouseEvent e)
	2041	+ {
	2042	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2043	+ cMaterial material = object.material;
	2044	+
	2045	+ anisoField.setFloat(material.aniso);
	2046	+ anisoVField.setFloat(material.anisoV);
	2047	+
	2048	+ materialtouched = true;
	2049	+ applySelf();
	2050	+ }
	2051	+ });
	2052	+ presetpanel.add(aniso2);
	2053	+
	2054	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2055	+ aniso3.setToolTipText("AnisoUV");
	2056	+ aniso3.addMouseListener(new MouseAdapter()
	2057	+ {
	2058	+ public void mouseClicked(MouseEvent e)
	2059	+ {
	2060	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2061	+ cMaterial material = object.material;
	2062	+
	2063	+ anisoField.setFloat(material.aniso);
	2064	+ anisoVField.setFloat(material.anisoV);
	2065	+
	2066	+ materialtouched = true;
	2067	+ applySelf();
	2068	+ }
	2069	+ });
	2070	+ presetpanel.add(aniso3);
	2071	+
	2072	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2073	+ velvet0.setToolTipText("Velvet");
	2074	+ velvet0.addMouseListener(new MouseAdapter()
	2075	+ {
	2076	+ public void mouseClicked(MouseEvent e)
	2077	+ {
	2078	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2079	+ cMaterial material = object.material;
	2080	+
	2081	+ diffusenessField.setFloat(material.factor);
	2082	+ selfshadowField.setFloat(material.diffuseness);
	2083	+ sheenField.setFloat(material.sheen);
	2084	+ shininessField.setFloat(material.shininess);
	2085	+ velvetField.setFloat(material.velvet);
	2086	+ shiftField.setFloat(material.shift);
	2087	+
	2088	+ materialtouched = true;
	2089	+ applySelf();
	2090	+ }
	2091	+ });
	2092	+ presetpanel.add(velvet0);
	2093	+
	2094	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2095	+ bump0.setToolTipText("Bump texture");
	2096	+ bump0.addMouseListener(new MouseAdapter()
	2097	+ {
	2098	+ public void mouseClicked(MouseEvent e)
	2099	+ {
	2100	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2101	+ cMaterial material = object.material;
	2102	+
	2103	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2104	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2105	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2106	+
	2107	+ materialtouched = true;
	2108	+ applySelf();
	2109	+ }
	2110	+ });
	2111	+ presetpanel.add(bump0);
	2112	+
	2113	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2114	+ halo.setToolTipText("Halo");
	2115	+ halo.addMouseListener(new MouseAdapter()
	2116	+ {
	2117	+ public void mouseClicked(MouseEvent e)
	2118	+ {
	2119	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2120	+ cMaterial material = object.material;
	2121	+
	2122	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2123	+
	2124	+ materialtouched = true;
	2125	+ applySelf();
	2126	+ }
	2127	+ });
	2128	+ presetpanel.add(halo);
	2129	+
	2130	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2131	+ candle.setToolTipText("Candle");
	2132	+ candle.addMouseListener(new MouseAdapter()
	2133	+ {
	2134	+ public void mouseClicked(MouseEvent e)
	2135	+ {
	2136	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2137	+ cMaterial material = object.material;
	2138	+
	2139	+ subsurfaceField.setFloat(material.subsurface);
	2140	+ shadowbiasField.setFloat(material.shadowbias);
	2141	+ ambientField.setFloat(material.ambient);
	2142	+ specularField.setFloat(material.specular);
	2143	+ lightareaField.setFloat(material.lightarea);
	2144	+ shininessField.setFloat(material.shininess);
	2145	+
	2146	+ materialtouched = true;
	2147	+ applySelf();
	2148	+ }
	2149	+ });
	2150	+ presetpanel.add(candle);
	2151	+
	2152	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2153	+ shadowShader.setToolTipText("Shadow");
	2154	+ shadowShader.addMouseListener(new MouseAdapter()
	2155	+ {
	2156	+ public void mouseClicked(MouseEvent e)
	2157	+ {
	2158	+ diffuseField.setFloat(0.001);
	2159	+ ambientField.setFloat(0.001);
	2160	+ cameraField.setFloat(0.001);
	2161	+ specularField.setFloat(0.001);
	2162	+ fakedepthField.setFloat(0.001);
	2163	+ opacityField.setFloat(0.6);
	2164	+
	2165	+ materialtouched = true;
	2166	+ applySelf();
	2167	+ }
	2168	+ });
	2169	+ presetpanel.add(shadowShader);
	2170	+
	2171	+ cGridBag panel = new cGridBag().setVertical(true);
	2172	+
	2173	+ presetpanel.preferredWidth = 1;
	2174	+
	2175	+ materialpanel.add(presetpanel);
	2176	+ materialpanel.add(panel);
	2177	+
	2178	+ panel.preferredWidth = 8;
	2179	+
	2180	+ /*
1739	2181	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1740	2182	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1741		- */
	2183	+ */
1742	2184
1743	2185	cGridBag editBar = new cGridBag().setVertical(false);
1744	2186
..	..	@@ -1775,7 +2217,9 @@
1775	2217
1776	2218	cGridBag huepanel = new cGridBag();
1777	2219	cGridBag huelabel = new cGridBag();
1778		- huelabel.add(GetLabel("icons/hue.png", false));
	2220	+ skin = GetLabel("icons/hue.png", false);
	2221	+ skin.fit = true;
	2222	+ huelabel.add(skin);
1779	2223	huelabel.preferredWidth = 20;
1780	2224	huepanel.add(new cGridBag()); // Label
1781	2225	huepanel.add(huelabel); // Field/slider
..	..	@@ -1796,7 +2240,7 @@
1796	2240	cGridBag modulation = new cGridBag();
1797	2241	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1798	2242	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1799		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2243	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1800	2244	colorSection.add(modulation);
1801	2245
1802	2246	cGridBag opacity = new cGridBag();
..	..	@@ -2989,7 +3433,7 @@
2989	3433
2990	3434	freezematerial = true;
2991	3435	colorField.setFloat(mat.color);
2992		- modulationField.setFloat(mat.modulation);
	3436	+ saturationField.setFloat(mat.modulation);
2993	3437	metalnessField.setFloat(mat.metalness);
2994	3438	diffuseField.setFloat(mat.diffuse);
2995	3439	specularField.setFloat(mat.specular);
..	..	@@ -3196,6 +3640,17 @@
3196	3640	public void itemStateChanged(ItemEvent event)
3197	3641	{
3198	3642	// System.out.println("Propagate = " + propagate);
	3643	+ if (event.getSource() == pinButton)
	3644	+ {
	3645	+ copy.pinned ^= true;
	3646	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3647	+ {
	3648	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3649	+ copy.CloseUI();
	3650	+ //copy.editWindow.refreshContents();
	3651	+ }
	3652	+ }
	3653	+ else
3199	3654	if (event.getSource() == propagateToggle)
3200	3655	{
3201	3656	propagate ^= true;
..	..	@@ -3300,6 +3755,7 @@
3300	3755	} else if (event.getSource() == liveCB)
3301	3756	{
3302	3757	copy.live ^= true;
	3758	+ objEditor.refreshContents(true); // To show item colors
3303	3759	return;
3304	3760	} else if (event.getSource() == selectableCB)
3305	3761	{
..	..	@@ -3309,7 +3765,7 @@
3309	3765	{
3310	3766	copy.hide ^= true;
3311	3767	copy.Touch(); // display list issue
3312		- objEditor.refreshContents();
	3768	+ objEditor.refreshContents(true); // To show item colors
3313	3769	return;
3314	3770	} else if (event.getSource() == link2masterCB)
3315	3771	{
..	..	@@ -3565,6 +4021,7 @@
3565	4021
3566	4022	static public byte[] Compress(Object3D o)
3567	4023	{
	4024	+ // Slower to actually compress.
3568	4025	try
3569	4026	{
3570	4027	ByteArrayOutputStream baos = new ByteArrayOutputStream();
..	..	@@ -3666,6 +4123,7 @@
3666	4123	{
3667	4124	//Save(true);
3668	4125	Replace();
	4126	+ SetUndoStates();
3669	4127	}
3670	4128
3671	4129	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3686,29 +4144,46 @@
3686	4144
3687	4145	java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3688	4146
	4147	+ void DeleteVersion()
	4148	+ {
	4149	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4150	+ {
	4151	+ copy.versionlist[i] = copy.versionlist[i+1];
	4152	+ }
	4153	+
	4154	+ CopyChanged();
	4155	+
	4156	+ SetUndoStates();
	4157	+ }
	4158	+
3689	4159	public boolean Save(boolean user)
3690	4160	{
3691	4161	System.err.println("Save");
	4162	+ Replace();
3692	4163
3693	4164	cRadio tab = GetCurrentTab();
3694	4165
3695		- byte[] compress = CompressCopy(); // Saved version. No need for "Replace".
	4166	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3696	4167
3697	4168	boolean thesame = false;
3698	4169
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		- }
	4170	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4171	+// {
	4172	+// thesame = true;
	4173	+// }
3704	4174
3705	4175	//EditorFrame.m_MainFrame.requestFocusInWindow();
3706	4176	if (!thesame)
3707	4177	{
	4178	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4179	+ {
	4180	+ copy.versionlist[i] = copy.versionlist[i-1];
	4181	+ }
	4182	+
3708	4183	//tab.user[tab.versionindex] = user;
3709	4184	//boolean increment = true; // tab.graphs[tab.versionindex] == null;
3710	4185
3711		- copy.versions[++copy.versionindex] = compress;
	4186	+ copy.versionlist[++copy.versionindex] = compress;
3712	4187
3713	4188	// if (increment)
3714	4189	// tab.versionindex++;
..	..	@@ -3718,11 +4193,11 @@
3718	4193
3719	4194	//assert(hashtable.isEmpty());
3720	4195
3721		- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3722		- {
3723		- //tab.user[i] = false;
3724		- copy.versions[i] = null;
3725		- }
	4196	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4197	+// {
	4198	+// //tab.user[i] = false;
	4199	+// copy.versionlist[i] = null;
	4200	+// }
3726	4201
3727	4202	SetUndoStates();
3728	4203
..	..	@@ -3747,9 +4222,43 @@
3747	4222
3748	4223	return !thesame;
3749	4224	}
3750		-
3751		- void CopyChanged(Object3D obj)
	4225	+
	4226	+ boolean flashIt = true;
	4227	+
	4228	+ void RefreshSelection()
3752	4229	{
	4230	+ Object3D selection = new Object3D();
	4231	+
	4232	+ for (int i = 0; i < copy.selection.size(); i++)
	4233	+ {
	4234	+ Object3D elem = copy.selection.elementAt(i);
	4235	+
	4236	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4237	+
	4238	+ if (obj == null)
	4239	+ {
	4240	+ copy.selection.remove(i--);
	4241	+ }
	4242	+ else
	4243	+ {
	4244	+ selection.add(obj);
	4245	+ copy.selection.setElementAt(obj, i);
	4246	+ }
	4247	+ }
	4248	+
	4249	+ flashIt = false;
	4250	+ GetTree().clearSelection();
	4251	+ for (int i = 0; i < selection.size(); i++)
	4252	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4253	+ flashIt = true;
	4254	+
	4255	+ //refreshContents(false);
	4256	+ }
	4257	+
	4258	+ void CopyChanged()
	4259	+ {
	4260	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4261	+
3753	4262	SetUndoStates();
3754	4263
3755	4264	boolean temp = CameraPane.SWITCH;
..	..	@@ -3771,6 +4280,7 @@
3771	4280
3772	4281	CameraPane.SWITCH = temp;
3773	4282
	4283	+ RefreshSelection();
3774	4284	//assert(hashtable.isEmpty());
3775	4285
3776	4286	copy.Touch();
..	..	@@ -3791,13 +4301,15 @@
3791	4301	}
3792	4302	}
3793	4303
3794		- refreshContents();
	4304	+ refreshContents(true);
3795	4305	}
3796	4306
3797		- cButton undoButton;
	4307	+ cButton previousVersionButton;
3798	4308	cButton restoreButton;
3799	4309	cButton replaceButton;
3800		- cButton redoButton;
	4310	+ cButton nextVersionButton;
	4311	+ cButton saveVersionButton;
	4312	+ cButton deleteVersionButton;
3801	4313
3802	4314	boolean muteSlider;
3803	4315
..	..	@@ -3805,9 +4317,9 @@
3805	4317	{
3806	4318	int count = 0;
3807	4319
3808		- for (int i = copy.versions.length; --i >= 0;)
	4320	+ for (int i = copy.versionlist.length; --i >= 0;)
3809	4321	{
3810		- if (copy.versions[i] != null)
	4322	+ if (copy.versionlist[i] != null)
3811	4323	count++;
3812	4324	}
3813	4325
..	..	@@ -3818,11 +4330,14 @@
3818	4330	{
3819	4331	cRadio tab = GetCurrentTab();
3820	4332
3821		- restoreButton.setEnabled(copy.versionindex != -1);
3822		- replaceButton.setEnabled(copy.versionindex != -1);
	4333	+ restoreButton.setEnabled(true); // copy.versionindex != -1);
	4334	+ replaceButton.setEnabled(true); // copy.versionindex != -1);
3823	4335
3824		- undoButton.setEnabled(copy.versionindex > 0);
3825		- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	4336	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4337	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4338	+
	4339	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4340	+ copy.versionlist[copy.versionindex + 1] != null);
3826	4341
3827	4342	muteSlider = true;
3828	4343	versionSlider.setMaximum(VersionCount() - 1);
..	..	@@ -3830,7 +4345,7 @@
3830	4345	muteSlider = false;
3831	4346	}
3832	4347
3833		- public boolean Undo()
	4348	+ public boolean PreviousVersion()
3834	4349	{
3835	4350	// Option?
3836	4351	Replace();
..	..	@@ -3860,7 +4375,7 @@
3860	4375
3861	4376	copy.versionindex -= 1;
3862	4377
3863		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4378	+ CopyChanged();
3864	4379
3865	4380	return true;
3866	4381	}
..	..	@@ -3871,13 +4386,14 @@
3871	4386
3872	4387	cRadio tab = GetCurrentTab();
3873	4388
3874		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4389	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3875	4390	{
3876	4391	java.awt.Toolkit.getDefaultToolkit().beep();
3877	4392	return false;
3878	4393	}
3879	4394
3880		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4395	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4396	+ CopyChanged();
3881	4397
3882	4398	return true;
3883	4399	}
..	..	@@ -3888,25 +4404,25 @@
3888	4404
3889	4405	cRadio tab = GetCurrentTab();
3890	4406
3891		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4407	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3892	4408	{
3893	4409	// No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3894	4410	return false;
3895	4411	}
3896	4412
3897		- copy.versions[copy.versionindex] = CompressCopy();
	4413	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
3898	4414
3899	4415	return true;
3900	4416	}
3901	4417
3902		- public void Redo()
	4418	+ public void NextVersion()
3903	4419	{
3904	4420	// Option?
3905	4421	Replace();
3906	4422
3907	4423	cRadio tab = GetCurrentTab();
3908	4424
3909		- if (copy.versions[copy.versionindex + 1] == null)
	4425	+ if (copy.versionlist[copy.versionindex + 1] == null)
3910	4426	{
3911	4427	java.awt.Toolkit.getDefaultToolkit().beep();
3912	4428	return;
..	..	@@ -3914,7 +4430,7 @@
3914	4430
3915	4431	copy.versionindex += 1;
3916	4432
3917		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4433	+ CopyChanged();
3918	4434
3919	4435	//if (!tab.user[tab.versionindex])
3920	4436	// tab.graphs[tab.versionindex] = null;
..	..	@@ -4128,7 +4644,7 @@
4128	4644	//copy.material = new cMaterial(copy.GetMaterial());
4129	4645
4130	4646	current.color = (float) colorField.getFloat();
4131		- current.modulation = (float) modulationField.getFloat();
	4647	+ current.modulation = (float) saturationField.getFloat();
4132	4648	current.metalness = (float) metalnessField.getFloat();
4133	4649	current.diffuse = (float) diffuseField.getFloat();
4134	4650	current.specular = (float) specularField.getFloat();
..	..	@@ -4161,7 +4677,7 @@
4161	4677	cMaterial mat = copy.material;
4162	4678
4163	4679	colorField.SetToolTipValue((mat.color));
4164		- modulationField.SetToolTipValue((mat.modulation));
	4680	+ saturationField.SetToolTipValue((mat.modulation));
4165	4681	metalnessField.SetToolTipValue((mat.metalness));
4166	4682	diffuseField.SetToolTipValue((mat.diffuse));
4167	4683	specularField.SetToolTipValue((mat.specular));
..	..	@@ -4225,9 +4741,10 @@
4225	4741
4226	4742	int version = versionSlider.getInteger();
4227	4743
4228		- if (copy.versions[version] != null)
	4744	+ if (copy.versionlist[version] != null)
4229	4745	{
4230		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4746	+ copy.versionindex = version;
	4747	+ CopyChanged();
4231	4748	}
4232	4749
4233	4750	return;
..	..	@@ -4267,6 +4784,12 @@
4267	4784	{
4268	4785	//System.out.println("stateChanged = " + this);
4269	4786	materialtouched = true;
	4787	+
	4788	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4789	+ {
	4790	+ saturationField.setFloat(1);
	4791	+ }
	4792	+
4270	4793	applySelf();
4271	4794	//System.out.println("this = " + this);
4272	4795	//System.out.println("PARENT = " + parent);
..	..	@@ -4566,6 +5089,7 @@
4566	5089	{
4567	5090	if (GetTree() != null)
4568	5091	{
	5092	+ GetTree().revalidate();
4569	5093	GetTree().repaint();
4570	5094	}
4571	5095
..	..	@@ -4574,6 +5098,9 @@
4574	5098	ctrlPanel.validate(); // ? new
4575	5099	ctrlPanel.repaint();
4576	5100	}
	5101	+
	5102	+ if (previousVersionButton != null && copy.versionlist != null)
	5103	+ SetUndoStates();
4577	5104	}
4578	5105
4579	5106	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4957,12 +5484,12 @@
4957	5484	c.addChild(csg);
4958	5485	}
4959	5486
4960		- copy.versions = readobj.versions;
	5487	+ copy.versionlist = readobj.versionlist;
4961	5488	copy.versionindex = readobj.versionindex;
4962	5489
4963		- if (copy.versions == null)
	5490	+ if (copy.versionlist == null)
4964	5491	{
4965		- copy.versions = new byte[100][];
	5492	+ copy.versionlist = new Object3D[100];
4966	5493	copy.versionindex = -1;
4967	5494	}
4968	5495
..	..	@@ -4978,7 +5505,7 @@
4978	5505	{
4979	5506	if (Grafreed.standAlone)
4980	5507	{
4981		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5508	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4982	5509	browser.show();
4983	5510	String filename = browser.getFile();
4984	5511	if (filename != null && filename.length() > 0)
..	..	@@ -5297,6 +5824,7 @@
5297	5824	ButtonGroup buttonGroup;
5298	5825
5299	5826	cGridBag toolboxPanel;
	5827	+ cGridBag skyboxPanel;
5300	5828	cGridBag materialPanel;
5301	5829	cGridBag ctrlPanel;
5302	5830
..	..	@@ -5370,7 +5898,7 @@
5370	5898	JLabel colorLabel;
5371	5899	cNumberSlider colorField;
5372	5900	JLabel modulationLabel;
5373		- cNumberSlider modulationField;
	5901	+ cNumberSlider saturationField;
5374	5902	JLabel metalnessLabel;
5375	5903	cNumberSlider metalnessField;
5376	5904	JLabel diffuseLabel;
..	..	@@ -5401,6 +5929,7 @@
5401	5929	cNumberSlider anisoField;
5402	5930	JLabel anisoVLabel;
5403	5931	cNumberSlider anisoVField;
	5932	+
5404	5933	JLabel cameraLabel;
5405	5934	cNumberSlider cameraField;
5406	5935	JLabel selfshadowLabel;
..	..	@@ -5415,6 +5944,7 @@
5415	5944	cNumberSlider fakedepthField;
5416	5945	JLabel shadowbiasLabel;
5417	5946	cNumberSlider shadowbiasField;
	5947	+
5418	5948	JLabel bumpLabel;
5419	5949	cNumberSlider bumpField;
5420	5950	JLabel noiseLabel;