~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
..	..	@@ -442,8 +458,11 @@
442	458	importOBJItem.addActionListener(this);
443	459	import3DSItem = menu.add(new MenuItem("3DS file..."));
444	460	import3DSItem.addActionListener(this);
	461	+ if (Globals.ADVANCED)
	462	+ {
445	463	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
446	464	importVRMLX3DItem.addActionListener(this);
	465	+ }
447	466	menu.add("-");
448	467	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
449	468	importGFDItem.addActionListener(this);
..	..	@@ -965,8 +984,13 @@
965	984	object.versionlist = null;
966	985	object.versiontable = null;
967	986
	987	+ Object3D parent = object.parent;
	988	+ object.parent = null;
	989	+
968	990	//byte[] compress = Compress(copy);
969	991	Object3D compress = (Object3D)Grafreed.clone(object);
	992	+
	993	+ object.parent = parent;
970	994
971	995	object.versionlist = versions;
972	996	object.versiontable = versiontable; // if Grafreed.grafreed.universe
..	..	@@ -1310,7 +1334,7 @@
1310	1334
1311	1335	//if (copy.pinned)
1312	1336	{
1313		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1337	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1314	1338	pinButton.setSelected(copy.pinned);
1315	1339	cGridBag t = new cGridBag();
1316	1340	t.preferredWidth = 2;
..	..	@@ -1542,23 +1566,9 @@
1542	1566
1543	1567	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1544	1568	{
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);
	1569	+ if (Globals.DEBUG)
	1570	+ System.out.println("CREATE CAMERAS");
	1571	+ cams = CreateCameras();
1562	1572	} else
1563	1573	{
1564	1574	cams = (cGroup) copy.get(0);
..	..	@@ -1624,6 +1634,45 @@
1624	1634	//frontView.object = copy;
1625	1635	//sideView.object = copy;
1626	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	+
1627	1676	XYZPanel = new cGridBag().setVertical(true);
1628	1677	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1629	1678
..	..	@@ -1633,6 +1682,9 @@
1633	1682	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1634	1683	//XYZPanel.setName("XYZ");
1635	1684
	1685	+ transformPanel.add(resetTransformPanel);
	1686	+ transformPanel.add(XYZPanel);
	1687	+
1636	1688	/*
1637	1689	gridPanel = new JPanel(); //new BorderLayout());
1638	1690	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1640,12 +1692,12 @@
1640	1692	gridPanel.add(cameraView);
1641	1693	gridPanel.add(XYZPanel);
1642	1694	*/
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);
	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);
1649	1701
1650	1702	// aConstraints.weighty = 0;
1651	1703	//System.out.println("THIS = " + this);
..	..	@@ -1668,33 +1720,33 @@
1668	1720
1669	1721	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1670	1722	//tmp.setName("Edit");
	1723	+ objectPanel.add(skyboxPanel);
	1724	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1725	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1726	+
1671	1727	objectPanel.add(toolboxPanel);
1672		- objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1673		- objectPanel.setToolTipTextAt(0, "Objects & textures");
	1728	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1729	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1674	1730
1675	1731	objectPanel.add(materialPanel);
1676		- objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1677		- objectPanel.setToolTipTextAt(1, "Material");
	1732	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1733	+ objectPanel.setToolTipTextAt(2, "Material");
1678	1734
1679		- objectPanel.add(skyboxPanel);
1680		- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1681		- objectPanel.setToolTipTextAt(2, "Backgrounds");
1682		-
1683	1735	// JPanel north = new JPanel(new BorderLayout());
1684	1736	// north.setName("Edit");
1685	1737	// north.add(ctrlPanel, BorderLayout.NORTH);
1686	1738	// objectPanel.add(north);
1687	1739	objectPanel.add(editPanel);
1688		- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1740	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1689	1741	objectPanel.setToolTipTextAt(3, "Edit controls");
1690	1742
1691		- objectPanel.add(XYZPanel);
	1743	+ objectPanel.add(transformPanel);
1692	1744	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1693		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1745	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1694	1746
1695	1747	patchMaterial = true;
1696	1748	cameraView.patchMaterial = this;
1697		- objectPanel.setSelectedIndex(1);
	1749	+ objectPanel.setSelectedIndex(2);
1698	1750
1699	1751	/*
1700	1752	aConstraints.gridx = 0;
..	..	@@ -1726,17 +1778,109 @@
1726	1778
1727	1779	AddOptions(optionsPanel); //, aConstraints);
1728	1780
1729		- tabbedPane.add(optionsPanel);
1730		-
1731	1781	tabbedPane.add(FSPane = new cFileSystemPane(this));
1732	1782
	1783	+ tabbedPane.add(optionsPanel);
	1784	+
1733	1785	scenePanel.add(tabbedPane);
1734	1786
1735		- //if (Globals.ADVANCED)
1736		-// tabbedPane.add(infoPanel);
1737		-// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1738		-// tabbedPane.setToolTipTextAt(3, "Information");
	1787	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1788	+ creditsPanel.setName("Credits");
1739	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	+
1740	1884	/*
1741	1885	cTree jTree = new cTree(null);
1742	1886	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1757,13 +1901,13 @@
1757	1901	jtp.add(tree);
1758	1902	*/
1759	1903
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");
	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");
1767	1911
1768	1912	//bigPanel.setLayout(new BorderLayout());
1769	1913	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1847,7 +1991,7 @@
1847	1991
1848	1992	cameraView.requestFocusInWindow();
1849	1993
1850		- gridPanel.setDividerLocation(1.0);
	1994	+// gridPanel.setDividerLocation(1.0);
1851	1995
1852	1996	frame.validate();
1853	1997
..	..	@@ -1882,7 +2026,7 @@
1882	2026	{
1883	2027	cGridBag presetpanel = new cGridBag().setVertical(true);
1884	2028
1885		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	2029	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1886	2030	skin.setToolTipText("Skin");
1887	2031	skin.addMouseListener(new MouseAdapter()
1888	2032	{
..	..	@@ -1920,7 +2064,7 @@
1920	2064	});
1921	2065	presetpanel.add(skin);
1922	2066
1923		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2067	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1924	2068	lambert.setToolTipText("Diffuse");
1925	2069	lambert.addMouseListener(new MouseAdapter()
1926	2070	{
..	..	@@ -1938,7 +2082,7 @@
1938	2082	});
1939	2083	presetpanel.add(lambert);
1940	2084
1941		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2085	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1942	2086	diffuse2.setToolTipText("Diffuse2");
1943	2087	diffuse2.addMouseListener(new MouseAdapter()
1944	2088	{
..	..	@@ -1956,7 +2100,7 @@
1956	2100	});
1957	2101	presetpanel.add(diffuse2);
1958	2102
1959		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2103	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1960	2104	diffusemoon.setToolTipText("Moon");
1961	2105	diffusemoon.addMouseListener(new MouseAdapter()
1962	2106	{
..	..	@@ -1974,7 +2118,7 @@
1974	2118	});
1975	2119	presetpanel.add(diffusemoon);
1976	2120
1977		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2121	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1978	2122	diffusemoon2.setToolTipText("Moon2");
1979	2123	diffusemoon2.addMouseListener(new MouseAdapter()
1980	2124	{
..	..	@@ -1992,7 +2136,7 @@
1992	2136	});
1993	2137	presetpanel.add(diffusemoon2);
1994	2138
1995		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2139	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1996	2140	diffusemoon3.setToolTipText("Moon3");
1997	2141	diffusemoon3.addMouseListener(new MouseAdapter()
1998	2142	{
..	..	@@ -2010,7 +2154,7 @@
2010	2154	});
2011	2155	presetpanel.add(diffusemoon3);
2012	2156
2013		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2157	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
2014	2158	diffusesheen.setToolTipText("Sheen");
2015	2159	diffusesheen.addMouseListener(new MouseAdapter()
2016	2160	{
..	..	@@ -2027,7 +2171,7 @@
2027	2171	});
2028	2172	presetpanel.add(diffusesheen);
2029	2173
2030		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2174	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
2031	2175	rough.setToolTipText("Rough metal");
2032	2176	rough.addMouseListener(new MouseAdapter()
2033	2177	{
..	..	@@ -2045,7 +2189,7 @@
2045	2189	});
2046	2190	presetpanel.add(rough);
2047	2191
2048		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2192	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
2049	2193	rough2.setToolTipText("Medium metal");
2050	2194	rough2.addMouseListener(new MouseAdapter()
2051	2195	{
..	..	@@ -2063,7 +2207,7 @@
2063	2207	});
2064	2208	presetpanel.add(rough2);
2065	2209
2066		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2210	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
2067	2211	shini0.setToolTipText("Shiny");
2068	2212	shini0.addMouseListener(new MouseAdapter()
2069	2213	{
..	..	@@ -2081,7 +2225,7 @@
2081	2225	});
2082	2226	presetpanel.add(shini0);
2083	2227
2084		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2228	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
2085	2229	shini1.setToolTipText("Shiny2");
2086	2230	shini1.addMouseListener(new MouseAdapter()
2087	2231	{
..	..	@@ -2099,7 +2243,7 @@
2099	2243	});
2100	2244	presetpanel.add(shini1);
2101	2245
2102		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2246	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2103	2247	shini2.setToolTipText("Shiny3");
2104	2248	shini2.addMouseListener(new MouseAdapter()
2105	2249	{
..	..	@@ -2117,7 +2261,7 @@
2117	2261	});
2118	2262	presetpanel.add(shini2);
2119	2263
2120		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2264	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2121	2265	aniso.setToolTipText("AnisoU");
2122	2266	aniso.addMouseListener(new MouseAdapter()
2123	2267	{
..	..	@@ -2135,7 +2279,7 @@
2135	2279	});
2136	2280	presetpanel.add(aniso);
2137	2281
2138		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2282	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2139	2283	aniso2.setToolTipText("AnisoV");
2140	2284	aniso2.addMouseListener(new MouseAdapter()
2141	2285	{
..	..	@@ -2153,7 +2297,7 @@
2153	2297	});
2154	2298	presetpanel.add(aniso2);
2155	2299
2156		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2300	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2157	2301	aniso3.setToolTipText("AnisoUV");
2158	2302	aniso3.addMouseListener(new MouseAdapter()
2159	2303	{
..	..	@@ -2171,7 +2315,7 @@
2171	2315	});
2172	2316	presetpanel.add(aniso3);
2173	2317
2174		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2318	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2175	2319	velvet0.setToolTipText("Velvet");
2176	2320	velvet0.addMouseListener(new MouseAdapter()
2177	2321	{
..	..	@@ -2193,7 +2337,7 @@
2193	2337	});
2194	2338	presetpanel.add(velvet0);
2195	2339
2196		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2340	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2197	2341	bump0.setToolTipText("Bump texture");
2198	2342	bump0.addMouseListener(new MouseAdapter()
2199	2343	{
..	..	@@ -2212,13 +2356,13 @@
2212	2356	});
2213	2357	presetpanel.add(bump0);
2214	2358
2215		- cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2359	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
2216	2360	borderShader.setToolTipText("Border fade");
2217	2361	borderShader.addMouseListener(new MouseAdapter()
2218	2362	{
2219	2363	public void mouseClicked(MouseEvent e)
2220	2364	{
2221		- borderfadeField.setFloat(0.5);
	2365	+ borderfadeField.setFloat(0.4);
2222	2366	opacityField.setFloat(0.75);
2223	2367
2224	2368	materialtouched = true;
..	..	@@ -2227,7 +2371,7 @@
2227	2371	});
2228	2372	presetpanel.add(borderShader);
2229	2373
2230		- cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2374	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2231	2375	halo.setToolTipText("Halo");
2232	2376	halo.addMouseListener(new MouseAdapter()
2233	2377	{
..	..	@@ -2244,7 +2388,7 @@
2244	2388	});
2245	2389	presetpanel.add(halo);
2246	2390
2247		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2391	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2248	2392	candle.setToolTipText("Candle");
2249	2393	candle.addMouseListener(new MouseAdapter()
2250	2394	{
..	..	@@ -2266,7 +2410,7 @@
2266	2410	});
2267	2411	presetpanel.add(candle);
2268	2412
2269		- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2413	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2270	2414	shadowShader.setToolTipText("Shadow");
2271	2415	shadowShader.addMouseListener(new MouseAdapter()
2272	2416	{
..	..	@@ -2285,6 +2429,48 @@
2285	2429	});
2286	2430	presetpanel.add(shadowShader);
2287	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	+
2288	2474	cGridBag panel = new cGridBag().setVertical(true);
2289	2475
2290	2476	presetpanel.preferredWidth = 1;
..	..	@@ -2301,19 +2487,19 @@
2301	2487
2302	2488	cGridBag editBar = new cGridBag().setVertical(false);
2303	2489
2304		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2490	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2305	2491	createMaterialButton.setToolTipText("Create material");
2306	2492
2307	2493	/*
2308	2494	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2309	2495	*/
2310	2496
2311		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2497	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2312	2498	clearMaterialButton.setToolTipText("Clear material");
2313	2499
2314	2500	if (Globals.ADVANCED)
2315	2501	{
2316		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2502	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2317	2503	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2318	2504	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2319	2505	}
..	..	@@ -2530,6 +2716,12 @@
2530	2716	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
2531	2717	colorSection.add(backlit);
2532	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	+
2533	2725	//panel.add(new JSeparator());
2534	2726
2535	2727	//panel.add(globalSection);
..	..	@@ -3581,6 +3773,7 @@
3581	3773	shadowField.setFloat(mat.shadow);
3582	3774	textureField.setFloat(mat.texture);
3583	3775	opacityField.setFloat(mat.opacity);
	3776	+ parallaxField.setFloat(mat.parallax + 0.125f);
3584	3777	fakedepthField.setFloat(mat.fakedepth);
3585	3778	shadowbiasField.setFloat(mat.shadowbias);
3586	3779	bumpField.setInteger(1); // dec 2013
..	..	@@ -4114,11 +4307,18 @@
4114	4307
4115	4308	void New()
4116	4309	{
4117		- while (copy.Size() > 1)
	4310	+ while (copy.Size() > 0)
4118	4311	{
4119		- copy.remove(1);
	4312	+ copy.remove(0);
4120	4313	}
4121	4314
	4315	+ copy.selection.clear();
	4316	+
	4317	+ if (copy == Grafreed.grafreed.universe)
	4318	+ {
	4319	+ CreateCameras();
	4320	+ cameraView.SetCamera(GetCamera(copy, 0));
	4321	+ }
4122	4322	ResetModel();
4123	4323	objEditor.refreshContents();
4124	4324	}
..	..	@@ -4267,7 +4467,11 @@
4267	4467	System.err.println("Save");
4268	4468	Replace();
4269	4469
4270		- //cRadio tab = GetCurrentTab();
	4470	+ if (copy.versionlist == null)
	4471	+ {
	4472	+ copy.versionlist = new Object3D[100];
	4473	+ copy.versionindex = -1;
	4474	+ }
4271	4475
4272	4476	Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4273	4477
..	..	@@ -4432,6 +4636,8 @@
4432	4636	return count;
4433	4637	}
4434	4638
	4639	+ public cGridBag versionSliderPane;
	4640	+
4435	4641	void SetVersionStates()
4436	4642	{
4437	4643	//if (true)
..	..	@@ -4439,21 +4645,36 @@
4439	4645
4440	4646	//cRadio tab = GetCurrentTab();
4441	4647
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;
	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	+ }
4457	4678	}
4458	4679
4459	4680	public boolean PreviousVersion()
..	..	@@ -4738,6 +4959,12 @@
4738	4959	// else
4739	4960	// applySelf(true);
4740	4961	// }
	4962	+
	4963	+ boolean Equal(double a, double b)
	4964	+ {
	4965	+ return Math.abs(a - b) < 0.001;
	4966	+ }
	4967	+
4741	4968	void applySelf0(boolean name)
4742	4969	{
4743	4970	if (name)
..	..	@@ -4775,6 +5002,7 @@
4775	5002	current.shadow = (float) shadowField.getFloat();
4776	5003	current.texture = (float) textureField.getFloat();
4777	5004	current.opacity = (float) opacityField.getFloat();
	5005	+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
4778	5006	current.fakedepth = (float) fakedepthField.getFloat();
4779	5007	current.shadowbias = (float) shadowbiasField.getFloat();
4780	5008
..	..	@@ -4787,29 +5015,54 @@
4787	5015	{
4788	5016	cMaterial mat = copy.material;
4789	5017
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));
	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));
4813	5066	}
4814	5067
4815	5068	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4844,7 +5097,7 @@
4844	5097
4845	5098	public void stateChanged(ChangeEvent e)
4846	5099	{
4847		- // assert(false);
	5100	+ // assert(false);
4848	5101	if (e.getSource() == versionSlider)
4849	5102	{
4850	5103	if (muteSlider)
..	..	@@ -5957,6 +6210,7 @@
5957	6210	boolean materialFlushed;
5958	6211	Object3D latestObject;
5959	6212
	6213	+ cGridBag transformPanel;
5960	6214	cGridBag XYZPanel;
5961	6215
5962	6216	JSplitPane gridPanel;
..	..	@@ -6061,6 +6315,8 @@
6061	6315	cNumberSlider textureField;
6062	6316	JLabel opacityLabel;
6063	6317	cNumberSlider opacityField;
	6318	+ JLabel parallaxLabel;
	6319	+ cNumberSlider parallaxField;
6064	6320	JLabel fakedepthLabel;
6065	6321	cNumberSlider fakedepthField;
6066	6322	JLabel shadowbiasLabel;