~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -72,6 +72,21 @@
72	72	}
73	73	}
74	74
	75	+ public Composite CreateCameras()
	76	+ {
	77	+ Composite cams = new cTemplate();
	78	+ cams.name = "Cameras";
	79	+ copy.insertElementAt(cams, 0);
	80	+
	81	+ cams.addChild(new Camera());
	82	+ cams.addChild(new Camera(1));
	83	+ cams.addChild(new Camera(2));
	84	+ cams.addChild(new Camera(3));
	85	+ cams.addChild(new Camera(4));
	86	+
	87	+ return cams;
	88	+ }
	89	+
75	90	public cGridBag GetSeparator()
76	91	{
77	92	cGridBag separator = new cGridBag();
..	..	@@ -83,7 +98,10 @@
83	98	cButton GetButton(String name, boolean border)
84	99	{
85	100	ImageIcon icon = GetIcon(name);
86		- return new cButton(icon, border);
	101	+ if (icon != null \|\| name.contains("/"))
	102	+ return new cButton(icon, border);
	103	+ else
	104	+ return new cButton(name, border);
87	105	}
88	106
89	107	cLabel GetLabel(String name, boolean border)
..	..	@@ -106,7 +124,7 @@
106	124
107	125	static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
108	126
109		- ImageIcon GetIcon(String name)
	127	+ static ImageIcon GetIcon(String name)
110	128	{
111	129	javax.swing.ImageIcon iconCache = icons.get(name);
112	130	if (iconCache != null)
..	..	@@ -116,8 +134,14 @@
116	134
117	135	try
118	136	{
119		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
120		-
	137	+ BufferedImage image;
	138	+
	139	+ if (name.endsWith("jpg"))
	140	+ // Much faster!
	141	+ image = new sun.awt.image.codec.JPEGImageDecoderImpl(ObjEditor.class.getClassLoader().getResourceAsStream(name)).decodeAsBufferedImage();
	142	+ else
	143	+ image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	144	+
121	145	// if (image.getWidth() > 48 && image.getHeight() > 48)
122	146	// {
123	147	// BufferedImage resized = new BufferedImage(48, 48, image.getType());
..	..	@@ -359,14 +383,6 @@
359	383	client = inClient;
360	384	copy = client;
361	385
362		- if (copy.versionlist == null)
363		- {
364		- copy.versionlist = new Object3D[100];
365		- copy.versionindex = -1;
366		-
367		-// Save(true);
368		- }
369		-
370	386	SetupUI2(callee.GetEditor());
371	387	}
372	388
..	..	@@ -388,7 +404,8 @@
388	404	//parent = p;
389	405
390	406	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
391		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	407	+ if (Globals.DEBUG)
	408	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
392	409	//gd.setFullScreenWindow(this);
393	410	//setResizable(false);
394	411	//if (!isDisplayable())
..	..	@@ -425,6 +442,9 @@
425	442
426	443	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
427	444
	445	+ // This is to refresh the UI of the material panel.
	446	+ boolean patchMaterial;
	447	+
428	448	void SetupMenu()
429	449	{
430	450	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -438,8 +458,11 @@
438	458	importOBJItem.addActionListener(this);
439	459	import3DSItem = menu.add(new MenuItem("3DS file..."));
440	460	import3DSItem.addActionListener(this);
	461	+ if (Globals.ADVANCED)
	462	+ {
441	463	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
442	464	importVRMLX3DItem.addActionListener(this);
	465	+ }
443	466	menu.add("-");
444	467	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
445	468	importGFDItem.addActionListener(this);
..	..	@@ -950,18 +973,29 @@
950	973	boolean temp = CameraPane.SWITCH;
951	974	CameraPane.SWITCH = false;
952	975
953		- object.ExtractBigData(versiontable);
	976	+ if (Grafreed.grafreed.universe.versiontable == null)
	977	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	978	+
	979	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
954	980	// if (copy == client)
955	981
956	982	Object3D versions[] = object.versionlist;
	983	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
957	984	object.versionlist = null;
	985	+ object.versiontable = null;
	986	+
	987	+ Object3D parent = object.parent;
	988	+ object.parent = null;
958	989
959	990	//byte[] compress = Compress(copy);
960	991	Object3D compress = (Object3D)Grafreed.clone(object);
961	992
962		- object.versionlist = versions;
	993	+ object.parent = parent;
963	994
964		- object.RestoreBigData(versiontable);
	995	+ object.versionlist = versions;
	996	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	997	+
	998	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
965	999
966	1000	CameraPane.SWITCH = temp;
967	1001
..	..	@@ -1300,7 +1334,7 @@
1300	1334
1301	1335	//if (copy.pinned)
1302	1336	{
1303		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1337	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1304	1338	pinButton.setSelected(copy.pinned);
1305	1339	cGridBag t = new cGridBag();
1306	1340	t.preferredWidth = 2;
..	..	@@ -1323,14 +1357,14 @@
1323	1357
1324	1358	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1325	1359	liveCB.setToolTipText("Animate object");
	1360	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1361	+ markCB.setToolTipText("Set target transform");
1326	1362	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1327	1363	selectableCB.setToolTipText("Make object selectable");
1328	1364	// Return();
1329	1365
1330	1366	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1331	1367	hideCB.setToolTipText("Hide object");
1332		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1333		- markCB.setToolTipText("As animation target transform");
1334	1368
1335	1369	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1336	1370
..	..	@@ -1532,22 +1566,9 @@
1532	1566
1533	1567	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1534	1568	{
1535		- System.out.println("CREATE CAMERAS");
1536		- cams = new cTemplate();
1537		- cams.name = "Cameras";
1538		- copy.insertElementAt(cams, 0);
1539		- //cams.parent = copy;
1540		-
1541		- cam = new Camera(); // LA.newVector(3, 2, 1));
1542		- cams.addChild(cam);
1543		- cam = new Camera(1);
1544		- cams.addChild(cam);
1545		- cam = new Camera(2);
1546		- cams.addChild(cam);
1547		- cam = new Camera(3);
1548		- cams.addChild(cam);
1549		- cam = new Camera(4); // Light
1550		- cams.addChild(cam);
	1569	+ if (Globals.DEBUG)
	1570	+ System.out.println("CREATE CAMERAS");
	1571	+ cams = CreateCameras();
1551	1572	} else
1552	1573	{
1553	1574	cams = (cGroup) copy.get(0);
..	..	@@ -1613,6 +1634,45 @@
1613	1634	//frontView.object = copy;
1614	1635	//sideView.object = copy;
1615	1636
	1637	+ transformPanel = new cGridBag().setVertical(true);
	1638	+
	1639	+ cGridBag resetTransformPanel = new cGridBag();
	1640	+
	1641	+ resetTransformPanel.preferredHeight = 2;
	1642	+
	1643	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1644	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1645	+ resetTransform.addMouseListener(new MouseAdapter()
	1646	+ {
	1647	+ public void mouseClicked(MouseEvent e)
	1648	+ {
	1649	+ ResetTransform();
	1650	+ }
	1651	+ });
	1652	+ resetTransformPanel.add(resetTransform);
	1653	+
	1654	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1655	+ resetTransform.setToolTipText("Reset Translation only");
	1656	+ resetTransform.addMouseListener(new MouseAdapter()
	1657	+ {
	1658	+ public void mouseClicked(MouseEvent e)
	1659	+ {
	1660	+ ResetTransform(1);
	1661	+ }
	1662	+ });
	1663	+ resetTransformPanel.add(resetTransform);
	1664	+
	1665	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1666	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1667	+ resetTransform.addMouseListener(new MouseAdapter()
	1668	+ {
	1669	+ public void mouseClicked(MouseEvent e)
	1670	+ {
	1671	+ ResetTransform(2);
	1672	+ }
	1673	+ });
	1674	+ resetTransformPanel.add(resetTransform);
	1675	+
1616	1676	XYZPanel = new cGridBag().setVertical(true);
1617	1677	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1618	1678
..	..	@@ -1622,6 +1682,9 @@
1622	1682	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1623	1683	//XYZPanel.setName("XYZ");
1624	1684
	1685	+ transformPanel.add(resetTransformPanel);
	1686	+ transformPanel.add(XYZPanel);
	1687	+
1625	1688	/*
1626	1689	gridPanel = new JPanel(); //new BorderLayout());
1627	1690	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1629,12 +1692,12 @@
1629	1692	gridPanel.add(cameraView);
1630	1693	gridPanel.add(XYZPanel);
1631	1694	*/
1632		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1633		- gridPanel.setContinuousLayout(true);
1634		- gridPanel.setOneTouchExpandable(true);
1635		- gridPanel.setDividerLocation(1.0);
1636		- gridPanel.setDividerSize(9);
1637		- gridPanel.setResizeWeight(0.85);
	1695	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1696	+// gridPanel.setContinuousLayout(true);
	1697	+// gridPanel.setOneTouchExpandable(true);
	1698	+// gridPanel.setDividerLocation(1.0);
	1699	+// gridPanel.setDividerSize(9);
	1700	+// gridPanel.setResizeWeight(0.85);
1638	1701
1639	1702	// aConstraints.weighty = 0;
1640	1703	//System.out.println("THIS = " + this);
..	..	@@ -1657,30 +1720,34 @@
1657	1720
1658	1721	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1659	1722	//tmp.setName("Edit");
1660		- objectPanel.add(materialPanel);
1661		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1662		- objectPanel.setToolTipTextAt(0, "Material");
1663		-
	1723	+ objectPanel.add(skyboxPanel);
	1724	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1725	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1726	+
1664	1727	objectPanel.add(toolboxPanel);
1665	1728	objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1666	1729	objectPanel.setToolTipTextAt(1, "Objects & textures");
1667	1730
1668		- objectPanel.add(skyboxPanel);
1669		- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1670		- objectPanel.setToolTipTextAt(2, "Backgrounds");
1671		-
	1731	+ objectPanel.add(materialPanel);
	1732	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1733	+ objectPanel.setToolTipTextAt(2, "Material");
	1734	+
1672	1735	// JPanel north = new JPanel(new BorderLayout());
1673	1736	// north.setName("Edit");
1674	1737	// north.add(ctrlPanel, BorderLayout.NORTH);
1675	1738	// objectPanel.add(north);
1676	1739	objectPanel.add(editPanel);
1677		- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1740	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1678	1741	objectPanel.setToolTipTextAt(3, "Edit controls");
1679	1742
1680		- objectPanel.add(XYZPanel);
	1743	+ objectPanel.add(transformPanel);
1681	1744	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1682		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1745	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1683	1746
	1747	+ patchMaterial = true;
	1748	+ cameraView.patchMaterial = this;
	1749	+ objectPanel.setSelectedIndex(2);
	1750	+
1684	1751	/*
1685	1752	aConstraints.gridx = 0;
1686	1753	aConstraints.gridwidth = 1;
..	..	@@ -1700,7 +1767,7 @@
1700	1767	scrollpane.addMouseWheelListener(this); // Default not fast enough
1701	1768
1702	1769	/JTabbedPane/ scenePanel = new cGridBag();
1703		- scenePanel.preferredWidth = 5;
	1770	+ scenePanel.preferredWidth = 6;
1704	1771
1705	1772	JTabbedPane tabbedPane = new JTabbedPane();
1706	1773	tabbedPane.add(scrollpane);
..	..	@@ -1711,17 +1778,109 @@
1711	1778
1712	1779	AddOptions(optionsPanel); //, aConstraints);
1713	1780
1714		- tabbedPane.add(optionsPanel);
1715		-
1716	1781	tabbedPane.add(FSPane = new cFileSystemPane(this));
1717	1782
	1783	+ tabbedPane.add(optionsPanel);
	1784	+
1718	1785	scenePanel.add(tabbedPane);
1719	1786
1720		- //if (Globals.ADVANCED)
1721		-// tabbedPane.add(infoPanel);
1722		-// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1723		-// tabbedPane.setToolTipTextAt(3, "Information");
	1787	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1788	+ creditsPanel.setName("Credits");
1724	1789
	1790	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1791	+ creditsPanel.add(ogaLabel);
	1792	+
	1793	+ cButton creditButton;
	1794	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1795	+ creditButton.setToolTipText("https://opengameart.org");
	1796	+
	1797	+ creditButton.addMouseListener(new MouseAdapter()
	1798	+ {
	1799	+ public void mouseClicked(MouseEvent e)
	1800	+ {
	1801	+ try
	1802	+ {
	1803	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1804	+ } catch (Exception e1)
	1805	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1806	+ {
	1807	+ e1.printStackTrace();
	1808	+ }
	1809	+ }
	1810	+ });
	1811	+
	1812	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1813	+ creditsPanel.add(ogaLabel);
	1814	+
	1815	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1816	+ creditButton.setToolTipText("https://3delicious.net");
	1817	+
	1818	+ creditButton.addMouseListener(new MouseAdapter()
	1819	+ {
	1820	+ public void mouseClicked(MouseEvent e)
	1821	+ {
	1822	+ try
	1823	+ {
	1824	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1825	+ } catch (Exception e1)
	1826	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1827	+ {
	1828	+ e1.printStackTrace();
	1829	+ }
	1830	+ }
	1831	+ });
	1832	+
	1833	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1834	+ creditButton.setToolTipText("https://archive3d.net");
	1835	+
	1836	+ creditButton.addMouseListener(new MouseAdapter()
	1837	+ {
	1838	+ public void mouseClicked(MouseEvent e)
	1839	+ {
	1840	+ try
	1841	+ {
	1842	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1843	+ } catch (Exception e1)
	1844	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1845	+ {
	1846	+ e1.printStackTrace();
	1847	+ }
	1848	+ }
	1849	+ });
	1850	+
	1851	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1852	+ creditButton.setToolTipText("https://turbosquid.com");
	1853	+
	1854	+ creditButton.addMouseListener(new MouseAdapter()
	1855	+ {
	1856	+ public void mouseClicked(MouseEvent e)
	1857	+ {
	1858	+ try
	1859	+ {
	1860	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1861	+ } catch (Exception e1)
	1862	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1863	+ {
	1864	+ e1.printStackTrace();
	1865	+ }
	1866	+ }
	1867	+ });
	1868	+
	1869	+ for (int i=6; --i>=0;)
	1870	+ {
	1871	+ creditsPanel.add(new cGridBag());
	1872	+ }
	1873	+
	1874	+ tabbedPane.add(creditsPanel);
	1875	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1876	+
	1877	+ if (Globals.ADVANCED)
	1878	+ {
	1879	+ objectPanel.add(infoPanel);
	1880	+ objectPanel.setIconAt(5, GetIcon("icons/info.png"));
	1881	+ objectPanel.setToolTipTextAt(4, "Information");
	1882	+ }
	1883	+
1725	1884	/*
1726	1885	cTree jTree = new cTree(null);
1727	1886	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1742,13 +1901,13 @@
1742	1901	jtp.add(tree);
1743	1902	*/
1744	1903
1745		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1746		- bigPanel.setContinuousLayout(true);
1747		- bigPanel.setOneTouchExpandable(true);
1748		- bigPanel.setDividerLocation(0.8);
1749		- bigPanel.setDividerSize(15);
1750		- bigPanel.setResizeWeight(0.15);
1751		- bigPanel.setName("Scene");
	1904	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1905	+// bigPanel.setContinuousLayout(true);
	1906	+// bigPanel.setOneTouchExpandable(true);
	1907	+// bigPanel.setDividerLocation(0.8);
	1908	+// bigPanel.setDividerSize(15);
	1909	+// bigPanel.setResizeWeight(0.15);
	1910	+// bigPanel.setName("Scene");
1752	1911
1753	1912	//bigPanel.setLayout(new BorderLayout());
1754	1913	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1832,7 +1991,7 @@
1832	1991
1833	1992	cameraView.requestFocusInWindow();
1834	1993
1835		- gridPanel.setDividerLocation(1.0);
	1994	+// gridPanel.setDividerLocation(1.0);
1836	1995
1837	1996	frame.validate();
1838	1997
..	..	@@ -1867,7 +2026,7 @@
1867	2026	{
1868	2027	cGridBag presetpanel = new cGridBag().setVertical(true);
1869	2028
1870		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	2029	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1871	2030	skin.setToolTipText("Skin");
1872	2031	skin.addMouseListener(new MouseAdapter()
1873	2032	{
..	..	@@ -1878,7 +2037,15 @@
1878	2037
1879	2038	// Skin
1880	2039	colorField.setFloat(material.color);
1881		- saturationField.setFloat(material.modulation);
	2040	+ float saturation = material.modulation;
	2041	+
	2042	+ if (!cameraView.Skinshader)
	2043	+ {
	2044	+ saturation /= 1.5;
	2045	+ }
	2046	+
	2047	+ saturationField.setFloat(saturation);
	2048	+
1882	2049	subsurfaceField.setFloat(material.subsurface);
1883	2050	selfshadowField.setFloat(material.diffuseness);
1884	2051	diffusenessField.setFloat(material.factor);
..	..	@@ -1897,7 +2064,7 @@
1897	2064	});
1898	2065	presetpanel.add(skin);
1899	2066
1900		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2067	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1901	2068	lambert.setToolTipText("Diffuse");
1902	2069	lambert.addMouseListener(new MouseAdapter()
1903	2070	{
..	..	@@ -1915,7 +2082,7 @@
1915	2082	});
1916	2083	presetpanel.add(lambert);
1917	2084
1918		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2085	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1919	2086	diffuse2.setToolTipText("Diffuse2");
1920	2087	diffuse2.addMouseListener(new MouseAdapter()
1921	2088	{
..	..	@@ -1933,7 +2100,7 @@
1933	2100	});
1934	2101	presetpanel.add(diffuse2);
1935	2102
1936		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2103	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1937	2104	diffusemoon.setToolTipText("Moon");
1938	2105	diffusemoon.addMouseListener(new MouseAdapter()
1939	2106	{
..	..	@@ -1951,7 +2118,7 @@
1951	2118	});
1952	2119	presetpanel.add(diffusemoon);
1953	2120
1954		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2121	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1955	2122	diffusemoon2.setToolTipText("Moon2");
1956	2123	diffusemoon2.addMouseListener(new MouseAdapter()
1957	2124	{
..	..	@@ -1969,7 +2136,7 @@
1969	2136	});
1970	2137	presetpanel.add(diffusemoon2);
1971	2138
1972		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2139	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1973	2140	diffusemoon3.setToolTipText("Moon3");
1974	2141	diffusemoon3.addMouseListener(new MouseAdapter()
1975	2142	{
..	..	@@ -1987,7 +2154,7 @@
1987	2154	});
1988	2155	presetpanel.add(diffusemoon3);
1989	2156
1990		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2157	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1991	2158	diffusesheen.setToolTipText("Sheen");
1992	2159	diffusesheen.addMouseListener(new MouseAdapter()
1993	2160	{
..	..	@@ -2004,7 +2171,7 @@
2004	2171	});
2005	2172	presetpanel.add(diffusesheen);
2006	2173
2007		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2174	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
2008	2175	rough.setToolTipText("Rough metal");
2009	2176	rough.addMouseListener(new MouseAdapter()
2010	2177	{
..	..	@@ -2022,7 +2189,7 @@
2022	2189	});
2023	2190	presetpanel.add(rough);
2024	2191
2025		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2192	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
2026	2193	rough2.setToolTipText("Medium metal");
2027	2194	rough2.addMouseListener(new MouseAdapter()
2028	2195	{
..	..	@@ -2040,7 +2207,7 @@
2040	2207	});
2041	2208	presetpanel.add(rough2);
2042	2209
2043		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2210	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
2044	2211	shini0.setToolTipText("Shiny");
2045	2212	shini0.addMouseListener(new MouseAdapter()
2046	2213	{
..	..	@@ -2058,7 +2225,7 @@
2058	2225	});
2059	2226	presetpanel.add(shini0);
2060	2227
2061		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2228	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
2062	2229	shini1.setToolTipText("Shiny2");
2063	2230	shini1.addMouseListener(new MouseAdapter()
2064	2231	{
..	..	@@ -2076,7 +2243,7 @@
2076	2243	});
2077	2244	presetpanel.add(shini1);
2078	2245
2079		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2246	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2080	2247	shini2.setToolTipText("Shiny3");
2081	2248	shini2.addMouseListener(new MouseAdapter()
2082	2249	{
..	..	@@ -2094,7 +2261,7 @@
2094	2261	});
2095	2262	presetpanel.add(shini2);
2096	2263
2097		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2264	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2098	2265	aniso.setToolTipText("AnisoU");
2099	2266	aniso.addMouseListener(new MouseAdapter()
2100	2267	{
..	..	@@ -2112,7 +2279,7 @@
2112	2279	});
2113	2280	presetpanel.add(aniso);
2114	2281
2115		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2282	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2116	2283	aniso2.setToolTipText("AnisoV");
2117	2284	aniso2.addMouseListener(new MouseAdapter()
2118	2285	{
..	..	@@ -2130,7 +2297,7 @@
2130	2297	});
2131	2298	presetpanel.add(aniso2);
2132	2299
2133		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2300	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2134	2301	aniso3.setToolTipText("AnisoUV");
2135	2302	aniso3.addMouseListener(new MouseAdapter()
2136	2303	{
..	..	@@ -2148,7 +2315,7 @@
2148	2315	});
2149	2316	presetpanel.add(aniso3);
2150	2317
2151		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2318	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2152	2319	velvet0.setToolTipText("Velvet");
2153	2320	velvet0.addMouseListener(new MouseAdapter()
2154	2321	{
..	..	@@ -2170,7 +2337,7 @@
2170	2337	});
2171	2338	presetpanel.add(velvet0);
2172	2339
2173		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2340	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2174	2341	bump0.setToolTipText("Bump texture");
2175	2342	bump0.addMouseListener(new MouseAdapter()
2176	2343	{
..	..	@@ -2189,14 +2356,14 @@
2189	2356	});
2190	2357	presetpanel.add(bump0);
2191	2358
2192		- cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2359	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
2193	2360	borderShader.setToolTipText("Border fade");
2194	2361	borderShader.addMouseListener(new MouseAdapter()
2195	2362	{
2196	2363	public void mouseClicked(MouseEvent e)
2197	2364	{
2198		- borderfadeField.setFloat(0.5);
2199		- opacityField.setFloat(0.6);
	2365	+ borderfadeField.setFloat(0.4);
	2366	+ opacityField.setFloat(0.75);
2200	2367
2201	2368	materialtouched = true;
2202	2369	applySelf();
..	..	@@ -2204,7 +2371,7 @@
2204	2371	});
2205	2372	presetpanel.add(borderShader);
2206	2373
2207		- cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2374	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2208	2375	halo.setToolTipText("Halo");
2209	2376	halo.addMouseListener(new MouseAdapter()
2210	2377	{
..	..	@@ -2221,7 +2388,7 @@
2221	2388	});
2222	2389	presetpanel.add(halo);
2223	2390
2224		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2391	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2225	2392	candle.setToolTipText("Candle");
2226	2393	candle.addMouseListener(new MouseAdapter()
2227	2394	{
..	..	@@ -2243,7 +2410,7 @@
2243	2410	});
2244	2411	presetpanel.add(candle);
2245	2412
2246		- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2413	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2247	2414	shadowShader.setToolTipText("Shadow");
2248	2415	shadowShader.addMouseListener(new MouseAdapter()
2249	2416	{
..	..	@@ -2262,6 +2429,48 @@
2262	2429	});
2263	2430	presetpanel.add(shadowShader);
2264	2431
	2432	+ cLabel para0 = GetLabel("icons/shadericons/parallax0.png", !Globals.NIMBUSLAF);
	2433	+ para0.setToolTipText("No parallax");
	2434	+ para0.addMouseListener(new MouseAdapter()
	2435	+ {
	2436	+ public void mouseClicked(MouseEvent e)
	2437	+ {
	2438	+ parallaxField.setFloat(0.125);
	2439	+
	2440	+ materialtouched = true;
	2441	+ applySelf();
	2442	+ }
	2443	+ });
	2444	+ presetpanel.add(para0);
	2445	+
	2446	+ cLabel para1 = GetLabel("icons/shadericons/parallax1.png", !Globals.NIMBUSLAF);
	2447	+ para1.setToolTipText("With parallax");
	2448	+ para1.addMouseListener(new MouseAdapter()
	2449	+ {
	2450	+ public void mouseClicked(MouseEvent e)
	2451	+ {
	2452	+ parallaxField.setFloat(0.13);
	2453	+
	2454	+ materialtouched = true;
	2455	+ applySelf();
	2456	+ }
	2457	+ });
	2458	+ presetpanel.add(para1);
	2459	+
	2460	+ cLabel para2 = GetLabel("icons/shadericons/parallax2.png", !Globals.NIMBUSLAF);
	2461	+ para2.setToolTipText("Reset parallax");
	2462	+ para2.addMouseListener(new MouseAdapter()
	2463	+ {
	2464	+ public void mouseClicked(MouseEvent e)
	2465	+ {
	2466	+ parallaxField.setFloat(0.14);
	2467	+
	2468	+ materialtouched = true;
	2469	+ applySelf();
	2470	+ }
	2471	+ });
	2472	+ presetpanel.add(para2);
	2473	+
2265	2474	cGridBag panel = new cGridBag().setVertical(true);
2266	2475
2267	2476	presetpanel.preferredWidth = 1;
..	..	@@ -2278,19 +2487,19 @@
2278	2487
2279	2488	cGridBag editBar = new cGridBag().setVertical(false);
2280	2489
2281		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2490	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2282	2491	createMaterialButton.setToolTipText("Create material");
2283	2492
2284	2493	/*
2285	2494	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2286	2495	*/
2287	2496
2288		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2497	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2289	2498	clearMaterialButton.setToolTipText("Clear material");
2290	2499
2291	2500	if (Globals.ADVANCED)
2292	2501	{
2293		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2502	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2294	2503	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2295	2504	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2296	2505	}
..	..	@@ -2311,9 +2520,20 @@
2311	2520
2312	2521	cGridBag huepanel = new cGridBag();
2313	2522	cGridBag huelabel = new cGridBag();
2314		- skin = GetLabel("icons/hue.png", false);
2315		- skin.fit = true;
2316		- huelabel.add(skin);
	2523	+ cLabel hue = GetLabel("icons/hue.png", false);
	2524	+ hue.fit = true;
	2525	+
	2526	+ hue.addMouseListener(new MouseAdapter()
	2527	+ {
	2528	+ public void mousePressed(MouseEvent e)
	2529	+ {
	2530	+ int x = e.getX();
	2531	+
	2532	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2533	+ }
	2534	+ });
	2535	+
	2536	+ huelabel.add(hue);
2317	2537	huelabel.preferredWidth = 20;
2318	2538	huepanel.add(new cGridBag()); // Label
2319	2539	huepanel.add(huelabel); // Field/slider
..	..	@@ -2496,6 +2716,12 @@
2496	2716	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
2497	2717	colorSection.add(backlit);
2498	2718
	2719	+ cGridBag parallax = new cGridBag();
	2720	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2721	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2722	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.25, -0.125)); // , aConstraints);
	2723	+ colorSection.add(parallax);
	2724	+
2499	2725	//panel.add(new JSeparator());
2500	2726
2501	2727	//panel.add(globalSection);
..	..	@@ -3547,6 +3773,7 @@
3547	3773	shadowField.setFloat(mat.shadow);
3548	3774	textureField.setFloat(mat.texture);
3549	3775	opacityField.setFloat(mat.opacity);
	3776	+ parallaxField.setFloat(mat.parallax + 0.125f);
3550	3777	fakedepthField.setFloat(mat.fakedepth);
3551	3778	shadowbiasField.setFloat(mat.shadowbias);
3552	3779	bumpField.setInteger(1); // dec 2013
..	..	@@ -3900,7 +4127,7 @@
3900	4127	//System.out.println("ObjEditor " + event);
3901	4128	applySelf0(true);
3902	4129	//parent.applySelf();
3903		- objEditor.refreshContents();
	4130	+ // conflicts with requestFocus objEditor.refreshContents();
3904	4131	} else if (source == resetButton)
3905	4132	{
3906	4133	CameraPane.fullreset = true;
..	..	@@ -4080,11 +4307,18 @@
4080	4307
4081	4308	void New()
4082	4309	{
4083		- while (copy.Size() > 1)
	4310	+ while (copy.Size() > 0)
4084	4311	{
4085		- copy.remove(1);
	4312	+ copy.remove(0);
4086	4313	}
4087	4314
	4315	+ copy.selection.clear();
	4316	+
	4317	+ if (copy == Grafreed.grafreed.universe)
	4318	+ {
	4319	+ CreateCameras();
	4320	+ cameraView.SetCamera(GetCamera(copy, 0));
	4321	+ }
4088	4322	ResetModel();
4089	4323	objEditor.refreshContents();
4090	4324	}
..	..	@@ -4212,8 +4446,6 @@
4212	4446	return true;
4213	4447	}
4214	4448
4215		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4216		-
4217	4449	void DeleteVersion()
4218	4450	{
4219	4451	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4221,7 +4453,11 @@
4221	4453	copy.versionlist[i] = copy.versionlist[i+1];
4222	4454	}
4223	4455
4224		- CopyChanged();
	4456	+ if (copy.versionlist[copy.versionindex] == null)
	4457	+ copy.versionindex -= 1;
	4458	+
	4459	+ if (copy.versionindex != -1)
	4460	+ CopyChanged();
4225	4461
4226	4462	SetVersionStates();
4227	4463	}
..	..	@@ -4231,7 +4467,11 @@
4231	4467	System.err.println("Save");
4232	4468	Replace();
4233	4469
4234		- //cRadio tab = GetCurrentTab();
	4470	+ if (copy.versionlist == null)
	4471	+ {
	4472	+ copy.versionlist = new Object3D[100];
	4473	+ copy.versionindex = -1;
	4474	+ }
4235	4475
4236	4476	Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4237	4477
..	..	@@ -4334,7 +4574,7 @@
4334	4574	boolean temp = CameraPane.SWITCH;
4335	4575	CameraPane.SWITCH = false;
4336	4576
4337		- copy.ExtractBigData(versiontable);
	4577	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4338	4578
4339	4579	copy.clear();
4340	4580
..	..	@@ -4346,7 +4586,7 @@
4346	4586	copy.add(obj.get(i));
4347	4587	}
4348	4588
4349		- copy.RestoreBigData(versiontable);
	4589	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4350	4590
4351	4591	CameraPane.SWITCH = temp;
4352	4592
..	..	@@ -4396,6 +4636,8 @@
4396	4636	return count;
4397	4637	}
4398	4638
	4639	+ public cGridBag versionSliderPane;
	4640	+
4399	4641	void SetVersionStates()
4400	4642	{
4401	4643	//if (true)
..	..	@@ -4403,21 +4645,36 @@
4403	4645
4404	4646	//cRadio tab = GetCurrentTab();
4405	4647
4406		- restoreButton.setEnabled(copy.versionindex != -1);
4407		- replaceButton.setEnabled(copy.versionindex != -1);
4408		-
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);
4414		-
4415		- muteSlider = true;
4416		- versionSlider.setMinimum(0);
4417		- versionSlider.setMaximum(VersionCount() - 1);
4418		- versionSlider.setInteger(copy.versionindex);
4419		- versionSlider.setEnabled(copy.versionindex != -1);
4420		- muteSlider = false;
	4648	+ if (copy.versionindex == -2)
	4649	+ {
	4650	+ saveVersionButton.setEnabled(false);
	4651	+ restoreButton.setEnabled(false);
	4652	+ replaceButton.setEnabled(false);
	4653	+ previousVersionButton.setEnabled(false);
	4654	+ nextVersionButton.setEnabled(false);
	4655	+ deleteVersionButton.setEnabled(false);
	4656	+ versionSliderPane.setVisible(false);
	4657	+ }
	4658	+ else
	4659	+ {
	4660	+ restoreButton.setEnabled(copy.versionindex != -1);
	4661	+ replaceButton.setEnabled(copy.versionindex != -1);
	4662	+
	4663	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4664	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4665	+
	4666	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4667	+ //copy.versionlist[copy.versionindex + 1] != null);
	4668	+
	4669	+ muteSlider = true;
	4670	+ versionSlider.setMinimum(0);
	4671	+ versionSlider.setMaximum(VersionCount() - 1);
	4672	+ versionSlider.setInteger(copy.versionindex);
	4673	+ versionSlider.setEnabled(copy.versionindex != -1);
	4674	+ muteSlider = false;
	4675	+
	4676	+ versionSliderPane.setVisible(true);
	4677	+ }
4421	4678	}
4422	4679
4423	4680	public boolean PreviousVersion()
..	..	@@ -4475,7 +4732,7 @@
4475	4732
4476	4733	public boolean Replace()
4477	4734	{
4478		- System.err.println("Replace");
	4735	+ //System.err.println("Replace");
4479	4736
4480	4737	//cRadio tab = GetCurrentTab();
4481	4738
..	..	@@ -4702,6 +4959,12 @@
4702	4959	// else
4703	4960	// applySelf(true);
4704	4961	// }
	4962	+
	4963	+ boolean Equal(double a, double b)
	4964	+ {
	4965	+ return Math.abs(a - b) < 0.001;
	4966	+ }
	4967	+
4705	4968	void applySelf0(boolean name)
4706	4969	{
4707	4970	if (name)
..	..	@@ -4739,6 +5002,7 @@
4739	5002	current.shadow = (float) shadowField.getFloat();
4740	5003	current.texture = (float) textureField.getFloat();
4741	5004	current.opacity = (float) opacityField.getFloat();
	5005	+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
4742	5006	current.fakedepth = (float) fakedepthField.getFloat();
4743	5007	current.shadowbias = (float) shadowbiasField.getFloat();
4744	5008
..	..	@@ -4751,29 +5015,54 @@
4751	5015	{
4752	5016	cMaterial mat = copy.material;
4753	5017
4754		- colorField.SetToolTipValue((mat.color));
4755		- saturationField.SetToolTipValue((mat.modulation));
4756		- metalnessField.SetToolTipValue((mat.metalness));
4757		- diffuseField.SetToolTipValue((mat.diffuse));
4758		- specularField.SetToolTipValue((mat.specular));
4759		- shininessField.SetToolTipValue((mat.shininess));
4760		- shiftField.SetToolTipValue((mat.shift));
4761		- ambientField.SetToolTipValue((mat.ambient));
4762		- lightareaField.SetToolTipValue((mat.lightarea));
4763		- diffusenessField.SetToolTipValue((mat.factor));
4764		- velvetField.SetToolTipValue((mat.velvet));
4765		- sheenField.SetToolTipValue((mat.sheen));
4766		- subsurfaceField.SetToolTipValue((mat.subsurface));
4767		- backlitField.SetToolTipValue((mat.bump));
4768		- anisoField.SetToolTipValue((mat.aniso));
4769		- anisoVField.SetToolTipValue((mat.anisoV));
4770		- cameraField.SetToolTipValue((mat.cameralight));
4771		- selfshadowField.SetToolTipValue((mat.diffuseness));
4772		- shadowField.SetToolTipValue((mat.shadow));
4773		- textureField.SetToolTipValue((mat.texture));
4774		- opacityField.SetToolTipValue((mat.opacity));
4775		- fakedepthField.SetToolTipValue((mat.fakedepth));
4776		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	5018	+ if (!Equal(colorField.getFloat(), mat.color))
	5019	+ colorField.SetToolTipValue((mat.color));
	5020	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	5021	+ saturationField.SetToolTipValue((mat.modulation));
	5022	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	5023	+ metalnessField.SetToolTipValue((mat.metalness));
	5024	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	5025	+ diffuseField.SetToolTipValue((mat.diffuse));
	5026	+ if (!Equal(specularField.getFloat(), mat.specular))
	5027	+ specularField.SetToolTipValue((mat.specular));
	5028	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	5029	+ shininessField.SetToolTipValue((mat.shininess));
	5030	+ if (!Equal(shiftField.getFloat(), mat.shift))
	5031	+ shiftField.SetToolTipValue((mat.shift));
	5032	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	5033	+ ambientField.SetToolTipValue((mat.ambient));
	5034	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	5035	+ lightareaField.SetToolTipValue((mat.lightarea));
	5036	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	5037	+ diffusenessField.SetToolTipValue((mat.factor));
	5038	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	5039	+ velvetField.SetToolTipValue((mat.velvet));
	5040	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	5041	+ sheenField.SetToolTipValue((mat.sheen));
	5042	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	5043	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	5044	+ if (!Equal(backlitField.getFloat(), mat.bump))
	5045	+ backlitField.SetToolTipValue((mat.bump));
	5046	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5047	+ anisoField.SetToolTipValue((mat.aniso));
	5048	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5049	+ anisoVField.SetToolTipValue((mat.anisoV));
	5050	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5051	+ cameraField.SetToolTipValue((mat.cameralight));
	5052	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5053	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5054	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5055	+ shadowField.SetToolTipValue((mat.shadow));
	5056	+ if (!Equal(textureField.getFloat(), mat.texture))
	5057	+ textureField.SetToolTipValue((mat.texture));
	5058	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5059	+ opacityField.SetToolTipValue((mat.opacity));
	5060	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5061	+ parallaxField.SetToolTipValue((mat.parallax));
	5062	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5063	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5064	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5065	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4777	5066	}
4778	5067
4779	5068	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4808,7 +5097,7 @@
4808	5097
4809	5098	public void stateChanged(ChangeEvent e)
4810	5099	{
4811		- // assert(false);
	5100	+ // assert(false);
4812	5101	if (e.getSource() == versionSlider)
4813	5102	{
4814	5103	if (muteSlider)
..	..	@@ -5178,6 +5467,8 @@
5178	5467
5179	5468	if (previousVersionButton != null && copy.versionlist != null)
5180	5469	SetVersionStates();
	5470	+
	5471	+ cameraView.requestFocusInWindow();
5181	5472	}
5182	5473
5183	5474	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5209,7 +5500,7 @@
5209	5500	// group = (Composite) group.get(0);
5210	5501	// }
5211	5502
5212		- System.out.println("makeSomething of " + thing);
	5503	+ //System.out.println("makeSomething of " + thing);
5213	5504
5214	5505	/*
5215	5506	if (deselect && jList != null)
..	..	@@ -5563,6 +5854,7 @@
5563	5854
5564	5855	copy.versionlist = readobj.versionlist;
5565	5856	copy.versionindex = readobj.versionindex;
	5857	+ copy.versiontable = readobj.versiontable;
5566	5858
5567	5859	if (copy.versionlist == null)
5568	5860	{
..	..	@@ -5918,6 +6210,7 @@
5918	6210	boolean materialFlushed;
5919	6211	Object3D latestObject;
5920	6212
	6213	+ cGridBag transformPanel;
5921	6214	cGridBag XYZPanel;
5922	6215
5923	6216	JSplitPane gridPanel;
..	..	@@ -6022,6 +6315,8 @@
6022	6315	cNumberSlider textureField;
6023	6316	JLabel opacityLabel;
6024	6317	cNumberSlider opacityField;
	6318	+ JLabel parallaxLabel;
	6319	+ cNumberSlider parallaxField;
6025	6320	JLabel fakedepthLabel;
6026	6321	cNumberSlider fakedepthField;
6027	6322	JLabel shadowbiasLabel;