~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,7 +134,7 @@
116	134
117	135	try
118	136	{
119		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	137	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
120	138
121	139	// if (image.getWidth() > 48 && image.getHeight() > 48)
122	140	// {
..	..	@@ -442,8 +460,11 @@
442	460	importOBJItem.addActionListener(this);
443	461	import3DSItem = menu.add(new MenuItem("3DS file..."));
444	462	import3DSItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
445	465	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
446	466	importVRMLX3DItem.addActionListener(this);
	467	+ }
447	468	menu.add("-");
448	469	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
449	470	importGFDItem.addActionListener(this);
..	..	@@ -965,8 +986,13 @@
965	986	object.versionlist = null;
966	987	object.versiontable = null;
967	988
	989	+ Object3D parent = object.parent;
	990	+ object.parent = null;
	991	+
968	992	//byte[] compress = Compress(copy);
969	993	Object3D compress = (Object3D)Grafreed.clone(object);
	994	+
	995	+ object.parent = parent;
970	996
971	997	object.versionlist = versions;
972	998	object.versiontable = versiontable; // if Grafreed.grafreed.universe
..	..	@@ -1310,7 +1336,7 @@
1310	1336
1311	1337	//if (copy.pinned)
1312	1338	{
1313		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1339	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1314	1340	pinButton.setSelected(copy.pinned);
1315	1341	cGridBag t = new cGridBag();
1316	1342	t.preferredWidth = 2;
..	..	@@ -1542,23 +1568,9 @@
1542	1568
1543	1569	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1544	1570	{
1545		- if (Globals.DEBUG)
1546		- System.out.println("CREATE CAMERAS");
1547		- cams = new cTemplate();
1548		- cams.name = "Cameras";
1549		- copy.insertElementAt(cams, 0);
1550		- //cams.parent = copy;
1551		-
1552		- cam = new Camera(); // LA.newVector(3, 2, 1));
1553		- cams.addChild(cam);
1554		- cam = new Camera(1);
1555		- cams.addChild(cam);
1556		- cam = new Camera(2);
1557		- cams.addChild(cam);
1558		- cam = new Camera(3);
1559		- cams.addChild(cam);
1560		- cam = new Camera(4); // Light
1561		- cams.addChild(cam);
	1571	+ if (Globals.DEBUG)
	1572	+ System.out.println("CREATE CAMERAS");
	1573	+ cams = CreateCameras();
1562	1574	} else
1563	1575	{
1564	1576	cams = (cGroup) copy.get(0);
..	..	@@ -1624,6 +1636,45 @@
1624	1636	//frontView.object = copy;
1625	1637	//sideView.object = copy;
1626	1638
	1639	+ transformPanel = new cGridBag().setVertical(true);
	1640	+
	1641	+ cGridBag resetTransformPanel = new cGridBag();
	1642	+
	1643	+ resetTransformPanel.preferredHeight = 2;
	1644	+
	1645	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1646	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1647	+ resetTransform.addMouseListener(new MouseAdapter()
	1648	+ {
	1649	+ public void mouseClicked(MouseEvent e)
	1650	+ {
	1651	+ ResetTransform();
	1652	+ }
	1653	+ });
	1654	+ resetTransformPanel.add(resetTransform);
	1655	+
	1656	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1657	+ resetTransform.setToolTipText("Reset Translation only");
	1658	+ resetTransform.addMouseListener(new MouseAdapter()
	1659	+ {
	1660	+ public void mouseClicked(MouseEvent e)
	1661	+ {
	1662	+ ResetTransform(1);
	1663	+ }
	1664	+ });
	1665	+ resetTransformPanel.add(resetTransform);
	1666	+
	1667	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1668	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1669	+ resetTransform.addMouseListener(new MouseAdapter()
	1670	+ {
	1671	+ public void mouseClicked(MouseEvent e)
	1672	+ {
	1673	+ ResetTransform(2);
	1674	+ }
	1675	+ });
	1676	+ resetTransformPanel.add(resetTransform);
	1677	+
1627	1678	XYZPanel = new cGridBag().setVertical(true);
1628	1679	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1629	1680
..	..	@@ -1633,6 +1684,9 @@
1633	1684	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1634	1685	//XYZPanel.setName("XYZ");
1635	1686
	1687	+ transformPanel.add(resetTransformPanel);
	1688	+ transformPanel.add(XYZPanel);
	1689	+
1636	1690	/*
1637	1691	gridPanel = new JPanel(); //new BorderLayout());
1638	1692	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1640,12 +1694,12 @@
1640	1694	gridPanel.add(cameraView);
1641	1695	gridPanel.add(XYZPanel);
1642	1696	*/
1643		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1644		- gridPanel.setContinuousLayout(true);
1645		- gridPanel.setOneTouchExpandable(true);
1646		- gridPanel.setDividerLocation(1.0);
1647		- gridPanel.setDividerSize(9);
1648		- gridPanel.setResizeWeight(0.85);
	1697	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1698	+// gridPanel.setContinuousLayout(true);
	1699	+// gridPanel.setOneTouchExpandable(true);
	1700	+// gridPanel.setDividerLocation(1.0);
	1701	+// gridPanel.setDividerSize(9);
	1702	+// gridPanel.setResizeWeight(0.85);
1649	1703
1650	1704	// aConstraints.weighty = 0;
1651	1705	//System.out.println("THIS = " + this);
..	..	@@ -1668,33 +1722,33 @@
1668	1722
1669	1723	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1670	1724	//tmp.setName("Edit");
	1725	+ objectPanel.add(skyboxPanel);
	1726	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1727	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1728	+
1671	1729	objectPanel.add(toolboxPanel);
1672		- objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1673		- objectPanel.setToolTipTextAt(0, "Objects & textures");
	1730	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1731	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1674	1732
1675	1733	objectPanel.add(materialPanel);
1676		- objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1677		- objectPanel.setToolTipTextAt(1, "Material");
	1734	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1735	+ objectPanel.setToolTipTextAt(2, "Material");
1678	1736
1679		- objectPanel.add(skyboxPanel);
1680		- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1681		- objectPanel.setToolTipTextAt(2, "Backgrounds");
1682		-
1683	1737	// JPanel north = new JPanel(new BorderLayout());
1684	1738	// north.setName("Edit");
1685	1739	// north.add(ctrlPanel, BorderLayout.NORTH);
1686	1740	// objectPanel.add(north);
1687	1741	objectPanel.add(editPanel);
1688		- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1742	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1689	1743	objectPanel.setToolTipTextAt(3, "Edit controls");
1690	1744
1691		- objectPanel.add(XYZPanel);
	1745	+ objectPanel.add(transformPanel);
1692	1746	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1693		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1747	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1694	1748
1695	1749	patchMaterial = true;
1696	1750	cameraView.patchMaterial = this;
1697		- objectPanel.setSelectedIndex(1);
	1751	+ objectPanel.setSelectedIndex(2);
1698	1752
1699	1753	/*
1700	1754	aConstraints.gridx = 0;
..	..	@@ -1715,7 +1769,7 @@
1715	1769	scrollpane.addMouseWheelListener(this); // Default not fast enough
1716	1770
1717	1771	/JTabbedPane/ scenePanel = new cGridBag();
1718		- scenePanel.preferredWidth = 5;
	1772	+ scenePanel.preferredWidth = 6;
1719	1773
1720	1774	JTabbedPane tabbedPane = new JTabbedPane();
1721	1775	tabbedPane.add(scrollpane);
..	..	@@ -1726,17 +1780,109 @@
1726	1780
1727	1781	AddOptions(optionsPanel); //, aConstraints);
1728	1782
1729		- tabbedPane.add(optionsPanel);
1730		-
1731	1783	tabbedPane.add(FSPane = new cFileSystemPane(this));
1732	1784
	1785	+ tabbedPane.add(optionsPanel);
	1786	+
1733	1787	scenePanel.add(tabbedPane);
1734	1788
1735		- //if (Globals.ADVANCED)
1736		-// tabbedPane.add(infoPanel);
1737		-// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1738		-// tabbedPane.setToolTipTextAt(3, "Information");
	1789	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1790	+ creditsPanel.setName("Credits");
1739	1791
	1792	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1793	+ creditsPanel.add(ogaLabel);
	1794	+
	1795	+ cButton creditButton;
	1796	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1797	+ creditButton.setToolTipText("https://opengameart.org");
	1798	+
	1799	+ creditButton.addMouseListener(new MouseAdapter()
	1800	+ {
	1801	+ public void mouseClicked(MouseEvent e)
	1802	+ {
	1803	+ try
	1804	+ {
	1805	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1806	+ } catch (Exception e1)
	1807	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1808	+ {
	1809	+ e1.printStackTrace();
	1810	+ }
	1811	+ }
	1812	+ });
	1813	+
	1814	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1815	+ creditsPanel.add(ogaLabel);
	1816	+
	1817	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1818	+ creditButton.setToolTipText("https://3delicious.net");
	1819	+
	1820	+ creditButton.addMouseListener(new MouseAdapter()
	1821	+ {
	1822	+ public void mouseClicked(MouseEvent e)
	1823	+ {
	1824	+ try
	1825	+ {
	1826	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1827	+ } catch (Exception e1)
	1828	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1829	+ {
	1830	+ e1.printStackTrace();
	1831	+ }
	1832	+ }
	1833	+ });
	1834	+
	1835	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1836	+ creditButton.setToolTipText("https://archive3d.net");
	1837	+
	1838	+ creditButton.addMouseListener(new MouseAdapter()
	1839	+ {
	1840	+ public void mouseClicked(MouseEvent e)
	1841	+ {
	1842	+ try
	1843	+ {
	1844	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1845	+ } catch (Exception e1)
	1846	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1847	+ {
	1848	+ e1.printStackTrace();
	1849	+ }
	1850	+ }
	1851	+ });
	1852	+
	1853	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1854	+ creditButton.setToolTipText("https://turbosquid.com");
	1855	+
	1856	+ creditButton.addMouseListener(new MouseAdapter()
	1857	+ {
	1858	+ public void mouseClicked(MouseEvent e)
	1859	+ {
	1860	+ try
	1861	+ {
	1862	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1863	+ } catch (Exception e1)
	1864	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1865	+ {
	1866	+ e1.printStackTrace();
	1867	+ }
	1868	+ }
	1869	+ });
	1870	+
	1871	+ for (int i=6; --i>=0;)
	1872	+ {
	1873	+ creditsPanel.add(new cGridBag());
	1874	+ }
	1875	+
	1876	+ tabbedPane.add(creditsPanel);
	1877	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1878	+
	1879	+ if (Globals.ADVANCED)
	1880	+ {
	1881	+ tabbedPane.add(infoPanel);
	1882	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1883	+ tabbedPane.setToolTipTextAt(4, "Information");
	1884	+ }
	1885	+
1740	1886	/*
1741	1887	cTree jTree = new cTree(null);
1742	1888	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1757,13 +1903,13 @@
1757	1903	jtp.add(tree);
1758	1904	*/
1759	1905
1760		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1761		- bigPanel.setContinuousLayout(true);
1762		- bigPanel.setOneTouchExpandable(true);
1763		- bigPanel.setDividerLocation(0.8);
1764		- bigPanel.setDividerSize(15);
1765		- bigPanel.setResizeWeight(0.15);
1766		- bigPanel.setName("Scene");
	1906	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1907	+// bigPanel.setContinuousLayout(true);
	1908	+// bigPanel.setOneTouchExpandable(true);
	1909	+// bigPanel.setDividerLocation(0.8);
	1910	+// bigPanel.setDividerSize(15);
	1911	+// bigPanel.setResizeWeight(0.15);
	1912	+// bigPanel.setName("Scene");
1767	1913
1768	1914	//bigPanel.setLayout(new BorderLayout());
1769	1915	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1847,7 +1993,7 @@
1847	1993
1848	1994	cameraView.requestFocusInWindow();
1849	1995
1850		- gridPanel.setDividerLocation(1.0);
	1996	+// gridPanel.setDividerLocation(1.0);
1851	1997
1852	1998	frame.validate();
1853	1999
..	..	@@ -1882,7 +2028,7 @@
1882	2028	{
1883	2029	cGridBag presetpanel = new cGridBag().setVertical(true);
1884	2030
1885		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	2031	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1886	2032	skin.setToolTipText("Skin");
1887	2033	skin.addMouseListener(new MouseAdapter()
1888	2034	{
..	..	@@ -1920,7 +2066,7 @@
1920	2066	});
1921	2067	presetpanel.add(skin);
1922	2068
1923		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2069	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1924	2070	lambert.setToolTipText("Diffuse");
1925	2071	lambert.addMouseListener(new MouseAdapter()
1926	2072	{
..	..	@@ -1938,7 +2084,7 @@
1938	2084	});
1939	2085	presetpanel.add(lambert);
1940	2086
1941		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2087	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1942	2088	diffuse2.setToolTipText("Diffuse2");
1943	2089	diffuse2.addMouseListener(new MouseAdapter()
1944	2090	{
..	..	@@ -1956,7 +2102,7 @@
1956	2102	});
1957	2103	presetpanel.add(diffuse2);
1958	2104
1959		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2105	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1960	2106	diffusemoon.setToolTipText("Moon");
1961	2107	diffusemoon.addMouseListener(new MouseAdapter()
1962	2108	{
..	..	@@ -1974,7 +2120,7 @@
1974	2120	});
1975	2121	presetpanel.add(diffusemoon);
1976	2122
1977		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2123	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1978	2124	diffusemoon2.setToolTipText("Moon2");
1979	2125	diffusemoon2.addMouseListener(new MouseAdapter()
1980	2126	{
..	..	@@ -1992,7 +2138,7 @@
1992	2138	});
1993	2139	presetpanel.add(diffusemoon2);
1994	2140
1995		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2141	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1996	2142	diffusemoon3.setToolTipText("Moon3");
1997	2143	diffusemoon3.addMouseListener(new MouseAdapter()
1998	2144	{
..	..	@@ -2010,7 +2156,7 @@
2010	2156	});
2011	2157	presetpanel.add(diffusemoon3);
2012	2158
2013		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2159	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
2014	2160	diffusesheen.setToolTipText("Sheen");
2015	2161	diffusesheen.addMouseListener(new MouseAdapter()
2016	2162	{
..	..	@@ -2027,7 +2173,7 @@
2027	2173	});
2028	2174	presetpanel.add(diffusesheen);
2029	2175
2030		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2176	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
2031	2177	rough.setToolTipText("Rough metal");
2032	2178	rough.addMouseListener(new MouseAdapter()
2033	2179	{
..	..	@@ -2045,7 +2191,7 @@
2045	2191	});
2046	2192	presetpanel.add(rough);
2047	2193
2048		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2194	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
2049	2195	rough2.setToolTipText("Medium metal");
2050	2196	rough2.addMouseListener(new MouseAdapter()
2051	2197	{
..	..	@@ -2063,7 +2209,7 @@
2063	2209	});
2064	2210	presetpanel.add(rough2);
2065	2211
2066		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2212	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
2067	2213	shini0.setToolTipText("Shiny");
2068	2214	shini0.addMouseListener(new MouseAdapter()
2069	2215	{
..	..	@@ -2081,7 +2227,7 @@
2081	2227	});
2082	2228	presetpanel.add(shini0);
2083	2229
2084		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2230	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
2085	2231	shini1.setToolTipText("Shiny2");
2086	2232	shini1.addMouseListener(new MouseAdapter()
2087	2233	{
..	..	@@ -2099,7 +2245,7 @@
2099	2245	});
2100	2246	presetpanel.add(shini1);
2101	2247
2102		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2248	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2103	2249	shini2.setToolTipText("Shiny3");
2104	2250	shini2.addMouseListener(new MouseAdapter()
2105	2251	{
..	..	@@ -2117,7 +2263,7 @@
2117	2263	});
2118	2264	presetpanel.add(shini2);
2119	2265
2120		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2266	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2121	2267	aniso.setToolTipText("AnisoU");
2122	2268	aniso.addMouseListener(new MouseAdapter()
2123	2269	{
..	..	@@ -2135,7 +2281,7 @@
2135	2281	});
2136	2282	presetpanel.add(aniso);
2137	2283
2138		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2284	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2139	2285	aniso2.setToolTipText("AnisoV");
2140	2286	aniso2.addMouseListener(new MouseAdapter()
2141	2287	{
..	..	@@ -2153,7 +2299,7 @@
2153	2299	});
2154	2300	presetpanel.add(aniso2);
2155	2301
2156		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2302	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2157	2303	aniso3.setToolTipText("AnisoUV");
2158	2304	aniso3.addMouseListener(new MouseAdapter()
2159	2305	{
..	..	@@ -2171,7 +2317,7 @@
2171	2317	});
2172	2318	presetpanel.add(aniso3);
2173	2319
2174		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2320	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2175	2321	velvet0.setToolTipText("Velvet");
2176	2322	velvet0.addMouseListener(new MouseAdapter()
2177	2323	{
..	..	@@ -2193,7 +2339,7 @@
2193	2339	});
2194	2340	presetpanel.add(velvet0);
2195	2341
2196		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2342	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2197	2343	bump0.setToolTipText("Bump texture");
2198	2344	bump0.addMouseListener(new MouseAdapter()
2199	2345	{
..	..	@@ -2212,7 +2358,7 @@
2212	2358	});
2213	2359	presetpanel.add(bump0);
2214	2360
2215		- cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2361	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
2216	2362	borderShader.setToolTipText("Border fade");
2217	2363	borderShader.addMouseListener(new MouseAdapter()
2218	2364	{
..	..	@@ -2227,7 +2373,7 @@
2227	2373	});
2228	2374	presetpanel.add(borderShader);
2229	2375
2230		- cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2376	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2231	2377	halo.setToolTipText("Halo");
2232	2378	halo.addMouseListener(new MouseAdapter()
2233	2379	{
..	..	@@ -2244,7 +2390,7 @@
2244	2390	});
2245	2391	presetpanel.add(halo);
2246	2392
2247		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2393	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2248	2394	candle.setToolTipText("Candle");
2249	2395	candle.addMouseListener(new MouseAdapter()
2250	2396	{
..	..	@@ -2266,7 +2412,7 @@
2266	2412	});
2267	2413	presetpanel.add(candle);
2268	2414
2269		- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2415	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2270	2416	shadowShader.setToolTipText("Shadow");
2271	2417	shadowShader.addMouseListener(new MouseAdapter()
2272	2418	{
..	..	@@ -2301,19 +2447,19 @@
2301	2447
2302	2448	cGridBag editBar = new cGridBag().setVertical(false);
2303	2449
2304		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2450	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2305	2451	createMaterialButton.setToolTipText("Create material");
2306	2452
2307	2453	/*
2308	2454	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2309	2455	*/
2310	2456
2311		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2457	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2312	2458	clearMaterialButton.setToolTipText("Clear material");
2313	2459
2314	2460	if (Globals.ADVANCED)
2315	2461	{
2316		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2462	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2317	2463	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2318	2464	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2319	2465	}
..	..	@@ -4114,11 +4260,18 @@
4114	4260
4115	4261	void New()
4116	4262	{
4117		- while (copy.Size() > 1)
	4263	+ while (copy.Size() > 0)
4118	4264	{
4119		- copy.remove(1);
	4265	+ copy.remove(0);
4120	4266	}
4121	4267
	4268	+ copy.selection.clear();
	4269	+
	4270	+ if (copy == Grafreed.grafreed.universe)
	4271	+ {
	4272	+ CreateCameras();
	4273	+ cameraView.SetCamera(GetCamera(copy, 0));
	4274	+ }
4122	4275	ResetModel();
4123	4276	objEditor.refreshContents();
4124	4277	}
..	..	@@ -4432,6 +4585,8 @@
4432	4585	return count;
4433	4586	}
4434	4587
	4588	+ public cGridBag versionSliderPane;
	4589	+
4435	4590	void SetVersionStates()
4436	4591	{
4437	4592	//if (true)
..	..	@@ -4439,21 +4594,36 @@
4439	4594
4440	4595	//cRadio tab = GetCurrentTab();
4441	4596
4442		- restoreButton.setEnabled(copy.versionindex != -1);
4443		- replaceButton.setEnabled(copy.versionindex != -1);
4444		-
4445		- previousVersionButton.setEnabled(copy.versionindex > 0);
4446		- nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4447		-
4448		- deleteVersionButton.setEnabled(copy.versionindex != -1);
4449		- //copy.versionlist[copy.versionindex + 1] != null);
4450		-
4451		- muteSlider = true;
4452		- versionSlider.setMinimum(0);
4453		- versionSlider.setMaximum(VersionCount() - 1);
4454		- versionSlider.setInteger(copy.versionindex);
4455		- versionSlider.setEnabled(copy.versionindex != -1);
4456		- muteSlider = false;
	4597	+ if (copy.versionlist == null)
	4598	+ {
	4599	+ saveVersionButton.setEnabled(false);
	4600	+ restoreButton.setEnabled(false);
	4601	+ replaceButton.setEnabled(false);
	4602	+ previousVersionButton.setEnabled(false);
	4603	+ nextVersionButton.setEnabled(false);
	4604	+ deleteVersionButton.setEnabled(false);
	4605	+ versionSliderPane.setVisible(false);
	4606	+ }
	4607	+ else
	4608	+ {
	4609	+ restoreButton.setEnabled(copy.versionindex != -1);
	4610	+ replaceButton.setEnabled(copy.versionindex != -1);
	4611	+
	4612	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4613	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4614	+
	4615	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4616	+ //copy.versionlist[copy.versionindex + 1] != null);
	4617	+
	4618	+ muteSlider = true;
	4619	+ versionSlider.setMinimum(0);
	4620	+ versionSlider.setMaximum(VersionCount() - 1);
	4621	+ versionSlider.setInteger(copy.versionindex);
	4622	+ versionSlider.setEnabled(copy.versionindex != -1);
	4623	+ muteSlider = false;
	4624	+
	4625	+ versionSliderPane.setVisible(true);
	4626	+ }
4457	4627	}
4458	4628
4459	4629	public boolean PreviousVersion()
..	..	@@ -4738,6 +4908,12 @@
4738	4908	// else
4739	4909	// applySelf(true);
4740	4910	// }
	4911	+
	4912	+ boolean Equal(double a, double b)
	4913	+ {
	4914	+ return Math.abs(a - b) < 0.001;
	4915	+ }
	4916	+
4741	4917	void applySelf0(boolean name)
4742	4918	{
4743	4919	if (name)
..	..	@@ -4787,29 +4963,52 @@
4787	4963	{
4788	4964	cMaterial mat = copy.material;
4789	4965
4790		- colorField.SetToolTipValue((mat.color));
4791		- saturationField.SetToolTipValue((mat.modulation));
4792		- metalnessField.SetToolTipValue((mat.metalness));
4793		- diffuseField.SetToolTipValue((mat.diffuse));
4794		- specularField.SetToolTipValue((mat.specular));
4795		- shininessField.SetToolTipValue((mat.shininess));
4796		- shiftField.SetToolTipValue((mat.shift));
4797		- ambientField.SetToolTipValue((mat.ambient));
4798		- lightareaField.SetToolTipValue((mat.lightarea));
4799		- diffusenessField.SetToolTipValue((mat.factor));
4800		- velvetField.SetToolTipValue((mat.velvet));
4801		- sheenField.SetToolTipValue((mat.sheen));
4802		- subsurfaceField.SetToolTipValue((mat.subsurface));
4803		- backlitField.SetToolTipValue((mat.bump));
4804		- anisoField.SetToolTipValue((mat.aniso));
4805		- anisoVField.SetToolTipValue((mat.anisoV));
4806		- cameraField.SetToolTipValue((mat.cameralight));
4807		- selfshadowField.SetToolTipValue((mat.diffuseness));
4808		- shadowField.SetToolTipValue((mat.shadow));
4809		- textureField.SetToolTipValue((mat.texture));
4810		- opacityField.SetToolTipValue((mat.opacity));
4811		- fakedepthField.SetToolTipValue((mat.fakedepth));
4812		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	4966	+ if (!Equal(colorField.getFloat(), mat.color))
	4967	+ colorField.SetToolTipValue((mat.color));
	4968	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4969	+ saturationField.SetToolTipValue((mat.modulation));
	4970	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4971	+ metalnessField.SetToolTipValue((mat.metalness));
	4972	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4973	+ diffuseField.SetToolTipValue((mat.diffuse));
	4974	+ if (!Equal(specularField.getFloat(), mat.specular))
	4975	+ specularField.SetToolTipValue((mat.specular));
	4976	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4977	+ shininessField.SetToolTipValue((mat.shininess));
	4978	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4979	+ shiftField.SetToolTipValue((mat.shift));
	4980	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4981	+ ambientField.SetToolTipValue((mat.ambient));
	4982	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4983	+ lightareaField.SetToolTipValue((mat.lightarea));
	4984	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4985	+ diffusenessField.SetToolTipValue((mat.factor));
	4986	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4987	+ velvetField.SetToolTipValue((mat.velvet));
	4988	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4989	+ sheenField.SetToolTipValue((mat.sheen));
	4990	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4991	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4992	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4993	+ backlitField.SetToolTipValue((mat.bump));
	4994	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4995	+ anisoField.SetToolTipValue((mat.aniso));
	4996	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4997	+ anisoVField.SetToolTipValue((mat.anisoV));
	4998	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4999	+ cameraField.SetToolTipValue((mat.cameralight));
	5000	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5001	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5002	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5003	+ shadowField.SetToolTipValue((mat.shadow));
	5004	+ if (!Equal(textureField.getFloat(), mat.texture))
	5005	+ textureField.SetToolTipValue((mat.texture));
	5006	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5007	+ opacityField.SetToolTipValue((mat.opacity));
	5008	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5009	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5010	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5011	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4813	5012	}
4814	5013
4815	5014	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4844,7 +5043,7 @@
4844	5043
4845	5044	public void stateChanged(ChangeEvent e)
4846	5045	{
4847		- // assert(false);
	5046	+ // assert(false);
4848	5047	if (e.getSource() == versionSlider)
4849	5048	{
4850	5049	if (muteSlider)
..	..	@@ -5957,6 +6156,7 @@
5957	6156	boolean materialFlushed;
5958	6157	Object3D latestObject;
5959	6158
	6159	+ cGridBag transformPanel;
5960	6160	cGridBag XYZPanel;
5961	6161
5962	6162	JSplitPane gridPanel;