~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
..	..	@@ -41,6 +42,35 @@
41	42	JFrame frame;
42	43
43	44	static ObjEditor theFrame;
	45	+
	46	+ public void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
44	74
45	75	public cGridBag GetSeparator()
46	76	{
..	..	@@ -74,8 +104,16 @@
74	104	return new cCheckBox(icon, border);
75	105	}
76	106
	107	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	108	+
77	109	ImageIcon GetIcon(String name)
78	110	{
	111	+ javax.swing.ImageIcon iconCache = icons.get(name);
	112	+ if (iconCache != null)
	113	+ {
	114	+ return iconCache;
	115	+ }
	116	+
79	117	try
80	118	{
81	119	BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
..	..	@@ -93,10 +131,14 @@
93	131	// }
94	132
95	133	javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	134	+
	135	+ icons.put(name, icon);
	136	+
96	137	return icon;
97	138	}
98	139	catch (Exception e)
99	140	{
	141	+ //icons.put(name, null);
100	142	return null;
101	143	}
102	144	}
..	..	@@ -296,11 +338,13 @@
296	338	client = inClient;
297	339	copy = client;
298	340
299		- if (copy.versions == null)
300		- {
301		- copy.versions = new Object3D[100];
302		- copy.versionindex = -1;
303		- }
	341	+// if (copy.versionlist == null)
	342	+// {
	343	+// copy.versionlist = new Object3D[100];
	344	+// copy.versionindex = -1;
	345	+//
	346	+// callee.Save(true);
	347	+// }
304	348
305	349	// "this" is not called: SetupUI2(objEditor);
306	350	}
..	..	@@ -315,10 +359,12 @@
315	359	client = inClient;
316	360	copy = client;
317	361
318		- if (copy.versions == null)
	362	+ if (copy.versionlist == null)
319	363	{
320		- copy.versions = new Object3D[100];
	364	+ copy.versionlist = new Object3D[100];
321	365	copy.versionindex = -1;
	366	+
	367	+// Save(true);
322	368	}
323	369
324	370	SetupUI2(callee.GetEditor());
..	..	@@ -353,11 +399,13 @@
353	399	copy = localCopy;
354	400	copy.editWindow = this;
355	401
356		- if (copy.versions == null)
357		- {
358		-// copy.versions = new byte[100][];
	402	+// if (copy.versionlist == null)
	403	+// {
	404	+// copy.versionlist = new Object3D[100];
359	405	// copy.versionindex = -1;
360		- }
	406	+//
	407	+// Save(true);
	408	+// }
361	409
362	410	SetupMenu();
363	411
..	..	@@ -426,6 +474,8 @@
426	474
427	475	ChangeListener changeListener = new ChangeListener()
428	476	{
	477	+ //String name;
	478	+
429	479	public void stateChanged(ChangeEvent changeEvent)
430	480	{
431	481	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -444,7 +494,37 @@
444	494	// EditSelection(false);
445	495	// }
446	496
447		- refreshContents(false); // To refresh Info tab
	497	+// if (objectPanel.getSelectedIndex() == 4)
	498	+// {
	499	+// name = copy.skyboxname;
	500	+//
	501	+// if (name == null)
	502	+// {
	503	+// name = "";
	504	+// }
	505	+//
	506	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	507	+// copy.skyboxext = "jpg";
	508	+// }
	509	+// else
	510	+// {
	511	+// if (name != null)
	512	+// {
	513	+// if (name.equals(""))
	514	+// {
	515	+// copy.skyboxname = null;
	516	+// copy.skyboxext = null;
	517	+// }
	518	+// else
	519	+// {
	520	+// copy.skyboxname = name;
	521	+// }
	522	+// }
	523	+// }
	524	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	525	+
	526	+// refreshContents(false); // To refresh Info tab
	527	+ cameraView.repaint();
448	528	}
449	529	};
450	530	objectPanel.addChangeListener(changeListener);
..	..	@@ -467,7 +547,9 @@
467	547	toolboxPanel = new cGridBag().setVertical(true);
468	548	//toolboxPanel.setName("Toolbox");
469	549
470		- materialPanel = new cGridBag().setVertical(true);
	550	+ skyboxPanel = new cGridBag().setVertical(true);
	551	+
	552	+ materialPanel = new cGridBag().setVertical(false);
471	553	//materialPanel.setName("Material");
472	554
473	555	/JTextPane/
..	..	@@ -751,6 +833,7 @@
751	833	boolean maximized;
752	834
753	835	cButton fullscreenLayout;
	836	+ cButton expandedLayout;
754	837
755	838	void Minimize()
756	839	{
..	..	@@ -790,10 +873,12 @@
790	873	cButton minButton;
791	874	cButton maxButton;
792	875	cButton fullButton;
	876	+ cButton collapseButton;
	877	+ cButton maximize3DButton;
793	878
794	879	void ToggleFullScreen()
795	880	{
796		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	881	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797	882
798	883	cameraView.ToggleFullScreen();
799	884
..	..	@@ -814,13 +899,13 @@
814	899	// X frame.getContentPane().remove(/"Center",/bigThree);
815	900	// X framePanel.add(bigThree);
816	901	// X frame.getContentPane().add(/"Center",/framePanel);
817		- framePanel.setDividerLocation(46);
	902	+// framePanel.setDividerLocation(46); // icons are 24x24
818	903
819	904	//frame.setVisible(true);
820		- radio.layout = keepButton;
	905	+// radio.layout = keepButton;
821	906	//theFrame = null;
822	907	keepButton = null;
823		- radio.layout.doClick();
	908	+// radio.layout.doClick();
824	909
825	910	} else
826	911	{
..	..	@@ -841,32 +926,42 @@
841	926	// X frame.getContentPane().remove(/"Center",/framePanel);
842	927	// X framePanel.remove(bigThree);
843	928	// X frame.getContentPane().add(/"Center",/bigThree);
844		- framePanel.setDividerLocation(0);
	929	+// framePanel.setDividerLocation(0);
845	930
846		- radio.layout = fullscreenLayout;
847		- radio.layout.doClick();
	931	+// radio.layout = fullscreenLayout;
	932	+// radio.layout.doClick();
848	933	//frame.setVisible(true);
849	934	}
850	935	frame.validate();
	936	+
	937	+ cameraView.requestFocusInWindow();
851	938	}
852	939
853		- private Object3D CompressCopy()
	940	+ void CollapseToolbar()
	941	+ {
	942	+ framePanel.setDividerLocation(0);
	943	+ //frame.validate();
	944	+
	945	+ cameraView.requestFocusInWindow();
	946	+ }
	947	+
	948	+ private Object3D Duplicate(Object3D object)
854	949	{
855	950	boolean temp = CameraPane.SWITCH;
856	951	CameraPane.SWITCH = false;
857	952
858		- copy.ExtractBigData(versiontable);
	953	+ object.ExtractBigData(versiontable);
859	954	// if (copy == client)
860	955
861		- Object3D versions[] = copy.versions;
862		- copy.versions = null;
	956	+ Object3D versions[] = object.versionlist;
	957	+ object.versionlist = null;
863	958
864	959	//byte[] compress = Compress(copy);
865		- Object3D compress = (Object3D)Grafreed.clone(copy);
	960	+ Object3D compress = (Object3D)Grafreed.clone(object);
866	961
867		- copy.versions = versions;
	962	+ object.versionlist = versions;
868	963
869		- copy.RestoreBigData(versiontable);
	964	+ object.RestoreBigData(versiontable);
870	965
871	966	CameraPane.SWITCH = temp;
872	967
..	..	@@ -994,6 +1089,7 @@
994	1089	{
995	1090	SetupMaterial(materialPanel);
996	1091	}
	1092	+
997	1093	//SetupName();
998	1094	//SetupViews();
999	1095	}
..	..	@@ -1202,6 +1298,18 @@
1202	1298
1203	1299	namePanel = new cGridBag();
1204	1300
	1301	+ //if (copy.pinned)
	1302	+ {
	1303	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1304	+ pinButton.setSelected(copy.pinned);
	1305	+ cGridBag t = new cGridBag();
	1306	+ t.preferredWidth = 2;
	1307	+ t.add(pinButton);
	1308	+ namePanel.add(t);
	1309	+
	1310	+ pinButton.addItemListener(this);
	1311	+ }
	1312	+
1205	1313	nameField = AddText(namePanel, copy.GetName());
1206	1314	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1207	1315	oe.ctrlPanel.add(namePanel);
..	..	@@ -1551,29 +1659,28 @@
1551	1659	//tmp.setName("Edit");
1552	1660	objectPanel.add(materialPanel);
1553	1661	objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1554		- objectPanel.setToolTipTextAt(0, "Material panel");
	1662	+ objectPanel.setToolTipTextAt(0, "Material");
1555	1663
	1664	+ objectPanel.add(toolboxPanel);
	1665	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1666	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1667	+
	1668	+ objectPanel.add(skyboxPanel);
	1669	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1670	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1671	+
1556	1672	// JPanel north = new JPanel(new BorderLayout());
1557	1673	// north.setName("Edit");
1558	1674	// north.add(ctrlPanel, BorderLayout.NORTH);
1559	1675	// objectPanel.add(north);
1560	1676	objectPanel.add(editPanel);
1561		- objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1562		- objectPanel.setToolTipTextAt(1, "Edit panel");
1563		-
1564		- //if (Globals.ADVANCED)
1565		- objectPanel.add(infoPanel);
1566		- objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1567		- objectPanel.setToolTipTextAt(2, "Info panel");
	1677	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1678	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1568	1679
1569	1680	objectPanel.add(XYZPanel);
1570		- objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1571		- objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
	1681	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1682	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1572	1683
1573		- objectPanel.add(toolboxPanel);
1574		- objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1575		- objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
1576		-
1577	1684	/*
1578	1685	aConstraints.gridx = 0;
1579	1686	aConstraints.gridwidth = 1;
..	..	@@ -1610,6 +1717,11 @@
1610	1717
1611	1718	scenePanel.add(tabbedPane);
1612	1719
	1720	+ //if (Globals.ADVANCED)
	1721	+// tabbedPane.add(infoPanel);
	1722	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1723	+// tabbedPane.setToolTipTextAt(3, "Information");
	1724	+
1613	1725	/*
1614	1726	cTree jTree = new cTree(null);
1615	1727	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1680,6 +1792,23 @@
1680	1792	// aConstraints.gridheight = 1;
1681	1793
1682	1794	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1795	+
	1796	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1797	+ new java.beans.PropertyChangeListener()
	1798	+ {
	1799	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1800	+ {
	1801	+ if ((Integer)pce.getOldValue() == 1)
	1802	+ {
	1803	+ if (radio.layout != expandedLayout)
	1804	+ {
	1805	+ radio.layout = expandedLayout;
	1806	+ radio.layout.doClick();
	1807	+ }
	1808	+ }
	1809	+ }
	1810	+ });
	1811	+
1683	1812	framePanel.setContinuousLayout(false);
1684	1813	framePanel.setOneTouchExpandable(false);
1685	1814	//.setDividerLocation(0.8);
..	..	@@ -1689,7 +1818,7 @@
1689	1818
1690	1819	frame.getContentPane().setLayout(new BorderLayout());
1691	1820	/**/
1692		- JTabbedPane worldPane = new JTabbedPane();
	1821	+ //JTabbedPane worldPane = new JTabbedPane();
1693	1822	//worldPane.add(bigPanel);
1694	1823	//worldPane.add(worldPanel);
1695	1824	/**/
..	..	@@ -1734,12 +1863,418 @@
1734	1863	ctrlPanel.removeAll();
1735	1864	}
1736	1865
1737		- void SetupMaterial(cGridBag panel)
	1866	+ void SetupMaterial(cGridBag materialpanel)
1738	1867	{
1739		- /*
	1868	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1869	+
	1870	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1871	+ skin.setToolTipText("Skin");
	1872	+ skin.addMouseListener(new MouseAdapter()
	1873	+ {
	1874	+ public void mouseClicked(MouseEvent e)
	1875	+ {
	1876	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1877	+ cMaterial material = object.material;
	1878	+
	1879	+ // Skin
	1880	+ colorField.setFloat(material.color);
	1881	+ saturationField.setFloat(material.modulation);
	1882	+ subsurfaceField.setFloat(material.subsurface);
	1883	+ selfshadowField.setFloat(material.diffuseness);
	1884	+ diffusenessField.setFloat(material.factor);
	1885	+ shininessField.setFloat(material.shininess);
	1886	+ shadowbiasField.setFloat(material.shadowbias);
	1887	+ diffuseField.setFloat(material.diffuse);
	1888	+ specularField.setFloat(material.specular);
	1889	+
	1890	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1891	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1892	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1893	+
	1894	+ materialtouched = true;
	1895	+ applySelf();
	1896	+ }
	1897	+ });
	1898	+ presetpanel.add(skin);
	1899	+
	1900	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1901	+ lambert.setToolTipText("Diffuse");
	1902	+ lambert.addMouseListener(new MouseAdapter()
	1903	+ {
	1904	+ public void mouseClicked(MouseEvent e)
	1905	+ {
	1906	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1907	+ cMaterial material = object.material;
	1908	+
	1909	+ diffusenessField.setFloat(material.factor);
	1910	+ selfshadowField.setFloat(material.diffuseness);
	1911	+
	1912	+ materialtouched = true;
	1913	+ applySelf();
	1914	+ }
	1915	+ });
	1916	+ presetpanel.add(lambert);
	1917	+
	1918	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1919	+ diffuse2.setToolTipText("Diffuse2");
	1920	+ diffuse2.addMouseListener(new MouseAdapter()
	1921	+ {
	1922	+ public void mouseClicked(MouseEvent e)
	1923	+ {
	1924	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1925	+ cMaterial material = object.material;
	1926	+
	1927	+ diffusenessField.setFloat(material.factor);
	1928	+ selfshadowField.setFloat(material.diffuseness);
	1929	+
	1930	+ materialtouched = true;
	1931	+ applySelf();
	1932	+ }
	1933	+ });
	1934	+ presetpanel.add(diffuse2);
	1935	+
	1936	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1937	+ diffusemoon.setToolTipText("Moon");
	1938	+ diffusemoon.addMouseListener(new MouseAdapter()
	1939	+ {
	1940	+ public void mouseClicked(MouseEvent e)
	1941	+ {
	1942	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1943	+ cMaterial material = object.material;
	1944	+
	1945	+ diffusenessField.setFloat(material.factor);
	1946	+ selfshadowField.setFloat(material.diffuseness);
	1947	+
	1948	+ materialtouched = true;
	1949	+ applySelf();
	1950	+ }
	1951	+ });
	1952	+ presetpanel.add(diffusemoon);
	1953	+
	1954	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1955	+ diffusemoon2.setToolTipText("Moon2");
	1956	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1957	+ {
	1958	+ public void mouseClicked(MouseEvent e)
	1959	+ {
	1960	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1961	+ cMaterial material = object.material;
	1962	+
	1963	+ diffusenessField.setFloat(material.factor);
	1964	+ selfshadowField.setFloat(material.diffuseness);
	1965	+
	1966	+ materialtouched = true;
	1967	+ applySelf();
	1968	+ }
	1969	+ });
	1970	+ presetpanel.add(diffusemoon2);
	1971	+
	1972	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1973	+ diffusemoon3.setToolTipText("Moon3");
	1974	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1975	+ {
	1976	+ public void mouseClicked(MouseEvent e)
	1977	+ {
	1978	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1979	+ cMaterial material = object.material;
	1980	+
	1981	+ diffusenessField.setFloat(material.factor);
	1982	+ selfshadowField.setFloat(material.diffuseness);
	1983	+
	1984	+ materialtouched = true;
	1985	+ applySelf();
	1986	+ }
	1987	+ });
	1988	+ presetpanel.add(diffusemoon3);
	1989	+
	1990	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1991	+ diffusesheen.setToolTipText("Sheen");
	1992	+ diffusesheen.addMouseListener(new MouseAdapter()
	1993	+ {
	1994	+ public void mouseClicked(MouseEvent e)
	1995	+ {
	1996	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1997	+ cMaterial material = object.material;
	1998	+
	1999	+ sheenField.setFloat(material.sheen);
	2000	+
	2001	+ materialtouched = true;
	2002	+ applySelf();
	2003	+ }
	2004	+ });
	2005	+ presetpanel.add(diffusesheen);
	2006	+
	2007	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2008	+ rough.setToolTipText("Rough metal");
	2009	+ rough.addMouseListener(new MouseAdapter()
	2010	+ {
	2011	+ public void mouseClicked(MouseEvent e)
	2012	+ {
	2013	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2014	+ cMaterial material = object.material;
	2015	+
	2016	+ shininessField.setFloat(material.shininess);
	2017	+ velvetField.setFloat(material.velvet);
	2018	+
	2019	+ materialtouched = true;
	2020	+ applySelf();
	2021	+ }
	2022	+ });
	2023	+ presetpanel.add(rough);
	2024	+
	2025	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2026	+ rough2.setToolTipText("Medium metal");
	2027	+ rough2.addMouseListener(new MouseAdapter()
	2028	+ {
	2029	+ public void mouseClicked(MouseEvent e)
	2030	+ {
	2031	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2032	+ cMaterial material = object.material;
	2033	+
	2034	+ shininessField.setFloat(material.shininess);
	2035	+ lightareaField.setFloat(material.lightarea);
	2036	+
	2037	+ materialtouched = true;
	2038	+ applySelf();
	2039	+ }
	2040	+ });
	2041	+ presetpanel.add(rough2);
	2042	+
	2043	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2044	+ shini0.setToolTipText("Shiny");
	2045	+ shini0.addMouseListener(new MouseAdapter()
	2046	+ {
	2047	+ public void mouseClicked(MouseEvent e)
	2048	+ {
	2049	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2050	+ cMaterial material = object.material;
	2051	+
	2052	+ shininessField.setFloat(material.shininess);
	2053	+ lightareaField.setFloat(material.lightarea);
	2054	+
	2055	+ materialtouched = true;
	2056	+ applySelf();
	2057	+ }
	2058	+ });
	2059	+ presetpanel.add(shini0);
	2060	+
	2061	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2062	+ shini1.setToolTipText("Shiny2");
	2063	+ shini1.addMouseListener(new MouseAdapter()
	2064	+ {
	2065	+ public void mouseClicked(MouseEvent e)
	2066	+ {
	2067	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2068	+ cMaterial material = object.material;
	2069	+
	2070	+ shininessField.setFloat(material.shininess);
	2071	+ lightareaField.setFloat(material.lightarea);
	2072	+
	2073	+ materialtouched = true;
	2074	+ applySelf();
	2075	+ }
	2076	+ });
	2077	+ presetpanel.add(shini1);
	2078	+
	2079	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2080	+ shini2.setToolTipText("Shiny3");
	2081	+ shini2.addMouseListener(new MouseAdapter()
	2082	+ {
	2083	+ public void mouseClicked(MouseEvent e)
	2084	+ {
	2085	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2086	+ cMaterial material = object.material;
	2087	+
	2088	+ shininessField.setFloat(material.shininess);
	2089	+ lightareaField.setFloat(material.lightarea);
	2090	+
	2091	+ materialtouched = true;
	2092	+ applySelf();
	2093	+ }
	2094	+ });
	2095	+ presetpanel.add(shini2);
	2096	+
	2097	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2098	+ aniso.setToolTipText("AnisoU");
	2099	+ aniso.addMouseListener(new MouseAdapter()
	2100	+ {
	2101	+ public void mouseClicked(MouseEvent e)
	2102	+ {
	2103	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2104	+ cMaterial material = object.material;
	2105	+
	2106	+ anisoField.setFloat(material.aniso);
	2107	+ anisoVField.setFloat(material.anisoV);
	2108	+
	2109	+ materialtouched = true;
	2110	+ applySelf();
	2111	+ }
	2112	+ });
	2113	+ presetpanel.add(aniso);
	2114	+
	2115	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2116	+ aniso2.setToolTipText("AnisoV");
	2117	+ aniso2.addMouseListener(new MouseAdapter()
	2118	+ {
	2119	+ public void mouseClicked(MouseEvent e)
	2120	+ {
	2121	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2122	+ cMaterial material = object.material;
	2123	+
	2124	+ anisoField.setFloat(material.aniso);
	2125	+ anisoVField.setFloat(material.anisoV);
	2126	+
	2127	+ materialtouched = true;
	2128	+ applySelf();
	2129	+ }
	2130	+ });
	2131	+ presetpanel.add(aniso2);
	2132	+
	2133	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2134	+ aniso3.setToolTipText("AnisoUV");
	2135	+ aniso3.addMouseListener(new MouseAdapter()
	2136	+ {
	2137	+ public void mouseClicked(MouseEvent e)
	2138	+ {
	2139	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2140	+ cMaterial material = object.material;
	2141	+
	2142	+ anisoField.setFloat(material.aniso);
	2143	+ anisoVField.setFloat(material.anisoV);
	2144	+
	2145	+ materialtouched = true;
	2146	+ applySelf();
	2147	+ }
	2148	+ });
	2149	+ presetpanel.add(aniso3);
	2150	+
	2151	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2152	+ velvet0.setToolTipText("Velvet");
	2153	+ velvet0.addMouseListener(new MouseAdapter()
	2154	+ {
	2155	+ public void mouseClicked(MouseEvent e)
	2156	+ {
	2157	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2158	+ cMaterial material = object.material;
	2159	+
	2160	+ diffusenessField.setFloat(material.factor);
	2161	+ selfshadowField.setFloat(material.diffuseness);
	2162	+ sheenField.setFloat(material.sheen);
	2163	+ shininessField.setFloat(material.shininess);
	2164	+ velvetField.setFloat(material.velvet);
	2165	+ shiftField.setFloat(material.shift);
	2166	+
	2167	+ materialtouched = true;
	2168	+ applySelf();
	2169	+ }
	2170	+ });
	2171	+ presetpanel.add(velvet0);
	2172	+
	2173	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2174	+ bump0.setToolTipText("Bump texture");
	2175	+ bump0.addMouseListener(new MouseAdapter()
	2176	+ {
	2177	+ public void mouseClicked(MouseEvent e)
	2178	+ {
	2179	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2180	+ cMaterial material = object.material;
	2181	+
	2182	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2183	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2184	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2185	+
	2186	+ materialtouched = true;
	2187	+ applySelf();
	2188	+ }
	2189	+ });
	2190	+ presetpanel.add(bump0);
	2191	+
	2192	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2193	+ borderShader.setToolTipText("Border fade");
	2194	+ borderShader.addMouseListener(new MouseAdapter()
	2195	+ {
	2196	+ public void mouseClicked(MouseEvent e)
	2197	+ {
	2198	+ borderfadeField.setFloat(0.5);
	2199	+ opacityField.setFloat(0.6);
	2200	+
	2201	+ materialtouched = true;
	2202	+ applySelf();
	2203	+ }
	2204	+ });
	2205	+ presetpanel.add(borderShader);
	2206	+
	2207	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2208	+ halo.setToolTipText("Halo");
	2209	+ halo.addMouseListener(new MouseAdapter()
	2210	+ {
	2211	+ public void mouseClicked(MouseEvent e)
	2212	+ {
	2213	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2214	+ cMaterial material = object.material;
	2215	+
	2216	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2217	+
	2218	+ materialtouched = true;
	2219	+ applySelf();
	2220	+ }
	2221	+ });
	2222	+ presetpanel.add(halo);
	2223	+
	2224	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2225	+ candle.setToolTipText("Candle");
	2226	+ candle.addMouseListener(new MouseAdapter()
	2227	+ {
	2228	+ public void mouseClicked(MouseEvent e)
	2229	+ {
	2230	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2231	+ cMaterial material = object.material;
	2232	+
	2233	+ subsurfaceField.setFloat(material.subsurface);
	2234	+ shadowbiasField.setFloat(material.shadowbias);
	2235	+ ambientField.setFloat(material.ambient);
	2236	+ specularField.setFloat(material.specular);
	2237	+ lightareaField.setFloat(material.lightarea);
	2238	+ shininessField.setFloat(material.shininess);
	2239	+
	2240	+ materialtouched = true;
	2241	+ applySelf();
	2242	+ }
	2243	+ });
	2244	+ presetpanel.add(candle);
	2245	+
	2246	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2247	+ shadowShader.setToolTipText("Shadow");
	2248	+ shadowShader.addMouseListener(new MouseAdapter()
	2249	+ {
	2250	+ public void mouseClicked(MouseEvent e)
	2251	+ {
	2252	+ diffuseField.setFloat(0.001);
	2253	+ ambientField.setFloat(0.001);
	2254	+ cameraField.setFloat(0.001);
	2255	+ specularField.setFloat(0.001);
	2256	+ fakedepthField.setFloat(0.001);
	2257	+ opacityField.setFloat(0.6);
	2258	+
	2259	+ materialtouched = true;
	2260	+ applySelf();
	2261	+ }
	2262	+ });
	2263	+ presetpanel.add(shadowShader);
	2264	+
	2265	+ cGridBag panel = new cGridBag().setVertical(true);
	2266	+
	2267	+ presetpanel.preferredWidth = 1;
	2268	+
	2269	+ materialpanel.add(presetpanel);
	2270	+ materialpanel.add(panel);
	2271	+
	2272	+ panel.preferredWidth = 8;
	2273	+
	2274	+ /*
1740	2275	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1741	2276	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1742		- */
	2277	+ */
1743	2278
1744	2279	cGridBag editBar = new cGridBag().setVertical(false);
1745	2280
..	..	@@ -1776,7 +2311,9 @@
1776	2311
1777	2312	cGridBag huepanel = new cGridBag();
1778	2313	cGridBag huelabel = new cGridBag();
1779		- huelabel.add(GetLabel("icons/hue.png", false));
	2314	+ skin = GetLabel("icons/hue.png", false);
	2315	+ skin.fit = true;
	2316	+ huelabel.add(skin);
1780	2317	huelabel.preferredWidth = 20;
1781	2318	huepanel.add(new cGridBag()); // Label
1782	2319	huepanel.add(huelabel); // Field/slider
..	..	@@ -1797,7 +2334,7 @@
1797	2334	cGridBag modulation = new cGridBag();
1798	2335	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1799	2336	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1800		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2337	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1801	2338	colorSection.add(modulation);
1802	2339
1803	2340	cGridBag opacity = new cGridBag();
..	..	@@ -2990,7 +3527,7 @@
2990	3527
2991	3528	freezematerial = true;
2992	3529	colorField.setFloat(mat.color);
2993		- modulationField.setFloat(mat.modulation);
	3530	+ saturationField.setFloat(mat.modulation);
2994	3531	metalnessField.setFloat(mat.metalness);
2995	3532	diffuseField.setFloat(mat.diffuse);
2996	3533	specularField.setFloat(mat.specular);
..	..	@@ -3052,32 +3589,8 @@
3052	3589
3053	3590	if (multiplyToggle != null)
3054	3591	multiplyToggle.setSelected(mat.multiply);
3055		-
3056		- assert (object.projectedVertices != null);
3057		-
3058		- if (object.projectedVertices.length <= 2)
3059		- {
3060		- // Side effect...
3061		- Object3D.cVector2[] keep = object.projectedVertices;
3062		- object.projectedVertices = new Object3D.cVector2[3];
3063		- for (int i = 0; i < 3; i++)
3064		- {
3065		- if (i < keep.length)
3066		- {
3067		- object.projectedVertices[i] = keep[i];
3068		- } else
3069		- {
3070		- object.projectedVertices[i] = new Object3D.cVector2();
3071		- }
3072		- /*
3073		- if(keep.length == 0)
3074		- object.projectedVertices[0] = new Object3D.cVector2();
3075		- else
3076		- object.projectedVertices[0] = keep[0];
3077		- object.projectedVertices[1] = new Object3D.cVector2();
3078		- */
3079		- }
3080		- }
	3592	+
	3593	+ AllocProjectedVertices(object);
3081	3594
3082	3595	SetMaterial(mat, object.projectedVertices);
3083	3596	}
..	..	@@ -3197,6 +3710,17 @@
3197	3710	public void itemStateChanged(ItemEvent event)
3198	3711	{
3199	3712	// System.out.println("Propagate = " + propagate);
	3713	+ if (event.getSource() == pinButton)
	3714	+ {
	3715	+ copy.pinned ^= true;
	3716	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3717	+ {
	3718	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3719	+ copy.CloseUI();
	3720	+ //copy.editWindow.refreshContents();
	3721	+ }
	3722	+ }
	3723	+ else
3200	3724	if (event.getSource() == propagateToggle)
3201	3725	{
3202	3726	propagate ^= true;
..	..	@@ -3301,6 +3825,7 @@
3301	3825	} else if (event.getSource() == liveCB)
3302	3826	{
3303	3827	copy.live ^= true;
	3828	+ objEditor.refreshContents(true); // To show item colors
3304	3829	return;
3305	3830	} else if (event.getSource() == selectableCB)
3306	3831	{
..	..	@@ -3310,7 +3835,7 @@
3310	3835	{
3311	3836	copy.hide ^= true;
3312	3837	copy.Touch(); // display list issue
3313		- objEditor.refreshContents();
	3838	+ objEditor.refreshContents(true); // To show item colors
3314	3839	return;
3315	3840	} else if (event.getSource() == link2masterCB)
3316	3841	{
..	..	@@ -3668,6 +4193,7 @@
3668	4193	{
3669	4194	//Save(true);
3670	4195	Replace();
	4196	+ SetVersionStates();
3671	4197	}
3672	4198
3673	4199	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3688,13 +4214,26 @@
3688	4214
3689	4215	java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3690	4216
	4217	+ void DeleteVersion()
	4218	+ {
	4219	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4220	+ {
	4221	+ copy.versionlist[i] = copy.versionlist[i+1];
	4222	+ }
	4223	+
	4224	+ CopyChanged();
	4225	+
	4226	+ SetVersionStates();
	4227	+ }
	4228	+
3691	4229	public boolean Save(boolean user)
3692	4230	{
3693	4231	System.err.println("Save");
	4232	+ Replace();
3694	4233
3695		- cRadio tab = GetCurrentTab();
	4234	+ //cRadio tab = GetCurrentTab();
3696	4235
3697		- Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
	4236	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3698	4237
3699	4238	boolean thesame = false;
3700	4239
..	..	@@ -3706,10 +4245,15 @@
3706	4245	//EditorFrame.m_MainFrame.requestFocusInWindow();
3707	4246	if (!thesame)
3708	4247	{
	4248	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4249	+ {
	4250	+ copy.versionlist[i] = copy.versionlist[i-1];
	4251	+ }
	4252	+
3709	4253	//tab.user[tab.versionindex] = user;
3710	4254	//boolean increment = true; // tab.graphs[tab.versionindex] == null;
3711	4255
3712		- copy.versions[++copy.versionindex] = compress;
	4256	+ copy.versionlist[++copy.versionindex] = compress;
3713	4257
3714	4258	// if (increment)
3715	4259	// tab.versionindex++;
..	..	@@ -3719,13 +4263,13 @@
3719	4263
3720	4264	//assert(hashtable.isEmpty());
3721	4265
3722		- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3723		- {
3724		- //tab.user[i] = false;
3725		- copy.versions[i] = null;
3726		- }
	4266	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4267	+// {
	4268	+// //tab.user[i] = false;
	4269	+// copy.versionlist[i] = null;
	4270	+// }
3727	4271
3728		- SetUndoStates();
	4272	+ SetVersionStates();
3729	4273
3730	4274	// test save
3731	4275	if (false)
..	..	@@ -3748,10 +4292,44 @@
3748	4292
3749	4293	return !thesame;
3750	4294	}
3751		-
3752		- void CopyChanged(Object3D obj)
	4295	+
	4296	+ boolean flashIt = true;
	4297	+
	4298	+ void RefreshSelection()
3753	4299	{
3754		- SetUndoStates();
	4300	+ Object3D selection = new Object3D();
	4301	+
	4302	+ for (int i = 0; i < copy.selection.size(); i++)
	4303	+ {
	4304	+ Object3D elem = copy.selection.elementAt(i);
	4305	+
	4306	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4307	+
	4308	+ if (obj == null)
	4309	+ {
	4310	+ copy.selection.remove(i--);
	4311	+ }
	4312	+ else
	4313	+ {
	4314	+ selection.add(obj);
	4315	+ copy.selection.setElementAt(obj, i);
	4316	+ }
	4317	+ }
	4318	+
	4319	+ flashIt = false;
	4320	+ GetTree().clearSelection();
	4321	+ for (int i = 0; i < selection.size(); i++)
	4322	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4323	+ flashIt = true;
	4324	+
	4325	+ //refreshContents(false);
	4326	+ }
	4327	+
	4328	+ void CopyChanged()
	4329	+ {
	4330	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4331	+
	4332	+ SetVersionStates();
3755	4333
3756	4334	boolean temp = CameraPane.SWITCH;
3757	4335	CameraPane.SWITCH = false;
..	..	@@ -3772,6 +4350,7 @@
3772	4350
3773	4351	CameraPane.SWITCH = temp;
3774	4352
	4353	+ RefreshSelection();
3775	4354	//assert(hashtable.isEmpty());
3776	4355
3777	4356	copy.Touch();
..	..	@@ -3792,13 +4371,15 @@
3792	4371	}
3793	4372	}
3794	4373
3795		- refreshContents();
	4374	+ refreshContents(true);
3796	4375	}
3797	4376
3798		- cButton undoButton;
	4377	+ cButton previousVersionButton;
3799	4378	cButton restoreButton;
3800	4379	cButton replaceButton;
3801		- cButton redoButton;
	4380	+ cButton nextVersionButton;
	4381	+ cButton saveVersionButton;
	4382	+ cButton deleteVersionButton;
3802	4383
3803	4384	boolean muteSlider;
3804	4385
..	..	@@ -3806,39 +4387,47 @@
3806	4387	{
3807	4388	int count = 0;
3808	4389
3809		- for (int i = copy.versions.length; --i >= 0;)
	4390	+ for (int i = copy.versionlist.length; --i >= 0;)
3810	4391	{
3811		- if (copy.versions[i] != null)
	4392	+ if (copy.versionlist[i] != null)
3812	4393	count++;
3813	4394	}
3814	4395
3815	4396	return count;
3816	4397	}
3817	4398
3818		- void SetUndoStates()
	4399	+ void SetVersionStates()
3819	4400	{
3820		- cRadio tab = GetCurrentTab();
	4401	+ //if (true)
	4402	+ // return;
	4403	+
	4404	+ //cRadio tab = GetCurrentTab();
3821	4405
3822	4406	restoreButton.setEnabled(copy.versionindex != -1);
3823	4407	replaceButton.setEnabled(copy.versionindex != -1);
3824	4408
3825		- undoButton.setEnabled(copy.versionindex > 0);
3826		- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	4409	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4410	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4411	+
	4412	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4413	+ copy.versionlist[copy.versionindex + 1] != null);
3827	4414
3828	4415	muteSlider = true;
	4416	+ versionSlider.setMinimum(0);
3829	4417	versionSlider.setMaximum(VersionCount() - 1);
3830	4418	versionSlider.setInteger(copy.versionindex);
	4419	+ versionSlider.setEnabled(copy.versionindex != -1);
3831	4420	muteSlider = false;
3832	4421	}
3833	4422
3834		- public boolean Undo()
	4423	+ public boolean PreviousVersion()
3835	4424	{
3836	4425	// Option?
3837	4426	Replace();
3838	4427
3839	4428	System.err.println("Undo");
3840	4429
3841		- cRadio tab = GetCurrentTab();
	4430	+ //cRadio tab = GetCurrentTab();
3842	4431
3843	4432	if (copy.versionindex == 0)
3844	4433	{
..	..	@@ -3861,7 +4450,7 @@
3861	4450
3862	4451	copy.versionindex -= 1;
3863	4452
3864		- CopyChanged((Object3D)copy.versions[copy.versionindex]);
	4453	+ CopyChanged();
3865	4454
3866	4455	return true;
3867	4456	}
..	..	@@ -3870,16 +4459,16 @@
3870	4459	{
3871	4460	System.err.println("Restore");
3872	4461
3873		- cRadio tab = GetCurrentTab();
	4462	+ //cRadio tab = GetCurrentTab();
3874	4463
3875		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4464	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3876	4465	{
3877	4466	java.awt.Toolkit.getDefaultToolkit().beep();
3878	4467	return false;
3879	4468	}
3880	4469
3881	4470	//CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3882		- CopyChanged(copy.versions[copy.versionindex]);
	4471	+ CopyChanged();
3883	4472
3884	4473	return true;
3885	4474	}
..	..	@@ -3888,27 +4477,27 @@
3888	4477	{
3889	4478	System.err.println("Replace");
3890	4479
3891		- cRadio tab = GetCurrentTab();
	4480	+ //cRadio tab = GetCurrentTab();
3892	4481
3893		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4482	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3894	4483	{
3895	4484	// No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3896	4485	return false;
3897	4486	}
3898	4487
3899		- copy.versions[copy.versionindex] = CompressCopy();
	4488	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
3900	4489
3901	4490	return true;
3902	4491	}
3903	4492
3904		- public void Redo()
	4493	+ public void NextVersion()
3905	4494	{
3906	4495	// Option?
3907	4496	Replace();
3908	4497
3909		- cRadio tab = GetCurrentTab();
	4498	+ //cRadio tab = GetCurrentTab();
3910	4499
3911		- if (copy.versions[copy.versionindex + 1] == null)
	4500	+ if (copy.versionlist[copy.versionindex + 1] == null)
3912	4501	{
3913	4502	java.awt.Toolkit.getDefaultToolkit().beep();
3914	4503	return;
..	..	@@ -3916,7 +4505,7 @@
3916	4505
3917	4506	copy.versionindex += 1;
3918	4507
3919		- CopyChanged(copy.versions[copy.versionindex]);
	4508	+ CopyChanged();
3920	4509
3921	4510	//if (!tab.user[tab.versionindex])
3922	4511	// tab.graphs[tab.versionindex] = null;
..	..	@@ -4130,7 +4719,7 @@
4130	4719	//copy.material = new cMaterial(copy.GetMaterial());
4131	4720
4132	4721	current.color = (float) colorField.getFloat();
4133		- current.modulation = (float) modulationField.getFloat();
	4722	+ current.modulation = (float) saturationField.getFloat();
4134	4723	current.metalness = (float) metalnessField.getFloat();
4135	4724	current.diffuse = (float) diffuseField.getFloat();
4136	4725	current.specular = (float) specularField.getFloat();
..	..	@@ -4163,7 +4752,7 @@
4163	4752	cMaterial mat = copy.material;
4164	4753
4165	4754	colorField.SetToolTipValue((mat.color));
4166		- modulationField.SetToolTipValue((mat.modulation));
	4755	+ saturationField.SetToolTipValue((mat.modulation));
4167	4756	metalnessField.SetToolTipValue((mat.metalness));
4168	4757	diffuseField.SetToolTipValue((mat.diffuse));
4169	4758	specularField.SetToolTipValue((mat.specular));
..	..	@@ -4225,11 +4814,14 @@
4225	4814	if (muteSlider)
4226	4815	return;
4227	4816
	4817	+ Replace();
	4818	+
4228	4819	int version = versionSlider.getInteger();
4229	4820
4230		- if (copy.versions[version] != null)
	4821	+ if (version != -1 && copy.versionlist[version] != null)
4231	4822	{
4232		- CopyChanged(copy.versions[copy.versionindex = version]);
	4823	+ copy.versionindex = version;
	4824	+ CopyChanged();
4233	4825	}
4234	4826
4235	4827	return;
..	..	@@ -4269,6 +4861,12 @@
4269	4861	{
4270	4862	//System.out.println("stateChanged = " + this);
4271	4863	materialtouched = true;
	4864	+
	4865	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4866	+ {
	4867	+ saturationField.setFloat(1);
	4868	+ }
	4869	+
4272	4870	applySelf();
4273	4871	//System.out.println("this = " + this);
4274	4872	//System.out.println("PARENT = " + parent);
..	..	@@ -4568,6 +5166,7 @@
4568	5166	{
4569	5167	if (GetTree() != null)
4570	5168	{
	5169	+ GetTree().revalidate();
4571	5170	GetTree().repaint();
4572	5171	}
4573	5172
..	..	@@ -4576,6 +5175,9 @@
4576	5175	ctrlPanel.validate(); // ? new
4577	5176	ctrlPanel.repaint();
4578	5177	}
	5178	+
	5179	+ if (previousVersionButton != null && copy.versionlist != null)
	5180	+ SetVersionStates();
4579	5181	}
4580	5182
4581	5183	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4959,13 +5561,16 @@
4959	5561	c.addChild(csg);
4960	5562	}
4961	5563
4962		- copy.versions = readobj.versions;
	5564	+ copy.versionlist = readobj.versionlist;
4963	5565	copy.versionindex = readobj.versionindex;
4964	5566
4965		- if (copy.versions == null)
	5567	+ if (copy.versionlist == null)
4966	5568	{
4967		- copy.versions = new Object3D[100];
	5569	+ // Backward compatibility
	5570	+ copy.versionlist = new Object3D[100];
4968	5571	copy.versionindex = -1;
	5572	+
	5573	+ //Save(true);
4969	5574	}
4970	5575
4971	5576	//? SetUndoStates();
..	..	@@ -4980,7 +5585,7 @@
4980	5585	{
4981	5586	if (Grafreed.standAlone)
4982	5587	{
4983		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5588	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4984	5589	browser.show();
4985	5590	String filename = browser.getFile();
4986	5591	if (filename != null && filename.length() > 0)
..	..	@@ -5057,6 +5662,8 @@
5057	5662
5058	5663	void save()
5059	5664	{
	5665	+ Replace();
	5666	+
5060	5667	if (lastname == null)
5061	5668	{
5062	5669	return;
..	..	@@ -5299,6 +5906,7 @@
5299	5906	ButtonGroup buttonGroup;
5300	5907
5301	5908	cGridBag toolboxPanel;
	5909	+ cGridBag skyboxPanel;
5302	5910	cGridBag materialPanel;
5303	5911	cGridBag ctrlPanel;
5304	5912
..	..	@@ -5372,7 +5980,7 @@
5372	5980	JLabel colorLabel;
5373	5981	cNumberSlider colorField;
5374	5982	JLabel modulationLabel;
5375		- cNumberSlider modulationField;
	5983	+ cNumberSlider saturationField;
5376	5984	JLabel metalnessLabel;
5377	5985	cNumberSlider metalnessField;
5378	5986	JLabel diffuseLabel;
..	..	@@ -5403,6 +6011,7 @@
5403	6011	cNumberSlider anisoField;
5404	6012	JLabel anisoVLabel;
5405	6013	cNumberSlider anisoVField;
	6014	+
5406	6015	JLabel cameraLabel;
5407	6016	cNumberSlider cameraField;
5408	6017	JLabel selfshadowLabel;
..	..	@@ -5417,6 +6026,7 @@
5417	6026	cNumberSlider fakedepthField;
5418	6027	JLabel shadowbiasLabel;
5419	6028	cNumberSlider shadowbiasField;
	6029	+
5420	6030	JLabel bumpLabel;
5421	6031	cNumberSlider bumpField;
5422	6032	JLabel noiseLabel;