~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -72,6 +72,21 @@
72	72	}
73	73	}
74	74
	75	+ public Composite CreateCameras()
	76	+ {
	77	+ Composite cams = new cTemplate();
	78	+ cams.name = "Cameras";
	79	+ copy.insertElementAt(cams, 0);
	80	+
	81	+ cams.addChild(new Camera());
	82	+ cams.addChild(new Camera(1));
	83	+ cams.addChild(new Camera(2));
	84	+ cams.addChild(new Camera(3));
	85	+ cams.addChild(new Camera(4));
	86	+
	87	+ return cams;
	88	+ }
	89	+
75	90	public cGridBag GetSeparator()
76	91	{
77	92	cGridBag separator = new cGridBag();
..	..	@@ -83,7 +98,10 @@
83	98	cButton GetButton(String name, boolean border)
84	99	{
85	100	ImageIcon icon = GetIcon(name);
86		- return new cButton(icon, border);
	101	+ if (icon != null \|\| name.contains("/"))
	102	+ return new cButton(icon, border);
	103	+ else
	104	+ return new cButton(name, border);
87	105	}
88	106
89	107	cLabel GetLabel(String name, boolean border)
..	..	@@ -106,7 +124,7 @@
106	124
107	125	static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
108	126
109		- ImageIcon GetIcon(String name)
	127	+ static ImageIcon GetIcon(String name)
110	128	{
111	129	javax.swing.ImageIcon iconCache = icons.get(name);
112	130	if (iconCache != null)
..	..	@@ -116,7 +134,7 @@
116	134
117	135	try
118	136	{
119		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	137	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
120	138
121	139	// if (image.getWidth() > 48 && image.getHeight() > 48)
122	140	// {
..	..	@@ -426,6 +444,9 @@
426	444
427	445	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
428	446
	447	+ // This is to refresh the UI of the material panel.
	448	+ boolean patchMaterial;
	449	+
429	450	void SetupMenu()
430	451	{
431	452	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -439,8 +460,11 @@
439	460	importOBJItem.addActionListener(this);
440	461	import3DSItem = menu.add(new MenuItem("3DS file..."));
441	462	import3DSItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
442	465	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
443	466	importVRMLX3DItem.addActionListener(this);
	467	+ }
444	468	menu.add("-");
445	469	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
446	470	importGFDItem.addActionListener(this);
..	..	@@ -962,8 +986,13 @@
962	986	object.versionlist = null;
963	987	object.versiontable = null;
964	988
	989	+ Object3D parent = object.parent;
	990	+ object.parent = null;
	991	+
965	992	//byte[] compress = Compress(copy);
966	993	Object3D compress = (Object3D)Grafreed.clone(object);
	994	+
	995	+ object.parent = parent;
967	996
968	997	object.versionlist = versions;
969	998	object.versiontable = versiontable; // if Grafreed.grafreed.universe
..	..	@@ -1307,7 +1336,7 @@
1307	1336
1308	1337	//if (copy.pinned)
1309	1338	{
1310		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1339	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1311	1340	pinButton.setSelected(copy.pinned);
1312	1341	cGridBag t = new cGridBag();
1313	1342	t.preferredWidth = 2;
..	..	@@ -1539,23 +1568,9 @@
1539	1568
1540	1569	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1541	1570	{
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);
	1571	+ if (Globals.DEBUG)
	1572	+ System.out.println("CREATE CAMERAS");
	1573	+ cams = CreateCameras();
1559	1574	} else
1560	1575	{
1561	1576	cams = (cGroup) copy.get(0);
..	..	@@ -1621,6 +1636,45 @@
1621	1636	//frontView.object = copy;
1622	1637	//sideView.object = copy;
1623	1638
	1639	+ transformPanel = new cGridBag().setVertical(true);
	1640	+
	1641	+ cGridBag resetTransformPanel = new cGridBag();
	1642	+
	1643	+ resetTransformPanel.preferredHeight = 2;
	1644	+
	1645	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1646	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1647	+ resetTransform.addMouseListener(new MouseAdapter()
	1648	+ {
	1649	+ public void mouseClicked(MouseEvent e)
	1650	+ {
	1651	+ ResetTransform();
	1652	+ }
	1653	+ });
	1654	+ resetTransformPanel.add(resetTransform);
	1655	+
	1656	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1657	+ resetTransform.setToolTipText("Reset Translation only");
	1658	+ resetTransform.addMouseListener(new MouseAdapter()
	1659	+ {
	1660	+ public void mouseClicked(MouseEvent e)
	1661	+ {
	1662	+ ResetTransform(1);
	1663	+ }
	1664	+ });
	1665	+ resetTransformPanel.add(resetTransform);
	1666	+
	1667	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1668	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1669	+ resetTransform.addMouseListener(new MouseAdapter()
	1670	+ {
	1671	+ public void mouseClicked(MouseEvent e)
	1672	+ {
	1673	+ ResetTransform(2);
	1674	+ }
	1675	+ });
	1676	+ resetTransformPanel.add(resetTransform);
	1677	+
1624	1678	XYZPanel = new cGridBag().setVertical(true);
1625	1679	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1626	1680
..	..	@@ -1630,6 +1684,9 @@
1630	1684	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1631	1685	//XYZPanel.setName("XYZ");
1632	1686
	1687	+ transformPanel.add(resetTransformPanel);
	1688	+ transformPanel.add(XYZPanel);
	1689	+
1633	1690	/*
1634	1691	gridPanel = new JPanel(); //new BorderLayout());
1635	1692	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1637,12 +1694,12 @@
1637	1694	gridPanel.add(cameraView);
1638	1695	gridPanel.add(XYZPanel);
1639	1696	*/
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);
	1697	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1698	+// gridPanel.setContinuousLayout(true);
	1699	+// gridPanel.setOneTouchExpandable(true);
	1700	+// gridPanel.setDividerLocation(1.0);
	1701	+// gridPanel.setDividerSize(9);
	1702	+// gridPanel.setResizeWeight(0.85);
1646	1703
1647	1704	// aConstraints.weighty = 0;
1648	1705	//System.out.println("THIS = " + this);
..	..	@@ -1665,30 +1722,34 @@
1665	1722
1666	1723	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1667	1724	//tmp.setName("Edit");
	1725	+ objectPanel.add(skyboxPanel);
	1726	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1727	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1728	+
1668	1729	objectPanel.add(toolboxPanel);
1669		- objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1670		- objectPanel.setToolTipTextAt(0, "Objects & textures");
	1730	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1731	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1671	1732
1672	1733	objectPanel.add(materialPanel);
1673		- objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1674		- objectPanel.setToolTipTextAt(1, "Material");
	1734	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1735	+ objectPanel.setToolTipTextAt(2, "Material");
1675	1736
1676		- objectPanel.add(skyboxPanel);
1677		- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1678		- objectPanel.setToolTipTextAt(2, "Backgrounds");
1679		-
1680	1737	// JPanel north = new JPanel(new BorderLayout());
1681	1738	// north.setName("Edit");
1682	1739	// north.add(ctrlPanel, BorderLayout.NORTH);
1683	1740	// objectPanel.add(north);
1684	1741	objectPanel.add(editPanel);
1685		- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1742	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1686	1743	objectPanel.setToolTipTextAt(3, "Edit controls");
1687	1744
1688		- objectPanel.add(XYZPanel);
	1745	+ objectPanel.add(transformPanel);
1689	1746	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1690		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1747	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1691	1748
	1749	+ patchMaterial = true;
	1750	+ cameraView.patchMaterial = this;
	1751	+ objectPanel.setSelectedIndex(2);
	1752	+
1692	1753	/*
1693	1754	aConstraints.gridx = 0;
1694	1755	aConstraints.gridwidth = 1;
..	..	@@ -1708,7 +1769,7 @@
1708	1769	scrollpane.addMouseWheelListener(this); // Default not fast enough
1709	1770
1710	1771	/JTabbedPane/ scenePanel = new cGridBag();
1711		- scenePanel.preferredWidth = 5;
	1772	+ scenePanel.preferredWidth = 6;
1712	1773
1713	1774	JTabbedPane tabbedPane = new JTabbedPane();
1714	1775	tabbedPane.add(scrollpane);
..	..	@@ -1719,17 +1780,109 @@
1719	1780
1720	1781	AddOptions(optionsPanel); //, aConstraints);
1721	1782
1722		- tabbedPane.add(optionsPanel);
1723		-
1724	1783	tabbedPane.add(FSPane = new cFileSystemPane(this));
1725	1784
	1785	+ tabbedPane.add(optionsPanel);
	1786	+
1726	1787	scenePanel.add(tabbedPane);
1727	1788
1728		- //if (Globals.ADVANCED)
1729		-// tabbedPane.add(infoPanel);
1730		-// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1731		-// tabbedPane.setToolTipTextAt(3, "Information");
	1789	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1790	+ creditsPanel.setName("Credits");
1732	1791
	1792	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1793	+ creditsPanel.add(ogaLabel);
	1794	+
	1795	+ cButton creditButton;
	1796	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1797	+ creditButton.setToolTipText("https://opengameart.org");
	1798	+
	1799	+ creditButton.addMouseListener(new MouseAdapter()
	1800	+ {
	1801	+ public void mouseClicked(MouseEvent e)
	1802	+ {
	1803	+ try
	1804	+ {
	1805	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1806	+ } catch (Exception e1)
	1807	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1808	+ {
	1809	+ e1.printStackTrace();
	1810	+ }
	1811	+ }
	1812	+ });
	1813	+
	1814	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1815	+ creditsPanel.add(ogaLabel);
	1816	+
	1817	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1818	+ creditButton.setToolTipText("https://3delicious.net");
	1819	+
	1820	+ creditButton.addMouseListener(new MouseAdapter()
	1821	+ {
	1822	+ public void mouseClicked(MouseEvent e)
	1823	+ {
	1824	+ try
	1825	+ {
	1826	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1827	+ } catch (Exception e1)
	1828	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1829	+ {
	1830	+ e1.printStackTrace();
	1831	+ }
	1832	+ }
	1833	+ });
	1834	+
	1835	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1836	+ creditButton.setToolTipText("https://archive3d.net");
	1837	+
	1838	+ creditButton.addMouseListener(new MouseAdapter()
	1839	+ {
	1840	+ public void mouseClicked(MouseEvent e)
	1841	+ {
	1842	+ try
	1843	+ {
	1844	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1845	+ } catch (Exception e1)
	1846	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1847	+ {
	1848	+ e1.printStackTrace();
	1849	+ }
	1850	+ }
	1851	+ });
	1852	+
	1853	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1854	+ creditButton.setToolTipText("https://turbosquid.com");
	1855	+
	1856	+ creditButton.addMouseListener(new MouseAdapter()
	1857	+ {
	1858	+ public void mouseClicked(MouseEvent e)
	1859	+ {
	1860	+ try
	1861	+ {
	1862	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1863	+ } catch (Exception e1)
	1864	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1865	+ {
	1866	+ e1.printStackTrace();
	1867	+ }
	1868	+ }
	1869	+ });
	1870	+
	1871	+ for (int i=6; --i>=0;)
	1872	+ {
	1873	+ creditsPanel.add(new cGridBag());
	1874	+ }
	1875	+
	1876	+ tabbedPane.add(creditsPanel);
	1877	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1878	+
	1879	+ if (Globals.ADVANCED)
	1880	+ {
	1881	+ tabbedPane.add(infoPanel);
	1882	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1883	+ tabbedPane.setToolTipTextAt(4, "Information");
	1884	+ }
	1885	+
1733	1886	/*
1734	1887	cTree jTree = new cTree(null);
1735	1888	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1750,13 +1903,13 @@
1750	1903	jtp.add(tree);
1751	1904	*/
1752	1905
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");
	1906	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1907	+// bigPanel.setContinuousLayout(true);
	1908	+// bigPanel.setOneTouchExpandable(true);
	1909	+// bigPanel.setDividerLocation(0.8);
	1910	+// bigPanel.setDividerSize(15);
	1911	+// bigPanel.setResizeWeight(0.15);
	1912	+// bigPanel.setName("Scene");
1760	1913
1761	1914	//bigPanel.setLayout(new BorderLayout());
1762	1915	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1840,7 +1993,7 @@
1840	1993
1841	1994	cameraView.requestFocusInWindow();
1842	1995
1843		- gridPanel.setDividerLocation(1.0);
	1996	+// gridPanel.setDividerLocation(1.0);
1844	1997
1845	1998	frame.validate();
1846	1999
..	..	@@ -1875,7 +2028,7 @@
1875	2028	{
1876	2029	cGridBag presetpanel = new cGridBag().setVertical(true);
1877	2030
1878		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	2031	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1879	2032	skin.setToolTipText("Skin");
1880	2033	skin.addMouseListener(new MouseAdapter()
1881	2034	{
..	..	@@ -1886,7 +2039,15 @@
1886	2039
1887	2040	// Skin
1888	2041	colorField.setFloat(material.color);
1889		- saturationField.setFloat(material.modulation);
	2042	+ float saturation = material.modulation;
	2043	+
	2044	+ if (!cameraView.Skinshader)
	2045	+ {
	2046	+ saturation /= 1.5;
	2047	+ }
	2048	+
	2049	+ saturationField.setFloat(saturation);
	2050	+
1890	2051	subsurfaceField.setFloat(material.subsurface);
1891	2052	selfshadowField.setFloat(material.diffuseness);
1892	2053	diffusenessField.setFloat(material.factor);
..	..	@@ -1905,7 +2066,7 @@
1905	2066	});
1906	2067	presetpanel.add(skin);
1907	2068
1908		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2069	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1909	2070	lambert.setToolTipText("Diffuse");
1910	2071	lambert.addMouseListener(new MouseAdapter()
1911	2072	{
..	..	@@ -1923,7 +2084,7 @@
1923	2084	});
1924	2085	presetpanel.add(lambert);
1925	2086
1926		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2087	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1927	2088	diffuse2.setToolTipText("Diffuse2");
1928	2089	diffuse2.addMouseListener(new MouseAdapter()
1929	2090	{
..	..	@@ -1941,7 +2102,7 @@
1941	2102	});
1942	2103	presetpanel.add(diffuse2);
1943	2104
1944		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2105	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1945	2106	diffusemoon.setToolTipText("Moon");
1946	2107	diffusemoon.addMouseListener(new MouseAdapter()
1947	2108	{
..	..	@@ -1959,7 +2120,7 @@
1959	2120	});
1960	2121	presetpanel.add(diffusemoon);
1961	2122
1962		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2123	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1963	2124	diffusemoon2.setToolTipText("Moon2");
1964	2125	diffusemoon2.addMouseListener(new MouseAdapter()
1965	2126	{
..	..	@@ -1977,7 +2138,7 @@
1977	2138	});
1978	2139	presetpanel.add(diffusemoon2);
1979	2140
1980		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2141	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1981	2142	diffusemoon3.setToolTipText("Moon3");
1982	2143	diffusemoon3.addMouseListener(new MouseAdapter()
1983	2144	{
..	..	@@ -1995,7 +2156,7 @@
1995	2156	});
1996	2157	presetpanel.add(diffusemoon3);
1997	2158
1998		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2159	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1999	2160	diffusesheen.setToolTipText("Sheen");
2000	2161	diffusesheen.addMouseListener(new MouseAdapter()
2001	2162	{
..	..	@@ -2012,7 +2173,7 @@
2012	2173	});
2013	2174	presetpanel.add(diffusesheen);
2014	2175
2015		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2176	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
2016	2177	rough.setToolTipText("Rough metal");
2017	2178	rough.addMouseListener(new MouseAdapter()
2018	2179	{
..	..	@@ -2030,7 +2191,7 @@
2030	2191	});
2031	2192	presetpanel.add(rough);
2032	2193
2033		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2194	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
2034	2195	rough2.setToolTipText("Medium metal");
2035	2196	rough2.addMouseListener(new MouseAdapter()
2036	2197	{
..	..	@@ -2048,7 +2209,7 @@
2048	2209	});
2049	2210	presetpanel.add(rough2);
2050	2211
2051		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2212	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
2052	2213	shini0.setToolTipText("Shiny");
2053	2214	shini0.addMouseListener(new MouseAdapter()
2054	2215	{
..	..	@@ -2066,7 +2227,7 @@
2066	2227	});
2067	2228	presetpanel.add(shini0);
2068	2229
2069		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2230	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
2070	2231	shini1.setToolTipText("Shiny2");
2071	2232	shini1.addMouseListener(new MouseAdapter()
2072	2233	{
..	..	@@ -2084,7 +2245,7 @@
2084	2245	});
2085	2246	presetpanel.add(shini1);
2086	2247
2087		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2248	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2088	2249	shini2.setToolTipText("Shiny3");
2089	2250	shini2.addMouseListener(new MouseAdapter()
2090	2251	{
..	..	@@ -2102,7 +2263,7 @@
2102	2263	});
2103	2264	presetpanel.add(shini2);
2104	2265
2105		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2266	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2106	2267	aniso.setToolTipText("AnisoU");
2107	2268	aniso.addMouseListener(new MouseAdapter()
2108	2269	{
..	..	@@ -2120,7 +2281,7 @@
2120	2281	});
2121	2282	presetpanel.add(aniso);
2122	2283
2123		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2284	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2124	2285	aniso2.setToolTipText("AnisoV");
2125	2286	aniso2.addMouseListener(new MouseAdapter()
2126	2287	{
..	..	@@ -2138,7 +2299,7 @@
2138	2299	});
2139	2300	presetpanel.add(aniso2);
2140	2301
2141		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2302	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2142	2303	aniso3.setToolTipText("AnisoUV");
2143	2304	aniso3.addMouseListener(new MouseAdapter()
2144	2305	{
..	..	@@ -2156,7 +2317,7 @@
2156	2317	});
2157	2318	presetpanel.add(aniso3);
2158	2319
2159		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2320	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2160	2321	velvet0.setToolTipText("Velvet");
2161	2322	velvet0.addMouseListener(new MouseAdapter()
2162	2323	{
..	..	@@ -2178,7 +2339,7 @@
2178	2339	});
2179	2340	presetpanel.add(velvet0);
2180	2341
2181		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2342	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2182	2343	bump0.setToolTipText("Bump texture");
2183	2344	bump0.addMouseListener(new MouseAdapter()
2184	2345	{
..	..	@@ -2197,7 +2358,7 @@
2197	2358	});
2198	2359	presetpanel.add(bump0);
2199	2360
2200		- cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2361	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
2201	2362	borderShader.setToolTipText("Border fade");
2202	2363	borderShader.addMouseListener(new MouseAdapter()
2203	2364	{
..	..	@@ -2212,7 +2373,7 @@
2212	2373	});
2213	2374	presetpanel.add(borderShader);
2214	2375
2215		- cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2376	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2216	2377	halo.setToolTipText("Halo");
2217	2378	halo.addMouseListener(new MouseAdapter()
2218	2379	{
..	..	@@ -2229,7 +2390,7 @@
2229	2390	});
2230	2391	presetpanel.add(halo);
2231	2392
2232		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2393	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2233	2394	candle.setToolTipText("Candle");
2234	2395	candle.addMouseListener(new MouseAdapter()
2235	2396	{
..	..	@@ -2251,7 +2412,7 @@
2251	2412	});
2252	2413	presetpanel.add(candle);
2253	2414
2254		- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2415	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2255	2416	shadowShader.setToolTipText("Shadow");
2256	2417	shadowShader.addMouseListener(new MouseAdapter()
2257	2418	{
..	..	@@ -2286,19 +2447,19 @@
2286	2447
2287	2448	cGridBag editBar = new cGridBag().setVertical(false);
2288	2449
2289		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2450	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2290	2451	createMaterialButton.setToolTipText("Create material");
2291	2452
2292	2453	/*
2293	2454	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2294	2455	*/
2295	2456
2296		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2457	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2297	2458	clearMaterialButton.setToolTipText("Clear material");
2298	2459
2299	2460	if (Globals.ADVANCED)
2300	2461	{
2301		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2462	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2302	2463	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2303	2464	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2304	2465	}
..	..	@@ -4099,11 +4260,18 @@
4099	4260
4100	4261	void New()
4101	4262	{
4102		- while (copy.Size() > 1)
	4263	+ while (copy.Size() > 0)
4103	4264	{
4104		- copy.remove(1);
	4265	+ copy.remove(0);
4105	4266	}
4106	4267
	4268	+ copy.selection.clear();
	4269	+
	4270	+ if (copy == Grafreed.grafreed.universe)
	4271	+ {
	4272	+ CreateCameras();
	4273	+ cameraView.SetCamera(GetCamera(copy, 0));
	4274	+ }
4107	4275	ResetModel();
4108	4276	objEditor.refreshContents();
4109	4277	}
..	..	@@ -4417,6 +4585,8 @@
4417	4585	return count;
4418	4586	}
4419	4587
	4588	+ public cGridBag versionSliderPane;
	4589	+
4420	4590	void SetVersionStates()
4421	4591	{
4422	4592	//if (true)
..	..	@@ -4424,21 +4594,36 @@
4424	4594
4425	4595	//cRadio tab = GetCurrentTab();
4426	4596
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;
	4597	+ if (copy.versionlist == null)
	4598	+ {
	4599	+ saveVersionButton.setEnabled(false);
	4600	+ restoreButton.setEnabled(false);
	4601	+ replaceButton.setEnabled(false);
	4602	+ previousVersionButton.setEnabled(false);
	4603	+ nextVersionButton.setEnabled(false);
	4604	+ deleteVersionButton.setEnabled(false);
	4605	+ versionSliderPane.setVisible(false);
	4606	+ }
	4607	+ else
	4608	+ {
	4609	+ restoreButton.setEnabled(copy.versionindex != -1);
	4610	+ replaceButton.setEnabled(copy.versionindex != -1);
	4611	+
	4612	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4613	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4614	+
	4615	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4616	+ //copy.versionlist[copy.versionindex + 1] != null);
	4617	+
	4618	+ muteSlider = true;
	4619	+ versionSlider.setMinimum(0);
	4620	+ versionSlider.setMaximum(VersionCount() - 1);
	4621	+ versionSlider.setInteger(copy.versionindex);
	4622	+ versionSlider.setEnabled(copy.versionindex != -1);
	4623	+ muteSlider = false;
	4624	+
	4625	+ versionSliderPane.setVisible(true);
	4626	+ }
4442	4627	}
4443	4628
4444	4629	public boolean PreviousVersion()
..	..	@@ -4723,6 +4908,12 @@
4723	4908	// else
4724	4909	// applySelf(true);
4725	4910	// }
	4911	+
	4912	+ boolean Equal(double a, double b)
	4913	+ {
	4914	+ return Math.abs(a - b) < 0.001;
	4915	+ }
	4916	+
4726	4917	void applySelf0(boolean name)
4727	4918	{
4728	4919	if (name)
..	..	@@ -4772,29 +4963,52 @@
4772	4963	{
4773	4964	cMaterial mat = copy.material;
4774	4965
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));
	4966	+ if (!Equal(colorField.getFloat(), mat.color))
	4967	+ colorField.SetToolTipValue((mat.color));
	4968	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4969	+ saturationField.SetToolTipValue((mat.modulation));
	4970	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4971	+ metalnessField.SetToolTipValue((mat.metalness));
	4972	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4973	+ diffuseField.SetToolTipValue((mat.diffuse));
	4974	+ if (!Equal(specularField.getFloat(), mat.specular))
	4975	+ specularField.SetToolTipValue((mat.specular));
	4976	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4977	+ shininessField.SetToolTipValue((mat.shininess));
	4978	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4979	+ shiftField.SetToolTipValue((mat.shift));
	4980	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4981	+ ambientField.SetToolTipValue((mat.ambient));
	4982	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4983	+ lightareaField.SetToolTipValue((mat.lightarea));
	4984	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4985	+ diffusenessField.SetToolTipValue((mat.factor));
	4986	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4987	+ velvetField.SetToolTipValue((mat.velvet));
	4988	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4989	+ sheenField.SetToolTipValue((mat.sheen));
	4990	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4991	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4992	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4993	+ backlitField.SetToolTipValue((mat.bump));
	4994	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4995	+ anisoField.SetToolTipValue((mat.aniso));
	4996	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4997	+ anisoVField.SetToolTipValue((mat.anisoV));
	4998	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4999	+ cameraField.SetToolTipValue((mat.cameralight));
	5000	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5001	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5002	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5003	+ shadowField.SetToolTipValue((mat.shadow));
	5004	+ if (!Equal(textureField.getFloat(), mat.texture))
	5005	+ textureField.SetToolTipValue((mat.texture));
	5006	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5007	+ opacityField.SetToolTipValue((mat.opacity));
	5008	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5009	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5010	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5011	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4798	5012	}
4799	5013
4800	5014	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4829,7 +5043,7 @@
4829	5043
4830	5044	public void stateChanged(ChangeEvent e)
4831	5045	{
4832		- // assert(false);
	5046	+ // assert(false);
4833	5047	if (e.getSource() == versionSlider)
4834	5048	{
4835	5049	if (muteSlider)
..	..	@@ -5942,6 +6156,7 @@
5942	6156	boolean materialFlushed;
5943	6157	Object3D latestObject;
5944	6158
	6159	+ cGridBag transformPanel;
5945	6160	cGridBag XYZPanel;
5946	6161
5947	6162	JSplitPane gridPanel;