~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -83,7 +83,10 @@
83	83	cButton GetButton(String name, boolean border)
84	84	{
85	85	ImageIcon icon = GetIcon(name);
86		- return new cButton(icon, border);
	86	+ if (icon != null \|\| name.contains("/"))
	87	+ return new cButton(icon, border);
	88	+ else
	89	+ return new cButton(name, border);
87	90	}
88	91
89	92	cLabel GetLabel(String name, boolean border)
..	..	@@ -106,7 +109,7 @@
106	109
107	110	static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
108	111
109		- ImageIcon GetIcon(String name)
	112	+ static ImageIcon GetIcon(String name)
110	113	{
111	114	javax.swing.ImageIcon iconCache = icons.get(name);
112	115	if (iconCache != null)
..	..	@@ -116,7 +119,7 @@
116	119
117	120	try
118	121	{
119		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	122	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
120	123
121	124	// if (image.getWidth() > 48 && image.getHeight() > 48)
122	125	// {
..	..	@@ -426,6 +429,9 @@
426	429
427	430	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
428	431
	432	+ // This is to refresh the UI of the material panel.
	433	+ boolean patchMaterial;
	434	+
429	435	void SetupMenu()
430	436	{
431	437	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -951,18 +957,29 @@
951	957	boolean temp = CameraPane.SWITCH;
952	958	CameraPane.SWITCH = false;
953	959
954		- object.ExtractBigData(versiontable);
	960	+ if (Grafreed.grafreed.universe.versiontable == null)
	961	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	962	+
	963	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
955	964	// if (copy == client)
956	965
957	966	Object3D versions[] = object.versionlist;
	967	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
958	968	object.versionlist = null;
	969	+ object.versiontable = null;
	970	+
	971	+ Object3D parent = object.parent;
	972	+ object.parent = null;
959	973
960	974	//byte[] compress = Compress(copy);
961	975	Object3D compress = (Object3D)Grafreed.clone(object);
962	976
963		- object.versionlist = versions;
	977	+ object.parent = parent;
964	978
965		- object.RestoreBigData(versiontable);
	979	+ object.versionlist = versions;
	980	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	981	+
	982	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
966	983
967	984	CameraPane.SWITCH = temp;
968	985
..	..	@@ -1301,7 +1318,7 @@
1301	1318
1302	1319	//if (copy.pinned)
1303	1320	{
1304		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1321	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1305	1322	pinButton.setSelected(copy.pinned);
1306	1323	cGridBag t = new cGridBag();
1307	1324	t.preferredWidth = 2;
..	..	@@ -1615,6 +1632,45 @@
1615	1632	//frontView.object = copy;
1616	1633	//sideView.object = copy;
1617	1634
	1635	+ transformPanel = new cGridBag().setVertical(true);
	1636	+
	1637	+ cGridBag resetTransformPanel = new cGridBag();
	1638	+
	1639	+ resetTransformPanel.preferredHeight = 2;
	1640	+
	1641	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1642	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1643	+ resetTransform.addMouseListener(new MouseAdapter()
	1644	+ {
	1645	+ public void mouseClicked(MouseEvent e)
	1646	+ {
	1647	+ ResetTransform();
	1648	+ }
	1649	+ });
	1650	+ resetTransformPanel.add(resetTransform);
	1651	+
	1652	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1653	+ resetTransform.setToolTipText("Reset Translation only");
	1654	+ resetTransform.addMouseListener(new MouseAdapter()
	1655	+ {
	1656	+ public void mouseClicked(MouseEvent e)
	1657	+ {
	1658	+ ResetTransform(1);
	1659	+ }
	1660	+ });
	1661	+ resetTransformPanel.add(resetTransform);
	1662	+
	1663	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1664	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1665	+ resetTransform.addMouseListener(new MouseAdapter()
	1666	+ {
	1667	+ public void mouseClicked(MouseEvent e)
	1668	+ {
	1669	+ ResetTransform(2);
	1670	+ }
	1671	+ });
	1672	+ resetTransformPanel.add(resetTransform);
	1673	+
1618	1674	XYZPanel = new cGridBag().setVertical(true);
1619	1675	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1620	1676
..	..	@@ -1624,6 +1680,9 @@
1624	1680	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1625	1681	//XYZPanel.setName("XYZ");
1626	1682
	1683	+ transformPanel.add(resetTransformPanel);
	1684	+ transformPanel.add(XYZPanel);
	1685	+
1627	1686	/*
1628	1687	gridPanel = new JPanel(); //new BorderLayout());
1629	1688	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1631,12 +1690,12 @@
1631	1690	gridPanel.add(cameraView);
1632	1691	gridPanel.add(XYZPanel);
1633	1692	*/
1634		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1635		- gridPanel.setContinuousLayout(true);
1636		- gridPanel.setOneTouchExpandable(true);
1637		- gridPanel.setDividerLocation(1.0);
1638		- gridPanel.setDividerSize(9);
1639		- gridPanel.setResizeWeight(0.85);
	1693	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1694	+// gridPanel.setContinuousLayout(true);
	1695	+// gridPanel.setOneTouchExpandable(true);
	1696	+// gridPanel.setDividerLocation(1.0);
	1697	+// gridPanel.setDividerSize(9);
	1698	+// gridPanel.setResizeWeight(0.85);
1640	1699
1641	1700	// aConstraints.weighty = 0;
1642	1701	//System.out.println("THIS = " + this);
..	..	@@ -1659,14 +1718,14 @@
1659	1718
1660	1719	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1661	1720	//tmp.setName("Edit");
1662		- objectPanel.add(materialPanel);
1663		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1664		- objectPanel.setToolTipTextAt(0, "Material");
1665		-
1666	1721	objectPanel.add(toolboxPanel);
1667		- objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1668		- objectPanel.setToolTipTextAt(1, "Objects & textures");
	1722	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1723	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
1669	1724
	1725	+ objectPanel.add(materialPanel);
	1726	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1727	+ objectPanel.setToolTipTextAt(1, "Material");
	1728	+
1670	1729	objectPanel.add(skyboxPanel);
1671	1730	objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1672	1731	objectPanel.setToolTipTextAt(2, "Backgrounds");
..	..	@@ -1679,10 +1738,14 @@
1679	1738	objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1680	1739	objectPanel.setToolTipTextAt(3, "Edit controls");
1681	1740
1682		- objectPanel.add(XYZPanel);
	1741	+ objectPanel.add(transformPanel);
1683	1742	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1684		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1743	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1685	1744
	1745	+ patchMaterial = true;
	1746	+ cameraView.patchMaterial = this;
	1747	+ objectPanel.setSelectedIndex(1);
	1748	+
1686	1749	/*
1687	1750	aConstraints.gridx = 0;
1688	1751	aConstraints.gridwidth = 1;
..	..	@@ -1702,7 +1765,7 @@
1702	1765	scrollpane.addMouseWheelListener(this); // Default not fast enough
1703	1766
1704	1767	/JTabbedPane/ scenePanel = new cGridBag();
1705		- scenePanel.preferredWidth = 5;
	1768	+ scenePanel.preferredWidth = 6;
1706	1769
1707	1770	JTabbedPane tabbedPane = new JTabbedPane();
1708	1771	tabbedPane.add(scrollpane);
..	..	@@ -1713,17 +1776,52 @@
1713	1776
1714	1777	AddOptions(optionsPanel); //, aConstraints);
1715	1778
1716		- tabbedPane.add(optionsPanel);
1717		-
1718	1779	tabbedPane.add(FSPane = new cFileSystemPane(this));
1719	1780
	1781	+ tabbedPane.add(optionsPanel);
	1782	+
1720	1783	scenePanel.add(tabbedPane);
1721	1784
1722		- //if (Globals.ADVANCED)
1723		-// tabbedPane.add(infoPanel);
1724		-// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1725		-// tabbedPane.setToolTipTextAt(3, "Information");
	1785	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1786	+ creditsPanel.setName("Credits");
1726	1787
	1788	+ cLabel ogaLabel = new cLabel(" Most Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1789	+ creditsPanel.add(ogaLabel);
	1790	+
	1791	+ cButton opengameartButton;
	1792	+ creditsPanel.add(opengameartButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1793	+ opengameartButton.setToolTipText("https://opengameart.org");
	1794	+
	1795	+ opengameartButton.addMouseListener(new MouseAdapter()
	1796	+ {
	1797	+ public void mouseClicked(MouseEvent e)
	1798	+ {
	1799	+ try
	1800	+ {
	1801	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1802	+ } catch (Exception e1)
	1803	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1804	+ {
	1805	+ e1.printStackTrace();
	1806	+ }
	1807	+ }
	1808	+ });
	1809	+
	1810	+ for (int i=10; --i>=0;)
	1811	+ {
	1812	+ creditsPanel.add(new cGridBag());
	1813	+ }
	1814	+
	1815	+ tabbedPane.add(creditsPanel);
	1816	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1817	+
	1818	+ if (Globals.ADVANCED)
	1819	+ {
	1820	+ tabbedPane.add(infoPanel);
	1821	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1822	+ tabbedPane.setToolTipTextAt(4, "Information");
	1823	+ }
	1824	+
1727	1825	/*
1728	1826	cTree jTree = new cTree(null);
1729	1827	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1744,13 +1842,13 @@
1744	1842	jtp.add(tree);
1745	1843	*/
1746	1844
1747		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1748		- bigPanel.setContinuousLayout(true);
1749		- bigPanel.setOneTouchExpandable(true);
1750		- bigPanel.setDividerLocation(0.8);
1751		- bigPanel.setDividerSize(15);
1752		- bigPanel.setResizeWeight(0.15);
1753		- bigPanel.setName("Scene");
	1845	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1846	+// bigPanel.setContinuousLayout(true);
	1847	+// bigPanel.setOneTouchExpandable(true);
	1848	+// bigPanel.setDividerLocation(0.8);
	1849	+// bigPanel.setDividerSize(15);
	1850	+// bigPanel.setResizeWeight(0.15);
	1851	+// bigPanel.setName("Scene");
1754	1852
1755	1853	//bigPanel.setLayout(new BorderLayout());
1756	1854	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1834,7 +1932,7 @@
1834	1932
1835	1933	cameraView.requestFocusInWindow();
1836	1934
1837		- gridPanel.setDividerLocation(1.0);
	1935	+// gridPanel.setDividerLocation(1.0);
1838	1936
1839	1937	frame.validate();
1840	1938
..	..	@@ -1869,7 +1967,7 @@
1869	1967	{
1870	1968	cGridBag presetpanel = new cGridBag().setVertical(true);
1871	1969
1872		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1970	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1873	1971	skin.setToolTipText("Skin");
1874	1972	skin.addMouseListener(new MouseAdapter()
1875	1973	{
..	..	@@ -1880,7 +1978,15 @@
1880	1978
1881	1979	// Skin
1882	1980	colorField.setFloat(material.color);
1883		- saturationField.setFloat(material.modulation);
	1981	+ float saturation = material.modulation;
	1982	+
	1983	+ if (!cameraView.Skinshader)
	1984	+ {
	1985	+ saturation /= 1.5;
	1986	+ }
	1987	+
	1988	+ saturationField.setFloat(saturation);
	1989	+
1884	1990	subsurfaceField.setFloat(material.subsurface);
1885	1991	selfshadowField.setFloat(material.diffuseness);
1886	1992	diffusenessField.setFloat(material.factor);
..	..	@@ -1899,7 +2005,7 @@
1899	2005	});
1900	2006	presetpanel.add(skin);
1901	2007
1902		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2008	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1903	2009	lambert.setToolTipText("Diffuse");
1904	2010	lambert.addMouseListener(new MouseAdapter()
1905	2011	{
..	..	@@ -1917,7 +2023,7 @@
1917	2023	});
1918	2024	presetpanel.add(lambert);
1919	2025
1920		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2026	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1921	2027	diffuse2.setToolTipText("Diffuse2");
1922	2028	diffuse2.addMouseListener(new MouseAdapter()
1923	2029	{
..	..	@@ -1935,7 +2041,7 @@
1935	2041	});
1936	2042	presetpanel.add(diffuse2);
1937	2043
1938		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2044	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1939	2045	diffusemoon.setToolTipText("Moon");
1940	2046	diffusemoon.addMouseListener(new MouseAdapter()
1941	2047	{
..	..	@@ -1953,7 +2059,7 @@
1953	2059	});
1954	2060	presetpanel.add(diffusemoon);
1955	2061
1956		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2062	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1957	2063	diffusemoon2.setToolTipText("Moon2");
1958	2064	diffusemoon2.addMouseListener(new MouseAdapter()
1959	2065	{
..	..	@@ -1971,7 +2077,7 @@
1971	2077	});
1972	2078	presetpanel.add(diffusemoon2);
1973	2079
1974		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2080	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1975	2081	diffusemoon3.setToolTipText("Moon3");
1976	2082	diffusemoon3.addMouseListener(new MouseAdapter()
1977	2083	{
..	..	@@ -1989,7 +2095,7 @@
1989	2095	});
1990	2096	presetpanel.add(diffusemoon3);
1991	2097
1992		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2098	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1993	2099	diffusesheen.setToolTipText("Sheen");
1994	2100	diffusesheen.addMouseListener(new MouseAdapter()
1995	2101	{
..	..	@@ -2006,7 +2112,7 @@
2006	2112	});
2007	2113	presetpanel.add(diffusesheen);
2008	2114
2009		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2115	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
2010	2116	rough.setToolTipText("Rough metal");
2011	2117	rough.addMouseListener(new MouseAdapter()
2012	2118	{
..	..	@@ -2024,7 +2130,7 @@
2024	2130	});
2025	2131	presetpanel.add(rough);
2026	2132
2027		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2133	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
2028	2134	rough2.setToolTipText("Medium metal");
2029	2135	rough2.addMouseListener(new MouseAdapter()
2030	2136	{
..	..	@@ -2042,7 +2148,7 @@
2042	2148	});
2043	2149	presetpanel.add(rough2);
2044	2150
2045		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2151	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
2046	2152	shini0.setToolTipText("Shiny");
2047	2153	shini0.addMouseListener(new MouseAdapter()
2048	2154	{
..	..	@@ -2060,7 +2166,7 @@
2060	2166	});
2061	2167	presetpanel.add(shini0);
2062	2168
2063		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2169	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
2064	2170	shini1.setToolTipText("Shiny2");
2065	2171	shini1.addMouseListener(new MouseAdapter()
2066	2172	{
..	..	@@ -2078,7 +2184,7 @@
2078	2184	});
2079	2185	presetpanel.add(shini1);
2080	2186
2081		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2187	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2082	2188	shini2.setToolTipText("Shiny3");
2083	2189	shini2.addMouseListener(new MouseAdapter()
2084	2190	{
..	..	@@ -2096,7 +2202,7 @@
2096	2202	});
2097	2203	presetpanel.add(shini2);
2098	2204
2099		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2205	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2100	2206	aniso.setToolTipText("AnisoU");
2101	2207	aniso.addMouseListener(new MouseAdapter()
2102	2208	{
..	..	@@ -2114,7 +2220,7 @@
2114	2220	});
2115	2221	presetpanel.add(aniso);
2116	2222
2117		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2223	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2118	2224	aniso2.setToolTipText("AnisoV");
2119	2225	aniso2.addMouseListener(new MouseAdapter()
2120	2226	{
..	..	@@ -2132,7 +2238,7 @@
2132	2238	});
2133	2239	presetpanel.add(aniso2);
2134	2240
2135		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2241	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2136	2242	aniso3.setToolTipText("AnisoUV");
2137	2243	aniso3.addMouseListener(new MouseAdapter()
2138	2244	{
..	..	@@ -2150,7 +2256,7 @@
2150	2256	});
2151	2257	presetpanel.add(aniso3);
2152	2258
2153		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2259	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2154	2260	velvet0.setToolTipText("Velvet");
2155	2261	velvet0.addMouseListener(new MouseAdapter()
2156	2262	{
..	..	@@ -2172,7 +2278,7 @@
2172	2278	});
2173	2279	presetpanel.add(velvet0);
2174	2280
2175		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2281	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2176	2282	bump0.setToolTipText("Bump texture");
2177	2283	bump0.addMouseListener(new MouseAdapter()
2178	2284	{
..	..	@@ -2191,7 +2297,7 @@
2191	2297	});
2192	2298	presetpanel.add(bump0);
2193	2299
2194		- cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2300	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
2195	2301	borderShader.setToolTipText("Border fade");
2196	2302	borderShader.addMouseListener(new MouseAdapter()
2197	2303	{
..	..	@@ -2206,7 +2312,7 @@
2206	2312	});
2207	2313	presetpanel.add(borderShader);
2208	2314
2209		- cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2315	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2210	2316	halo.setToolTipText("Halo");
2211	2317	halo.addMouseListener(new MouseAdapter()
2212	2318	{
..	..	@@ -2223,7 +2329,7 @@
2223	2329	});
2224	2330	presetpanel.add(halo);
2225	2331
2226		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2332	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2227	2333	candle.setToolTipText("Candle");
2228	2334	candle.addMouseListener(new MouseAdapter()
2229	2335	{
..	..	@@ -2245,7 +2351,7 @@
2245	2351	});
2246	2352	presetpanel.add(candle);
2247	2353
2248		- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2354	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2249	2355	shadowShader.setToolTipText("Shadow");
2250	2356	shadowShader.addMouseListener(new MouseAdapter()
2251	2357	{
..	..	@@ -2280,19 +2386,19 @@
2280	2386
2281	2387	cGridBag editBar = new cGridBag().setVertical(false);
2282	2388
2283		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2389	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2284	2390	createMaterialButton.setToolTipText("Create material");
2285	2391
2286	2392	/*
2287	2393	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2288	2394	*/
2289	2395
2290		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2396	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2291	2397	clearMaterialButton.setToolTipText("Clear material");
2292	2398
2293	2399	if (Globals.ADVANCED)
2294	2400	{
2295		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2401	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2296	2402	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2297	2403	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2298	2404	}
..	..	@@ -3913,7 +4019,7 @@
3913	4019	//System.out.println("ObjEditor " + event);
3914	4020	applySelf0(true);
3915	4021	//parent.applySelf();
3916		- objEditor.refreshContents();
	4022	+ // conflicts with requestFocus objEditor.refreshContents();
3917	4023	} else if (source == resetButton)
3918	4024	{
3919	4025	CameraPane.fullreset = true;
..	..	@@ -4093,12 +4199,15 @@
4093	4199
4094	4200	void New()
4095	4201	{
4096		- while (copy.Size() > 1)
	4202	+ while (copy.Size() > 0)
4097	4203	{
4098		- copy.remove(1);
	4204	+ copy.remove(0);
4099	4205	}
4100	4206
	4207	+ copy.selection.clear();
	4208	+
4101	4209	ResetModel();
	4210	+ SetupViews();
4102	4211	objEditor.refreshContents();
4103	4212	}
4104	4213
..	..	@@ -4225,8 +4334,6 @@
4225	4334	return true;
4226	4335	}
4227	4336
4228		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4229		-
4230	4337	void DeleteVersion()
4231	4338	{
4232	4339	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4234,7 +4341,11 @@
4234	4341	copy.versionlist[i] = copy.versionlist[i+1];
4235	4342	}
4236	4343
4237		- CopyChanged();
	4344	+ if (copy.versionlist[copy.versionindex] == null)
	4345	+ copy.versionindex -= 1;
	4346	+
	4347	+ if (copy.versionindex != -1)
	4348	+ CopyChanged();
4238	4349
4239	4350	SetVersionStates();
4240	4351	}
..	..	@@ -4347,7 +4458,7 @@
4347	4458	boolean temp = CameraPane.SWITCH;
4348	4459	CameraPane.SWITCH = false;
4349	4460
4350		- copy.ExtractBigData(versiontable);
	4461	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4351	4462
4352	4463	copy.clear();
4353	4464
..	..	@@ -4359,7 +4470,7 @@
4359	4470	copy.add(obj.get(i));
4360	4471	}
4361	4472
4362		- copy.RestoreBigData(versiontable);
	4473	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4363	4474
4364	4475	CameraPane.SWITCH = temp;
4365	4476
..	..	@@ -4409,6 +4520,8 @@
4409	4520	return count;
4410	4521	}
4411	4522
	4523	+ public cGridBag versionSliderPane;
	4524	+
4412	4525	void SetVersionStates()
4413	4526	{
4414	4527	//if (true)
..	..	@@ -4416,21 +4529,36 @@
4416	4529
4417	4530	//cRadio tab = GetCurrentTab();
4418	4531
4419		- restoreButton.setEnabled(copy.versionindex != -1);
4420		- replaceButton.setEnabled(copy.versionindex != -1);
4421		-
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);
4427		-
4428		- muteSlider = true;
4429		- versionSlider.setMinimum(0);
4430		- versionSlider.setMaximum(VersionCount() - 1);
4431		- versionSlider.setInteger(copy.versionindex);
4432		- versionSlider.setEnabled(copy.versionindex != -1);
4433		- muteSlider = false;
	4532	+ if (copy.versionlist == null)
	4533	+ {
	4534	+ saveVersionButton.setEnabled(false);
	4535	+ restoreButton.setEnabled(false);
	4536	+ replaceButton.setEnabled(false);
	4537	+ previousVersionButton.setEnabled(false);
	4538	+ nextVersionButton.setEnabled(false);
	4539	+ deleteVersionButton.setEnabled(false);
	4540	+ versionSliderPane.setVisible(false);
	4541	+ }
	4542	+ else
	4543	+ {
	4544	+ restoreButton.setEnabled(copy.versionindex != -1);
	4545	+ replaceButton.setEnabled(copy.versionindex != -1);
	4546	+
	4547	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4548	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4549	+
	4550	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4551	+ //copy.versionlist[copy.versionindex + 1] != null);
	4552	+
	4553	+ muteSlider = true;
	4554	+ versionSlider.setMinimum(0);
	4555	+ versionSlider.setMaximum(VersionCount() - 1);
	4556	+ versionSlider.setInteger(copy.versionindex);
	4557	+ versionSlider.setEnabled(copy.versionindex != -1);
	4558	+ muteSlider = false;
	4559	+
	4560	+ versionSliderPane.setVisible(true);
	4561	+ }
4434	4562	}
4435	4563
4436	4564	public boolean PreviousVersion()
..	..	@@ -4488,7 +4616,7 @@
4488	4616
4489	4617	public boolean Replace()
4490	4618	{
4491		- System.err.println("Replace");
	4619	+ //System.err.println("Replace");
4492	4620
4493	4621	//cRadio tab = GetCurrentTab();
4494	4622
..	..	@@ -4715,6 +4843,12 @@
4715	4843	// else
4716	4844	// applySelf(true);
4717	4845	// }
	4846	+
	4847	+ boolean Equal(double a, double b)
	4848	+ {
	4849	+ return Math.abs(a - b) < 0.001;
	4850	+ }
	4851	+
4718	4852	void applySelf0(boolean name)
4719	4853	{
4720	4854	if (name)
..	..	@@ -4764,29 +4898,52 @@
4764	4898	{
4765	4899	cMaterial mat = copy.material;
4766	4900
4767		- colorField.SetToolTipValue((mat.color));
4768		- saturationField.SetToolTipValue((mat.modulation));
4769		- metalnessField.SetToolTipValue((mat.metalness));
4770		- diffuseField.SetToolTipValue((mat.diffuse));
4771		- specularField.SetToolTipValue((mat.specular));
4772		- shininessField.SetToolTipValue((mat.shininess));
4773		- shiftField.SetToolTipValue((mat.shift));
4774		- ambientField.SetToolTipValue((mat.ambient));
4775		- lightareaField.SetToolTipValue((mat.lightarea));
4776		- diffusenessField.SetToolTipValue((mat.factor));
4777		- velvetField.SetToolTipValue((mat.velvet));
4778		- sheenField.SetToolTipValue((mat.sheen));
4779		- subsurfaceField.SetToolTipValue((mat.subsurface));
4780		- backlitField.SetToolTipValue((mat.bump));
4781		- anisoField.SetToolTipValue((mat.aniso));
4782		- anisoVField.SetToolTipValue((mat.anisoV));
4783		- cameraField.SetToolTipValue((mat.cameralight));
4784		- selfshadowField.SetToolTipValue((mat.diffuseness));
4785		- shadowField.SetToolTipValue((mat.shadow));
4786		- textureField.SetToolTipValue((mat.texture));
4787		- opacityField.SetToolTipValue((mat.opacity));
4788		- fakedepthField.SetToolTipValue((mat.fakedepth));
4789		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	4901	+ if (!Equal(colorField.getFloat(), mat.color))
	4902	+ colorField.SetToolTipValue((mat.color));
	4903	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4904	+ saturationField.SetToolTipValue((mat.modulation));
	4905	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4906	+ metalnessField.SetToolTipValue((mat.metalness));
	4907	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4908	+ diffuseField.SetToolTipValue((mat.diffuse));
	4909	+ if (!Equal(specularField.getFloat(), mat.specular))
	4910	+ specularField.SetToolTipValue((mat.specular));
	4911	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4912	+ shininessField.SetToolTipValue((mat.shininess));
	4913	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4914	+ shiftField.SetToolTipValue((mat.shift));
	4915	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4916	+ ambientField.SetToolTipValue((mat.ambient));
	4917	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4918	+ lightareaField.SetToolTipValue((mat.lightarea));
	4919	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4920	+ diffusenessField.SetToolTipValue((mat.factor));
	4921	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4922	+ velvetField.SetToolTipValue((mat.velvet));
	4923	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4924	+ sheenField.SetToolTipValue((mat.sheen));
	4925	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4926	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4927	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4928	+ backlitField.SetToolTipValue((mat.bump));
	4929	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4930	+ anisoField.SetToolTipValue((mat.aniso));
	4931	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4932	+ anisoVField.SetToolTipValue((mat.anisoV));
	4933	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4934	+ cameraField.SetToolTipValue((mat.cameralight));
	4935	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	4936	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4937	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	4938	+ shadowField.SetToolTipValue((mat.shadow));
	4939	+ if (!Equal(textureField.getFloat(), mat.texture))
	4940	+ textureField.SetToolTipValue((mat.texture));
	4941	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	4942	+ opacityField.SetToolTipValue((mat.opacity));
	4943	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	4944	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4945	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	4946	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4790	4947	}
4791	4948
4792	4949	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4821,7 +4978,7 @@
4821	4978
4822	4979	public void stateChanged(ChangeEvent e)
4823	4980	{
4824		- // assert(false);
	4981	+ // assert(false);
4825	4982	if (e.getSource() == versionSlider)
4826	4983	{
4827	4984	if (muteSlider)
..	..	@@ -5578,6 +5735,7 @@
5578	5735
5579	5736	copy.versionlist = readobj.versionlist;
5580	5737	copy.versionindex = readobj.versionindex;
	5738	+ copy.versiontable = readobj.versiontable;
5581	5739
5582	5740	if (copy.versionlist == null)
5583	5741	{
..	..	@@ -5933,6 +6091,7 @@
5933	6091	boolean materialFlushed;
5934	6092	Object3D latestObject;
5935	6093
	6094	+ cGridBag transformPanel;
5936	6095	cGridBag XYZPanel;
5937	6096
5938	6097	JSplitPane gridPanel;