~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
..	..	@@ -444,7 +451,7 @@
444	451	// EditSelection(false);
445	452	// }
446	453
447		- refreshContents(false); // To refresh Info tab
	454	+// refreshContents(false); // To refresh Info tab
448	455	}
449	456	};
450	457	objectPanel.addChangeListener(changeListener);
..	..	@@ -467,7 +474,9 @@
467	474	toolboxPanel = new cGridBag().setVertical(true);
468	475	//toolboxPanel.setName("Toolbox");
469	476
470		- materialPanel = new cGridBag().setVertical(true);
	477	+ skyboxPanel = new cGridBag().setVertical(true);
	478	+
	479	+ materialPanel = new cGridBag().setVertical(false);
471	480	//materialPanel.setName("Material");
472	481
473	482	/JTextPane/
..	..	@@ -751,6 +760,7 @@
751	760	boolean maximized;
752	761
753	762	cButton fullscreenLayout;
	763	+ cButton expandedLayout;
754	764
755	765	void Minimize()
756	766	{
..	..	@@ -790,10 +800,12 @@
790	800	cButton minButton;
791	801	cButton maxButton;
792	802	cButton fullButton;
	803	+ cButton collapseButton;
	804	+ cButton maximize3DButton;
793	805
794	806	void ToggleFullScreen()
795	807	{
796		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	808	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797	809
798	810	cameraView.ToggleFullScreen();
799	811
..	..	@@ -814,13 +826,13 @@
814	826	// X frame.getContentPane().remove(/"Center",/bigThree);
815	827	// X framePanel.add(bigThree);
816	828	// X frame.getContentPane().add(/"Center",/framePanel);
817		- framePanel.setDividerLocation(46);
	829	+// framePanel.setDividerLocation(46); // icons are 24x24
818	830
819	831	//frame.setVisible(true);
820		- radio.layout = keepButton;
	832	+// radio.layout = keepButton;
821	833	//theFrame = null;
822	834	keepButton = null;
823		- radio.layout.doClick();
	835	+// radio.layout.doClick();
824	836
825	837	} else
826	838	{
..	..	@@ -841,31 +853,42 @@
841	853	// X frame.getContentPane().remove(/"Center",/framePanel);
842	854	// X framePanel.remove(bigThree);
843	855	// X frame.getContentPane().add(/"Center",/bigThree);
844		- framePanel.setDividerLocation(0);
	856	+// framePanel.setDividerLocation(0);
845	857
846		- radio.layout = fullscreenLayout;
847		- radio.layout.doClick();
	858	+// radio.layout = fullscreenLayout;
	859	+// radio.layout.doClick();
848	860	//frame.setVisible(true);
849	861	}
850	862	frame.validate();
	863	+
	864	+ cameraView.requestFocusInWindow();
851	865	}
852	866
853		- private byte[] CompressCopy()
	867	+ void CollapseToolbar()
	868	+ {
	869	+ framePanel.setDividerLocation(0);
	870	+ //frame.validate();
	871	+
	872	+ cameraView.requestFocusInWindow();
	873	+ }
	874	+
	875	+ private Object3D Duplicate(Object3D object)
854	876	{
855	877	boolean temp = CameraPane.SWITCH;
856	878	CameraPane.SWITCH = false;
857	879
858		- copy.ExtractBigData(versiontable);
	880	+ object.ExtractBigData(versiontable);
859	881	// if (copy == client)
860	882
861		- byte[] versions[] = copy.versions;
862		- copy.versions = null;
	883	+ Object3D versions[] = object.versionlist;
	884	+ object.versionlist = null;
863	885
864		- byte[] compress = Compress(copy);
	886	+ //byte[] compress = Compress(copy);
	887	+ Object3D compress = (Object3D)Grafreed.clone(object);
865	888
866		- copy.versions = versions;
	889	+ object.versionlist = versions;
867	890
868		- copy.RestoreBigData(versiontable);
	891	+ object.RestoreBigData(versiontable);
869	892
870	893	CameraPane.SWITCH = temp;
871	894
..	..	@@ -993,6 +1016,7 @@
993	1016	{
994	1017	SetupMaterial(materialPanel);
995	1018	}
	1019	+
996	1020	//SetupName();
997	1021	//SetupViews();
998	1022	}
..	..	@@ -1201,6 +1225,18 @@
1201	1225
1202	1226	namePanel = new cGridBag();
1203	1227
	1228	+ //if (copy.pinned)
	1229	+ {
	1230	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1231	+ pinButton.setSelected(copy.pinned);
	1232	+ cGridBag t = new cGridBag();
	1233	+ t.preferredWidth = 2;
	1234	+ t.add(pinButton);
	1235	+ namePanel.add(t);
	1236	+
	1237	+ pinButton.addItemListener(this);
	1238	+ }
	1239	+
1204	1240	nameField = AddText(namePanel, copy.GetName());
1205	1241	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1206	1242	oe.ctrlPanel.add(namePanel);
..	..	@@ -1550,29 +1586,28 @@
1550	1586	//tmp.setName("Edit");
1551	1587	objectPanel.add(materialPanel);
1552	1588	objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1553		- objectPanel.setToolTipTextAt(0, "Material panel");
	1589	+ objectPanel.setToolTipTextAt(0, "Material");
1554	1590
	1591	+ objectPanel.add(toolboxPanel);
	1592	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1593	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1594	+
	1595	+ objectPanel.add(skyboxPanel);
	1596	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1597	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1598	+
1555	1599	// JPanel north = new JPanel(new BorderLayout());
1556	1600	// north.setName("Edit");
1557	1601	// north.add(ctrlPanel, BorderLayout.NORTH);
1558	1602	// objectPanel.add(north);
1559	1603	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");
	1604	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1605	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1567	1606
1568	1607	objectPanel.add(XYZPanel);
1569		- objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1570		- objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
	1608	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1609	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1571	1610
1572		- objectPanel.add(toolboxPanel);
1573		- objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1574		- objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
1575		-
1576	1611	/*
1577	1612	aConstraints.gridx = 0;
1578	1613	aConstraints.gridwidth = 1;
..	..	@@ -1609,6 +1644,11 @@
1609	1644
1610	1645	scenePanel.add(tabbedPane);
1611	1646
	1647	+ //if (Globals.ADVANCED)
	1648	+ tabbedPane.add(infoPanel);
	1649	+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1650	+ tabbedPane.setToolTipTextAt(3, "Information");
	1651	+
1612	1652	/*
1613	1653	cTree jTree = new cTree(null);
1614	1654	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1679,6 +1719,23 @@
1679	1719	// aConstraints.gridheight = 1;
1680	1720
1681	1721	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1722	+
	1723	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1724	+ new java.beans.PropertyChangeListener()
	1725	+ {
	1726	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1727	+ {
	1728	+ if ((Integer)pce.getOldValue() == 1)
	1729	+ {
	1730	+ if (radio.layout != expandedLayout)
	1731	+ {
	1732	+ radio.layout = expandedLayout;
	1733	+ radio.layout.doClick();
	1734	+ }
	1735	+ }
	1736	+ }
	1737	+ });
	1738	+
1682	1739	framePanel.setContinuousLayout(false);
1683	1740	framePanel.setOneTouchExpandable(false);
1684	1741	//.setDividerLocation(0.8);
..	..	@@ -1733,12 +1790,403 @@
1733	1790	ctrlPanel.removeAll();
1734	1791	}
1735	1792
1736		- void SetupMaterial(cGridBag panel)
	1793	+ void SetupMaterial(cGridBag materialpanel)
1737	1794	{
1738		- /*
	1795	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1796	+
	1797	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1798	+ skin.setToolTipText("Skin");
	1799	+ skin.addMouseListener(new MouseAdapter()
	1800	+ {
	1801	+ public void mouseClicked(MouseEvent e)
	1802	+ {
	1803	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1804	+ cMaterial material = object.material;
	1805	+
	1806	+ // Skin
	1807	+ colorField.setFloat(material.color);
	1808	+ saturationField.setFloat(material.modulation);
	1809	+ subsurfaceField.setFloat(material.subsurface);
	1810	+ selfshadowField.setFloat(material.diffuseness);
	1811	+ diffusenessField.setFloat(material.factor);
	1812	+ shininessField.setFloat(material.shininess);
	1813	+ shadowbiasField.setFloat(material.shadowbias);
	1814	+ diffuseField.setFloat(material.diffuse);
	1815	+ specularField.setFloat(material.specular);
	1816	+
	1817	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1818	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1819	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1820	+
	1821	+ materialtouched = true;
	1822	+ applySelf();
	1823	+ }
	1824	+ });
	1825	+ presetpanel.add(skin);
	1826	+
	1827	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1828	+ lambert.setToolTipText("Diffuse");
	1829	+ lambert.addMouseListener(new MouseAdapter()
	1830	+ {
	1831	+ public void mouseClicked(MouseEvent e)
	1832	+ {
	1833	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1834	+ cMaterial material = object.material;
	1835	+
	1836	+ diffusenessField.setFloat(material.factor);
	1837	+ selfshadowField.setFloat(material.diffuseness);
	1838	+
	1839	+ materialtouched = true;
	1840	+ applySelf();
	1841	+ }
	1842	+ });
	1843	+ presetpanel.add(lambert);
	1844	+
	1845	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1846	+ diffuse2.setToolTipText("Diffuse2");
	1847	+ diffuse2.addMouseListener(new MouseAdapter()
	1848	+ {
	1849	+ public void mouseClicked(MouseEvent e)
	1850	+ {
	1851	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1852	+ cMaterial material = object.material;
	1853	+
	1854	+ diffusenessField.setFloat(material.factor);
	1855	+ selfshadowField.setFloat(material.diffuseness);
	1856	+
	1857	+ materialtouched = true;
	1858	+ applySelf();
	1859	+ }
	1860	+ });
	1861	+ presetpanel.add(diffuse2);
	1862	+
	1863	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1864	+ diffusemoon.setToolTipText("Moon");
	1865	+ diffusemoon.addMouseListener(new MouseAdapter()
	1866	+ {
	1867	+ public void mouseClicked(MouseEvent e)
	1868	+ {
	1869	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1870	+ cMaterial material = object.material;
	1871	+
	1872	+ diffusenessField.setFloat(material.factor);
	1873	+ selfshadowField.setFloat(material.diffuseness);
	1874	+
	1875	+ materialtouched = true;
	1876	+ applySelf();
	1877	+ }
	1878	+ });
	1879	+ presetpanel.add(diffusemoon);
	1880	+
	1881	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1882	+ diffusemoon2.setToolTipText("Moon2");
	1883	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1884	+ {
	1885	+ public void mouseClicked(MouseEvent e)
	1886	+ {
	1887	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1888	+ cMaterial material = object.material;
	1889	+
	1890	+ diffusenessField.setFloat(material.factor);
	1891	+ selfshadowField.setFloat(material.diffuseness);
	1892	+
	1893	+ materialtouched = true;
	1894	+ applySelf();
	1895	+ }
	1896	+ });
	1897	+ presetpanel.add(diffusemoon2);
	1898	+
	1899	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1900	+ diffusemoon3.setToolTipText("Moon3");
	1901	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1902	+ {
	1903	+ public void mouseClicked(MouseEvent e)
	1904	+ {
	1905	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1906	+ cMaterial material = object.material;
	1907	+
	1908	+ diffusenessField.setFloat(material.factor);
	1909	+ selfshadowField.setFloat(material.diffuseness);
	1910	+
	1911	+ materialtouched = true;
	1912	+ applySelf();
	1913	+ }
	1914	+ });
	1915	+ presetpanel.add(diffusemoon3);
	1916	+
	1917	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1918	+ diffusesheen.setToolTipText("Sheen");
	1919	+ diffusesheen.addMouseListener(new MouseAdapter()
	1920	+ {
	1921	+ public void mouseClicked(MouseEvent e)
	1922	+ {
	1923	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1924	+ cMaterial material = object.material;
	1925	+
	1926	+ sheenField.setFloat(material.sheen);
	1927	+
	1928	+ materialtouched = true;
	1929	+ applySelf();
	1930	+ }
	1931	+ });
	1932	+ presetpanel.add(diffusesheen);
	1933	+
	1934	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1935	+ rough.setToolTipText("Rough metal");
	1936	+ rough.addMouseListener(new MouseAdapter()
	1937	+ {
	1938	+ public void mouseClicked(MouseEvent e)
	1939	+ {
	1940	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1941	+ cMaterial material = object.material;
	1942	+
	1943	+ shininessField.setFloat(material.shininess);
	1944	+ velvetField.setFloat(material.velvet);
	1945	+
	1946	+ materialtouched = true;
	1947	+ applySelf();
	1948	+ }
	1949	+ });
	1950	+ presetpanel.add(rough);
	1951	+
	1952	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1953	+ rough2.setToolTipText("Medium metal");
	1954	+ rough2.addMouseListener(new MouseAdapter()
	1955	+ {
	1956	+ public void mouseClicked(MouseEvent e)
	1957	+ {
	1958	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1959	+ cMaterial material = object.material;
	1960	+
	1961	+ shininessField.setFloat(material.shininess);
	1962	+ lightareaField.setFloat(material.lightarea);
	1963	+
	1964	+ materialtouched = true;
	1965	+ applySelf();
	1966	+ }
	1967	+ });
	1968	+ presetpanel.add(rough2);
	1969	+
	1970	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	1971	+ shini0.setToolTipText("Shiny");
	1972	+ shini0.addMouseListener(new MouseAdapter()
	1973	+ {
	1974	+ public void mouseClicked(MouseEvent e)
	1975	+ {
	1976	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	1977	+ cMaterial material = object.material;
	1978	+
	1979	+ shininessField.setFloat(material.shininess);
	1980	+ lightareaField.setFloat(material.lightarea);
	1981	+
	1982	+ materialtouched = true;
	1983	+ applySelf();
	1984	+ }
	1985	+ });
	1986	+ presetpanel.add(shini0);
	1987	+
	1988	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	1989	+ shini1.setToolTipText("Shiny2");
	1990	+ shini1.addMouseListener(new MouseAdapter()
	1991	+ {
	1992	+ public void mouseClicked(MouseEvent e)
	1993	+ {
	1994	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	1995	+ cMaterial material = object.material;
	1996	+
	1997	+ shininessField.setFloat(material.shininess);
	1998	+ lightareaField.setFloat(material.lightarea);
	1999	+
	2000	+ materialtouched = true;
	2001	+ applySelf();
	2002	+ }
	2003	+ });
	2004	+ presetpanel.add(shini1);
	2005	+
	2006	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2007	+ shini2.setToolTipText("Shiny3");
	2008	+ shini2.addMouseListener(new MouseAdapter()
	2009	+ {
	2010	+ public void mouseClicked(MouseEvent e)
	2011	+ {
	2012	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2013	+ cMaterial material = object.material;
	2014	+
	2015	+ shininessField.setFloat(material.shininess);
	2016	+ lightareaField.setFloat(material.lightarea);
	2017	+
	2018	+ materialtouched = true;
	2019	+ applySelf();
	2020	+ }
	2021	+ });
	2022	+ presetpanel.add(shini2);
	2023	+
	2024	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2025	+ aniso.setToolTipText("AnisoU");
	2026	+ aniso.addMouseListener(new MouseAdapter()
	2027	+ {
	2028	+ public void mouseClicked(MouseEvent e)
	2029	+ {
	2030	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2031	+ cMaterial material = object.material;
	2032	+
	2033	+ anisoField.setFloat(material.aniso);
	2034	+ anisoVField.setFloat(material.anisoV);
	2035	+
	2036	+ materialtouched = true;
	2037	+ applySelf();
	2038	+ }
	2039	+ });
	2040	+ presetpanel.add(aniso);
	2041	+
	2042	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2043	+ aniso2.setToolTipText("AnisoV");
	2044	+ aniso2.addMouseListener(new MouseAdapter()
	2045	+ {
	2046	+ public void mouseClicked(MouseEvent e)
	2047	+ {
	2048	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2049	+ cMaterial material = object.material;
	2050	+
	2051	+ anisoField.setFloat(material.aniso);
	2052	+ anisoVField.setFloat(material.anisoV);
	2053	+
	2054	+ materialtouched = true;
	2055	+ applySelf();
	2056	+ }
	2057	+ });
	2058	+ presetpanel.add(aniso2);
	2059	+
	2060	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2061	+ aniso3.setToolTipText("AnisoUV");
	2062	+ aniso3.addMouseListener(new MouseAdapter()
	2063	+ {
	2064	+ public void mouseClicked(MouseEvent e)
	2065	+ {
	2066	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2067	+ cMaterial material = object.material;
	2068	+
	2069	+ anisoField.setFloat(material.aniso);
	2070	+ anisoVField.setFloat(material.anisoV);
	2071	+
	2072	+ materialtouched = true;
	2073	+ applySelf();
	2074	+ }
	2075	+ });
	2076	+ presetpanel.add(aniso3);
	2077	+
	2078	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2079	+ velvet0.setToolTipText("Velvet");
	2080	+ velvet0.addMouseListener(new MouseAdapter()
	2081	+ {
	2082	+ public void mouseClicked(MouseEvent e)
	2083	+ {
	2084	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2085	+ cMaterial material = object.material;
	2086	+
	2087	+ diffusenessField.setFloat(material.factor);
	2088	+ selfshadowField.setFloat(material.diffuseness);
	2089	+ sheenField.setFloat(material.sheen);
	2090	+ shininessField.setFloat(material.shininess);
	2091	+ velvetField.setFloat(material.velvet);
	2092	+ shiftField.setFloat(material.shift);
	2093	+
	2094	+ materialtouched = true;
	2095	+ applySelf();
	2096	+ }
	2097	+ });
	2098	+ presetpanel.add(velvet0);
	2099	+
	2100	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2101	+ bump0.setToolTipText("Bump texture");
	2102	+ bump0.addMouseListener(new MouseAdapter()
	2103	+ {
	2104	+ public void mouseClicked(MouseEvent e)
	2105	+ {
	2106	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2107	+ cMaterial material = object.material;
	2108	+
	2109	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2110	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2111	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2112	+
	2113	+ materialtouched = true;
	2114	+ applySelf();
	2115	+ }
	2116	+ });
	2117	+ presetpanel.add(bump0);
	2118	+
	2119	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2120	+ halo.setToolTipText("Halo");
	2121	+ halo.addMouseListener(new MouseAdapter()
	2122	+ {
	2123	+ public void mouseClicked(MouseEvent e)
	2124	+ {
	2125	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2126	+ cMaterial material = object.material;
	2127	+
	2128	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2129	+
	2130	+ materialtouched = true;
	2131	+ applySelf();
	2132	+ }
	2133	+ });
	2134	+ presetpanel.add(halo);
	2135	+
	2136	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2137	+ candle.setToolTipText("Candle");
	2138	+ candle.addMouseListener(new MouseAdapter()
	2139	+ {
	2140	+ public void mouseClicked(MouseEvent e)
	2141	+ {
	2142	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2143	+ cMaterial material = object.material;
	2144	+
	2145	+ subsurfaceField.setFloat(material.subsurface);
	2146	+ shadowbiasField.setFloat(material.shadowbias);
	2147	+ ambientField.setFloat(material.ambient);
	2148	+ specularField.setFloat(material.specular);
	2149	+ lightareaField.setFloat(material.lightarea);
	2150	+ shininessField.setFloat(material.shininess);
	2151	+
	2152	+ materialtouched = true;
	2153	+ applySelf();
	2154	+ }
	2155	+ });
	2156	+ presetpanel.add(candle);
	2157	+
	2158	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2159	+ shadowShader.setToolTipText("Shadow");
	2160	+ shadowShader.addMouseListener(new MouseAdapter()
	2161	+ {
	2162	+ public void mouseClicked(MouseEvent e)
	2163	+ {
	2164	+ diffuseField.setFloat(0.001);
	2165	+ ambientField.setFloat(0.001);
	2166	+ cameraField.setFloat(0.001);
	2167	+ specularField.setFloat(0.001);
	2168	+ fakedepthField.setFloat(0.001);
	2169	+ opacityField.setFloat(0.6);
	2170	+
	2171	+ materialtouched = true;
	2172	+ applySelf();
	2173	+ }
	2174	+ });
	2175	+ presetpanel.add(shadowShader);
	2176	+
	2177	+ cGridBag panel = new cGridBag().setVertical(true);
	2178	+
	2179	+ presetpanel.preferredWidth = 1;
	2180	+
	2181	+ materialpanel.add(presetpanel);
	2182	+ materialpanel.add(panel);
	2183	+
	2184	+ panel.preferredWidth = 8;
	2185	+
	2186	+ /*
1739	2187	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1740	2188	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1741		- */
	2189	+ */
1742	2190
1743	2191	cGridBag editBar = new cGridBag().setVertical(false);
1744	2192
..	..	@@ -1775,7 +2223,9 @@
1775	2223
1776	2224	cGridBag huepanel = new cGridBag();
1777	2225	cGridBag huelabel = new cGridBag();
1778		- huelabel.add(GetLabel("icons/hue.png", false));
	2226	+ skin = GetLabel("icons/hue.png", false);
	2227	+ skin.fit = true;
	2228	+ huelabel.add(skin);
1779	2229	huelabel.preferredWidth = 20;
1780	2230	huepanel.add(new cGridBag()); // Label
1781	2231	huepanel.add(huelabel); // Field/slider
..	..	@@ -1796,7 +2246,7 @@
1796	2246	cGridBag modulation = new cGridBag();
1797	2247	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1798	2248	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1799		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2249	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1800	2250	colorSection.add(modulation);
1801	2251
1802	2252	cGridBag opacity = new cGridBag();
..	..	@@ -2989,7 +3439,7 @@
2989	3439
2990	3440	freezematerial = true;
2991	3441	colorField.setFloat(mat.color);
2992		- modulationField.setFloat(mat.modulation);
	3442	+ saturationField.setFloat(mat.modulation);
2993	3443	metalnessField.setFloat(mat.metalness);
2994	3444	diffuseField.setFloat(mat.diffuse);
2995	3445	specularField.setFloat(mat.specular);
..	..	@@ -3196,6 +3646,17 @@
3196	3646	public void itemStateChanged(ItemEvent event)
3197	3647	{
3198	3648	// System.out.println("Propagate = " + propagate);
	3649	+ if (event.getSource() == pinButton)
	3650	+ {
	3651	+ copy.pinned ^= true;
	3652	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3653	+ {
	3654	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3655	+ copy.CloseUI();
	3656	+ //copy.editWindow.refreshContents();
	3657	+ }
	3658	+ }
	3659	+ else
3199	3660	if (event.getSource() == propagateToggle)
3200	3661	{
3201	3662	propagate ^= true;
..	..	@@ -3300,6 +3761,7 @@
3300	3761	} else if (event.getSource() == liveCB)
3301	3762	{
3302	3763	copy.live ^= true;
	3764	+ objEditor.refreshContents(true); // To show item colors
3303	3765	return;
3304	3766	} else if (event.getSource() == selectableCB)
3305	3767	{
..	..	@@ -3309,7 +3771,7 @@
3309	3771	{
3310	3772	copy.hide ^= true;
3311	3773	copy.Touch(); // display list issue
3312		- objEditor.refreshContents();
	3774	+ objEditor.refreshContents(true); // To show item colors
3313	3775	return;
3314	3776	} else if (event.getSource() == link2masterCB)
3315	3777	{
..	..	@@ -3565,6 +4027,7 @@
3565	4027
3566	4028	static public byte[] Compress(Object3D o)
3567	4029	{
	4030	+ // Slower to actually compress.
3568	4031	try
3569	4032	{
3570	4033	ByteArrayOutputStream baos = new ByteArrayOutputStream();
..	..	@@ -3666,6 +4129,7 @@
3666	4129	{
3667	4130	//Save(true);
3668	4131	Replace();
	4132	+ SetVersionStates();
3669	4133	}
3670	4134
3671	4135	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3686,29 +4150,46 @@
3686	4150
3687	4151	java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3688	4152
	4153	+ void DeleteVersion()
	4154	+ {
	4155	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4156	+ {
	4157	+ copy.versionlist[i] = copy.versionlist[i+1];
	4158	+ }
	4159	+
	4160	+ CopyChanged();
	4161	+
	4162	+ SetVersionStates();
	4163	+ }
	4164	+
3689	4165	public boolean Save(boolean user)
3690	4166	{
3691	4167	System.err.println("Save");
	4168	+ Replace();
3692	4169
3693		- cRadio tab = GetCurrentTab();
	4170	+ //cRadio tab = GetCurrentTab();
3694	4171
3695		- byte[] compress = CompressCopy(); // Saved version. No need for "Replace".
	4172	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3696	4173
3697	4174	boolean thesame = false;
3698	4175
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		- }
	4176	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4177	+// {
	4178	+// thesame = true;
	4179	+// }
3704	4180
3705	4181	//EditorFrame.m_MainFrame.requestFocusInWindow();
3706	4182	if (!thesame)
3707	4183	{
	4184	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4185	+ {
	4186	+ copy.versionlist[i] = copy.versionlist[i-1];
	4187	+ }
	4188	+
3708	4189	//tab.user[tab.versionindex] = user;
3709	4190	//boolean increment = true; // tab.graphs[tab.versionindex] == null;
3710	4191
3711		- copy.versions[++copy.versionindex] = compress;
	4192	+ copy.versionlist[++copy.versionindex] = compress;
3712	4193
3713	4194	// if (increment)
3714	4195	// tab.versionindex++;
..	..	@@ -3718,13 +4199,13 @@
3718	4199
3719	4200	//assert(hashtable.isEmpty());
3720	4201
3721		- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3722		- {
3723		- //tab.user[i] = false;
3724		- copy.versions[i] = null;
3725		- }
	4202	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4203	+// {
	4204	+// //tab.user[i] = false;
	4205	+// copy.versionlist[i] = null;
	4206	+// }
3726	4207
3727		- SetUndoStates();
	4208	+ SetVersionStates();
3728	4209
3729	4210	// test save
3730	4211	if (false)
..	..	@@ -3747,10 +4228,44 @@
3747	4228
3748	4229	return !thesame;
3749	4230	}
3750		-
3751		- void CopyChanged(Object3D obj)
	4231	+
	4232	+ boolean flashIt = true;
	4233	+
	4234	+ void RefreshSelection()
3752	4235	{
3753		- SetUndoStates();
	4236	+ Object3D selection = new Object3D();
	4237	+
	4238	+ for (int i = 0; i < copy.selection.size(); i++)
	4239	+ {
	4240	+ Object3D elem = copy.selection.elementAt(i);
	4241	+
	4242	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4243	+
	4244	+ if (obj == null)
	4245	+ {
	4246	+ copy.selection.remove(i--);
	4247	+ }
	4248	+ else
	4249	+ {
	4250	+ selection.add(obj);
	4251	+ copy.selection.setElementAt(obj, i);
	4252	+ }
	4253	+ }
	4254	+
	4255	+ flashIt = false;
	4256	+ GetTree().clearSelection();
	4257	+ for (int i = 0; i < selection.size(); i++)
	4258	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4259	+ flashIt = true;
	4260	+
	4261	+ //refreshContents(false);
	4262	+ }
	4263	+
	4264	+ void CopyChanged()
	4265	+ {
	4266	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4267	+
	4268	+ SetVersionStates();
3754	4269
3755	4270	boolean temp = CameraPane.SWITCH;
3756	4271	CameraPane.SWITCH = false;
..	..	@@ -3771,6 +4286,7 @@
3771	4286
3772	4287	CameraPane.SWITCH = temp;
3773	4288
	4289	+ RefreshSelection();
3774	4290	//assert(hashtable.isEmpty());
3775	4291
3776	4292	copy.Touch();
..	..	@@ -3791,13 +4307,15 @@
3791	4307	}
3792	4308	}
3793	4309
3794		- refreshContents();
	4310	+ refreshContents(true);
3795	4311	}
3796	4312
3797		- cButton undoButton;
	4313	+ cButton previousVersionButton;
3798	4314	cButton restoreButton;
3799	4315	cButton replaceButton;
3800		- cButton redoButton;
	4316	+ cButton nextVersionButton;
	4317	+ cButton saveVersionButton;
	4318	+ cButton deleteVersionButton;
3801	4319
3802	4320	boolean muteSlider;
3803	4321
..	..	@@ -3805,39 +4323,47 @@
3805	4323	{
3806	4324	int count = 0;
3807	4325
3808		- for (int i = copy.versions.length; --i >= 0;)
	4326	+ for (int i = copy.versionlist.length; --i >= 0;)
3809	4327	{
3810		- if (copy.versions[i] != null)
	4328	+ if (copy.versionlist[i] != null)
3811	4329	count++;
3812	4330	}
3813	4331
3814	4332	return count;
3815	4333	}
3816	4334
3817		- void SetUndoStates()
	4335	+ void SetVersionStates()
3818	4336	{
3819		- cRadio tab = GetCurrentTab();
	4337	+ //if (true)
	4338	+ // return;
	4339	+
	4340	+ //cRadio tab = GetCurrentTab();
3820	4341
3821	4342	restoreButton.setEnabled(copy.versionindex != -1);
3822	4343	replaceButton.setEnabled(copy.versionindex != -1);
3823	4344
3824		- undoButton.setEnabled(copy.versionindex > 0);
3825		- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	4345	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4346	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4347	+
	4348	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4349	+ copy.versionlist[copy.versionindex + 1] != null);
3826	4350
3827	4351	muteSlider = true;
	4352	+ versionSlider.setMinimum(0);
3828	4353	versionSlider.setMaximum(VersionCount() - 1);
3829	4354	versionSlider.setInteger(copy.versionindex);
	4355	+ versionSlider.setEnabled(copy.versionindex != -1);
3830	4356	muteSlider = false;
3831	4357	}
3832	4358
3833		- public boolean Undo()
	4359	+ public boolean PreviousVersion()
3834	4360	{
3835	4361	// Option?
3836	4362	Replace();
3837	4363
3838	4364	System.err.println("Undo");
3839	4365
3840		- cRadio tab = GetCurrentTab();
	4366	+ //cRadio tab = GetCurrentTab();
3841	4367
3842	4368	if (copy.versionindex == 0)
3843	4369	{
..	..	@@ -3860,7 +4386,7 @@
3860	4386
3861	4387	copy.versionindex -= 1;
3862	4388
3863		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4389	+ CopyChanged();
3864	4390
3865	4391	return true;
3866	4392	}
..	..	@@ -3869,15 +4395,16 @@
3869	4395	{
3870	4396	System.err.println("Restore");
3871	4397
3872		- cRadio tab = GetCurrentTab();
	4398	+ //cRadio tab = GetCurrentTab();
3873	4399
3874		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4400	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3875	4401	{
3876	4402	java.awt.Toolkit.getDefaultToolkit().beep();
3877	4403	return false;
3878	4404	}
3879	4405
3880		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4406	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4407	+ CopyChanged();
3881	4408
3882	4409	return true;
3883	4410	}
..	..	@@ -3886,27 +4413,27 @@
3886	4413	{
3887	4414	System.err.println("Replace");
3888	4415
3889		- cRadio tab = GetCurrentTab();
	4416	+ //cRadio tab = GetCurrentTab();
3890	4417
3891		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4418	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3892	4419	{
3893	4420	// No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3894	4421	return false;
3895	4422	}
3896	4423
3897		- copy.versions[copy.versionindex] = CompressCopy();
	4424	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
3898	4425
3899	4426	return true;
3900	4427	}
3901	4428
3902		- public void Redo()
	4429	+ public void NextVersion()
3903	4430	{
3904	4431	// Option?
3905	4432	Replace();
3906	4433
3907		- cRadio tab = GetCurrentTab();
	4434	+ //cRadio tab = GetCurrentTab();
3908	4435
3909		- if (copy.versions[copy.versionindex + 1] == null)
	4436	+ if (copy.versionlist[copy.versionindex + 1] == null)
3910	4437	{
3911	4438	java.awt.Toolkit.getDefaultToolkit().beep();
3912	4439	return;
..	..	@@ -3914,7 +4441,7 @@
3914	4441
3915	4442	copy.versionindex += 1;
3916	4443
3917		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4444	+ CopyChanged();
3918	4445
3919	4446	//if (!tab.user[tab.versionindex])
3920	4447	// tab.graphs[tab.versionindex] = null;
..	..	@@ -4128,7 +4655,7 @@
4128	4655	//copy.material = new cMaterial(copy.GetMaterial());
4129	4656
4130	4657	current.color = (float) colorField.getFloat();
4131		- current.modulation = (float) modulationField.getFloat();
	4658	+ current.modulation = (float) saturationField.getFloat();
4132	4659	current.metalness = (float) metalnessField.getFloat();
4133	4660	current.diffuse = (float) diffuseField.getFloat();
4134	4661	current.specular = (float) specularField.getFloat();
..	..	@@ -4161,7 +4688,7 @@
4161	4688	cMaterial mat = copy.material;
4162	4689
4163	4690	colorField.SetToolTipValue((mat.color));
4164		- modulationField.SetToolTipValue((mat.modulation));
	4691	+ saturationField.SetToolTipValue((mat.modulation));
4165	4692	metalnessField.SetToolTipValue((mat.metalness));
4166	4693	diffuseField.SetToolTipValue((mat.diffuse));
4167	4694	specularField.SetToolTipValue((mat.specular));
..	..	@@ -4225,9 +4752,10 @@
4225	4752
4226	4753	int version = versionSlider.getInteger();
4227	4754
4228		- if (copy.versions[version] != null)
	4755	+ if (version != -1 && copy.versionlist[version] != null)
4229	4756	{
4230		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4757	+ copy.versionindex = version;
	4758	+ CopyChanged();
4231	4759	}
4232	4760
4233	4761	return;
..	..	@@ -4267,6 +4795,12 @@
4267	4795	{
4268	4796	//System.out.println("stateChanged = " + this);
4269	4797	materialtouched = true;
	4798	+
	4799	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4800	+ {
	4801	+ saturationField.setFloat(1);
	4802	+ }
	4803	+
4270	4804	applySelf();
4271	4805	//System.out.println("this = " + this);
4272	4806	//System.out.println("PARENT = " + parent);
..	..	@@ -4566,6 +5100,7 @@
4566	5100	{
4567	5101	if (GetTree() != null)
4568	5102	{
	5103	+ GetTree().revalidate();
4569	5104	GetTree().repaint();
4570	5105	}
4571	5106
..	..	@@ -4574,6 +5109,9 @@
4574	5109	ctrlPanel.validate(); // ? new
4575	5110	ctrlPanel.repaint();
4576	5111	}
	5112	+
	5113	+ if (previousVersionButton != null && copy.versionlist != null)
	5114	+ SetVersionStates();
4577	5115	}
4578	5116
4579	5117	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4957,13 +5495,16 @@
4957	5495	c.addChild(csg);
4958	5496	}
4959	5497
4960		- copy.versions = readobj.versions;
	5498	+ copy.versionlist = readobj.versionlist;
4961	5499	copy.versionindex = readobj.versionindex;
4962	5500
4963		- if (copy.versions == null)
	5501	+ if (copy.versionlist == null)
4964	5502	{
4965		- copy.versions = new byte[100][];
	5503	+ // Backward compatibility
	5504	+ copy.versionlist = new Object3D[100];
4966	5505	copy.versionindex = -1;
	5506	+
	5507	+ Save(true);
4967	5508	}
4968	5509
4969	5510	//? SetUndoStates();
..	..	@@ -4978,7 +5519,7 @@
4978	5519	{
4979	5520	if (Grafreed.standAlone)
4980	5521	{
4981		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5522	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4982	5523	browser.show();
4983	5524	String filename = browser.getFile();
4984	5525	if (filename != null && filename.length() > 0)
..	..	@@ -5055,6 +5596,8 @@
5055	5596
5056	5597	void save()
5057	5598	{
	5599	+ Replace();
	5600	+
5058	5601	if (lastname == null)
5059	5602	{
5060	5603	return;
..	..	@@ -5297,6 +5840,7 @@
5297	5840	ButtonGroup buttonGroup;
5298	5841
5299	5842	cGridBag toolboxPanel;
	5843	+ cGridBag skyboxPanel;
5300	5844	cGridBag materialPanel;
5301	5845	cGridBag ctrlPanel;
5302	5846
..	..	@@ -5370,7 +5914,7 @@
5370	5914	JLabel colorLabel;
5371	5915	cNumberSlider colorField;
5372	5916	JLabel modulationLabel;
5373		- cNumberSlider modulationField;
	5917	+ cNumberSlider saturationField;
5374	5918	JLabel metalnessLabel;
5375	5919	cNumberSlider metalnessField;
5376	5920	JLabel diffuseLabel;
..	..	@@ -5401,6 +5945,7 @@
5401	5945	cNumberSlider anisoField;
5402	5946	JLabel anisoVLabel;
5403	5947	cNumberSlider anisoVField;
	5948	+
5404	5949	JLabel cameraLabel;
5405	5950	cNumberSlider cameraField;
5406	5951	JLabel selfshadowLabel;
..	..	@@ -5415,6 +5960,7 @@
5415	5960	cNumberSlider fakedepthField;
5416	5961	JLabel shadowbiasLabel;
5417	5962	cNumberSlider shadowbiasField;
	5963	+
5418	5964	JLabel bumpLabel;
5419	5965	cNumberSlider bumpField;
5420	5966	JLabel noiseLabel;