~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
..	..	@@ -426,6 +442,9 @@
426	442
427	443	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
428	444
	445	+ // This is to refresh the UI of the material panel.
	446	+ boolean patchMaterial;
	447	+
429	448	void SetupMenu()
430	449	{
431	450	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -439,8 +458,11 @@
439	458	importOBJItem.addActionListener(this);
440	459	import3DSItem = menu.add(new MenuItem("3DS file..."));
441	460	import3DSItem.addActionListener(this);
	461	+ if (Globals.ADVANCED)
	462	+ {
442	463	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
443	464	importVRMLX3DItem.addActionListener(this);
	465	+ }
444	466	menu.add("-");
445	467	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
446	468	importGFDItem.addActionListener(this);
..	..	@@ -962,8 +984,13 @@
962	984	object.versionlist = null;
963	985	object.versiontable = null;
964	986
	987	+ Object3D parent = object.parent;
	988	+ object.parent = null;
	989	+
965	990	//byte[] compress = Compress(copy);
966	991	Object3D compress = (Object3D)Grafreed.clone(object);
	992	+
	993	+ object.parent = parent;
967	994
968	995	object.versionlist = versions;
969	996	object.versiontable = versiontable; // if Grafreed.grafreed.universe
..	..	@@ -1307,7 +1334,7 @@
1307	1334
1308	1335	//if (copy.pinned)
1309	1336	{
1310		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1337	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1311	1338	pinButton.setSelected(copy.pinned);
1312	1339	cGridBag t = new cGridBag();
1313	1340	t.preferredWidth = 2;
..	..	@@ -1539,23 +1566,9 @@
1539	1566
1540	1567	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1541	1568	{
1542		- if (Globals.DEBUG)
1543		- System.out.println("CREATE CAMERAS");
1544		- cams = new cTemplate();
1545		- cams.name = "Cameras";
1546		- copy.insertElementAt(cams, 0);
1547		- //cams.parent = copy;
1548		-
1549		- cam = new Camera(); // LA.newVector(3, 2, 1));
1550		- cams.addChild(cam);
1551		- cam = new Camera(1);
1552		- cams.addChild(cam);
1553		- cam = new Camera(2);
1554		- cams.addChild(cam);
1555		- cam = new Camera(3);
1556		- cams.addChild(cam);
1557		- cam = new Camera(4); // Light
1558		- cams.addChild(cam);
	1569	+ if (Globals.DEBUG)
	1570	+ System.out.println("CREATE CAMERAS");
	1571	+ cams = CreateCameras();
1559	1572	} else
1560	1573	{
1561	1574	cams = (cGroup) copy.get(0);
..	..	@@ -1621,6 +1634,45 @@
1621	1634	//frontView.object = copy;
1622	1635	//sideView.object = copy;
1623	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	+
1624	1676	XYZPanel = new cGridBag().setVertical(true);
1625	1677	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1626	1678
..	..	@@ -1630,6 +1682,9 @@
1630	1682	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1631	1683	//XYZPanel.setName("XYZ");
1632	1684
	1685	+ transformPanel.add(resetTransformPanel);
	1686	+ transformPanel.add(XYZPanel);
	1687	+
1633	1688	/*
1634	1689	gridPanel = new JPanel(); //new BorderLayout());
1635	1690	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1637,12 +1692,12 @@
1637	1692	gridPanel.add(cameraView);
1638	1693	gridPanel.add(XYZPanel);
1639	1694	*/
1640		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1641		- gridPanel.setContinuousLayout(true);
1642		- gridPanel.setOneTouchExpandable(true);
1643		- gridPanel.setDividerLocation(1.0);
1644		- gridPanel.setDividerSize(9);
1645		- 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);
1646	1701
1647	1702	// aConstraints.weighty = 0;
1648	1703	//System.out.println("THIS = " + this);
..	..	@@ -1665,30 +1720,34 @@
1665	1720
1666	1721	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1667	1722	//tmp.setName("Edit");
	1723	+ objectPanel.add(skyboxPanel);
	1724	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1725	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1726	+
1668	1727	objectPanel.add(toolboxPanel);
1669		- objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1670		- objectPanel.setToolTipTextAt(0, "Objects & textures");
	1728	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1729	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1671	1730
1672	1731	objectPanel.add(materialPanel);
1673		- objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1674		- objectPanel.setToolTipTextAt(1, "Material");
	1732	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1733	+ objectPanel.setToolTipTextAt(2, "Material");
1675	1734
1676		- objectPanel.add(skyboxPanel);
1677		- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1678		- objectPanel.setToolTipTextAt(2, "Backgrounds");
1679		-
1680	1735	// JPanel north = new JPanel(new BorderLayout());
1681	1736	// north.setName("Edit");
1682	1737	// north.add(ctrlPanel, BorderLayout.NORTH);
1683	1738	// objectPanel.add(north);
1684	1739	objectPanel.add(editPanel);
1685		- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1740	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1686	1741	objectPanel.setToolTipTextAt(3, "Edit controls");
1687	1742
1688		- objectPanel.add(XYZPanel);
	1743	+ objectPanel.add(transformPanel);
1689	1744	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1690		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1745	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1691	1746
	1747	+ patchMaterial = true;
	1748	+ cameraView.patchMaterial = this;
	1749	+ objectPanel.setSelectedIndex(2);
	1750	+
1692	1751	/*
1693	1752	aConstraints.gridx = 0;
1694	1753	aConstraints.gridwidth = 1;
..	..	@@ -1708,7 +1767,7 @@
1708	1767	scrollpane.addMouseWheelListener(this); // Default not fast enough
1709	1768
1710	1769	/JTabbedPane/ scenePanel = new cGridBag();
1711		- scenePanel.preferredWidth = 5;
	1770	+ scenePanel.preferredWidth = 6;
1712	1771
1713	1772	JTabbedPane tabbedPane = new JTabbedPane();
1714	1773	tabbedPane.add(scrollpane);
..	..	@@ -1719,17 +1778,109 @@
1719	1778
1720	1779	AddOptions(optionsPanel); //, aConstraints);
1721	1780
1722		- tabbedPane.add(optionsPanel);
1723		-
1724	1781	tabbedPane.add(FSPane = new cFileSystemPane(this));
1725	1782
	1783	+ tabbedPane.add(optionsPanel);
	1784	+
1726	1785	scenePanel.add(tabbedPane);
1727	1786
1728		- //if (Globals.ADVANCED)
1729		-// tabbedPane.add(infoPanel);
1730		-// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1731		-// tabbedPane.setToolTipTextAt(3, "Information");
	1787	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1788	+ creditsPanel.setName("Credits");
1732	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	+
1733	1884	/*
1734	1885	cTree jTree = new cTree(null);
1735	1886	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1750,13 +1901,13 @@
1750	1901	jtp.add(tree);
1751	1902	*/
1752	1903
1753		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1754		- bigPanel.setContinuousLayout(true);
1755		- bigPanel.setOneTouchExpandable(true);
1756		- bigPanel.setDividerLocation(0.8);
1757		- bigPanel.setDividerSize(15);
1758		- bigPanel.setResizeWeight(0.15);
1759		- 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");
1760	1911
1761	1912	//bigPanel.setLayout(new BorderLayout());
1762	1913	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1840,7 +1991,7 @@
1840	1991
1841	1992	cameraView.requestFocusInWindow();
1842	1993
1843		- gridPanel.setDividerLocation(1.0);
	1994	+// gridPanel.setDividerLocation(1.0);
1844	1995
1845	1996	frame.validate();
1846	1997
..	..	@@ -1875,7 +2026,7 @@
1875	2026	{
1876	2027	cGridBag presetpanel = new cGridBag().setVertical(true);
1877	2028
1878		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	2029	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1879	2030	skin.setToolTipText("Skin");
1880	2031	skin.addMouseListener(new MouseAdapter()
1881	2032	{
..	..	@@ -1886,7 +2037,15 @@
1886	2037
1887	2038	// Skin
1888	2039	colorField.setFloat(material.color);
1889		- saturationField.setFloat(material.modulation);
	2040	+ float saturation = material.modulation;
	2041	+
	2042	+ if (!cameraView.Skinshader)
	2043	+ {
	2044	+ saturation /= 1.5;
	2045	+ }
	2046	+
	2047	+ saturationField.setFloat(saturation);
	2048	+
1890	2049	subsurfaceField.setFloat(material.subsurface);
1891	2050	selfshadowField.setFloat(material.diffuseness);
1892	2051	diffusenessField.setFloat(material.factor);
..	..	@@ -1905,7 +2064,7 @@
1905	2064	});
1906	2065	presetpanel.add(skin);
1907	2066
1908		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2067	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1909	2068	lambert.setToolTipText("Diffuse");
1910	2069	lambert.addMouseListener(new MouseAdapter()
1911	2070	{
..	..	@@ -1923,7 +2082,7 @@
1923	2082	});
1924	2083	presetpanel.add(lambert);
1925	2084
1926		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2085	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1927	2086	diffuse2.setToolTipText("Diffuse2");
1928	2087	diffuse2.addMouseListener(new MouseAdapter()
1929	2088	{
..	..	@@ -1941,7 +2100,7 @@
1941	2100	});
1942	2101	presetpanel.add(diffuse2);
1943	2102
1944		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2103	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1945	2104	diffusemoon.setToolTipText("Moon");
1946	2105	diffusemoon.addMouseListener(new MouseAdapter()
1947	2106	{
..	..	@@ -1959,7 +2118,7 @@
1959	2118	});
1960	2119	presetpanel.add(diffusemoon);
1961	2120
1962		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2121	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1963	2122	diffusemoon2.setToolTipText("Moon2");
1964	2123	diffusemoon2.addMouseListener(new MouseAdapter()
1965	2124	{
..	..	@@ -1977,7 +2136,7 @@
1977	2136	});
1978	2137	presetpanel.add(diffusemoon2);
1979	2138
1980		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2139	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1981	2140	diffusemoon3.setToolTipText("Moon3");
1982	2141	diffusemoon3.addMouseListener(new MouseAdapter()
1983	2142	{
..	..	@@ -1995,7 +2154,7 @@
1995	2154	});
1996	2155	presetpanel.add(diffusemoon3);
1997	2156
1998		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2157	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1999	2158	diffusesheen.setToolTipText("Sheen");
2000	2159	diffusesheen.addMouseListener(new MouseAdapter()
2001	2160	{
..	..	@@ -2012,7 +2171,7 @@
2012	2171	});
2013	2172	presetpanel.add(diffusesheen);
2014	2173
2015		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2174	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
2016	2175	rough.setToolTipText("Rough metal");
2017	2176	rough.addMouseListener(new MouseAdapter()
2018	2177	{
..	..	@@ -2030,7 +2189,7 @@
2030	2189	});
2031	2190	presetpanel.add(rough);
2032	2191
2033		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2192	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
2034	2193	rough2.setToolTipText("Medium metal");
2035	2194	rough2.addMouseListener(new MouseAdapter()
2036	2195	{
..	..	@@ -2048,7 +2207,7 @@
2048	2207	});
2049	2208	presetpanel.add(rough2);
2050	2209
2051		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2210	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
2052	2211	shini0.setToolTipText("Shiny");
2053	2212	shini0.addMouseListener(new MouseAdapter()
2054	2213	{
..	..	@@ -2066,7 +2225,7 @@
2066	2225	});
2067	2226	presetpanel.add(shini0);
2068	2227
2069		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2228	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
2070	2229	shini1.setToolTipText("Shiny2");
2071	2230	shini1.addMouseListener(new MouseAdapter()
2072	2231	{
..	..	@@ -2084,7 +2243,7 @@
2084	2243	});
2085	2244	presetpanel.add(shini1);
2086	2245
2087		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2246	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2088	2247	shini2.setToolTipText("Shiny3");
2089	2248	shini2.addMouseListener(new MouseAdapter()
2090	2249	{
..	..	@@ -2102,7 +2261,7 @@
2102	2261	});
2103	2262	presetpanel.add(shini2);
2104	2263
2105		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2264	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2106	2265	aniso.setToolTipText("AnisoU");
2107	2266	aniso.addMouseListener(new MouseAdapter()
2108	2267	{
..	..	@@ -2120,7 +2279,7 @@
2120	2279	});
2121	2280	presetpanel.add(aniso);
2122	2281
2123		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2282	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2124	2283	aniso2.setToolTipText("AnisoV");
2125	2284	aniso2.addMouseListener(new MouseAdapter()
2126	2285	{
..	..	@@ -2138,7 +2297,7 @@
2138	2297	});
2139	2298	presetpanel.add(aniso2);
2140	2299
2141		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2300	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2142	2301	aniso3.setToolTipText("AnisoUV");
2143	2302	aniso3.addMouseListener(new MouseAdapter()
2144	2303	{
..	..	@@ -2156,7 +2315,7 @@
2156	2315	});
2157	2316	presetpanel.add(aniso3);
2158	2317
2159		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2318	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2160	2319	velvet0.setToolTipText("Velvet");
2161	2320	velvet0.addMouseListener(new MouseAdapter()
2162	2321	{
..	..	@@ -2178,7 +2337,7 @@
2178	2337	});
2179	2338	presetpanel.add(velvet0);
2180	2339
2181		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2340	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2182	2341	bump0.setToolTipText("Bump texture");
2183	2342	bump0.addMouseListener(new MouseAdapter()
2184	2343	{
..	..	@@ -2197,13 +2356,13 @@
2197	2356	});
2198	2357	presetpanel.add(bump0);
2199	2358
2200		- cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2359	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
2201	2360	borderShader.setToolTipText("Border fade");
2202	2361	borderShader.addMouseListener(new MouseAdapter()
2203	2362	{
2204	2363	public void mouseClicked(MouseEvent e)
2205	2364	{
2206		- borderfadeField.setFloat(0.5);
	2365	+ borderfadeField.setFloat(0.4);
2207	2366	opacityField.setFloat(0.75);
2208	2367
2209	2368	materialtouched = true;
..	..	@@ -2212,7 +2371,7 @@
2212	2371	});
2213	2372	presetpanel.add(borderShader);
2214	2373
2215		- cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2374	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2216	2375	halo.setToolTipText("Halo");
2217	2376	halo.addMouseListener(new MouseAdapter()
2218	2377	{
..	..	@@ -2229,7 +2388,7 @@
2229	2388	});
2230	2389	presetpanel.add(halo);
2231	2390
2232		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2391	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2233	2392	candle.setToolTipText("Candle");
2234	2393	candle.addMouseListener(new MouseAdapter()
2235	2394	{
..	..	@@ -2251,7 +2410,7 @@
2251	2410	});
2252	2411	presetpanel.add(candle);
2253	2412
2254		- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2413	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2255	2414	shadowShader.setToolTipText("Shadow");
2256	2415	shadowShader.addMouseListener(new MouseAdapter()
2257	2416	{
..	..	@@ -2270,6 +2429,48 @@
2270	2429	});
2271	2430	presetpanel.add(shadowShader);
2272	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	+
2273	2474	cGridBag panel = new cGridBag().setVertical(true);
2274	2475
2275	2476	presetpanel.preferredWidth = 1;
..	..	@@ -2286,19 +2487,19 @@
2286	2487
2287	2488	cGridBag editBar = new cGridBag().setVertical(false);
2288	2489
2289		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2490	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2290	2491	createMaterialButton.setToolTipText("Create material");
2291	2492
2292	2493	/*
2293	2494	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2294	2495	*/
2295	2496
2296		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2497	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2297	2498	clearMaterialButton.setToolTipText("Clear material");
2298	2499
2299	2500	if (Globals.ADVANCED)
2300	2501	{
2301		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2502	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2302	2503	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2303	2504	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2304	2505	}
..	..	@@ -2515,6 +2716,12 @@
2515	2716	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
2516	2717	colorSection.add(backlit);
2517	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	+
2518	2725	//panel.add(new JSeparator());
2519	2726
2520	2727	//panel.add(globalSection);
..	..	@@ -3566,6 +3773,7 @@
3566	3773	shadowField.setFloat(mat.shadow);
3567	3774	textureField.setFloat(mat.texture);
3568	3775	opacityField.setFloat(mat.opacity);
	3776	+ parallaxField.setFloat(mat.parallax + 0.125f);
3569	3777	fakedepthField.setFloat(mat.fakedepth);
3570	3778	shadowbiasField.setFloat(mat.shadowbias);
3571	3779	bumpField.setInteger(1); // dec 2013
..	..	@@ -4099,11 +4307,18 @@
4099	4307
4100	4308	void New()
4101	4309	{
4102		- while (copy.Size() > 1)
	4310	+ while (copy.Size() > 0)
4103	4311	{
4104		- copy.remove(1);
	4312	+ copy.remove(0);
4105	4313	}
4106	4314
	4315	+ copy.selection.clear();
	4316	+
	4317	+ if (copy == Grafreed.grafreed.universe)
	4318	+ {
	4319	+ CreateCameras();
	4320	+ cameraView.SetCamera(GetCamera(copy, 0));
	4321	+ }
4107	4322	ResetModel();
4108	4323	objEditor.refreshContents();
4109	4324	}
..	..	@@ -4252,7 +4467,11 @@
4252	4467	System.err.println("Save");
4253	4468	Replace();
4254	4469
4255		- //cRadio tab = GetCurrentTab();
	4470	+ if (copy.versionlist == null)
	4471	+ {
	4472	+ copy.versionlist = new Object3D[100];
	4473	+ copy.versionindex = -1;
	4474	+ }
4256	4475
4257	4476	Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4258	4477
..	..	@@ -4417,6 +4636,8 @@
4417	4636	return count;
4418	4637	}
4419	4638
	4639	+ public cGridBag versionSliderPane;
	4640	+
4420	4641	void SetVersionStates()
4421	4642	{
4422	4643	//if (true)
..	..	@@ -4424,21 +4645,36 @@
4424	4645
4425	4646	//cRadio tab = GetCurrentTab();
4426	4647
4427		- restoreButton.setEnabled(copy.versionindex != -1);
4428		- replaceButton.setEnabled(copy.versionindex != -1);
4429		-
4430		- previousVersionButton.setEnabled(copy.versionindex > 0);
4431		- nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4432		-
4433		- deleteVersionButton.setEnabled(copy.versionindex != -1);
4434		- //copy.versionlist[copy.versionindex + 1] != null);
4435		-
4436		- muteSlider = true;
4437		- versionSlider.setMinimum(0);
4438		- versionSlider.setMaximum(VersionCount() - 1);
4439		- versionSlider.setInteger(copy.versionindex);
4440		- versionSlider.setEnabled(copy.versionindex != -1);
4441		- 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	+ }
4442	4678	}
4443	4679
4444	4680	public boolean PreviousVersion()
..	..	@@ -4723,6 +4959,12 @@
4723	4959	// else
4724	4960	// applySelf(true);
4725	4961	// }
	4962	+
	4963	+ boolean Equal(double a, double b)
	4964	+ {
	4965	+ return Math.abs(a - b) < 0.001;
	4966	+ }
	4967	+
4726	4968	void applySelf0(boolean name)
4727	4969	{
4728	4970	if (name)
..	..	@@ -4760,6 +5002,7 @@
4760	5002	current.shadow = (float) shadowField.getFloat();
4761	5003	current.texture = (float) textureField.getFloat();
4762	5004	current.opacity = (float) opacityField.getFloat();
	5005	+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
4763	5006	current.fakedepth = (float) fakedepthField.getFloat();
4764	5007	current.shadowbias = (float) shadowbiasField.getFloat();
4765	5008
..	..	@@ -4772,29 +5015,54 @@
4772	5015	{
4773	5016	cMaterial mat = copy.material;
4774	5017
4775		- colorField.SetToolTipValue((mat.color));
4776		- saturationField.SetToolTipValue((mat.modulation));
4777		- metalnessField.SetToolTipValue((mat.metalness));
4778		- diffuseField.SetToolTipValue((mat.diffuse));
4779		- specularField.SetToolTipValue((mat.specular));
4780		- shininessField.SetToolTipValue((mat.shininess));
4781		- shiftField.SetToolTipValue((mat.shift));
4782		- ambientField.SetToolTipValue((mat.ambient));
4783		- lightareaField.SetToolTipValue((mat.lightarea));
4784		- diffusenessField.SetToolTipValue((mat.factor));
4785		- velvetField.SetToolTipValue((mat.velvet));
4786		- sheenField.SetToolTipValue((mat.sheen));
4787		- subsurfaceField.SetToolTipValue((mat.subsurface));
4788		- backlitField.SetToolTipValue((mat.bump));
4789		- anisoField.SetToolTipValue((mat.aniso));
4790		- anisoVField.SetToolTipValue((mat.anisoV));
4791		- cameraField.SetToolTipValue((mat.cameralight));
4792		- selfshadowField.SetToolTipValue((mat.diffuseness));
4793		- shadowField.SetToolTipValue((mat.shadow));
4794		- textureField.SetToolTipValue((mat.texture));
4795		- opacityField.SetToolTipValue((mat.opacity));
4796		- fakedepthField.SetToolTipValue((mat.fakedepth));
4797		- 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));
4798	5066	}
4799	5067
4800	5068	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4829,7 +5097,7 @@
4829	5097
4830	5098	public void stateChanged(ChangeEvent e)
4831	5099	{
4832		- // assert(false);
	5100	+ // assert(false);
4833	5101	if (e.getSource() == versionSlider)
4834	5102	{
4835	5103	if (muteSlider)
..	..	@@ -5942,6 +6210,7 @@
5942	6210	boolean materialFlushed;
5943	6211	Object3D latestObject;
5944	6212
	6213	+ cGridBag transformPanel;
5945	6214	cGridBag XYZPanel;
5946	6215
5947	6216	JSplitPane gridPanel;
..	..	@@ -6046,6 +6315,8 @@
6046	6315	cNumberSlider textureField;
6047	6316	JLabel opacityLabel;
6048	6317	cNumberSlider opacityField;
	6318	+ JLabel parallaxLabel;
	6319	+ cNumberSlider parallaxField;
6049	6320	JLabel fakedepthLabel;
6050	6321	cNumberSlider fakedepthField;
6051	6322	JLabel shadowbiasLabel;