~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)
..	..	@@ -116,8 +134,14 @@
116	134
117	135	try
118	136	{
119		- BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.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());
..	..	@@ -442,8 +466,11 @@
442	466	importOBJItem.addActionListener(this);
443	467	import3DSItem = menu.add(new MenuItem("3DS file..."));
444	468	import3DSItem.addActionListener(this);
	469	+ if (Globals.ADVANCED)
	470	+ {
445	471	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
446	472	importVRMLX3DItem.addActionListener(this);
	473	+ }
447	474	menu.add("-");
448	475	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
449	476	importGFDItem.addActionListener(this);
..	..	@@ -965,8 +992,13 @@
965	992	object.versionlist = null;
966	993	object.versiontable = null;
967	994
	995	+ Object3D parent = object.parent;
	996	+ object.parent = null;
	997	+
968	998	//byte[] compress = Compress(copy);
969	999	Object3D compress = (Object3D)Grafreed.clone(object);
	1000	+
	1001	+ object.parent = parent;
970	1002
971	1003	object.versionlist = versions;
972	1004	object.versiontable = versiontable; // if Grafreed.grafreed.universe
..	..	@@ -1310,7 +1342,7 @@
1310	1342
1311	1343	//if (copy.pinned)
1312	1344	{
1313		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1345	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1314	1346	pinButton.setSelected(copy.pinned);
1315	1347	cGridBag t = new cGridBag();
1316	1348	t.preferredWidth = 2;
..	..	@@ -1542,23 +1574,9 @@
1542	1574
1543	1575	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1544	1576	{
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);
	1577	+ if (Globals.DEBUG)
	1578	+ System.out.println("CREATE CAMERAS");
	1579	+ cams = CreateCameras();
1562	1580	} else
1563	1581	{
1564	1582	cams = (cGroup) copy.get(0);
..	..	@@ -1624,6 +1642,45 @@
1624	1642	//frontView.object = copy;
1625	1643	//sideView.object = copy;
1626	1644
	1645	+ transformPanel = new cGridBag().setVertical(true);
	1646	+
	1647	+ cGridBag resetTransformPanel = new cGridBag();
	1648	+
	1649	+ resetTransformPanel.preferredHeight = 2;
	1650	+
	1651	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1652	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1653	+ resetTransform.addMouseListener(new MouseAdapter()
	1654	+ {
	1655	+ public void mouseClicked(MouseEvent e)
	1656	+ {
	1657	+ ResetTransform();
	1658	+ }
	1659	+ });
	1660	+ resetTransformPanel.add(resetTransform);
	1661	+
	1662	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1663	+ resetTransform.setToolTipText("Reset Translation only");
	1664	+ resetTransform.addMouseListener(new MouseAdapter()
	1665	+ {
	1666	+ public void mouseClicked(MouseEvent e)
	1667	+ {
	1668	+ ResetTransform(1);
	1669	+ }
	1670	+ });
	1671	+ resetTransformPanel.add(resetTransform);
	1672	+
	1673	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1674	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1675	+ resetTransform.addMouseListener(new MouseAdapter()
	1676	+ {
	1677	+ public void mouseClicked(MouseEvent e)
	1678	+ {
	1679	+ ResetTransform(2);
	1680	+ }
	1681	+ });
	1682	+ resetTransformPanel.add(resetTransform);
	1683	+
1627	1684	XYZPanel = new cGridBag().setVertical(true);
1628	1685	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1629	1686
..	..	@@ -1633,6 +1690,9 @@
1633	1690	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1634	1691	//XYZPanel.setName("XYZ");
1635	1692
	1693	+ transformPanel.add(resetTransformPanel);
	1694	+ transformPanel.add(XYZPanel);
	1695	+
1636	1696	/*
1637	1697	gridPanel = new JPanel(); //new BorderLayout());
1638	1698	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1640,12 +1700,12 @@
1640	1700	gridPanel.add(cameraView);
1641	1701	gridPanel.add(XYZPanel);
1642	1702	*/
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);
	1703	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1704	+// gridPanel.setContinuousLayout(true);
	1705	+// gridPanel.setOneTouchExpandable(true);
	1706	+// gridPanel.setDividerLocation(1.0);
	1707	+// gridPanel.setDividerSize(9);
	1708	+// gridPanel.setResizeWeight(0.85);
1649	1709
1650	1710	// aConstraints.weighty = 0;
1651	1711	//System.out.println("THIS = " + this);
..	..	@@ -1668,33 +1728,33 @@
1668	1728
1669	1729	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1670	1730	//tmp.setName("Edit");
	1731	+ objectPanel.add(skyboxPanel);
	1732	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1733	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1734	+
1671	1735	objectPanel.add(toolboxPanel);
1672		- objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1673		- objectPanel.setToolTipTextAt(0, "Objects & textures");
	1736	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1737	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1674	1738
1675	1739	objectPanel.add(materialPanel);
1676		- objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1677		- objectPanel.setToolTipTextAt(1, "Material");
	1740	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1741	+ objectPanel.setToolTipTextAt(2, "Material");
1678	1742
1679		- objectPanel.add(skyboxPanel);
1680		- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1681		- objectPanel.setToolTipTextAt(2, "Backgrounds");
1682		-
1683	1743	// JPanel north = new JPanel(new BorderLayout());
1684	1744	// north.setName("Edit");
1685	1745	// north.add(ctrlPanel, BorderLayout.NORTH);
1686	1746	// objectPanel.add(north);
1687	1747	objectPanel.add(editPanel);
1688		- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1748	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1689	1749	objectPanel.setToolTipTextAt(3, "Edit controls");
1690	1750
1691		- objectPanel.add(XYZPanel);
	1751	+ objectPanel.add(transformPanel);
1692	1752	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1693		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1753	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1694	1754
1695	1755	patchMaterial = true;
1696	1756	cameraView.patchMaterial = this;
1697		- objectPanel.setSelectedIndex(1);
	1757	+ objectPanel.setSelectedIndex(2);
1698	1758
1699	1759	/*
1700	1760	aConstraints.gridx = 0;
..	..	@@ -1726,17 +1786,109 @@
1726	1786
1727	1787	AddOptions(optionsPanel); //, aConstraints);
1728	1788
1729		- tabbedPane.add(optionsPanel);
1730		-
1731	1789	tabbedPane.add(FSPane = new cFileSystemPane(this));
1732	1790
	1791	+ tabbedPane.add(optionsPanel);
	1792	+
1733	1793	scenePanel.add(tabbedPane);
1734	1794
1735		- //if (Globals.ADVANCED)
1736		-// tabbedPane.add(infoPanel);
1737		-// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1738		-// tabbedPane.setToolTipTextAt(3, "Information");
	1795	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1796	+ creditsPanel.setName("Credits");
1739	1797
	1798	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1799	+ creditsPanel.add(ogaLabel);
	1800	+
	1801	+ cButton creditButton;
	1802	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1803	+ creditButton.setToolTipText("https://opengameart.org");
	1804	+
	1805	+ creditButton.addMouseListener(new MouseAdapter()
	1806	+ {
	1807	+ public void mouseClicked(MouseEvent e)
	1808	+ {
	1809	+ try
	1810	+ {
	1811	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1812	+ } catch (Exception e1)
	1813	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1814	+ {
	1815	+ e1.printStackTrace();
	1816	+ }
	1817	+ }
	1818	+ });
	1819	+
	1820	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1821	+ creditsPanel.add(ogaLabel);
	1822	+
	1823	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1824	+ creditButton.setToolTipText("https://3delicious.net");
	1825	+
	1826	+ creditButton.addMouseListener(new MouseAdapter()
	1827	+ {
	1828	+ public void mouseClicked(MouseEvent e)
	1829	+ {
	1830	+ try
	1831	+ {
	1832	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1833	+ } catch (Exception e1)
	1834	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1835	+ {
	1836	+ e1.printStackTrace();
	1837	+ }
	1838	+ }
	1839	+ });
	1840	+
	1841	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1842	+ creditButton.setToolTipText("https://archive3d.net");
	1843	+
	1844	+ creditButton.addMouseListener(new MouseAdapter()
	1845	+ {
	1846	+ public void mouseClicked(MouseEvent e)
	1847	+ {
	1848	+ try
	1849	+ {
	1850	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1851	+ } catch (Exception e1)
	1852	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1853	+ {
	1854	+ e1.printStackTrace();
	1855	+ }
	1856	+ }
	1857	+ });
	1858	+
	1859	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1860	+ creditButton.setToolTipText("https://turbosquid.com");
	1861	+
	1862	+ creditButton.addMouseListener(new MouseAdapter()
	1863	+ {
	1864	+ public void mouseClicked(MouseEvent e)
	1865	+ {
	1866	+ try
	1867	+ {
	1868	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1869	+ } catch (Exception e1)
	1870	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1871	+ {
	1872	+ e1.printStackTrace();
	1873	+ }
	1874	+ }
	1875	+ });
	1876	+
	1877	+ for (int i=6; --i>=0;)
	1878	+ {
	1879	+ creditsPanel.add(new cGridBag());
	1880	+ }
	1881	+
	1882	+ tabbedPane.add(creditsPanel);
	1883	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1884	+
	1885	+ if (Globals.ADVANCED)
	1886	+ {
	1887	+ tabbedPane.add(infoPanel);
	1888	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1889	+ tabbedPane.setToolTipTextAt(4, "Information");
	1890	+ }
	1891	+
1740	1892	/*
1741	1893	cTree jTree = new cTree(null);
1742	1894	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1757,13 +1909,13 @@
1757	1909	jtp.add(tree);
1758	1910	*/
1759	1911
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");
	1912	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1913	+// bigPanel.setContinuousLayout(true);
	1914	+// bigPanel.setOneTouchExpandable(true);
	1915	+// bigPanel.setDividerLocation(0.8);
	1916	+// bigPanel.setDividerSize(15);
	1917	+// bigPanel.setResizeWeight(0.15);
	1918	+// bigPanel.setName("Scene");
1767	1919
1768	1920	//bigPanel.setLayout(new BorderLayout());
1769	1921	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1847,7 +1999,7 @@
1847	1999
1848	2000	cameraView.requestFocusInWindow();
1849	2001
1850		- gridPanel.setDividerLocation(1.0);
	2002	+// gridPanel.setDividerLocation(1.0);
1851	2003
1852	2004	frame.validate();
1853	2005
..	..	@@ -1882,7 +2034,7 @@
1882	2034	{
1883	2035	cGridBag presetpanel = new cGridBag().setVertical(true);
1884	2036
1885		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	2037	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1886	2038	skin.setToolTipText("Skin");
1887	2039	skin.addMouseListener(new MouseAdapter()
1888	2040	{
..	..	@@ -1920,7 +2072,7 @@
1920	2072	});
1921	2073	presetpanel.add(skin);
1922	2074
1923		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2075	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1924	2076	lambert.setToolTipText("Diffuse");
1925	2077	lambert.addMouseListener(new MouseAdapter()
1926	2078	{
..	..	@@ -1938,7 +2090,7 @@
1938	2090	});
1939	2091	presetpanel.add(lambert);
1940	2092
1941		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2093	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1942	2094	diffuse2.setToolTipText("Diffuse2");
1943	2095	diffuse2.addMouseListener(new MouseAdapter()
1944	2096	{
..	..	@@ -1956,7 +2108,7 @@
1956	2108	});
1957	2109	presetpanel.add(diffuse2);
1958	2110
1959		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2111	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1960	2112	diffusemoon.setToolTipText("Moon");
1961	2113	diffusemoon.addMouseListener(new MouseAdapter()
1962	2114	{
..	..	@@ -1974,7 +2126,7 @@
1974	2126	});
1975	2127	presetpanel.add(diffusemoon);
1976	2128
1977		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2129	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1978	2130	diffusemoon2.setToolTipText("Moon2");
1979	2131	diffusemoon2.addMouseListener(new MouseAdapter()
1980	2132	{
..	..	@@ -1992,7 +2144,7 @@
1992	2144	});
1993	2145	presetpanel.add(diffusemoon2);
1994	2146
1995		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2147	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1996	2148	diffusemoon3.setToolTipText("Moon3");
1997	2149	diffusemoon3.addMouseListener(new MouseAdapter()
1998	2150	{
..	..	@@ -2010,7 +2162,7 @@
2010	2162	});
2011	2163	presetpanel.add(diffusemoon3);
2012	2164
2013		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2165	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
2014	2166	diffusesheen.setToolTipText("Sheen");
2015	2167	diffusesheen.addMouseListener(new MouseAdapter()
2016	2168	{
..	..	@@ -2027,7 +2179,7 @@
2027	2179	});
2028	2180	presetpanel.add(diffusesheen);
2029	2181
2030		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2182	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
2031	2183	rough.setToolTipText("Rough metal");
2032	2184	rough.addMouseListener(new MouseAdapter()
2033	2185	{
..	..	@@ -2045,7 +2197,7 @@
2045	2197	});
2046	2198	presetpanel.add(rough);
2047	2199
2048		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2200	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
2049	2201	rough2.setToolTipText("Medium metal");
2050	2202	rough2.addMouseListener(new MouseAdapter()
2051	2203	{
..	..	@@ -2063,7 +2215,7 @@
2063	2215	});
2064	2216	presetpanel.add(rough2);
2065	2217
2066		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2218	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
2067	2219	shini0.setToolTipText("Shiny");
2068	2220	shini0.addMouseListener(new MouseAdapter()
2069	2221	{
..	..	@@ -2081,7 +2233,7 @@
2081	2233	});
2082	2234	presetpanel.add(shini0);
2083	2235
2084		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2236	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
2085	2237	shini1.setToolTipText("Shiny2");
2086	2238	shini1.addMouseListener(new MouseAdapter()
2087	2239	{
..	..	@@ -2099,7 +2251,7 @@
2099	2251	});
2100	2252	presetpanel.add(shini1);
2101	2253
2102		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2254	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2103	2255	shini2.setToolTipText("Shiny3");
2104	2256	shini2.addMouseListener(new MouseAdapter()
2105	2257	{
..	..	@@ -2117,7 +2269,7 @@
2117	2269	});
2118	2270	presetpanel.add(shini2);
2119	2271
2120		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2272	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2121	2273	aniso.setToolTipText("AnisoU");
2122	2274	aniso.addMouseListener(new MouseAdapter()
2123	2275	{
..	..	@@ -2135,7 +2287,7 @@
2135	2287	});
2136	2288	presetpanel.add(aniso);
2137	2289
2138		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2290	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2139	2291	aniso2.setToolTipText("AnisoV");
2140	2292	aniso2.addMouseListener(new MouseAdapter()
2141	2293	{
..	..	@@ -2153,7 +2305,7 @@
2153	2305	});
2154	2306	presetpanel.add(aniso2);
2155	2307
2156		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2308	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2157	2309	aniso3.setToolTipText("AnisoUV");
2158	2310	aniso3.addMouseListener(new MouseAdapter()
2159	2311	{
..	..	@@ -2171,7 +2323,7 @@
2171	2323	});
2172	2324	presetpanel.add(aniso3);
2173	2325
2174		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2326	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2175	2327	velvet0.setToolTipText("Velvet");
2176	2328	velvet0.addMouseListener(new MouseAdapter()
2177	2329	{
..	..	@@ -2193,7 +2345,7 @@
2193	2345	});
2194	2346	presetpanel.add(velvet0);
2195	2347
2196		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2348	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2197	2349	bump0.setToolTipText("Bump texture");
2198	2350	bump0.addMouseListener(new MouseAdapter()
2199	2351	{
..	..	@@ -2212,7 +2364,7 @@
2212	2364	});
2213	2365	presetpanel.add(bump0);
2214	2366
2215		- cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2367	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
2216	2368	borderShader.setToolTipText("Border fade");
2217	2369	borderShader.addMouseListener(new MouseAdapter()
2218	2370	{
..	..	@@ -2227,7 +2379,7 @@
2227	2379	});
2228	2380	presetpanel.add(borderShader);
2229	2381
2230		- cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2382	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2231	2383	halo.setToolTipText("Halo");
2232	2384	halo.addMouseListener(new MouseAdapter()
2233	2385	{
..	..	@@ -2244,7 +2396,7 @@
2244	2396	});
2245	2397	presetpanel.add(halo);
2246	2398
2247		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2399	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2248	2400	candle.setToolTipText("Candle");
2249	2401	candle.addMouseListener(new MouseAdapter()
2250	2402	{
..	..	@@ -2266,7 +2418,7 @@
2266	2418	});
2267	2419	presetpanel.add(candle);
2268	2420
2269		- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2421	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2270	2422	shadowShader.setToolTipText("Shadow");
2271	2423	shadowShader.addMouseListener(new MouseAdapter()
2272	2424	{
..	..	@@ -2301,19 +2453,19 @@
2301	2453
2302	2454	cGridBag editBar = new cGridBag().setVertical(false);
2303	2455
2304		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2456	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2305	2457	createMaterialButton.setToolTipText("Create material");
2306	2458
2307	2459	/*
2308	2460	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2309	2461	*/
2310	2462
2311		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2463	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2312	2464	clearMaterialButton.setToolTipText("Clear material");
2313	2465
2314	2466	if (Globals.ADVANCED)
2315	2467	{
2316		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2468	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2317	2469	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2318	2470	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2319	2471	}
..	..	@@ -4114,11 +4266,18 @@
4114	4266
4115	4267	void New()
4116	4268	{
4117		- while (copy.Size() > 1)
	4269	+ while (copy.Size() > 0)
4118	4270	{
4119		- copy.remove(1);
	4271	+ copy.remove(0);
4120	4272	}
4121	4273
	4274	+ copy.selection.clear();
	4275	+
	4276	+ if (copy == Grafreed.grafreed.universe)
	4277	+ {
	4278	+ CreateCameras();
	4279	+ cameraView.SetCamera(GetCamera(copy, 0));
	4280	+ }
4122	4281	ResetModel();
4123	4282	objEditor.refreshContents();
4124	4283	}
..	..	@@ -4432,6 +4591,8 @@
4432	4591	return count;
4433	4592	}
4434	4593
	4594	+ public cGridBag versionSliderPane;
	4595	+
4435	4596	void SetVersionStates()
4436	4597	{
4437	4598	//if (true)
..	..	@@ -4439,21 +4600,36 @@
4439	4600
4440	4601	//cRadio tab = GetCurrentTab();
4441	4602
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;
	4603	+ if (copy.versionlist == null)
	4604	+ {
	4605	+ saveVersionButton.setEnabled(false);
	4606	+ restoreButton.setEnabled(false);
	4607	+ replaceButton.setEnabled(false);
	4608	+ previousVersionButton.setEnabled(false);
	4609	+ nextVersionButton.setEnabled(false);
	4610	+ deleteVersionButton.setEnabled(false);
	4611	+ versionSliderPane.setVisible(false);
	4612	+ }
	4613	+ else
	4614	+ {
	4615	+ restoreButton.setEnabled(copy.versionindex != -1);
	4616	+ replaceButton.setEnabled(copy.versionindex != -1);
	4617	+
	4618	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4619	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4620	+
	4621	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4622	+ //copy.versionlist[copy.versionindex + 1] != null);
	4623	+
	4624	+ muteSlider = true;
	4625	+ versionSlider.setMinimum(0);
	4626	+ versionSlider.setMaximum(VersionCount() - 1);
	4627	+ versionSlider.setInteger(copy.versionindex);
	4628	+ versionSlider.setEnabled(copy.versionindex != -1);
	4629	+ muteSlider = false;
	4630	+
	4631	+ versionSliderPane.setVisible(true);
	4632	+ }
4457	4633	}
4458	4634
4459	4635	public boolean PreviousVersion()
..	..	@@ -4873,7 +5049,7 @@
4873	5049
4874	5050	public void stateChanged(ChangeEvent e)
4875	5051	{
4876		- // assert(false);
	5052	+ // assert(false);
4877	5053	if (e.getSource() == versionSlider)
4878	5054	{
4879	5055	if (muteSlider)
..	..	@@ -5986,6 +6162,7 @@
5986	6162	boolean materialFlushed;
5987	6163	Object3D latestObject;
5988	6164
	6165	+ cGridBag transformPanel;
5989	6166	cGridBag XYZPanel;
5990	6167
5991	6168	JSplitPane gridPanel;