~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());
..	..	@@ -426,6 +450,9 @@
426	450
427	451	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
428	452
	453	+ // This is to refresh the UI of the material panel.
	454	+ boolean patchMaterial;
	455	+
429	456	void SetupMenu()
430	457	{
431	458	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -439,8 +466,11 @@
439	466	importOBJItem.addActionListener(this);
440	467	import3DSItem = menu.add(new MenuItem("3DS file..."));
441	468	import3DSItem.addActionListener(this);
	469	+ if (Globals.ADVANCED)
	470	+ {
442	471	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
443	472	importVRMLX3DItem.addActionListener(this);
	473	+ }
444	474	menu.add("-");
445	475	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
446	476	importGFDItem.addActionListener(this);
..	..	@@ -962,8 +992,13 @@
962	992	object.versionlist = null;
963	993	object.versiontable = null;
964	994
	995	+ Object3D parent = object.parent;
	996	+ object.parent = null;
	997	+
965	998	//byte[] compress = Compress(copy);
966	999	Object3D compress = (Object3D)Grafreed.clone(object);
	1000	+
	1001	+ object.parent = parent;
967	1002
968	1003	object.versionlist = versions;
969	1004	object.versiontable = versiontable; // if Grafreed.grafreed.universe
..	..	@@ -1307,7 +1342,7 @@
1307	1342
1308	1343	//if (copy.pinned)
1309	1344	{
1310		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1345	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1311	1346	pinButton.setSelected(copy.pinned);
1312	1347	cGridBag t = new cGridBag();
1313	1348	t.preferredWidth = 2;
..	..	@@ -1539,23 +1574,9 @@
1539	1574
1540	1575	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1541	1576	{
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);
	1577	+ if (Globals.DEBUG)
	1578	+ System.out.println("CREATE CAMERAS");
	1579	+ cams = CreateCameras();
1559	1580	} else
1560	1581	{
1561	1582	cams = (cGroup) copy.get(0);
..	..	@@ -1621,6 +1642,45 @@
1621	1642	//frontView.object = copy;
1622	1643	//sideView.object = copy;
1623	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	+
1624	1684	XYZPanel = new cGridBag().setVertical(true);
1625	1685	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1626	1686
..	..	@@ -1630,6 +1690,9 @@
1630	1690	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1631	1691	//XYZPanel.setName("XYZ");
1632	1692
	1693	+ transformPanel.add(resetTransformPanel);
	1694	+ transformPanel.add(XYZPanel);
	1695	+
1633	1696	/*
1634	1697	gridPanel = new JPanel(); //new BorderLayout());
1635	1698	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1637,12 +1700,12 @@
1637	1700	gridPanel.add(cameraView);
1638	1701	gridPanel.add(XYZPanel);
1639	1702	*/
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);
	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);
1646	1709
1647	1710	// aConstraints.weighty = 0;
1648	1711	//System.out.println("THIS = " + this);
..	..	@@ -1665,30 +1728,34 @@
1665	1728
1666	1729	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1667	1730	//tmp.setName("Edit");
	1731	+ objectPanel.add(skyboxPanel);
	1732	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1733	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1734	+
1668	1735	objectPanel.add(toolboxPanel);
1669		- objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1670		- objectPanel.setToolTipTextAt(0, "Objects & textures");
	1736	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1737	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1671	1738
1672	1739	objectPanel.add(materialPanel);
1673		- objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1674		- objectPanel.setToolTipTextAt(1, "Material");
	1740	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1741	+ objectPanel.setToolTipTextAt(2, "Material");
1675	1742
1676		- objectPanel.add(skyboxPanel);
1677		- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1678		- objectPanel.setToolTipTextAt(2, "Backgrounds");
1679		-
1680	1743	// JPanel north = new JPanel(new BorderLayout());
1681	1744	// north.setName("Edit");
1682	1745	// north.add(ctrlPanel, BorderLayout.NORTH);
1683	1746	// objectPanel.add(north);
1684	1747	objectPanel.add(editPanel);
1685		- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1748	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1686	1749	objectPanel.setToolTipTextAt(3, "Edit controls");
1687	1750
1688		- objectPanel.add(XYZPanel);
	1751	+ objectPanel.add(transformPanel);
1689	1752	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1690		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1753	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1691	1754
	1755	+ patchMaterial = true;
	1756	+ cameraView.patchMaterial = this;
	1757	+ objectPanel.setSelectedIndex(2);
	1758	+
1692	1759	/*
1693	1760	aConstraints.gridx = 0;
1694	1761	aConstraints.gridwidth = 1;
..	..	@@ -1708,7 +1775,7 @@
1708	1775	scrollpane.addMouseWheelListener(this); // Default not fast enough
1709	1776
1710	1777	/JTabbedPane/ scenePanel = new cGridBag();
1711		- scenePanel.preferredWidth = 5;
	1778	+ scenePanel.preferredWidth = 6;
1712	1779
1713	1780	JTabbedPane tabbedPane = new JTabbedPane();
1714	1781	tabbedPane.add(scrollpane);
..	..	@@ -1719,17 +1786,109 @@
1719	1786
1720	1787	AddOptions(optionsPanel); //, aConstraints);
1721	1788
1722		- tabbedPane.add(optionsPanel);
1723		-
1724	1789	tabbedPane.add(FSPane = new cFileSystemPane(this));
1725	1790
	1791	+ tabbedPane.add(optionsPanel);
	1792	+
1726	1793	scenePanel.add(tabbedPane);
1727	1794
1728		- //if (Globals.ADVANCED)
1729		-// tabbedPane.add(infoPanel);
1730		-// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1731		-// tabbedPane.setToolTipTextAt(3, "Information");
	1795	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1796	+ creditsPanel.setName("Credits");
1732	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	+
1733	1892	/*
1734	1893	cTree jTree = new cTree(null);
1735	1894	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1750,13 +1909,13 @@
1750	1909	jtp.add(tree);
1751	1910	*/
1752	1911
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");
	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");
1760	1919
1761	1920	//bigPanel.setLayout(new BorderLayout());
1762	1921	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1840,7 +1999,7 @@
1840	1999
1841	2000	cameraView.requestFocusInWindow();
1842	2001
1843		- gridPanel.setDividerLocation(1.0);
	2002	+// gridPanel.setDividerLocation(1.0);
1844	2003
1845	2004	frame.validate();
1846	2005
..	..	@@ -1875,7 +2034,7 @@
1875	2034	{
1876	2035	cGridBag presetpanel = new cGridBag().setVertical(true);
1877	2036
1878		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	2037	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1879	2038	skin.setToolTipText("Skin");
1880	2039	skin.addMouseListener(new MouseAdapter()
1881	2040	{
..	..	@@ -1886,7 +2045,15 @@
1886	2045
1887	2046	// Skin
1888	2047	colorField.setFloat(material.color);
1889		- saturationField.setFloat(material.modulation);
	2048	+ float saturation = material.modulation;
	2049	+
	2050	+ if (!cameraView.Skinshader)
	2051	+ {
	2052	+ saturation /= 1.5;
	2053	+ }
	2054	+
	2055	+ saturationField.setFloat(saturation);
	2056	+
1890	2057	subsurfaceField.setFloat(material.subsurface);
1891	2058	selfshadowField.setFloat(material.diffuseness);
1892	2059	diffusenessField.setFloat(material.factor);
..	..	@@ -1905,7 +2072,7 @@
1905	2072	});
1906	2073	presetpanel.add(skin);
1907	2074
1908		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2075	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1909	2076	lambert.setToolTipText("Diffuse");
1910	2077	lambert.addMouseListener(new MouseAdapter()
1911	2078	{
..	..	@@ -1923,7 +2090,7 @@
1923	2090	});
1924	2091	presetpanel.add(lambert);
1925	2092
1926		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2093	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1927	2094	diffuse2.setToolTipText("Diffuse2");
1928	2095	diffuse2.addMouseListener(new MouseAdapter()
1929	2096	{
..	..	@@ -1941,7 +2108,7 @@
1941	2108	});
1942	2109	presetpanel.add(diffuse2);
1943	2110
1944		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2111	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1945	2112	diffusemoon.setToolTipText("Moon");
1946	2113	diffusemoon.addMouseListener(new MouseAdapter()
1947	2114	{
..	..	@@ -1959,7 +2126,7 @@
1959	2126	});
1960	2127	presetpanel.add(diffusemoon);
1961	2128
1962		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2129	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1963	2130	diffusemoon2.setToolTipText("Moon2");
1964	2131	diffusemoon2.addMouseListener(new MouseAdapter()
1965	2132	{
..	..	@@ -1977,7 +2144,7 @@
1977	2144	});
1978	2145	presetpanel.add(diffusemoon2);
1979	2146
1980		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2147	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1981	2148	diffusemoon3.setToolTipText("Moon3");
1982	2149	diffusemoon3.addMouseListener(new MouseAdapter()
1983	2150	{
..	..	@@ -1995,7 +2162,7 @@
1995	2162	});
1996	2163	presetpanel.add(diffusemoon3);
1997	2164
1998		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2165	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1999	2166	diffusesheen.setToolTipText("Sheen");
2000	2167	diffusesheen.addMouseListener(new MouseAdapter()
2001	2168	{
..	..	@@ -2012,7 +2179,7 @@
2012	2179	});
2013	2180	presetpanel.add(diffusesheen);
2014	2181
2015		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2182	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
2016	2183	rough.setToolTipText("Rough metal");
2017	2184	rough.addMouseListener(new MouseAdapter()
2018	2185	{
..	..	@@ -2030,7 +2197,7 @@
2030	2197	});
2031	2198	presetpanel.add(rough);
2032	2199
2033		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2200	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
2034	2201	rough2.setToolTipText("Medium metal");
2035	2202	rough2.addMouseListener(new MouseAdapter()
2036	2203	{
..	..	@@ -2048,7 +2215,7 @@
2048	2215	});
2049	2216	presetpanel.add(rough2);
2050	2217
2051		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2218	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
2052	2219	shini0.setToolTipText("Shiny");
2053	2220	shini0.addMouseListener(new MouseAdapter()
2054	2221	{
..	..	@@ -2066,7 +2233,7 @@
2066	2233	});
2067	2234	presetpanel.add(shini0);
2068	2235
2069		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2236	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
2070	2237	shini1.setToolTipText("Shiny2");
2071	2238	shini1.addMouseListener(new MouseAdapter()
2072	2239	{
..	..	@@ -2084,7 +2251,7 @@
2084	2251	});
2085	2252	presetpanel.add(shini1);
2086	2253
2087		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2254	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2088	2255	shini2.setToolTipText("Shiny3");
2089	2256	shini2.addMouseListener(new MouseAdapter()
2090	2257	{
..	..	@@ -2102,7 +2269,7 @@
2102	2269	});
2103	2270	presetpanel.add(shini2);
2104	2271
2105		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2272	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2106	2273	aniso.setToolTipText("AnisoU");
2107	2274	aniso.addMouseListener(new MouseAdapter()
2108	2275	{
..	..	@@ -2120,7 +2287,7 @@
2120	2287	});
2121	2288	presetpanel.add(aniso);
2122	2289
2123		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2290	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2124	2291	aniso2.setToolTipText("AnisoV");
2125	2292	aniso2.addMouseListener(new MouseAdapter()
2126	2293	{
..	..	@@ -2138,7 +2305,7 @@
2138	2305	});
2139	2306	presetpanel.add(aniso2);
2140	2307
2141		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2308	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2142	2309	aniso3.setToolTipText("AnisoUV");
2143	2310	aniso3.addMouseListener(new MouseAdapter()
2144	2311	{
..	..	@@ -2156,7 +2323,7 @@
2156	2323	});
2157	2324	presetpanel.add(aniso3);
2158	2325
2159		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2326	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2160	2327	velvet0.setToolTipText("Velvet");
2161	2328	velvet0.addMouseListener(new MouseAdapter()
2162	2329	{
..	..	@@ -2178,7 +2345,7 @@
2178	2345	});
2179	2346	presetpanel.add(velvet0);
2180	2347
2181		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2348	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2182	2349	bump0.setToolTipText("Bump texture");
2183	2350	bump0.addMouseListener(new MouseAdapter()
2184	2351	{
..	..	@@ -2197,7 +2364,7 @@
2197	2364	});
2198	2365	presetpanel.add(bump0);
2199	2366
2200		- cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2367	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
2201	2368	borderShader.setToolTipText("Border fade");
2202	2369	borderShader.addMouseListener(new MouseAdapter()
2203	2370	{
..	..	@@ -2212,7 +2379,7 @@
2212	2379	});
2213	2380	presetpanel.add(borderShader);
2214	2381
2215		- cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2382	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2216	2383	halo.setToolTipText("Halo");
2217	2384	halo.addMouseListener(new MouseAdapter()
2218	2385	{
..	..	@@ -2229,7 +2396,7 @@
2229	2396	});
2230	2397	presetpanel.add(halo);
2231	2398
2232		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2399	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2233	2400	candle.setToolTipText("Candle");
2234	2401	candle.addMouseListener(new MouseAdapter()
2235	2402	{
..	..	@@ -2251,7 +2418,7 @@
2251	2418	});
2252	2419	presetpanel.add(candle);
2253	2420
2254		- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2421	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2255	2422	shadowShader.setToolTipText("Shadow");
2256	2423	shadowShader.addMouseListener(new MouseAdapter()
2257	2424	{
..	..	@@ -2286,19 +2453,19 @@
2286	2453
2287	2454	cGridBag editBar = new cGridBag().setVertical(false);
2288	2455
2289		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2456	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2290	2457	createMaterialButton.setToolTipText("Create material");
2291	2458
2292	2459	/*
2293	2460	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2294	2461	*/
2295	2462
2296		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2463	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2297	2464	clearMaterialButton.setToolTipText("Clear material");
2298	2465
2299	2466	if (Globals.ADVANCED)
2300	2467	{
2301		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2468	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2302	2469	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2303	2470	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2304	2471	}
..	..	@@ -2515,6 +2682,12 @@
2515	2682	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
2516	2683	colorSection.add(backlit);
2517	2684
	2685	+ cGridBag parallax = new cGridBag();
	2686	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2687	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2688	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.5, -0.25)); // , aConstraints);
	2689	+ colorSection.add(parallax);
	2690	+
2518	2691	//panel.add(new JSeparator());
2519	2692
2520	2693	//panel.add(globalSection);
..	..	@@ -3566,6 +3739,7 @@
3566	3739	shadowField.setFloat(mat.shadow);
3567	3740	textureField.setFloat(mat.texture);
3568	3741	opacityField.setFloat(mat.opacity);
	3742	+ parallaxField.setFloat(mat.parallax + 0.25f);
3569	3743	fakedepthField.setFloat(mat.fakedepth);
3570	3744	shadowbiasField.setFloat(mat.shadowbias);
3571	3745	bumpField.setInteger(1); // dec 2013
..	..	@@ -4099,11 +4273,18 @@
4099	4273
4100	4274	void New()
4101	4275	{
4102		- while (copy.Size() > 1)
	4276	+ while (copy.Size() > 0)
4103	4277	{
4104		- copy.remove(1);
	4278	+ copy.remove(0);
4105	4279	}
4106	4280
	4281	+ copy.selection.clear();
	4282	+
	4283	+ if (copy == Grafreed.grafreed.universe)
	4284	+ {
	4285	+ CreateCameras();
	4286	+ cameraView.SetCamera(GetCamera(copy, 0));
	4287	+ }
4107	4288	ResetModel();
4108	4289	objEditor.refreshContents();
4109	4290	}
..	..	@@ -4417,6 +4598,8 @@
4417	4598	return count;
4418	4599	}
4419	4600
	4601	+ public cGridBag versionSliderPane;
	4602	+
4420	4603	void SetVersionStates()
4421	4604	{
4422	4605	//if (true)
..	..	@@ -4424,21 +4607,36 @@
4424	4607
4425	4608	//cRadio tab = GetCurrentTab();
4426	4609
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;
	4610	+ if (copy.versionlist == null)
	4611	+ {
	4612	+ saveVersionButton.setEnabled(false);
	4613	+ restoreButton.setEnabled(false);
	4614	+ replaceButton.setEnabled(false);
	4615	+ previousVersionButton.setEnabled(false);
	4616	+ nextVersionButton.setEnabled(false);
	4617	+ deleteVersionButton.setEnabled(false);
	4618	+ versionSliderPane.setVisible(false);
	4619	+ }
	4620	+ else
	4621	+ {
	4622	+ restoreButton.setEnabled(copy.versionindex != -1);
	4623	+ replaceButton.setEnabled(copy.versionindex != -1);
	4624	+
	4625	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4626	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4627	+
	4628	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4629	+ //copy.versionlist[copy.versionindex + 1] != null);
	4630	+
	4631	+ muteSlider = true;
	4632	+ versionSlider.setMinimum(0);
	4633	+ versionSlider.setMaximum(VersionCount() - 1);
	4634	+ versionSlider.setInteger(copy.versionindex);
	4635	+ versionSlider.setEnabled(copy.versionindex != -1);
	4636	+ muteSlider = false;
	4637	+
	4638	+ versionSliderPane.setVisible(true);
	4639	+ }
4442	4640	}
4443	4641
4444	4642	public boolean PreviousVersion()
..	..	@@ -4723,6 +4921,12 @@
4723	4921	// else
4724	4922	// applySelf(true);
4725	4923	// }
	4924	+
	4925	+ boolean Equal(double a, double b)
	4926	+ {
	4927	+ return Math.abs(a - b) < 0.001;
	4928	+ }
	4929	+
4726	4930	void applySelf0(boolean name)
4727	4931	{
4728	4932	if (name)
..	..	@@ -4760,6 +4964,7 @@
4760	4964	current.shadow = (float) shadowField.getFloat();
4761	4965	current.texture = (float) textureField.getFloat();
4762	4966	current.opacity = (float) opacityField.getFloat();
	4967	+ current.parallax = (float) parallaxField.getFloat() - 0.25f;
4763	4968	current.fakedepth = (float) fakedepthField.getFloat();
4764	4969	current.shadowbias = (float) shadowbiasField.getFloat();
4765	4970
..	..	@@ -4772,29 +4977,54 @@
4772	4977	{
4773	4978	cMaterial mat = copy.material;
4774	4979
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));
	4980	+ if (!Equal(colorField.getFloat(), mat.color))
	4981	+ colorField.SetToolTipValue((mat.color));
	4982	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4983	+ saturationField.SetToolTipValue((mat.modulation));
	4984	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4985	+ metalnessField.SetToolTipValue((mat.metalness));
	4986	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4987	+ diffuseField.SetToolTipValue((mat.diffuse));
	4988	+ if (!Equal(specularField.getFloat(), mat.specular))
	4989	+ specularField.SetToolTipValue((mat.specular));
	4990	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4991	+ shininessField.SetToolTipValue((mat.shininess));
	4992	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4993	+ shiftField.SetToolTipValue((mat.shift));
	4994	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4995	+ ambientField.SetToolTipValue((mat.ambient));
	4996	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4997	+ lightareaField.SetToolTipValue((mat.lightarea));
	4998	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4999	+ diffusenessField.SetToolTipValue((mat.factor));
	5000	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	5001	+ velvetField.SetToolTipValue((mat.velvet));
	5002	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	5003	+ sheenField.SetToolTipValue((mat.sheen));
	5004	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	5005	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	5006	+ if (!Equal(backlitField.getFloat(), mat.bump))
	5007	+ backlitField.SetToolTipValue((mat.bump));
	5008	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5009	+ anisoField.SetToolTipValue((mat.aniso));
	5010	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5011	+ anisoVField.SetToolTipValue((mat.anisoV));
	5012	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5013	+ cameraField.SetToolTipValue((mat.cameralight));
	5014	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5015	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5016	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5017	+ shadowField.SetToolTipValue((mat.shadow));
	5018	+ if (!Equal(textureField.getFloat(), mat.texture))
	5019	+ textureField.SetToolTipValue((mat.texture));
	5020	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5021	+ opacityField.SetToolTipValue((mat.opacity));
	5022	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5023	+ parallaxField.SetToolTipValue((mat.parallax));
	5024	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5025	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5026	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5027	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4798	5028	}
4799	5029
4800	5030	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4829,7 +5059,7 @@
4829	5059
4830	5060	public void stateChanged(ChangeEvent e)
4831	5061	{
4832		- // assert(false);
	5062	+ // assert(false);
4833	5063	if (e.getSource() == versionSlider)
4834	5064	{
4835	5065	if (muteSlider)
..	..	@@ -5942,6 +6172,7 @@
5942	6172	boolean materialFlushed;
5943	6173	Object3D latestObject;
5944	6174
	6175	+ cGridBag transformPanel;
5945	6176	cGridBag XYZPanel;
5946	6177
5947	6178	JSplitPane gridPanel;
..	..	@@ -6046,6 +6277,8 @@
6046	6277	cNumberSlider textureField;
6047	6278	JLabel opacityLabel;
6048	6279	cNumberSlider opacityField;
	6280	+ JLabel parallaxLabel;
	6281	+ cNumberSlider parallaxField;
6049	6282	JLabel fakedepthLabel;
6050	6283	cNumberSlider fakedepthField;
6051	6284	JLabel shadowbiasLabel;