~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,48 @@
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	+ if (Grafreed.grafreed.universe.versiontable == null)
	955	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	956	+
	957	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
859	958	// if (copy == client)
860	959
861		- Object3D versions[] = copy.versions;
862		- copy.versions = null;
	960	+ Object3D versions[] = object.versionlist;
	961	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	962	+ object.versionlist = null;
	963	+ object.versiontable = null;
863	964
864	965	//byte[] compress = Compress(copy);
865		- Object3D compress = (Object3D)Grafreed.clone(copy);
	966	+ Object3D compress = (Object3D)Grafreed.clone(object);
866	967
867		- copy.versions = versions;
	968	+ object.versionlist = versions;
	969	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
868	970
869		- copy.RestoreBigData(versiontable);
	971	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
870	972
871	973	CameraPane.SWITCH = temp;
872	974
..	..	@@ -994,6 +1096,7 @@
994	1096	{
995	1097	SetupMaterial(materialPanel);
996	1098	}
	1099	+
997	1100	//SetupName();
998	1101	//SetupViews();
999	1102	}
..	..	@@ -1202,6 +1305,18 @@
1202	1305
1203	1306	namePanel = new cGridBag();
1204	1307
	1308	+ //if (copy.pinned)
	1309	+ {
	1310	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1311	+ pinButton.setSelected(copy.pinned);
	1312	+ cGridBag t = new cGridBag();
	1313	+ t.preferredWidth = 2;
	1314	+ t.add(pinButton);
	1315	+ namePanel.add(t);
	1316	+
	1317	+ pinButton.addItemListener(this);
	1318	+ }
	1319	+
1205	1320	nameField = AddText(namePanel, copy.GetName());
1206	1321	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1207	1322	oe.ctrlPanel.add(namePanel);
..	..	@@ -1215,14 +1330,14 @@
1215	1330
1216	1331	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1217	1332	liveCB.setToolTipText("Animate object");
	1333	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1334	+ markCB.setToolTipText("Set target transform");
1218	1335	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1219	1336	selectableCB.setToolTipText("Make object selectable");
1220	1337	// Return();
1221	1338
1222	1339	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1223	1340	hideCB.setToolTipText("Hide object");
1224		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1225		- markCB.setToolTipText("As animation target transform");
1226	1341
1227	1342	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1228	1343
..	..	@@ -1424,6 +1539,7 @@
1424	1539
1425	1540	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1426	1541	{
	1542	+ if (Globals.DEBUG)
1427	1543	System.out.println("CREATE CAMERAS");
1428	1544	cams = new cTemplate();
1429	1545	cams.name = "Cameras";
..	..	@@ -1549,31 +1665,30 @@
1549	1665
1550	1666	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1551	1667	//tmp.setName("Edit");
	1668	+ objectPanel.add(toolboxPanel);
	1669	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1670	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
	1671	+
1552	1672	objectPanel.add(materialPanel);
1553		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1554		- objectPanel.setToolTipTextAt(0, "Material panel");
	1673	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1674	+ objectPanel.setToolTipTextAt(1, "Material");
1555	1675
	1676	+ objectPanel.add(skyboxPanel);
	1677	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1678	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1679	+
1556	1680	// JPanel north = new JPanel(new BorderLayout());
1557	1681	// north.setName("Edit");
1558	1682	// north.add(ctrlPanel, BorderLayout.NORTH);
1559	1683	// objectPanel.add(north);
1560	1684	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");
	1685	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1686	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1568	1687
1569	1688	objectPanel.add(XYZPanel);
1570		- objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1571		- objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
	1689	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1690	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1572	1691
1573		- objectPanel.add(toolboxPanel);
1574		- objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1575		- objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
1576		-
1577	1692	/*
1578	1693	aConstraints.gridx = 0;
1579	1694	aConstraints.gridwidth = 1;
..	..	@@ -1610,6 +1725,11 @@
1610	1725
1611	1726	scenePanel.add(tabbedPane);
1612	1727
	1728	+ //if (Globals.ADVANCED)
	1729	+// tabbedPane.add(infoPanel);
	1730	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1731	+// tabbedPane.setToolTipTextAt(3, "Information");
	1732	+
1613	1733	/*
1614	1734	cTree jTree = new cTree(null);
1615	1735	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1680,6 +1800,23 @@
1680	1800	// aConstraints.gridheight = 1;
1681	1801
1682	1802	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1803	+
	1804	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1805	+ new java.beans.PropertyChangeListener()
	1806	+ {
	1807	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1808	+ {
	1809	+ if ((Integer)pce.getOldValue() == 1)
	1810	+ {
	1811	+ if (radio.layout != expandedLayout)
	1812	+ {
	1813	+ radio.layout = expandedLayout;
	1814	+ radio.layout.doClick();
	1815	+ }
	1816	+ }
	1817	+ }
	1818	+ });
	1819	+
1683	1820	framePanel.setContinuousLayout(false);
1684	1821	framePanel.setOneTouchExpandable(false);
1685	1822	//.setDividerLocation(0.8);
..	..	@@ -1689,7 +1826,7 @@
1689	1826
1690	1827	frame.getContentPane().setLayout(new BorderLayout());
1691	1828	/**/
1692		- JTabbedPane worldPane = new JTabbedPane();
	1829	+ //JTabbedPane worldPane = new JTabbedPane();
1693	1830	//worldPane.add(bigPanel);
1694	1831	//worldPane.add(worldPanel);
1695	1832	/**/
..	..	@@ -1734,12 +1871,418 @@
1734	1871	ctrlPanel.removeAll();
1735	1872	}
1736	1873
1737		- void SetupMaterial(cGridBag panel)
	1874	+ void SetupMaterial(cGridBag materialpanel)
1738	1875	{
1739		- /*
	1876	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1877	+
	1878	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1879	+ skin.setToolTipText("Skin");
	1880	+ skin.addMouseListener(new MouseAdapter()
	1881	+ {
	1882	+ public void mouseClicked(MouseEvent e)
	1883	+ {
	1884	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1885	+ cMaterial material = object.material;
	1886	+
	1887	+ // Skin
	1888	+ colorField.setFloat(material.color);
	1889	+ saturationField.setFloat(material.modulation);
	1890	+ subsurfaceField.setFloat(material.subsurface);
	1891	+ selfshadowField.setFloat(material.diffuseness);
	1892	+ diffusenessField.setFloat(material.factor);
	1893	+ shininessField.setFloat(material.shininess);
	1894	+ shadowbiasField.setFloat(material.shadowbias);
	1895	+ diffuseField.setFloat(material.diffuse);
	1896	+ specularField.setFloat(material.specular);
	1897	+
	1898	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1899	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1900	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1901	+
	1902	+ materialtouched = true;
	1903	+ applySelf();
	1904	+ }
	1905	+ });
	1906	+ presetpanel.add(skin);
	1907	+
	1908	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1909	+ lambert.setToolTipText("Diffuse");
	1910	+ lambert.addMouseListener(new MouseAdapter()
	1911	+ {
	1912	+ public void mouseClicked(MouseEvent e)
	1913	+ {
	1914	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1915	+ cMaterial material = object.material;
	1916	+
	1917	+ diffusenessField.setFloat(material.factor);
	1918	+ selfshadowField.setFloat(material.diffuseness);
	1919	+
	1920	+ materialtouched = true;
	1921	+ applySelf();
	1922	+ }
	1923	+ });
	1924	+ presetpanel.add(lambert);
	1925	+
	1926	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1927	+ diffuse2.setToolTipText("Diffuse2");
	1928	+ diffuse2.addMouseListener(new MouseAdapter()
	1929	+ {
	1930	+ public void mouseClicked(MouseEvent e)
	1931	+ {
	1932	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1933	+ cMaterial material = object.material;
	1934	+
	1935	+ diffusenessField.setFloat(material.factor);
	1936	+ selfshadowField.setFloat(material.diffuseness);
	1937	+
	1938	+ materialtouched = true;
	1939	+ applySelf();
	1940	+ }
	1941	+ });
	1942	+ presetpanel.add(diffuse2);
	1943	+
	1944	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1945	+ diffusemoon.setToolTipText("Moon");
	1946	+ diffusemoon.addMouseListener(new MouseAdapter()
	1947	+ {
	1948	+ public void mouseClicked(MouseEvent e)
	1949	+ {
	1950	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1951	+ cMaterial material = object.material;
	1952	+
	1953	+ diffusenessField.setFloat(material.factor);
	1954	+ selfshadowField.setFloat(material.diffuseness);
	1955	+
	1956	+ materialtouched = true;
	1957	+ applySelf();
	1958	+ }
	1959	+ });
	1960	+ presetpanel.add(diffusemoon);
	1961	+
	1962	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1963	+ diffusemoon2.setToolTipText("Moon2");
	1964	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1965	+ {
	1966	+ public void mouseClicked(MouseEvent e)
	1967	+ {
	1968	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1969	+ cMaterial material = object.material;
	1970	+
	1971	+ diffusenessField.setFloat(material.factor);
	1972	+ selfshadowField.setFloat(material.diffuseness);
	1973	+
	1974	+ materialtouched = true;
	1975	+ applySelf();
	1976	+ }
	1977	+ });
	1978	+ presetpanel.add(diffusemoon2);
	1979	+
	1980	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1981	+ diffusemoon3.setToolTipText("Moon3");
	1982	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1983	+ {
	1984	+ public void mouseClicked(MouseEvent e)
	1985	+ {
	1986	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1987	+ cMaterial material = object.material;
	1988	+
	1989	+ diffusenessField.setFloat(material.factor);
	1990	+ selfshadowField.setFloat(material.diffuseness);
	1991	+
	1992	+ materialtouched = true;
	1993	+ applySelf();
	1994	+ }
	1995	+ });
	1996	+ presetpanel.add(diffusemoon3);
	1997	+
	1998	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1999	+ diffusesheen.setToolTipText("Sheen");
	2000	+ diffusesheen.addMouseListener(new MouseAdapter()
	2001	+ {
	2002	+ public void mouseClicked(MouseEvent e)
	2003	+ {
	2004	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2005	+ cMaterial material = object.material;
	2006	+
	2007	+ sheenField.setFloat(material.sheen);
	2008	+
	2009	+ materialtouched = true;
	2010	+ applySelf();
	2011	+ }
	2012	+ });
	2013	+ presetpanel.add(diffusesheen);
	2014	+
	2015	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2016	+ rough.setToolTipText("Rough metal");
	2017	+ rough.addMouseListener(new MouseAdapter()
	2018	+ {
	2019	+ public void mouseClicked(MouseEvent e)
	2020	+ {
	2021	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2022	+ cMaterial material = object.material;
	2023	+
	2024	+ shininessField.setFloat(material.shininess);
	2025	+ velvetField.setFloat(material.velvet);
	2026	+
	2027	+ materialtouched = true;
	2028	+ applySelf();
	2029	+ }
	2030	+ });
	2031	+ presetpanel.add(rough);
	2032	+
	2033	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2034	+ rough2.setToolTipText("Medium metal");
	2035	+ rough2.addMouseListener(new MouseAdapter()
	2036	+ {
	2037	+ public void mouseClicked(MouseEvent e)
	2038	+ {
	2039	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2040	+ cMaterial material = object.material;
	2041	+
	2042	+ shininessField.setFloat(material.shininess);
	2043	+ lightareaField.setFloat(material.lightarea);
	2044	+
	2045	+ materialtouched = true;
	2046	+ applySelf();
	2047	+ }
	2048	+ });
	2049	+ presetpanel.add(rough2);
	2050	+
	2051	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2052	+ shini0.setToolTipText("Shiny");
	2053	+ shini0.addMouseListener(new MouseAdapter()
	2054	+ {
	2055	+ public void mouseClicked(MouseEvent e)
	2056	+ {
	2057	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2058	+ cMaterial material = object.material;
	2059	+
	2060	+ shininessField.setFloat(material.shininess);
	2061	+ lightareaField.setFloat(material.lightarea);
	2062	+
	2063	+ materialtouched = true;
	2064	+ applySelf();
	2065	+ }
	2066	+ });
	2067	+ presetpanel.add(shini0);
	2068	+
	2069	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2070	+ shini1.setToolTipText("Shiny2");
	2071	+ shini1.addMouseListener(new MouseAdapter()
	2072	+ {
	2073	+ public void mouseClicked(MouseEvent e)
	2074	+ {
	2075	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2076	+ cMaterial material = object.material;
	2077	+
	2078	+ shininessField.setFloat(material.shininess);
	2079	+ lightareaField.setFloat(material.lightarea);
	2080	+
	2081	+ materialtouched = true;
	2082	+ applySelf();
	2083	+ }
	2084	+ });
	2085	+ presetpanel.add(shini1);
	2086	+
	2087	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2088	+ shini2.setToolTipText("Shiny3");
	2089	+ shini2.addMouseListener(new MouseAdapter()
	2090	+ {
	2091	+ public void mouseClicked(MouseEvent e)
	2092	+ {
	2093	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2094	+ cMaterial material = object.material;
	2095	+
	2096	+ shininessField.setFloat(material.shininess);
	2097	+ lightareaField.setFloat(material.lightarea);
	2098	+
	2099	+ materialtouched = true;
	2100	+ applySelf();
	2101	+ }
	2102	+ });
	2103	+ presetpanel.add(shini2);
	2104	+
	2105	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2106	+ aniso.setToolTipText("AnisoU");
	2107	+ aniso.addMouseListener(new MouseAdapter()
	2108	+ {
	2109	+ public void mouseClicked(MouseEvent e)
	2110	+ {
	2111	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2112	+ cMaterial material = object.material;
	2113	+
	2114	+ anisoField.setFloat(material.aniso);
	2115	+ anisoVField.setFloat(material.anisoV);
	2116	+
	2117	+ materialtouched = true;
	2118	+ applySelf();
	2119	+ }
	2120	+ });
	2121	+ presetpanel.add(aniso);
	2122	+
	2123	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2124	+ aniso2.setToolTipText("AnisoV");
	2125	+ aniso2.addMouseListener(new MouseAdapter()
	2126	+ {
	2127	+ public void mouseClicked(MouseEvent e)
	2128	+ {
	2129	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2130	+ cMaterial material = object.material;
	2131	+
	2132	+ anisoField.setFloat(material.aniso);
	2133	+ anisoVField.setFloat(material.anisoV);
	2134	+
	2135	+ materialtouched = true;
	2136	+ applySelf();
	2137	+ }
	2138	+ });
	2139	+ presetpanel.add(aniso2);
	2140	+
	2141	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2142	+ aniso3.setToolTipText("AnisoUV");
	2143	+ aniso3.addMouseListener(new MouseAdapter()
	2144	+ {
	2145	+ public void mouseClicked(MouseEvent e)
	2146	+ {
	2147	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2148	+ cMaterial material = object.material;
	2149	+
	2150	+ anisoField.setFloat(material.aniso);
	2151	+ anisoVField.setFloat(material.anisoV);
	2152	+
	2153	+ materialtouched = true;
	2154	+ applySelf();
	2155	+ }
	2156	+ });
	2157	+ presetpanel.add(aniso3);
	2158	+
	2159	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2160	+ velvet0.setToolTipText("Velvet");
	2161	+ velvet0.addMouseListener(new MouseAdapter()
	2162	+ {
	2163	+ public void mouseClicked(MouseEvent e)
	2164	+ {
	2165	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2166	+ cMaterial material = object.material;
	2167	+
	2168	+ diffusenessField.setFloat(material.factor);
	2169	+ selfshadowField.setFloat(material.diffuseness);
	2170	+ sheenField.setFloat(material.sheen);
	2171	+ shininessField.setFloat(material.shininess);
	2172	+ velvetField.setFloat(material.velvet);
	2173	+ shiftField.setFloat(material.shift);
	2174	+
	2175	+ materialtouched = true;
	2176	+ applySelf();
	2177	+ }
	2178	+ });
	2179	+ presetpanel.add(velvet0);
	2180	+
	2181	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2182	+ bump0.setToolTipText("Bump texture");
	2183	+ bump0.addMouseListener(new MouseAdapter()
	2184	+ {
	2185	+ public void mouseClicked(MouseEvent e)
	2186	+ {
	2187	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2188	+ cMaterial material = object.material;
	2189	+
	2190	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2191	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2192	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2193	+
	2194	+ materialtouched = true;
	2195	+ applySelf();
	2196	+ }
	2197	+ });
	2198	+ presetpanel.add(bump0);
	2199	+
	2200	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2201	+ borderShader.setToolTipText("Border fade");
	2202	+ borderShader.addMouseListener(new MouseAdapter()
	2203	+ {
	2204	+ public void mouseClicked(MouseEvent e)
	2205	+ {
	2206	+ borderfadeField.setFloat(0.5);
	2207	+ opacityField.setFloat(0.75);
	2208	+
	2209	+ materialtouched = true;
	2210	+ applySelf();
	2211	+ }
	2212	+ });
	2213	+ presetpanel.add(borderShader);
	2214	+
	2215	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2216	+ halo.setToolTipText("Halo");
	2217	+ halo.addMouseListener(new MouseAdapter()
	2218	+ {
	2219	+ public void mouseClicked(MouseEvent e)
	2220	+ {
	2221	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2222	+ cMaterial material = object.material;
	2223	+
	2224	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2225	+
	2226	+ materialtouched = true;
	2227	+ applySelf();
	2228	+ }
	2229	+ });
	2230	+ presetpanel.add(halo);
	2231	+
	2232	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2233	+ candle.setToolTipText("Candle");
	2234	+ candle.addMouseListener(new MouseAdapter()
	2235	+ {
	2236	+ public void mouseClicked(MouseEvent e)
	2237	+ {
	2238	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2239	+ cMaterial material = object.material;
	2240	+
	2241	+ subsurfaceField.setFloat(material.subsurface);
	2242	+ shadowbiasField.setFloat(material.shadowbias);
	2243	+ ambientField.setFloat(material.ambient);
	2244	+ specularField.setFloat(material.specular);
	2245	+ lightareaField.setFloat(material.lightarea);
	2246	+ shininessField.setFloat(material.shininess);
	2247	+
	2248	+ materialtouched = true;
	2249	+ applySelf();
	2250	+ }
	2251	+ });
	2252	+ presetpanel.add(candle);
	2253	+
	2254	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2255	+ shadowShader.setToolTipText("Shadow");
	2256	+ shadowShader.addMouseListener(new MouseAdapter()
	2257	+ {
	2258	+ public void mouseClicked(MouseEvent e)
	2259	+ {
	2260	+ diffuseField.setFloat(0.001);
	2261	+ ambientField.setFloat(0.001);
	2262	+ cameraField.setFloat(0.001);
	2263	+ specularField.setFloat(0.001);
	2264	+ fakedepthField.setFloat(0.001);
	2265	+ opacityField.setFloat(0.6);
	2266	+
	2267	+ materialtouched = true;
	2268	+ applySelf();
	2269	+ }
	2270	+ });
	2271	+ presetpanel.add(shadowShader);
	2272	+
	2273	+ cGridBag panel = new cGridBag().setVertical(true);
	2274	+
	2275	+ presetpanel.preferredWidth = 1;
	2276	+
	2277	+ materialpanel.add(presetpanel);
	2278	+ materialpanel.add(panel);
	2279	+
	2280	+ panel.preferredWidth = 8;
	2281	+
	2282	+ /*
1740	2283	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1741	2284	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1742		- */
	2285	+ */
1743	2286
1744	2287	cGridBag editBar = new cGridBag().setVertical(false);
1745	2288
..	..	@@ -1776,7 +2319,20 @@
1776	2319
1777	2320	cGridBag huepanel = new cGridBag();
1778	2321	cGridBag huelabel = new cGridBag();
1779		- huelabel.add(GetLabel("icons/hue.png", false));
	2322	+ cLabel hue = GetLabel("icons/hue.png", false);
	2323	+ hue.fit = true;
	2324	+
	2325	+ hue.addMouseListener(new MouseAdapter()
	2326	+ {
	2327	+ public void mousePressed(MouseEvent e)
	2328	+ {
	2329	+ int x = e.getX();
	2330	+
	2331	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2332	+ }
	2333	+ });
	2334	+
	2335	+ huelabel.add(hue);
1780	2336	huelabel.preferredWidth = 20;
1781	2337	huepanel.add(new cGridBag()); // Label
1782	2338	huepanel.add(huelabel); // Field/slider
..	..	@@ -1797,7 +2353,7 @@
1797	2353	cGridBag modulation = new cGridBag();
1798	2354	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1799	2355	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1800		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2356	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1801	2357	colorSection.add(modulation);
1802	2358
1803	2359	cGridBag opacity = new cGridBag();
..	..	@@ -2990,7 +3546,7 @@
2990	3546
2991	3547	freezematerial = true;
2992	3548	colorField.setFloat(mat.color);
2993		- modulationField.setFloat(mat.modulation);
	3549	+ saturationField.setFloat(mat.modulation);
2994	3550	metalnessField.setFloat(mat.metalness);
2995	3551	diffuseField.setFloat(mat.diffuse);
2996	3552	specularField.setFloat(mat.specular);
..	..	@@ -3052,32 +3608,8 @@
3052	3608
3053	3609	if (multiplyToggle != null)
3054	3610	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		- }
	3611	+
	3612	+ AllocProjectedVertices(object);
3081	3613
3082	3614	SetMaterial(mat, object.projectedVertices);
3083	3615	}
..	..	@@ -3197,6 +3729,17 @@
3197	3729	public void itemStateChanged(ItemEvent event)
3198	3730	{
3199	3731	// System.out.println("Propagate = " + propagate);
	3732	+ if (event.getSource() == pinButton)
	3733	+ {
	3734	+ copy.pinned ^= true;
	3735	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3736	+ {
	3737	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3738	+ copy.CloseUI();
	3739	+ //copy.editWindow.refreshContents();
	3740	+ }
	3741	+ }
	3742	+ else
3200	3743	if (event.getSource() == propagateToggle)
3201	3744	{
3202	3745	propagate ^= true;
..	..	@@ -3301,6 +3844,7 @@
3301	3844	} else if (event.getSource() == liveCB)
3302	3845	{
3303	3846	copy.live ^= true;
	3847	+ objEditor.refreshContents(true); // To show item colors
3304	3848	return;
3305	3849	} else if (event.getSource() == selectableCB)
3306	3850	{
..	..	@@ -3310,7 +3854,7 @@
3310	3854	{
3311	3855	copy.hide ^= true;
3312	3856	copy.Touch(); // display list issue
3313		- objEditor.refreshContents();
	3857	+ objEditor.refreshContents(true); // To show item colors
3314	3858	return;
3315	3859	} else if (event.getSource() == link2masterCB)
3316	3860	{
..	..	@@ -3375,7 +3919,7 @@
3375	3919	//System.out.println("ObjEditor " + event);
3376	3920	applySelf0(true);
3377	3921	//parent.applySelf();
3378		- objEditor.refreshContents();
	3922	+ // conflicts with requestFocus objEditor.refreshContents();
3379	3923	} else if (source == resetButton)
3380	3924	{
3381	3925	CameraPane.fullreset = true;
..	..	@@ -3668,6 +4212,7 @@
3668	4212	{
3669	4213	//Save(true);
3670	4214	Replace();
	4215	+ SetVersionStates();
3671	4216	}
3672	4217
3673	4218	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3686,15 +4231,30 @@
3686	4231	return true;
3687	4232	}
3688	4233
3689		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4234	+ void DeleteVersion()
	4235	+ {
	4236	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4237	+ {
	4238	+ copy.versionlist[i] = copy.versionlist[i+1];
	4239	+ }
	4240	+
	4241	+ if (copy.versionlist[copy.versionindex] == null)
	4242	+ copy.versionindex -= 1;
	4243	+
	4244	+ if (copy.versionindex != -1)
	4245	+ CopyChanged();
	4246	+
	4247	+ SetVersionStates();
	4248	+ }
3690	4249
3691	4250	public boolean Save(boolean user)
3692	4251	{
3693	4252	System.err.println("Save");
	4253	+ Replace();
3694	4254
3695		- cRadio tab = GetCurrentTab();
	4255	+ //cRadio tab = GetCurrentTab();
3696	4256
3697		- Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
	4257	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3698	4258
3699	4259	boolean thesame = false;
3700	4260
..	..	@@ -3706,10 +4266,15 @@
3706	4266	//EditorFrame.m_MainFrame.requestFocusInWindow();
3707	4267	if (!thesame)
3708	4268	{
	4269	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4270	+ {
	4271	+ copy.versionlist[i] = copy.versionlist[i-1];
	4272	+ }
	4273	+
3709	4274	//tab.user[tab.versionindex] = user;
3710	4275	//boolean increment = true; // tab.graphs[tab.versionindex] == null;
3711	4276
3712		- copy.versions[++copy.versionindex] = compress;
	4277	+ copy.versionlist[++copy.versionindex] = compress;
3713	4278
3714	4279	// if (increment)
3715	4280	// tab.versionindex++;
..	..	@@ -3719,13 +4284,13 @@
3719	4284
3720	4285	//assert(hashtable.isEmpty());
3721	4286
3722		- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3723		- {
3724		- //tab.user[i] = false;
3725		- copy.versions[i] = null;
3726		- }
	4287	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4288	+// {
	4289	+// //tab.user[i] = false;
	4290	+// copy.versionlist[i] = null;
	4291	+// }
3727	4292
3728		- SetUndoStates();
	4293	+ SetVersionStates();
3729	4294
3730	4295	// test save
3731	4296	if (false)
..	..	@@ -3748,15 +4313,49 @@
3748	4313
3749	4314	return !thesame;
3750	4315	}
3751		-
3752		- void CopyChanged(Object3D obj)
	4316	+
	4317	+ boolean flashIt = true;
	4318	+
	4319	+ void RefreshSelection()
3753	4320	{
3754		- SetUndoStates();
	4321	+ Object3D selection = new Object3D();
	4322	+
	4323	+ for (int i = 0; i < copy.selection.size(); i++)
	4324	+ {
	4325	+ Object3D elem = copy.selection.elementAt(i);
	4326	+
	4327	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4328	+
	4329	+ if (obj == null)
	4330	+ {
	4331	+ copy.selection.remove(i--);
	4332	+ }
	4333	+ else
	4334	+ {
	4335	+ selection.add(obj);
	4336	+ copy.selection.setElementAt(obj, i);
	4337	+ }
	4338	+ }
	4339	+
	4340	+ flashIt = false;
	4341	+ GetTree().clearSelection();
	4342	+ for (int i = 0; i < selection.size(); i++)
	4343	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4344	+ flashIt = true;
	4345	+
	4346	+ //refreshContents(false);
	4347	+ }
	4348	+
	4349	+ void CopyChanged()
	4350	+ {
	4351	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4352	+
	4353	+ SetVersionStates();
3755	4354
3756	4355	boolean temp = CameraPane.SWITCH;
3757	4356	CameraPane.SWITCH = false;
3758	4357
3759		- copy.ExtractBigData(versiontable);
	4358	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3760	4359
3761	4360	copy.clear();
3762	4361
..	..	@@ -3768,10 +4367,11 @@
3768	4367	copy.add(obj.get(i));
3769	4368	}
3770	4369
3771		- copy.RestoreBigData(versiontable);
	4370	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3772	4371
3773	4372	CameraPane.SWITCH = temp;
3774	4373
	4374	+ RefreshSelection();
3775	4375	//assert(hashtable.isEmpty());
3776	4376
3777	4377	copy.Touch();
..	..	@@ -3792,13 +4392,15 @@
3792	4392	}
3793	4393	}
3794	4394
3795		- refreshContents();
	4395	+ refreshContents(true);
3796	4396	}
3797	4397
3798		- cButton undoButton;
	4398	+ cButton previousVersionButton;
3799	4399	cButton restoreButton;
3800	4400	cButton replaceButton;
3801		- cButton redoButton;
	4401	+ cButton nextVersionButton;
	4402	+ cButton saveVersionButton;
	4403	+ cButton deleteVersionButton;
3802	4404
3803	4405	boolean muteSlider;
3804	4406
..	..	@@ -3806,39 +4408,47 @@
3806	4408	{
3807	4409	int count = 0;
3808	4410
3809		- for (int i = copy.versions.length; --i >= 0;)
	4411	+ for (int i = copy.versionlist.length; --i >= 0;)
3810	4412	{
3811		- if (copy.versions[i] != null)
	4413	+ if (copy.versionlist[i] != null)
3812	4414	count++;
3813	4415	}
3814	4416
3815	4417	return count;
3816	4418	}
3817	4419
3818		- void SetUndoStates()
	4420	+ void SetVersionStates()
3819	4421	{
3820		- cRadio tab = GetCurrentTab();
	4422	+ //if (true)
	4423	+ // return;
	4424	+
	4425	+ //cRadio tab = GetCurrentTab();
3821	4426
3822	4427	restoreButton.setEnabled(copy.versionindex != -1);
3823	4428	replaceButton.setEnabled(copy.versionindex != -1);
3824	4429
3825		- undoButton.setEnabled(copy.versionindex > 0);
3826		- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	4430	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4431	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4432	+
	4433	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4434	+ //copy.versionlist[copy.versionindex + 1] != null);
3827	4435
3828	4436	muteSlider = true;
	4437	+ versionSlider.setMinimum(0);
3829	4438	versionSlider.setMaximum(VersionCount() - 1);
3830	4439	versionSlider.setInteger(copy.versionindex);
	4440	+ versionSlider.setEnabled(copy.versionindex != -1);
3831	4441	muteSlider = false;
3832	4442	}
3833	4443
3834		- public boolean Undo()
	4444	+ public boolean PreviousVersion()
3835	4445	{
3836	4446	// Option?
3837	4447	Replace();
3838	4448
3839	4449	System.err.println("Undo");
3840	4450
3841		- cRadio tab = GetCurrentTab();
	4451	+ //cRadio tab = GetCurrentTab();
3842	4452
3843	4453	if (copy.versionindex == 0)
3844	4454	{
..	..	@@ -3861,7 +4471,7 @@
3861	4471
3862	4472	copy.versionindex -= 1;
3863	4473
3864		- CopyChanged((Object3D)copy.versions[copy.versionindex]);
	4474	+ CopyChanged();
3865	4475
3866	4476	return true;
3867	4477	}
..	..	@@ -3870,45 +4480,45 @@
3870	4480	{
3871	4481	System.err.println("Restore");
3872	4482
3873		- cRadio tab = GetCurrentTab();
	4483	+ //cRadio tab = GetCurrentTab();
3874	4484
3875		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4485	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3876	4486	{
3877	4487	java.awt.Toolkit.getDefaultToolkit().beep();
3878	4488	return false;
3879	4489	}
3880	4490
3881	4491	//CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3882		- CopyChanged(copy.versions[copy.versionindex]);
	4492	+ CopyChanged();
3883	4493
3884	4494	return true;
3885	4495	}
3886	4496
3887	4497	public boolean Replace()
3888	4498	{
3889		- System.err.println("Replace");
	4499	+ //System.err.println("Replace");
3890	4500
3891		- cRadio tab = GetCurrentTab();
	4501	+ //cRadio tab = GetCurrentTab();
3892	4502
3893		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4503	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3894	4504	{
3895	4505	// No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3896	4506	return false;
3897	4507	}
3898	4508
3899		- copy.versions[copy.versionindex] = CompressCopy();
	4509	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
3900	4510
3901	4511	return true;
3902	4512	}
3903	4513
3904		- public void Redo()
	4514	+ public void NextVersion()
3905	4515	{
3906	4516	// Option?
3907	4517	Replace();
3908	4518
3909		- cRadio tab = GetCurrentTab();
	4519	+ //cRadio tab = GetCurrentTab();
3910	4520
3911		- if (copy.versions[copy.versionindex + 1] == null)
	4521	+ if (copy.versionlist[copy.versionindex + 1] == null)
3912	4522	{
3913	4523	java.awt.Toolkit.getDefaultToolkit().beep();
3914	4524	return;
..	..	@@ -3916,7 +4526,7 @@
3916	4526
3917	4527	copy.versionindex += 1;
3918	4528
3919		- CopyChanged(copy.versions[copy.versionindex]);
	4529	+ CopyChanged();
3920	4530
3921	4531	//if (!tab.user[tab.versionindex])
3922	4532	// tab.graphs[tab.versionindex] = null;
..	..	@@ -4130,7 +4740,7 @@
4130	4740	//copy.material = new cMaterial(copy.GetMaterial());
4131	4741
4132	4742	current.color = (float) colorField.getFloat();
4133		- current.modulation = (float) modulationField.getFloat();
	4743	+ current.modulation = (float) saturationField.getFloat();
4134	4744	current.metalness = (float) metalnessField.getFloat();
4135	4745	current.diffuse = (float) diffuseField.getFloat();
4136	4746	current.specular = (float) specularField.getFloat();
..	..	@@ -4163,7 +4773,7 @@
4163	4773	cMaterial mat = copy.material;
4164	4774
4165	4775	colorField.SetToolTipValue((mat.color));
4166		- modulationField.SetToolTipValue((mat.modulation));
	4776	+ saturationField.SetToolTipValue((mat.modulation));
4167	4777	metalnessField.SetToolTipValue((mat.metalness));
4168	4778	diffuseField.SetToolTipValue((mat.diffuse));
4169	4779	specularField.SetToolTipValue((mat.specular));
..	..	@@ -4225,11 +4835,14 @@
4225	4835	if (muteSlider)
4226	4836	return;
4227	4837
	4838	+ Replace();
	4839	+
4228	4840	int version = versionSlider.getInteger();
4229	4841
4230		- if (copy.versions[version] != null)
	4842	+ if (version != -1 && copy.versionlist[version] != null)
4231	4843	{
4232		- CopyChanged(copy.versions[copy.versionindex = version]);
	4844	+ copy.versionindex = version;
	4845	+ CopyChanged();
4233	4846	}
4234	4847
4235	4848	return;
..	..	@@ -4269,6 +4882,12 @@
4269	4882	{
4270	4883	//System.out.println("stateChanged = " + this);
4271	4884	materialtouched = true;
	4885	+
	4886	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4887	+ {
	4888	+ saturationField.setFloat(1);
	4889	+ }
	4890	+
4272	4891	applySelf();
4273	4892	//System.out.println("this = " + this);
4274	4893	//System.out.println("PARENT = " + parent);
..	..	@@ -4568,6 +5187,7 @@
4568	5187	{
4569	5188	if (GetTree() != null)
4570	5189	{
	5190	+ GetTree().revalidate();
4571	5191	GetTree().repaint();
4572	5192	}
4573	5193
..	..	@@ -4576,6 +5196,11 @@
4576	5196	ctrlPanel.validate(); // ? new
4577	5197	ctrlPanel.repaint();
4578	5198	}
	5199	+
	5200	+ if (previousVersionButton != null && copy.versionlist != null)
	5201	+ SetVersionStates();
	5202	+
	5203	+ cameraView.requestFocusInWindow();
4579	5204	}
4580	5205
4581	5206	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4607,7 +5232,7 @@
4607	5232	// group = (Composite) group.get(0);
4608	5233	// }
4609	5234
4610		- System.out.println("makeSomething of " + thing);
	5235	+ //System.out.println("makeSomething of " + thing);
4611	5236
4612	5237	/*
4613	5238	if (deselect && jList != null)
..	..	@@ -4959,13 +5584,17 @@
4959	5584	c.addChild(csg);
4960	5585	}
4961	5586
4962		- copy.versions = readobj.versions;
	5587	+ copy.versionlist = readobj.versionlist;
4963	5588	copy.versionindex = readobj.versionindex;
	5589	+ copy.versiontable = readobj.versiontable;
4964	5590
4965		- if (copy.versions == null)
	5591	+ if (copy.versionlist == null)
4966	5592	{
4967		- copy.versions = new Object3D[100];
	5593	+ // Backward compatibility
	5594	+ copy.versionlist = new Object3D[100];
4968	5595	copy.versionindex = -1;
	5596	+
	5597	+ //Save(true);
4969	5598	}
4970	5599
4971	5600	//? SetUndoStates();
..	..	@@ -4980,7 +5609,7 @@
4980	5609	{
4981	5610	if (Grafreed.standAlone)
4982	5611	{
4983		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5612	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4984	5613	browser.show();
4985	5614	String filename = browser.getFile();
4986	5615	if (filename != null && filename.length() > 0)
..	..	@@ -5057,6 +5686,8 @@
5057	5686
5058	5687	void save()
5059	5688	{
	5689	+ Replace();
	5690	+
5060	5691	if (lastname == null)
5061	5692	{
5062	5693	return;
..	..	@@ -5299,6 +5930,7 @@
5299	5930	ButtonGroup buttonGroup;
5300	5931
5301	5932	cGridBag toolboxPanel;
	5933	+ cGridBag skyboxPanel;
5302	5934	cGridBag materialPanel;
5303	5935	cGridBag ctrlPanel;
5304	5936
..	..	@@ -5372,7 +6004,7 @@
5372	6004	JLabel colorLabel;
5373	6005	cNumberSlider colorField;
5374	6006	JLabel modulationLabel;
5375		- cNumberSlider modulationField;
	6007	+ cNumberSlider saturationField;
5376	6008	JLabel metalnessLabel;
5377	6009	cNumberSlider metalnessField;
5378	6010	JLabel diffuseLabel;
..	..	@@ -5403,6 +6035,7 @@
5403	6035	cNumberSlider anisoField;
5404	6036	JLabel anisoVLabel;
5405	6037	cNumberSlider anisoVField;
	6038	+
5406	6039	JLabel cameraLabel;
5407	6040	cNumberSlider cameraField;
5408	6041	JLabel selfshadowLabel;
..	..	@@ -5417,6 +6050,7 @@
5417	6050	cNumberSlider fakedepthField;
5418	6051	JLabel shadowbiasLabel;
5419	6052	cNumberSlider shadowbiasField;
	6053	+
5420	6054	JLabel bumpLabel;
5421	6055	cNumberSlider bumpField;
5422	6056	JLabel noiseLabel;