~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());
..	..	@@ -342,7 +388,8 @@
342	388	//parent = p;
343	389
344	390	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
345		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	391	+ if (Globals.DEBUG)
	392	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
346	393	//gd.setFullScreenWindow(this);
347	394	//setResizable(false);
348	395	//if (!isDisplayable())
..	..	@@ -353,11 +400,13 @@
353	400	copy = localCopy;
354	401	copy.editWindow = this;
355	402
356		- if (copy.versions == null)
357		- {
358		-// copy.versions = new byte[100][];
	403	+// if (copy.versionlist == null)
	404	+// {
	405	+// copy.versionlist = new Object3D[100];
359	406	// copy.versionindex = -1;
360		- }
	407	+//
	408	+// Save(true);
	409	+// }
361	410
362	411	SetupMenu();
363	412
..	..	@@ -426,6 +475,8 @@
426	475
427	476	ChangeListener changeListener = new ChangeListener()
428	477	{
	478	+ //String name;
	479	+
429	480	public void stateChanged(ChangeEvent changeEvent)
430	481	{
431	482	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -444,7 +495,37 @@
444	495	// EditSelection(false);
445	496	// }
446	497
447		- refreshContents(false); // To refresh Info tab
	498	+// if (objectPanel.getSelectedIndex() == 4)
	499	+// {
	500	+// name = copy.skyboxname;
	501	+//
	502	+// if (name == null)
	503	+// {
	504	+// name = "";
	505	+// }
	506	+//
	507	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	508	+// copy.skyboxext = "jpg";
	509	+// }
	510	+// else
	511	+// {
	512	+// if (name != null)
	513	+// {
	514	+// if (name.equals(""))
	515	+// {
	516	+// copy.skyboxname = null;
	517	+// copy.skyboxext = null;
	518	+// }
	519	+// else
	520	+// {
	521	+// copy.skyboxname = name;
	522	+// }
	523	+// }
	524	+// }
	525	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	526	+
	527	+// refreshContents(false); // To refresh Info tab
	528	+ cameraView.repaint();
448	529	}
449	530	};
450	531	objectPanel.addChangeListener(changeListener);
..	..	@@ -467,7 +548,9 @@
467	548	toolboxPanel = new cGridBag().setVertical(true);
468	549	//toolboxPanel.setName("Toolbox");
469	550
470		- materialPanel = new cGridBag().setVertical(true);
	551	+ skyboxPanel = new cGridBag().setVertical(true);
	552	+
	553	+ materialPanel = new cGridBag().setVertical(false);
471	554	//materialPanel.setName("Material");
472	555
473	556	/JTextPane/
..	..	@@ -751,6 +834,7 @@
751	834	boolean maximized;
752	835
753	836	cButton fullscreenLayout;
	837	+ cButton expandedLayout;
754	838
755	839	void Minimize()
756	840	{
..	..	@@ -790,10 +874,12 @@
790	874	cButton minButton;
791	875	cButton maxButton;
792	876	cButton fullButton;
	877	+ cButton collapseButton;
	878	+ cButton maximize3DButton;
793	879
794	880	void ToggleFullScreen()
795	881	{
796		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	882	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797	883
798	884	cameraView.ToggleFullScreen();
799	885
..	..	@@ -814,13 +900,13 @@
814	900	// X frame.getContentPane().remove(/"Center",/bigThree);
815	901	// X framePanel.add(bigThree);
816	902	// X frame.getContentPane().add(/"Center",/framePanel);
817		- framePanel.setDividerLocation(46);
	903	+// framePanel.setDividerLocation(46); // icons are 24x24
818	904
819	905	//frame.setVisible(true);
820		- radio.layout = keepButton;
	906	+// radio.layout = keepButton;
821	907	//theFrame = null;
822	908	keepButton = null;
823		- radio.layout.doClick();
	909	+// radio.layout.doClick();
824	910
825	911	} else
826	912	{
..	..	@@ -841,32 +927,42 @@
841	927	// X frame.getContentPane().remove(/"Center",/framePanel);
842	928	// X framePanel.remove(bigThree);
843	929	// X frame.getContentPane().add(/"Center",/bigThree);
844		- framePanel.setDividerLocation(0);
	930	+// framePanel.setDividerLocation(0);
845	931
846		- radio.layout = fullscreenLayout;
847		- radio.layout.doClick();
	932	+// radio.layout = fullscreenLayout;
	933	+// radio.layout.doClick();
848	934	//frame.setVisible(true);
849	935	}
850	936	frame.validate();
	937	+
	938	+ cameraView.requestFocusInWindow();
851	939	}
852	940
853		- private Object3D CompressCopy()
	941	+ void CollapseToolbar()
	942	+ {
	943	+ framePanel.setDividerLocation(0);
	944	+ //frame.validate();
	945	+
	946	+ cameraView.requestFocusInWindow();
	947	+ }
	948	+
	949	+ private Object3D Duplicate(Object3D object)
854	950	{
855	951	boolean temp = CameraPane.SWITCH;
856	952	CameraPane.SWITCH = false;
857	953
858		- copy.ExtractBigData(versiontable);
	954	+ object.ExtractBigData(versiontable);
859	955	// if (copy == client)
860	956
861		- Object3D versions[] = copy.versions;
862		- copy.versions = null;
	957	+ Object3D versions[] = object.versionlist;
	958	+ object.versionlist = null;
863	959
864	960	//byte[] compress = Compress(copy);
865		- Object3D compress = (Object3D)Grafreed.clone(copy);
	961	+ Object3D compress = (Object3D)Grafreed.clone(object);
866	962
867		- copy.versions = versions;
	963	+ object.versionlist = versions;
868	964
869		- copy.RestoreBigData(versiontable);
	965	+ object.RestoreBigData(versiontable);
870	966
871	967	CameraPane.SWITCH = temp;
872	968
..	..	@@ -994,6 +1090,7 @@
994	1090	{
995	1091	SetupMaterial(materialPanel);
996	1092	}
	1093	+
997	1094	//SetupName();
998	1095	//SetupViews();
999	1096	}
..	..	@@ -1202,6 +1299,18 @@
1202	1299
1203	1300	namePanel = new cGridBag();
1204	1301
	1302	+ //if (copy.pinned)
	1303	+ {
	1304	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1305	+ pinButton.setSelected(copy.pinned);
	1306	+ cGridBag t = new cGridBag();
	1307	+ t.preferredWidth = 2;
	1308	+ t.add(pinButton);
	1309	+ namePanel.add(t);
	1310	+
	1311	+ pinButton.addItemListener(this);
	1312	+ }
	1313	+
1205	1314	nameField = AddText(namePanel, copy.GetName());
1206	1315	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1207	1316	oe.ctrlPanel.add(namePanel);
..	..	@@ -1215,14 +1324,14 @@
1215	1324
1216	1325	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1217	1326	liveCB.setToolTipText("Animate object");
	1327	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1328	+ markCB.setToolTipText("Set target transform");
1218	1329	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1219	1330	selectableCB.setToolTipText("Make object selectable");
1220	1331	// Return();
1221	1332
1222	1333	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1223	1334	hideCB.setToolTipText("Hide object");
1224		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1225		- markCB.setToolTipText("As animation target transform");
1226	1335
1227	1336	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1228	1337
..	..	@@ -1424,6 +1533,7 @@
1424	1533
1425	1534	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1426	1535	{
	1536	+ if (Globals.DEBUG)
1427	1537	System.out.println("CREATE CAMERAS");
1428	1538	cams = new cTemplate();
1429	1539	cams.name = "Cameras";
..	..	@@ -1551,29 +1661,28 @@
1551	1661	//tmp.setName("Edit");
1552	1662	objectPanel.add(materialPanel);
1553	1663	objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1554		- objectPanel.setToolTipTextAt(0, "Material panel");
	1664	+ objectPanel.setToolTipTextAt(0, "Material");
1555	1665
	1666	+ objectPanel.add(toolboxPanel);
	1667	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1668	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1669	+
	1670	+ objectPanel.add(skyboxPanel);
	1671	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1672	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1673	+
1556	1674	// JPanel north = new JPanel(new BorderLayout());
1557	1675	// north.setName("Edit");
1558	1676	// north.add(ctrlPanel, BorderLayout.NORTH);
1559	1677	// objectPanel.add(north);
1560	1678	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");
	1679	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1680	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1568	1681
1569	1682	objectPanel.add(XYZPanel);
1570		- objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1571		- objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
	1683	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1684	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1572	1685
1573		- objectPanel.add(toolboxPanel);
1574		- objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1575		- objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
1576		-
1577	1686	/*
1578	1687	aConstraints.gridx = 0;
1579	1688	aConstraints.gridwidth = 1;
..	..	@@ -1610,6 +1719,11 @@
1610	1719
1611	1720	scenePanel.add(tabbedPane);
1612	1721
	1722	+ //if (Globals.ADVANCED)
	1723	+// tabbedPane.add(infoPanel);
	1724	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1725	+// tabbedPane.setToolTipTextAt(3, "Information");
	1726	+
1613	1727	/*
1614	1728	cTree jTree = new cTree(null);
1615	1729	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1680,6 +1794,23 @@
1680	1794	// aConstraints.gridheight = 1;
1681	1795
1682	1796	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1797	+
	1798	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1799	+ new java.beans.PropertyChangeListener()
	1800	+ {
	1801	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1802	+ {
	1803	+ if ((Integer)pce.getOldValue() == 1)
	1804	+ {
	1805	+ if (radio.layout != expandedLayout)
	1806	+ {
	1807	+ radio.layout = expandedLayout;
	1808	+ radio.layout.doClick();
	1809	+ }
	1810	+ }
	1811	+ }
	1812	+ });
	1813	+
1683	1814	framePanel.setContinuousLayout(false);
1684	1815	framePanel.setOneTouchExpandable(false);
1685	1816	//.setDividerLocation(0.8);
..	..	@@ -1689,7 +1820,7 @@
1689	1820
1690	1821	frame.getContentPane().setLayout(new BorderLayout());
1691	1822	/**/
1692		- JTabbedPane worldPane = new JTabbedPane();
	1823	+ //JTabbedPane worldPane = new JTabbedPane();
1693	1824	//worldPane.add(bigPanel);
1694	1825	//worldPane.add(worldPanel);
1695	1826	/**/
..	..	@@ -1734,12 +1865,418 @@
1734	1865	ctrlPanel.removeAll();
1735	1866	}
1736	1867
1737		- void SetupMaterial(cGridBag panel)
	1868	+ void SetupMaterial(cGridBag materialpanel)
1738	1869	{
1739		- /*
	1870	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1871	+
	1872	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1873	+ skin.setToolTipText("Skin");
	1874	+ skin.addMouseListener(new MouseAdapter()
	1875	+ {
	1876	+ public void mouseClicked(MouseEvent e)
	1877	+ {
	1878	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1879	+ cMaterial material = object.material;
	1880	+
	1881	+ // Skin
	1882	+ colorField.setFloat(material.color);
	1883	+ saturationField.setFloat(material.modulation);
	1884	+ subsurfaceField.setFloat(material.subsurface);
	1885	+ selfshadowField.setFloat(material.diffuseness);
	1886	+ diffusenessField.setFloat(material.factor);
	1887	+ shininessField.setFloat(material.shininess);
	1888	+ shadowbiasField.setFloat(material.shadowbias);
	1889	+ diffuseField.setFloat(material.diffuse);
	1890	+ specularField.setFloat(material.specular);
	1891	+
	1892	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1893	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1894	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1895	+
	1896	+ materialtouched = true;
	1897	+ applySelf();
	1898	+ }
	1899	+ });
	1900	+ presetpanel.add(skin);
	1901	+
	1902	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1903	+ lambert.setToolTipText("Diffuse");
	1904	+ lambert.addMouseListener(new MouseAdapter()
	1905	+ {
	1906	+ public void mouseClicked(MouseEvent e)
	1907	+ {
	1908	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1909	+ cMaterial material = object.material;
	1910	+
	1911	+ diffusenessField.setFloat(material.factor);
	1912	+ selfshadowField.setFloat(material.diffuseness);
	1913	+
	1914	+ materialtouched = true;
	1915	+ applySelf();
	1916	+ }
	1917	+ });
	1918	+ presetpanel.add(lambert);
	1919	+
	1920	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1921	+ diffuse2.setToolTipText("Diffuse2");
	1922	+ diffuse2.addMouseListener(new MouseAdapter()
	1923	+ {
	1924	+ public void mouseClicked(MouseEvent e)
	1925	+ {
	1926	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1927	+ cMaterial material = object.material;
	1928	+
	1929	+ diffusenessField.setFloat(material.factor);
	1930	+ selfshadowField.setFloat(material.diffuseness);
	1931	+
	1932	+ materialtouched = true;
	1933	+ applySelf();
	1934	+ }
	1935	+ });
	1936	+ presetpanel.add(diffuse2);
	1937	+
	1938	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1939	+ diffusemoon.setToolTipText("Moon");
	1940	+ diffusemoon.addMouseListener(new MouseAdapter()
	1941	+ {
	1942	+ public void mouseClicked(MouseEvent e)
	1943	+ {
	1944	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1945	+ cMaterial material = object.material;
	1946	+
	1947	+ diffusenessField.setFloat(material.factor);
	1948	+ selfshadowField.setFloat(material.diffuseness);
	1949	+
	1950	+ materialtouched = true;
	1951	+ applySelf();
	1952	+ }
	1953	+ });
	1954	+ presetpanel.add(diffusemoon);
	1955	+
	1956	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1957	+ diffusemoon2.setToolTipText("Moon2");
	1958	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1959	+ {
	1960	+ public void mouseClicked(MouseEvent e)
	1961	+ {
	1962	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1963	+ cMaterial material = object.material;
	1964	+
	1965	+ diffusenessField.setFloat(material.factor);
	1966	+ selfshadowField.setFloat(material.diffuseness);
	1967	+
	1968	+ materialtouched = true;
	1969	+ applySelf();
	1970	+ }
	1971	+ });
	1972	+ presetpanel.add(diffusemoon2);
	1973	+
	1974	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1975	+ diffusemoon3.setToolTipText("Moon3");
	1976	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1977	+ {
	1978	+ public void mouseClicked(MouseEvent e)
	1979	+ {
	1980	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1981	+ cMaterial material = object.material;
	1982	+
	1983	+ diffusenessField.setFloat(material.factor);
	1984	+ selfshadowField.setFloat(material.diffuseness);
	1985	+
	1986	+ materialtouched = true;
	1987	+ applySelf();
	1988	+ }
	1989	+ });
	1990	+ presetpanel.add(diffusemoon3);
	1991	+
	1992	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1993	+ diffusesheen.setToolTipText("Sheen");
	1994	+ diffusesheen.addMouseListener(new MouseAdapter()
	1995	+ {
	1996	+ public void mouseClicked(MouseEvent e)
	1997	+ {
	1998	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1999	+ cMaterial material = object.material;
	2000	+
	2001	+ sheenField.setFloat(material.sheen);
	2002	+
	2003	+ materialtouched = true;
	2004	+ applySelf();
	2005	+ }
	2006	+ });
	2007	+ presetpanel.add(diffusesheen);
	2008	+
	2009	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2010	+ rough.setToolTipText("Rough metal");
	2011	+ rough.addMouseListener(new MouseAdapter()
	2012	+ {
	2013	+ public void mouseClicked(MouseEvent e)
	2014	+ {
	2015	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2016	+ cMaterial material = object.material;
	2017	+
	2018	+ shininessField.setFloat(material.shininess);
	2019	+ velvetField.setFloat(material.velvet);
	2020	+
	2021	+ materialtouched = true;
	2022	+ applySelf();
	2023	+ }
	2024	+ });
	2025	+ presetpanel.add(rough);
	2026	+
	2027	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2028	+ rough2.setToolTipText("Medium metal");
	2029	+ rough2.addMouseListener(new MouseAdapter()
	2030	+ {
	2031	+ public void mouseClicked(MouseEvent e)
	2032	+ {
	2033	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2034	+ cMaterial material = object.material;
	2035	+
	2036	+ shininessField.setFloat(material.shininess);
	2037	+ lightareaField.setFloat(material.lightarea);
	2038	+
	2039	+ materialtouched = true;
	2040	+ applySelf();
	2041	+ }
	2042	+ });
	2043	+ presetpanel.add(rough2);
	2044	+
	2045	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2046	+ shini0.setToolTipText("Shiny");
	2047	+ shini0.addMouseListener(new MouseAdapter()
	2048	+ {
	2049	+ public void mouseClicked(MouseEvent e)
	2050	+ {
	2051	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2052	+ cMaterial material = object.material;
	2053	+
	2054	+ shininessField.setFloat(material.shininess);
	2055	+ lightareaField.setFloat(material.lightarea);
	2056	+
	2057	+ materialtouched = true;
	2058	+ applySelf();
	2059	+ }
	2060	+ });
	2061	+ presetpanel.add(shini0);
	2062	+
	2063	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2064	+ shini1.setToolTipText("Shiny2");
	2065	+ shini1.addMouseListener(new MouseAdapter()
	2066	+ {
	2067	+ public void mouseClicked(MouseEvent e)
	2068	+ {
	2069	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2070	+ cMaterial material = object.material;
	2071	+
	2072	+ shininessField.setFloat(material.shininess);
	2073	+ lightareaField.setFloat(material.lightarea);
	2074	+
	2075	+ materialtouched = true;
	2076	+ applySelf();
	2077	+ }
	2078	+ });
	2079	+ presetpanel.add(shini1);
	2080	+
	2081	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2082	+ shini2.setToolTipText("Shiny3");
	2083	+ shini2.addMouseListener(new MouseAdapter()
	2084	+ {
	2085	+ public void mouseClicked(MouseEvent e)
	2086	+ {
	2087	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2088	+ cMaterial material = object.material;
	2089	+
	2090	+ shininessField.setFloat(material.shininess);
	2091	+ lightareaField.setFloat(material.lightarea);
	2092	+
	2093	+ materialtouched = true;
	2094	+ applySelf();
	2095	+ }
	2096	+ });
	2097	+ presetpanel.add(shini2);
	2098	+
	2099	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2100	+ aniso.setToolTipText("AnisoU");
	2101	+ aniso.addMouseListener(new MouseAdapter()
	2102	+ {
	2103	+ public void mouseClicked(MouseEvent e)
	2104	+ {
	2105	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2106	+ cMaterial material = object.material;
	2107	+
	2108	+ anisoField.setFloat(material.aniso);
	2109	+ anisoVField.setFloat(material.anisoV);
	2110	+
	2111	+ materialtouched = true;
	2112	+ applySelf();
	2113	+ }
	2114	+ });
	2115	+ presetpanel.add(aniso);
	2116	+
	2117	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2118	+ aniso2.setToolTipText("AnisoV");
	2119	+ aniso2.addMouseListener(new MouseAdapter()
	2120	+ {
	2121	+ public void mouseClicked(MouseEvent e)
	2122	+ {
	2123	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2124	+ cMaterial material = object.material;
	2125	+
	2126	+ anisoField.setFloat(material.aniso);
	2127	+ anisoVField.setFloat(material.anisoV);
	2128	+
	2129	+ materialtouched = true;
	2130	+ applySelf();
	2131	+ }
	2132	+ });
	2133	+ presetpanel.add(aniso2);
	2134	+
	2135	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2136	+ aniso3.setToolTipText("AnisoUV");
	2137	+ aniso3.addMouseListener(new MouseAdapter()
	2138	+ {
	2139	+ public void mouseClicked(MouseEvent e)
	2140	+ {
	2141	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2142	+ cMaterial material = object.material;
	2143	+
	2144	+ anisoField.setFloat(material.aniso);
	2145	+ anisoVField.setFloat(material.anisoV);
	2146	+
	2147	+ materialtouched = true;
	2148	+ applySelf();
	2149	+ }
	2150	+ });
	2151	+ presetpanel.add(aniso3);
	2152	+
	2153	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2154	+ velvet0.setToolTipText("Velvet");
	2155	+ velvet0.addMouseListener(new MouseAdapter()
	2156	+ {
	2157	+ public void mouseClicked(MouseEvent e)
	2158	+ {
	2159	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2160	+ cMaterial material = object.material;
	2161	+
	2162	+ diffusenessField.setFloat(material.factor);
	2163	+ selfshadowField.setFloat(material.diffuseness);
	2164	+ sheenField.setFloat(material.sheen);
	2165	+ shininessField.setFloat(material.shininess);
	2166	+ velvetField.setFloat(material.velvet);
	2167	+ shiftField.setFloat(material.shift);
	2168	+
	2169	+ materialtouched = true;
	2170	+ applySelf();
	2171	+ }
	2172	+ });
	2173	+ presetpanel.add(velvet0);
	2174	+
	2175	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2176	+ bump0.setToolTipText("Bump texture");
	2177	+ bump0.addMouseListener(new MouseAdapter()
	2178	+ {
	2179	+ public void mouseClicked(MouseEvent e)
	2180	+ {
	2181	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2182	+ cMaterial material = object.material;
	2183	+
	2184	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2185	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2186	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2187	+
	2188	+ materialtouched = true;
	2189	+ applySelf();
	2190	+ }
	2191	+ });
	2192	+ presetpanel.add(bump0);
	2193	+
	2194	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2195	+ borderShader.setToolTipText("Border fade");
	2196	+ borderShader.addMouseListener(new MouseAdapter()
	2197	+ {
	2198	+ public void mouseClicked(MouseEvent e)
	2199	+ {
	2200	+ borderfadeField.setFloat(0.5);
	2201	+ opacityField.setFloat(0.75);
	2202	+
	2203	+ materialtouched = true;
	2204	+ applySelf();
	2205	+ }
	2206	+ });
	2207	+ presetpanel.add(borderShader);
	2208	+
	2209	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2210	+ halo.setToolTipText("Halo");
	2211	+ halo.addMouseListener(new MouseAdapter()
	2212	+ {
	2213	+ public void mouseClicked(MouseEvent e)
	2214	+ {
	2215	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2216	+ cMaterial material = object.material;
	2217	+
	2218	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2219	+
	2220	+ materialtouched = true;
	2221	+ applySelf();
	2222	+ }
	2223	+ });
	2224	+ presetpanel.add(halo);
	2225	+
	2226	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2227	+ candle.setToolTipText("Candle");
	2228	+ candle.addMouseListener(new MouseAdapter()
	2229	+ {
	2230	+ public void mouseClicked(MouseEvent e)
	2231	+ {
	2232	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2233	+ cMaterial material = object.material;
	2234	+
	2235	+ subsurfaceField.setFloat(material.subsurface);
	2236	+ shadowbiasField.setFloat(material.shadowbias);
	2237	+ ambientField.setFloat(material.ambient);
	2238	+ specularField.setFloat(material.specular);
	2239	+ lightareaField.setFloat(material.lightarea);
	2240	+ shininessField.setFloat(material.shininess);
	2241	+
	2242	+ materialtouched = true;
	2243	+ applySelf();
	2244	+ }
	2245	+ });
	2246	+ presetpanel.add(candle);
	2247	+
	2248	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2249	+ shadowShader.setToolTipText("Shadow");
	2250	+ shadowShader.addMouseListener(new MouseAdapter()
	2251	+ {
	2252	+ public void mouseClicked(MouseEvent e)
	2253	+ {
	2254	+ diffuseField.setFloat(0.001);
	2255	+ ambientField.setFloat(0.001);
	2256	+ cameraField.setFloat(0.001);
	2257	+ specularField.setFloat(0.001);
	2258	+ fakedepthField.setFloat(0.001);
	2259	+ opacityField.setFloat(0.6);
	2260	+
	2261	+ materialtouched = true;
	2262	+ applySelf();
	2263	+ }
	2264	+ });
	2265	+ presetpanel.add(shadowShader);
	2266	+
	2267	+ cGridBag panel = new cGridBag().setVertical(true);
	2268	+
	2269	+ presetpanel.preferredWidth = 1;
	2270	+
	2271	+ materialpanel.add(presetpanel);
	2272	+ materialpanel.add(panel);
	2273	+
	2274	+ panel.preferredWidth = 8;
	2275	+
	2276	+ /*
1740	2277	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1741	2278	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1742		- */
	2279	+ */
1743	2280
1744	2281	cGridBag editBar = new cGridBag().setVertical(false);
1745	2282
..	..	@@ -1776,7 +2313,20 @@
1776	2313
1777	2314	cGridBag huepanel = new cGridBag();
1778	2315	cGridBag huelabel = new cGridBag();
1779		- huelabel.add(GetLabel("icons/hue.png", false));
	2316	+ cLabel hue = GetLabel("icons/hue.png", false);
	2317	+ hue.fit = true;
	2318	+
	2319	+ hue.addMouseListener(new MouseAdapter()
	2320	+ {
	2321	+ public void mousePressed(MouseEvent e)
	2322	+ {
	2323	+ int x = e.getX();
	2324	+
	2325	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2326	+ }
	2327	+ });
	2328	+
	2329	+ huelabel.add(hue);
1780	2330	huelabel.preferredWidth = 20;
1781	2331	huepanel.add(new cGridBag()); // Label
1782	2332	huepanel.add(huelabel); // Field/slider
..	..	@@ -1797,7 +2347,7 @@
1797	2347	cGridBag modulation = new cGridBag();
1798	2348	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1799	2349	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1800		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2350	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1801	2351	colorSection.add(modulation);
1802	2352
1803	2353	cGridBag opacity = new cGridBag();
..	..	@@ -2990,7 +3540,7 @@
2990	3540
2991	3541	freezematerial = true;
2992	3542	colorField.setFloat(mat.color);
2993		- modulationField.setFloat(mat.modulation);
	3543	+ saturationField.setFloat(mat.modulation);
2994	3544	metalnessField.setFloat(mat.metalness);
2995	3545	diffuseField.setFloat(mat.diffuse);
2996	3546	specularField.setFloat(mat.specular);
..	..	@@ -3052,32 +3602,8 @@
3052	3602
3053	3603	if (multiplyToggle != null)
3054	3604	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		- }
	3605	+
	3606	+ AllocProjectedVertices(object);
3081	3607
3082	3608	SetMaterial(mat, object.projectedVertices);
3083	3609	}
..	..	@@ -3197,6 +3723,17 @@
3197	3723	public void itemStateChanged(ItemEvent event)
3198	3724	{
3199	3725	// System.out.println("Propagate = " + propagate);
	3726	+ if (event.getSource() == pinButton)
	3727	+ {
	3728	+ copy.pinned ^= true;
	3729	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3730	+ {
	3731	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3732	+ copy.CloseUI();
	3733	+ //copy.editWindow.refreshContents();
	3734	+ }
	3735	+ }
	3736	+ else
3200	3737	if (event.getSource() == propagateToggle)
3201	3738	{
3202	3739	propagate ^= true;
..	..	@@ -3301,6 +3838,7 @@
3301	3838	} else if (event.getSource() == liveCB)
3302	3839	{
3303	3840	copy.live ^= true;
	3841	+ objEditor.refreshContents(true); // To show item colors
3304	3842	return;
3305	3843	} else if (event.getSource() == selectableCB)
3306	3844	{
..	..	@@ -3310,7 +3848,7 @@
3310	3848	{
3311	3849	copy.hide ^= true;
3312	3850	copy.Touch(); // display list issue
3313		- objEditor.refreshContents();
	3851	+ objEditor.refreshContents(true); // To show item colors
3314	3852	return;
3315	3853	} else if (event.getSource() == link2masterCB)
3316	3854	{
..	..	@@ -3668,6 +4206,7 @@
3668	4206	{
3669	4207	//Save(true);
3670	4208	Replace();
	4209	+ SetVersionStates();
3671	4210	}
3672	4211
3673	4212	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3688,13 +4227,26 @@
3688	4227
3689	4228	java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3690	4229
	4230	+ void DeleteVersion()
	4231	+ {
	4232	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4233	+ {
	4234	+ copy.versionlist[i] = copy.versionlist[i+1];
	4235	+ }
	4236	+
	4237	+ CopyChanged();
	4238	+
	4239	+ SetVersionStates();
	4240	+ }
	4241	+
3691	4242	public boolean Save(boolean user)
3692	4243	{
3693	4244	System.err.println("Save");
	4245	+ Replace();
3694	4246
3695		- cRadio tab = GetCurrentTab();
	4247	+ //cRadio tab = GetCurrentTab();
3696	4248
3697		- Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
	4249	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3698	4250
3699	4251	boolean thesame = false;
3700	4252
..	..	@@ -3706,10 +4258,15 @@
3706	4258	//EditorFrame.m_MainFrame.requestFocusInWindow();
3707	4259	if (!thesame)
3708	4260	{
	4261	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4262	+ {
	4263	+ copy.versionlist[i] = copy.versionlist[i-1];
	4264	+ }
	4265	+
3709	4266	//tab.user[tab.versionindex] = user;
3710	4267	//boolean increment = true; // tab.graphs[tab.versionindex] == null;
3711	4268
3712		- copy.versions[++copy.versionindex] = compress;
	4269	+ copy.versionlist[++copy.versionindex] = compress;
3713	4270
3714	4271	// if (increment)
3715	4272	// tab.versionindex++;
..	..	@@ -3719,13 +4276,13 @@
3719	4276
3720	4277	//assert(hashtable.isEmpty());
3721	4278
3722		- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3723		- {
3724		- //tab.user[i] = false;
3725		- copy.versions[i] = null;
3726		- }
	4279	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4280	+// {
	4281	+// //tab.user[i] = false;
	4282	+// copy.versionlist[i] = null;
	4283	+// }
3727	4284
3728		- SetUndoStates();
	4285	+ SetVersionStates();
3729	4286
3730	4287	// test save
3731	4288	if (false)
..	..	@@ -3748,10 +4305,44 @@
3748	4305
3749	4306	return !thesame;
3750	4307	}
3751		-
3752		- void CopyChanged(Object3D obj)
	4308	+
	4309	+ boolean flashIt = true;
	4310	+
	4311	+ void RefreshSelection()
3753	4312	{
3754		- SetUndoStates();
	4313	+ Object3D selection = new Object3D();
	4314	+
	4315	+ for (int i = 0; i < copy.selection.size(); i++)
	4316	+ {
	4317	+ Object3D elem = copy.selection.elementAt(i);
	4318	+
	4319	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4320	+
	4321	+ if (obj == null)
	4322	+ {
	4323	+ copy.selection.remove(i--);
	4324	+ }
	4325	+ else
	4326	+ {
	4327	+ selection.add(obj);
	4328	+ copy.selection.setElementAt(obj, i);
	4329	+ }
	4330	+ }
	4331	+
	4332	+ flashIt = false;
	4333	+ GetTree().clearSelection();
	4334	+ for (int i = 0; i < selection.size(); i++)
	4335	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4336	+ flashIt = true;
	4337	+
	4338	+ //refreshContents(false);
	4339	+ }
	4340	+
	4341	+ void CopyChanged()
	4342	+ {
	4343	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4344	+
	4345	+ SetVersionStates();
3755	4346
3756	4347	boolean temp = CameraPane.SWITCH;
3757	4348	CameraPane.SWITCH = false;
..	..	@@ -3772,6 +4363,7 @@
3772	4363
3773	4364	CameraPane.SWITCH = temp;
3774	4365
	4366	+ RefreshSelection();
3775	4367	//assert(hashtable.isEmpty());
3776	4368
3777	4369	copy.Touch();
..	..	@@ -3792,13 +4384,15 @@
3792	4384	}
3793	4385	}
3794	4386
3795		- refreshContents();
	4387	+ refreshContents(true);
3796	4388	}
3797	4389
3798		- cButton undoButton;
	4390	+ cButton previousVersionButton;
3799	4391	cButton restoreButton;
3800	4392	cButton replaceButton;
3801		- cButton redoButton;
	4393	+ cButton nextVersionButton;
	4394	+ cButton saveVersionButton;
	4395	+ cButton deleteVersionButton;
3802	4396
3803	4397	boolean muteSlider;
3804	4398
..	..	@@ -3806,39 +4400,47 @@
3806	4400	{
3807	4401	int count = 0;
3808	4402
3809		- for (int i = copy.versions.length; --i >= 0;)
	4403	+ for (int i = copy.versionlist.length; --i >= 0;)
3810	4404	{
3811		- if (copy.versions[i] != null)
	4405	+ if (copy.versionlist[i] != null)
3812	4406	count++;
3813	4407	}
3814	4408
3815	4409	return count;
3816	4410	}
3817	4411
3818		- void SetUndoStates()
	4412	+ void SetVersionStates()
3819	4413	{
3820		- cRadio tab = GetCurrentTab();
	4414	+ //if (true)
	4415	+ // return;
	4416	+
	4417	+ //cRadio tab = GetCurrentTab();
3821	4418
3822	4419	restoreButton.setEnabled(copy.versionindex != -1);
3823	4420	replaceButton.setEnabled(copy.versionindex != -1);
3824	4421
3825		- undoButton.setEnabled(copy.versionindex > 0);
3826		- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	4422	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4423	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4424	+
	4425	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4426	+ copy.versionlist[copy.versionindex + 1] != null);
3827	4427
3828	4428	muteSlider = true;
	4429	+ versionSlider.setMinimum(0);
3829	4430	versionSlider.setMaximum(VersionCount() - 1);
3830	4431	versionSlider.setInteger(copy.versionindex);
	4432	+ versionSlider.setEnabled(copy.versionindex != -1);
3831	4433	muteSlider = false;
3832	4434	}
3833	4435
3834		- public boolean Undo()
	4436	+ public boolean PreviousVersion()
3835	4437	{
3836	4438	// Option?
3837	4439	Replace();
3838	4440
3839	4441	System.err.println("Undo");
3840	4442
3841		- cRadio tab = GetCurrentTab();
	4443	+ //cRadio tab = GetCurrentTab();
3842	4444
3843	4445	if (copy.versionindex == 0)
3844	4446	{
..	..	@@ -3861,7 +4463,7 @@
3861	4463
3862	4464	copy.versionindex -= 1;
3863	4465
3864		- CopyChanged((Object3D)copy.versions[copy.versionindex]);
	4466	+ CopyChanged();
3865	4467
3866	4468	return true;
3867	4469	}
..	..	@@ -3870,16 +4472,16 @@
3870	4472	{
3871	4473	System.err.println("Restore");
3872	4474
3873		- cRadio tab = GetCurrentTab();
	4475	+ //cRadio tab = GetCurrentTab();
3874	4476
3875		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4477	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3876	4478	{
3877	4479	java.awt.Toolkit.getDefaultToolkit().beep();
3878	4480	return false;
3879	4481	}
3880	4482
3881	4483	//CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3882		- CopyChanged(copy.versions[copy.versionindex]);
	4484	+ CopyChanged();
3883	4485
3884	4486	return true;
3885	4487	}
..	..	@@ -3888,27 +4490,27 @@
3888	4490	{
3889	4491	System.err.println("Replace");
3890	4492
3891		- cRadio tab = GetCurrentTab();
	4493	+ //cRadio tab = GetCurrentTab();
3892	4494
3893		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4495	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3894	4496	{
3895	4497	// No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3896	4498	return false;
3897	4499	}
3898	4500
3899		- copy.versions[copy.versionindex] = CompressCopy();
	4501	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
3900	4502
3901	4503	return true;
3902	4504	}
3903	4505
3904		- public void Redo()
	4506	+ public void NextVersion()
3905	4507	{
3906	4508	// Option?
3907	4509	Replace();
3908	4510
3909		- cRadio tab = GetCurrentTab();
	4511	+ //cRadio tab = GetCurrentTab();
3910	4512
3911		- if (copy.versions[copy.versionindex + 1] == null)
	4513	+ if (copy.versionlist[copy.versionindex + 1] == null)
3912	4514	{
3913	4515	java.awt.Toolkit.getDefaultToolkit().beep();
3914	4516	return;
..	..	@@ -3916,7 +4518,7 @@
3916	4518
3917	4519	copy.versionindex += 1;
3918	4520
3919		- CopyChanged(copy.versions[copy.versionindex]);
	4521	+ CopyChanged();
3920	4522
3921	4523	//if (!tab.user[tab.versionindex])
3922	4524	// tab.graphs[tab.versionindex] = null;
..	..	@@ -4130,7 +4732,7 @@
4130	4732	//copy.material = new cMaterial(copy.GetMaterial());
4131	4733
4132	4734	current.color = (float) colorField.getFloat();
4133		- current.modulation = (float) modulationField.getFloat();
	4735	+ current.modulation = (float) saturationField.getFloat();
4134	4736	current.metalness = (float) metalnessField.getFloat();
4135	4737	current.diffuse = (float) diffuseField.getFloat();
4136	4738	current.specular = (float) specularField.getFloat();
..	..	@@ -4163,7 +4765,7 @@
4163	4765	cMaterial mat = copy.material;
4164	4766
4165	4767	colorField.SetToolTipValue((mat.color));
4166		- modulationField.SetToolTipValue((mat.modulation));
	4768	+ saturationField.SetToolTipValue((mat.modulation));
4167	4769	metalnessField.SetToolTipValue((mat.metalness));
4168	4770	diffuseField.SetToolTipValue((mat.diffuse));
4169	4771	specularField.SetToolTipValue((mat.specular));
..	..	@@ -4225,11 +4827,14 @@
4225	4827	if (muteSlider)
4226	4828	return;
4227	4829
	4830	+ Replace();
	4831	+
4228	4832	int version = versionSlider.getInteger();
4229	4833
4230		- if (copy.versions[version] != null)
	4834	+ if (version != -1 && copy.versionlist[version] != null)
4231	4835	{
4232		- CopyChanged(copy.versions[copy.versionindex = version]);
	4836	+ copy.versionindex = version;
	4837	+ CopyChanged();
4233	4838	}
4234	4839
4235	4840	return;
..	..	@@ -4269,6 +4874,12 @@
4269	4874	{
4270	4875	//System.out.println("stateChanged = " + this);
4271	4876	materialtouched = true;
	4877	+
	4878	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4879	+ {
	4880	+ saturationField.setFloat(1);
	4881	+ }
	4882	+
4272	4883	applySelf();
4273	4884	//System.out.println("this = " + this);
4274	4885	//System.out.println("PARENT = " + parent);
..	..	@@ -4568,6 +5179,7 @@
4568	5179	{
4569	5180	if (GetTree() != null)
4570	5181	{
	5182	+ GetTree().revalidate();
4571	5183	GetTree().repaint();
4572	5184	}
4573	5185
..	..	@@ -4576,6 +5188,11 @@
4576	5188	ctrlPanel.validate(); // ? new
4577	5189	ctrlPanel.repaint();
4578	5190	}
	5191	+
	5192	+ if (previousVersionButton != null && copy.versionlist != null)
	5193	+ SetVersionStates();
	5194	+
	5195	+ cameraView.requestFocusInWindow();
4579	5196	}
4580	5197
4581	5198	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4607,7 +5224,7 @@
4607	5224	// group = (Composite) group.get(0);
4608	5225	// }
4609	5226
4610		- System.out.println("makeSomething of " + thing);
	5227	+ //System.out.println("makeSomething of " + thing);
4611	5228
4612	5229	/*
4613	5230	if (deselect && jList != null)
..	..	@@ -4959,13 +5576,16 @@
4959	5576	c.addChild(csg);
4960	5577	}
4961	5578
4962		- copy.versions = readobj.versions;
	5579	+ copy.versionlist = readobj.versionlist;
4963	5580	copy.versionindex = readobj.versionindex;
4964	5581
4965		- if (copy.versions == null)
	5582	+ if (copy.versionlist == null)
4966	5583	{
4967		- copy.versions = new Object3D[100];
	5584	+ // Backward compatibility
	5585	+ copy.versionlist = new Object3D[100];
4968	5586	copy.versionindex = -1;
	5587	+
	5588	+ //Save(true);
4969	5589	}
4970	5590
4971	5591	//? SetUndoStates();
..	..	@@ -4980,7 +5600,7 @@
4980	5600	{
4981	5601	if (Grafreed.standAlone)
4982	5602	{
4983		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5603	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4984	5604	browser.show();
4985	5605	String filename = browser.getFile();
4986	5606	if (filename != null && filename.length() > 0)
..	..	@@ -5057,6 +5677,8 @@
5057	5677
5058	5678	void save()
5059	5679	{
	5680	+ Replace();
	5681	+
5060	5682	if (lastname == null)
5061	5683	{
5062	5684	return;
..	..	@@ -5299,6 +5921,7 @@
5299	5921	ButtonGroup buttonGroup;
5300	5922
5301	5923	cGridBag toolboxPanel;
	5924	+ cGridBag skyboxPanel;
5302	5925	cGridBag materialPanel;
5303	5926	cGridBag ctrlPanel;
5304	5927
..	..	@@ -5372,7 +5995,7 @@
5372	5995	JLabel colorLabel;
5373	5996	cNumberSlider colorField;
5374	5997	JLabel modulationLabel;
5375		- cNumberSlider modulationField;
	5998	+ cNumberSlider saturationField;
5376	5999	JLabel metalnessLabel;
5377	6000	cNumberSlider metalnessField;
5378	6001	JLabel diffuseLabel;
..	..	@@ -5403,6 +6026,7 @@
5403	6026	cNumberSlider anisoField;
5404	6027	JLabel anisoVLabel;
5405	6028	cNumberSlider anisoVField;
	6029	+
5406	6030	JLabel cameraLabel;
5407	6031	cNumberSlider cameraField;
5408	6032	JLabel selfshadowLabel;
..	..	@@ -5417,6 +6041,7 @@
5417	6041	cNumberSlider fakedepthField;
5418	6042	JLabel shadowbiasLabel;
5419	6043	cNumberSlider shadowbiasField;
	6044	+
5420	6045	JLabel bumpLabel;
5421	6046	cNumberSlider bumpField;
5422	6047	JLabel noiseLabel;