~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 byte[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 byte[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,31 +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 byte[] 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		- byte[] versions[] = copy.versions;
862		- copy.versions = null;
	956	+ Object3D versions[] = object.versionlist;
	957	+ object.versionlist = null;
863	958
864		- byte[] compress = Compress(copy);
	959	+ //byte[] compress = Compress(copy);
	960	+ Object3D compress = (Object3D)Grafreed.clone(object);
865	961
866		- copy.versions = versions;
	962	+ object.versionlist = versions;
867	963
868		- copy.RestoreBigData(versiontable);
	964	+ object.RestoreBigData(versiontable);
869	965
870	966	CameraPane.SWITCH = temp;
871	967
..	..	@@ -993,6 +1089,7 @@
993	1089	{
994	1090	SetupMaterial(materialPanel);
995	1091	}
	1092	+
996	1093	//SetupName();
997	1094	//SetupViews();
998	1095	}
..	..	@@ -1201,6 +1298,18 @@
1201	1298
1202	1299	namePanel = new cGridBag();
1203	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	+
1204	1313	nameField = AddText(namePanel, copy.GetName());
1205	1314	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1206	1315	oe.ctrlPanel.add(namePanel);
..	..	@@ -1550,29 +1659,28 @@
1550	1659	//tmp.setName("Edit");
1551	1660	objectPanel.add(materialPanel);
1552	1661	objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1553		- objectPanel.setToolTipTextAt(0, "Material panel");
	1662	+ objectPanel.setToolTipTextAt(0, "Material");
1554	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	+
1555	1672	// JPanel north = new JPanel(new BorderLayout());
1556	1673	// north.setName("Edit");
1557	1674	// north.add(ctrlPanel, BorderLayout.NORTH);
1558	1675	// objectPanel.add(north);
1559	1676	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");
	1677	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1678	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1567	1679
1568	1680	objectPanel.add(XYZPanel);
1569		- objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1570		- objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
	1681	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1682	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1571	1683
1572		- objectPanel.add(toolboxPanel);
1573		- objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1574		- objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
1575		-
1576	1684	/*
1577	1685	aConstraints.gridx = 0;
1578	1686	aConstraints.gridwidth = 1;
..	..	@@ -1609,6 +1717,11 @@
1609	1717
1610	1718	scenePanel.add(tabbedPane);
1611	1719
	1720	+ //if (Globals.ADVANCED)
	1721	+// tabbedPane.add(infoPanel);
	1722	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1723	+// tabbedPane.setToolTipTextAt(3, "Information");
	1724	+
1612	1725	/*
1613	1726	cTree jTree = new cTree(null);
1614	1727	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1679,6 +1792,23 @@
1679	1792	// aConstraints.gridheight = 1;
1680	1793
1681	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	+
1682	1812	framePanel.setContinuousLayout(false);
1683	1813	framePanel.setOneTouchExpandable(false);
1684	1814	//.setDividerLocation(0.8);
..	..	@@ -1688,7 +1818,7 @@
1688	1818
1689	1819	frame.getContentPane().setLayout(new BorderLayout());
1690	1820	/**/
1691		- JTabbedPane worldPane = new JTabbedPane();
	1821	+ //JTabbedPane worldPane = new JTabbedPane();
1692	1822	//worldPane.add(bigPanel);
1693	1823	//worldPane.add(worldPanel);
1694	1824	/**/
..	..	@@ -1733,12 +1863,418 @@
1733	1863	ctrlPanel.removeAll();
1734	1864	}
1735	1865
1736		- void SetupMaterial(cGridBag panel)
	1866	+ void SetupMaterial(cGridBag materialpanel)
1737	1867	{
1738		- /*
	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	+ /*
1739	2275	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1740	2276	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1741		- */
	2277	+ */
1742	2278
1743	2279	cGridBag editBar = new cGridBag().setVertical(false);
1744	2280
..	..	@@ -1775,7 +2311,9 @@
1775	2311
1776	2312	cGridBag huepanel = new cGridBag();
1777	2313	cGridBag huelabel = new cGridBag();
1778		- huelabel.add(GetLabel("icons/hue.png", false));
	2314	+ skin = GetLabel("icons/hue.png", false);
	2315	+ skin.fit = true;
	2316	+ huelabel.add(skin);
1779	2317	huelabel.preferredWidth = 20;
1780	2318	huepanel.add(new cGridBag()); // Label
1781	2319	huepanel.add(huelabel); // Field/slider
..	..	@@ -1796,7 +2334,7 @@
1796	2334	cGridBag modulation = new cGridBag();
1797	2335	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1798	2336	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1799		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2337	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1800	2338	colorSection.add(modulation);
1801	2339
1802	2340	cGridBag opacity = new cGridBag();
..	..	@@ -2989,7 +3527,7 @@
2989	3527
2990	3528	freezematerial = true;
2991	3529	colorField.setFloat(mat.color);
2992		- modulationField.setFloat(mat.modulation);
	3530	+ saturationField.setFloat(mat.modulation);
2993	3531	metalnessField.setFloat(mat.metalness);
2994	3532	diffuseField.setFloat(mat.diffuse);
2995	3533	specularField.setFloat(mat.specular);
..	..	@@ -3051,32 +3589,8 @@
3051	3589
3052	3590	if (multiplyToggle != null)
3053	3591	multiplyToggle.setSelected(mat.multiply);
3054		-
3055		- assert (object.projectedVertices != null);
3056		-
3057		- if (object.projectedVertices.length <= 2)
3058		- {
3059		- // Side effect...
3060		- Object3D.cVector2[] keep = object.projectedVertices;
3061		- object.projectedVertices = new Object3D.cVector2[3];
3062		- for (int i = 0; i < 3; i++)
3063		- {
3064		- if (i < keep.length)
3065		- {
3066		- object.projectedVertices[i] = keep[i];
3067		- } else
3068		- {
3069		- object.projectedVertices[i] = new Object3D.cVector2();
3070		- }
3071		- /*
3072		- if(keep.length == 0)
3073		- object.projectedVertices[0] = new Object3D.cVector2();
3074		- else
3075		- object.projectedVertices[0] = keep[0];
3076		- object.projectedVertices[1] = new Object3D.cVector2();
3077		- */
3078		- }
3079		- }
	3592	+
	3593	+ AllocProjectedVertices(object);
3080	3594
3081	3595	SetMaterial(mat, object.projectedVertices);
3082	3596	}
..	..	@@ -3196,6 +3710,17 @@
3196	3710	public void itemStateChanged(ItemEvent event)
3197	3711	{
3198	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
3199	3724	if (event.getSource() == propagateToggle)
3200	3725	{
3201	3726	propagate ^= true;
..	..	@@ -3300,6 +3825,7 @@
3300	3825	} else if (event.getSource() == liveCB)
3301	3826	{
3302	3827	copy.live ^= true;
	3828	+ objEditor.refreshContents(true); // To show item colors
3303	3829	return;
3304	3830	} else if (event.getSource() == selectableCB)
3305	3831	{
..	..	@@ -3309,7 +3835,7 @@
3309	3835	{
3310	3836	copy.hide ^= true;
3311	3837	copy.Touch(); // display list issue
3312		- objEditor.refreshContents();
	3838	+ objEditor.refreshContents(true); // To show item colors
3313	3839	return;
3314	3840	} else if (event.getSource() == link2masterCB)
3315	3841	{
..	..	@@ -3565,6 +4091,7 @@
3565	4091
3566	4092	static public byte[] Compress(Object3D o)
3567	4093	{
	4094	+ // Slower to actually compress.
3568	4095	try
3569	4096	{
3570	4097	ByteArrayOutputStream baos = new ByteArrayOutputStream();
..	..	@@ -3666,6 +4193,7 @@
3666	4193	{
3667	4194	//Save(true);
3668	4195	Replace();
	4196	+ SetVersionStates();
3669	4197	}
3670	4198
3671	4199	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3686,29 +4214,46 @@
3686	4214
3687	4215	java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3688	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	+
3689	4229	public boolean Save(boolean user)
3690	4230	{
3691	4231	System.err.println("Save");
	4232	+ Replace();
3692	4233
3693		- cRadio tab = GetCurrentTab();
	4234	+ //cRadio tab = GetCurrentTab();
3694	4235
3695		- byte[] compress = CompressCopy(); // Saved version. No need for "Replace".
	4236	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3696	4237
3697	4238	boolean thesame = false;
3698	4239
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		- }
	4240	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4241	+// {
	4242	+// thesame = true;
	4243	+// }
3704	4244
3705	4245	//EditorFrame.m_MainFrame.requestFocusInWindow();
3706	4246	if (!thesame)
3707	4247	{
	4248	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4249	+ {
	4250	+ copy.versionlist[i] = copy.versionlist[i-1];
	4251	+ }
	4252	+
3708	4253	//tab.user[tab.versionindex] = user;
3709	4254	//boolean increment = true; // tab.graphs[tab.versionindex] == null;
3710	4255
3711		- copy.versions[++copy.versionindex] = compress;
	4256	+ copy.versionlist[++copy.versionindex] = compress;
3712	4257
3713	4258	// if (increment)
3714	4259	// tab.versionindex++;
..	..	@@ -3718,13 +4263,13 @@
3718	4263
3719	4264	//assert(hashtable.isEmpty());
3720	4265
3721		- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3722		- {
3723		- //tab.user[i] = false;
3724		- copy.versions[i] = null;
3725		- }
	4266	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4267	+// {
	4268	+// //tab.user[i] = false;
	4269	+// copy.versionlist[i] = null;
	4270	+// }
3726	4271
3727		- SetUndoStates();
	4272	+ SetVersionStates();
3728	4273
3729	4274	// test save
3730	4275	if (false)
..	..	@@ -3747,10 +4292,44 @@
3747	4292
3748	4293	return !thesame;
3749	4294	}
3750		-
3751		- void CopyChanged(Object3D obj)
	4295	+
	4296	+ boolean flashIt = true;
	4297	+
	4298	+ void RefreshSelection()
3752	4299	{
3753		- 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();
3754	4333
3755	4334	boolean temp = CameraPane.SWITCH;
3756	4335	CameraPane.SWITCH = false;
..	..	@@ -3771,6 +4350,7 @@
3771	4350
3772	4351	CameraPane.SWITCH = temp;
3773	4352
	4353	+ RefreshSelection();
3774	4354	//assert(hashtable.isEmpty());
3775	4355
3776	4356	copy.Touch();
..	..	@@ -3791,13 +4371,15 @@
3791	4371	}
3792	4372	}
3793	4373
3794		- refreshContents();
	4374	+ refreshContents(true);
3795	4375	}
3796	4376
3797		- cButton undoButton;
	4377	+ cButton previousVersionButton;
3798	4378	cButton restoreButton;
3799	4379	cButton replaceButton;
3800		- cButton redoButton;
	4380	+ cButton nextVersionButton;
	4381	+ cButton saveVersionButton;
	4382	+ cButton deleteVersionButton;
3801	4383
3802	4384	boolean muteSlider;
3803	4385
..	..	@@ -3805,39 +4387,47 @@
3805	4387	{
3806	4388	int count = 0;
3807	4389
3808		- for (int i = copy.versions.length; --i >= 0;)
	4390	+ for (int i = copy.versionlist.length; --i >= 0;)
3809	4391	{
3810		- if (copy.versions[i] != null)
	4392	+ if (copy.versionlist[i] != null)
3811	4393	count++;
3812	4394	}
3813	4395
3814	4396	return count;
3815	4397	}
3816	4398
3817		- void SetUndoStates()
	4399	+ void SetVersionStates()
3818	4400	{
3819		- cRadio tab = GetCurrentTab();
	4401	+ //if (true)
	4402	+ // return;
	4403	+
	4404	+ //cRadio tab = GetCurrentTab();
3820	4405
3821	4406	restoreButton.setEnabled(copy.versionindex != -1);
3822	4407	replaceButton.setEnabled(copy.versionindex != -1);
3823	4408
3824		- undoButton.setEnabled(copy.versionindex > 0);
3825		- 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);
3826	4414
3827	4415	muteSlider = true;
	4416	+ versionSlider.setMinimum(0);
3828	4417	versionSlider.setMaximum(VersionCount() - 1);
3829	4418	versionSlider.setInteger(copy.versionindex);
	4419	+ versionSlider.setEnabled(copy.versionindex != -1);
3830	4420	muteSlider = false;
3831	4421	}
3832	4422
3833		- public boolean Undo()
	4423	+ public boolean PreviousVersion()
3834	4424	{
3835	4425	// Option?
3836	4426	Replace();
3837	4427
3838	4428	System.err.println("Undo");
3839	4429
3840		- cRadio tab = GetCurrentTab();
	4430	+ //cRadio tab = GetCurrentTab();
3841	4431
3842	4432	if (copy.versionindex == 0)
3843	4433	{
..	..	@@ -3860,7 +4450,7 @@
3860	4450
3861	4451	copy.versionindex -= 1;
3862	4452
3863		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4453	+ CopyChanged();
3864	4454
3865	4455	return true;
3866	4456	}
..	..	@@ -3869,15 +4459,16 @@
3869	4459	{
3870	4460	System.err.println("Restore");
3871	4461
3872		- cRadio tab = GetCurrentTab();
	4462	+ //cRadio tab = GetCurrentTab();
3873	4463
3874		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4464	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3875	4465	{
3876	4466	java.awt.Toolkit.getDefaultToolkit().beep();
3877	4467	return false;
3878	4468	}
3879	4469
3880		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4470	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4471	+ CopyChanged();
3881	4472
3882	4473	return true;
3883	4474	}
..	..	@@ -3886,27 +4477,27 @@
3886	4477	{
3887	4478	System.err.println("Replace");
3888	4479
3889		- cRadio tab = GetCurrentTab();
	4480	+ //cRadio tab = GetCurrentTab();
3890	4481
3891		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4482	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3892	4483	{
3893	4484	// No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3894	4485	return false;
3895	4486	}
3896	4487
3897		- copy.versions[copy.versionindex] = CompressCopy();
	4488	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
3898	4489
3899	4490	return true;
3900	4491	}
3901	4492
3902		- public void Redo()
	4493	+ public void NextVersion()
3903	4494	{
3904	4495	// Option?
3905	4496	Replace();
3906	4497
3907		- cRadio tab = GetCurrentTab();
	4498	+ //cRadio tab = GetCurrentTab();
3908	4499
3909		- if (copy.versions[copy.versionindex + 1] == null)
	4500	+ if (copy.versionlist[copy.versionindex + 1] == null)
3910	4501	{
3911	4502	java.awt.Toolkit.getDefaultToolkit().beep();
3912	4503	return;
..	..	@@ -3914,7 +4505,7 @@
3914	4505
3915	4506	copy.versionindex += 1;
3916	4507
3917		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4508	+ CopyChanged();
3918	4509
3919	4510	//if (!tab.user[tab.versionindex])
3920	4511	// tab.graphs[tab.versionindex] = null;
..	..	@@ -4128,7 +4719,7 @@
4128	4719	//copy.material = new cMaterial(copy.GetMaterial());
4129	4720
4130	4721	current.color = (float) colorField.getFloat();
4131		- current.modulation = (float) modulationField.getFloat();
	4722	+ current.modulation = (float) saturationField.getFloat();
4132	4723	current.metalness = (float) metalnessField.getFloat();
4133	4724	current.diffuse = (float) diffuseField.getFloat();
4134	4725	current.specular = (float) specularField.getFloat();
..	..	@@ -4161,7 +4752,7 @@
4161	4752	cMaterial mat = copy.material;
4162	4753
4163	4754	colorField.SetToolTipValue((mat.color));
4164		- modulationField.SetToolTipValue((mat.modulation));
	4755	+ saturationField.SetToolTipValue((mat.modulation));
4165	4756	metalnessField.SetToolTipValue((mat.metalness));
4166	4757	diffuseField.SetToolTipValue((mat.diffuse));
4167	4758	specularField.SetToolTipValue((mat.specular));
..	..	@@ -4223,11 +4814,14 @@
4223	4814	if (muteSlider)
4224	4815	return;
4225	4816
	4817	+ Replace();
	4818	+
4226	4819	int version = versionSlider.getInteger();
4227	4820
4228		- if (copy.versions[version] != null)
	4821	+ if (version != -1 && copy.versionlist[version] != null)
4229	4822	{
4230		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4823	+ copy.versionindex = version;
	4824	+ CopyChanged();
4231	4825	}
4232	4826
4233	4827	return;
..	..	@@ -4267,6 +4861,12 @@
4267	4861	{
4268	4862	//System.out.println("stateChanged = " + this);
4269	4863	materialtouched = true;
	4864	+
	4865	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4866	+ {
	4867	+ saturationField.setFloat(1);
	4868	+ }
	4869	+
4270	4870	applySelf();
4271	4871	//System.out.println("this = " + this);
4272	4872	//System.out.println("PARENT = " + parent);
..	..	@@ -4566,6 +5166,7 @@
4566	5166	{
4567	5167	if (GetTree() != null)
4568	5168	{
	5169	+ GetTree().revalidate();
4569	5170	GetTree().repaint();
4570	5171	}
4571	5172
..	..	@@ -4574,6 +5175,9 @@
4574	5175	ctrlPanel.validate(); // ? new
4575	5176	ctrlPanel.repaint();
4576	5177	}
	5178	+
	5179	+ if (previousVersionButton != null && copy.versionlist != null)
	5180	+ SetVersionStates();
4577	5181	}
4578	5182
4579	5183	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4957,13 +5561,16 @@
4957	5561	c.addChild(csg);
4958	5562	}
4959	5563
4960		- copy.versions = readobj.versions;
	5564	+ copy.versionlist = readobj.versionlist;
4961	5565	copy.versionindex = readobj.versionindex;
4962	5566
4963		- if (copy.versions == null)
	5567	+ if (copy.versionlist == null)
4964	5568	{
4965		- copy.versions = new byte[100][];
	5569	+ // Backward compatibility
	5570	+ copy.versionlist = new Object3D[100];
4966	5571	copy.versionindex = -1;
	5572	+
	5573	+ //Save(true);
4967	5574	}
4968	5575
4969	5576	//? SetUndoStates();
..	..	@@ -4978,7 +5585,7 @@
4978	5585	{
4979	5586	if (Grafreed.standAlone)
4980	5587	{
4981		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5588	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4982	5589	browser.show();
4983	5590	String filename = browser.getFile();
4984	5591	if (filename != null && filename.length() > 0)
..	..	@@ -5055,6 +5662,8 @@
5055	5662
5056	5663	void save()
5057	5664	{
	5665	+ Replace();
	5666	+
5058	5667	if (lastname == null)
5059	5668	{
5060	5669	return;
..	..	@@ -5297,6 +5906,7 @@
5297	5906	ButtonGroup buttonGroup;
5298	5907
5299	5908	cGridBag toolboxPanel;
	5909	+ cGridBag skyboxPanel;
5300	5910	cGridBag materialPanel;
5301	5911	cGridBag ctrlPanel;
5302	5912
..	..	@@ -5370,7 +5980,7 @@
5370	5980	JLabel colorLabel;
5371	5981	cNumberSlider colorField;
5372	5982	JLabel modulationLabel;
5373		- cNumberSlider modulationField;
	5983	+ cNumberSlider saturationField;
5374	5984	JLabel metalnessLabel;
5375	5985	cNumberSlider metalnessField;
5376	5986	JLabel diffuseLabel;
..	..	@@ -5401,6 +6011,7 @@
5401	6011	cNumberSlider anisoField;
5402	6012	JLabel anisoVLabel;
5403	6013	cNumberSlider anisoVField;
	6014	+
5404	6015	JLabel cameraLabel;
5405	6016	cNumberSlider cameraField;
5406	6017	JLabel selfshadowLabel;
..	..	@@ -5415,6 +6026,7 @@
5415	6026	cNumberSlider fakedepthField;
5416	6027	JLabel shadowbiasLabel;
5417	6028	cNumberSlider shadowbiasField;
	6029	+
5418	6030	JLabel bumpLabel;
5419	6031	cNumberSlider bumpField;
5420	6032	JLabel noiseLabel;