~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);
..	..	@@ -951,18 +975,29 @@
951	975	boolean temp = CameraPane.SWITCH;
952	976	CameraPane.SWITCH = false;
953	977
954		- object.ExtractBigData(versiontable);
	978	+ if (Grafreed.grafreed.universe.versiontable == null)
	979	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	980	+
	981	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
955	982	// if (copy == client)
956	983
957	984	Object3D versions[] = object.versionlist;
	985	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
958	986	object.versionlist = null;
	987	+ object.versiontable = null;
	988	+
	989	+ Object3D parent = object.parent;
	990	+ object.parent = null;
959	991
960	992	//byte[] compress = Compress(copy);
961	993	Object3D compress = (Object3D)Grafreed.clone(object);
962	994
963		- object.versionlist = versions;
	995	+ object.parent = parent;
964	996
965		- object.RestoreBigData(versiontable);
	997	+ object.versionlist = versions;
	998	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	999	+
	1000	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
966	1001
967	1002	CameraPane.SWITCH = temp;
968	1003
..	..	@@ -1301,7 +1336,7 @@
1301	1336
1302	1337	//if (copy.pinned)
1303	1338	{
1304		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1339	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1305	1340	pinButton.setSelected(copy.pinned);
1306	1341	cGridBag t = new cGridBag();
1307	1342	t.preferredWidth = 2;
..	..	@@ -1533,23 +1568,9 @@
1533	1568
1534	1569	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1535	1570	{
1536		- if (Globals.DEBUG)
1537		- System.out.println("CREATE CAMERAS");
1538		- cams = new cTemplate();
1539		- cams.name = "Cameras";
1540		- copy.insertElementAt(cams, 0);
1541		- //cams.parent = copy;
1542		-
1543		- cam = new Camera(); // LA.newVector(3, 2, 1));
1544		- cams.addChild(cam);
1545		- cam = new Camera(1);
1546		- cams.addChild(cam);
1547		- cam = new Camera(2);
1548		- cams.addChild(cam);
1549		- cam = new Camera(3);
1550		- cams.addChild(cam);
1551		- cam = new Camera(4); // Light
1552		- cams.addChild(cam);
	1571	+ if (Globals.DEBUG)
	1572	+ System.out.println("CREATE CAMERAS");
	1573	+ cams = CreateCameras();
1553	1574	} else
1554	1575	{
1555	1576	cams = (cGroup) copy.get(0);
..	..	@@ -1615,6 +1636,45 @@
1615	1636	//frontView.object = copy;
1616	1637	//sideView.object = copy;
1617	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	+
1618	1678	XYZPanel = new cGridBag().setVertical(true);
1619	1679	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1620	1680
..	..	@@ -1624,6 +1684,9 @@
1624	1684	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1625	1685	//XYZPanel.setName("XYZ");
1626	1686
	1687	+ transformPanel.add(resetTransformPanel);
	1688	+ transformPanel.add(XYZPanel);
	1689	+
1627	1690	/*
1628	1691	gridPanel = new JPanel(); //new BorderLayout());
1629	1692	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1631,12 +1694,12 @@
1631	1694	gridPanel.add(cameraView);
1632	1695	gridPanel.add(XYZPanel);
1633	1696	*/
1634		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1635		- gridPanel.setContinuousLayout(true);
1636		- gridPanel.setOneTouchExpandable(true);
1637		- gridPanel.setDividerLocation(1.0);
1638		- gridPanel.setDividerSize(9);
1639		- 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);
1640	1703
1641	1704	// aConstraints.weighty = 0;
1642	1705	//System.out.println("THIS = " + this);
..	..	@@ -1659,30 +1722,34 @@
1659	1722
1660	1723	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1661	1724	//tmp.setName("Edit");
1662		- objectPanel.add(materialPanel);
1663		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1664		- objectPanel.setToolTipTextAt(0, "Material");
1665		-
	1725	+ objectPanel.add(skyboxPanel);
	1726	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1727	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1728	+
1666	1729	objectPanel.add(toolboxPanel);
1667	1730	objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1668	1731	objectPanel.setToolTipTextAt(1, "Objects & textures");
1669	1732
1670		- objectPanel.add(skyboxPanel);
1671		- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1672		- objectPanel.setToolTipTextAt(2, "Backgrounds");
1673		-
	1733	+ objectPanel.add(materialPanel);
	1734	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1735	+ objectPanel.setToolTipTextAt(2, "Material");
	1736	+
1674	1737	// JPanel north = new JPanel(new BorderLayout());
1675	1738	// north.setName("Edit");
1676	1739	// north.add(ctrlPanel, BorderLayout.NORTH);
1677	1740	// objectPanel.add(north);
1678	1741	objectPanel.add(editPanel);
1679		- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1742	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1680	1743	objectPanel.setToolTipTextAt(3, "Edit controls");
1681	1744
1682		- objectPanel.add(XYZPanel);
	1745	+ objectPanel.add(transformPanel);
1683	1746	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1684		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1747	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1685	1748
	1749	+ patchMaterial = true;
	1750	+ cameraView.patchMaterial = this;
	1751	+ objectPanel.setSelectedIndex(2);
	1752	+
1686	1753	/*
1687	1754	aConstraints.gridx = 0;
1688	1755	aConstraints.gridwidth = 1;
..	..	@@ -1702,7 +1769,7 @@
1702	1769	scrollpane.addMouseWheelListener(this); // Default not fast enough
1703	1770
1704	1771	/JTabbedPane/ scenePanel = new cGridBag();
1705		- scenePanel.preferredWidth = 5;
	1772	+ scenePanel.preferredWidth = 6;
1706	1773
1707	1774	JTabbedPane tabbedPane = new JTabbedPane();
1708	1775	tabbedPane.add(scrollpane);
..	..	@@ -1713,17 +1780,109 @@
1713	1780
1714	1781	AddOptions(optionsPanel); //, aConstraints);
1715	1782
1716		- tabbedPane.add(optionsPanel);
1717		-
1718	1783	tabbedPane.add(FSPane = new cFileSystemPane(this));
1719	1784
	1785	+ tabbedPane.add(optionsPanel);
	1786	+
1720	1787	scenePanel.add(tabbedPane);
1721	1788
1722		- //if (Globals.ADVANCED)
1723		-// tabbedPane.add(infoPanel);
1724		-// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1725		-// tabbedPane.setToolTipTextAt(3, "Information");
	1789	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1790	+ creditsPanel.setName("Credits");
1726	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	+
1727	1886	/*
1728	1887	cTree jTree = new cTree(null);
1729	1888	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1744,13 +1903,13 @@
1744	1903	jtp.add(tree);
1745	1904	*/
1746	1905
1747		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1748		- bigPanel.setContinuousLayout(true);
1749		- bigPanel.setOneTouchExpandable(true);
1750		- bigPanel.setDividerLocation(0.8);
1751		- bigPanel.setDividerSize(15);
1752		- bigPanel.setResizeWeight(0.15);
1753		- 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");
1754	1913
1755	1914	//bigPanel.setLayout(new BorderLayout());
1756	1915	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1834,7 +1993,7 @@
1834	1993
1835	1994	cameraView.requestFocusInWindow();
1836	1995
1837		- gridPanel.setDividerLocation(1.0);
	1996	+// gridPanel.setDividerLocation(1.0);
1838	1997
1839	1998	frame.validate();
1840	1999
..	..	@@ -1869,7 +2028,7 @@
1869	2028	{
1870	2029	cGridBag presetpanel = new cGridBag().setVertical(true);
1871	2030
1872		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	2031	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1873	2032	skin.setToolTipText("Skin");
1874	2033	skin.addMouseListener(new MouseAdapter()
1875	2034	{
..	..	@@ -1880,7 +2039,15 @@
1880	2039
1881	2040	// Skin
1882	2041	colorField.setFloat(material.color);
1883		- 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	+
1884	2051	subsurfaceField.setFloat(material.subsurface);
1885	2052	selfshadowField.setFloat(material.diffuseness);
1886	2053	diffusenessField.setFloat(material.factor);
..	..	@@ -1899,7 +2066,7 @@
1899	2066	});
1900	2067	presetpanel.add(skin);
1901	2068
1902		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2069	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1903	2070	lambert.setToolTipText("Diffuse");
1904	2071	lambert.addMouseListener(new MouseAdapter()
1905	2072	{
..	..	@@ -1917,7 +2084,7 @@
1917	2084	});
1918	2085	presetpanel.add(lambert);
1919	2086
1920		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2087	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1921	2088	diffuse2.setToolTipText("Diffuse2");
1922	2089	diffuse2.addMouseListener(new MouseAdapter()
1923	2090	{
..	..	@@ -1935,7 +2102,7 @@
1935	2102	});
1936	2103	presetpanel.add(diffuse2);
1937	2104
1938		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2105	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1939	2106	diffusemoon.setToolTipText("Moon");
1940	2107	diffusemoon.addMouseListener(new MouseAdapter()
1941	2108	{
..	..	@@ -1953,7 +2120,7 @@
1953	2120	});
1954	2121	presetpanel.add(diffusemoon);
1955	2122
1956		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2123	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1957	2124	diffusemoon2.setToolTipText("Moon2");
1958	2125	diffusemoon2.addMouseListener(new MouseAdapter()
1959	2126	{
..	..	@@ -1971,7 +2138,7 @@
1971	2138	});
1972	2139	presetpanel.add(diffusemoon2);
1973	2140
1974		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2141	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1975	2142	diffusemoon3.setToolTipText("Moon3");
1976	2143	diffusemoon3.addMouseListener(new MouseAdapter()
1977	2144	{
..	..	@@ -1989,7 +2156,7 @@
1989	2156	});
1990	2157	presetpanel.add(diffusemoon3);
1991	2158
1992		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2159	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1993	2160	diffusesheen.setToolTipText("Sheen");
1994	2161	diffusesheen.addMouseListener(new MouseAdapter()
1995	2162	{
..	..	@@ -2006,7 +2173,7 @@
2006	2173	});
2007	2174	presetpanel.add(diffusesheen);
2008	2175
2009		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2176	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
2010	2177	rough.setToolTipText("Rough metal");
2011	2178	rough.addMouseListener(new MouseAdapter()
2012	2179	{
..	..	@@ -2024,7 +2191,7 @@
2024	2191	});
2025	2192	presetpanel.add(rough);
2026	2193
2027		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2194	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
2028	2195	rough2.setToolTipText("Medium metal");
2029	2196	rough2.addMouseListener(new MouseAdapter()
2030	2197	{
..	..	@@ -2042,7 +2209,7 @@
2042	2209	});
2043	2210	presetpanel.add(rough2);
2044	2211
2045		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2212	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
2046	2213	shini0.setToolTipText("Shiny");
2047	2214	shini0.addMouseListener(new MouseAdapter()
2048	2215	{
..	..	@@ -2060,7 +2227,7 @@
2060	2227	});
2061	2228	presetpanel.add(shini0);
2062	2229
2063		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2230	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
2064	2231	shini1.setToolTipText("Shiny2");
2065	2232	shini1.addMouseListener(new MouseAdapter()
2066	2233	{
..	..	@@ -2078,7 +2245,7 @@
2078	2245	});
2079	2246	presetpanel.add(shini1);
2080	2247
2081		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2248	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2082	2249	shini2.setToolTipText("Shiny3");
2083	2250	shini2.addMouseListener(new MouseAdapter()
2084	2251	{
..	..	@@ -2096,7 +2263,7 @@
2096	2263	});
2097	2264	presetpanel.add(shini2);
2098	2265
2099		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2266	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2100	2267	aniso.setToolTipText("AnisoU");
2101	2268	aniso.addMouseListener(new MouseAdapter()
2102	2269	{
..	..	@@ -2114,7 +2281,7 @@
2114	2281	});
2115	2282	presetpanel.add(aniso);
2116	2283
2117		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2284	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2118	2285	aniso2.setToolTipText("AnisoV");
2119	2286	aniso2.addMouseListener(new MouseAdapter()
2120	2287	{
..	..	@@ -2132,7 +2299,7 @@
2132	2299	});
2133	2300	presetpanel.add(aniso2);
2134	2301
2135		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2302	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2136	2303	aniso3.setToolTipText("AnisoUV");
2137	2304	aniso3.addMouseListener(new MouseAdapter()
2138	2305	{
..	..	@@ -2150,7 +2317,7 @@
2150	2317	});
2151	2318	presetpanel.add(aniso3);
2152	2319
2153		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2320	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2154	2321	velvet0.setToolTipText("Velvet");
2155	2322	velvet0.addMouseListener(new MouseAdapter()
2156	2323	{
..	..	@@ -2172,7 +2339,7 @@
2172	2339	});
2173	2340	presetpanel.add(velvet0);
2174	2341
2175		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2342	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2176	2343	bump0.setToolTipText("Bump texture");
2177	2344	bump0.addMouseListener(new MouseAdapter()
2178	2345	{
..	..	@@ -2191,7 +2358,7 @@
2191	2358	});
2192	2359	presetpanel.add(bump0);
2193	2360
2194		- cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2361	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
2195	2362	borderShader.setToolTipText("Border fade");
2196	2363	borderShader.addMouseListener(new MouseAdapter()
2197	2364	{
..	..	@@ -2206,7 +2373,7 @@
2206	2373	});
2207	2374	presetpanel.add(borderShader);
2208	2375
2209		- cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2376	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2210	2377	halo.setToolTipText("Halo");
2211	2378	halo.addMouseListener(new MouseAdapter()
2212	2379	{
..	..	@@ -2223,7 +2390,7 @@
2223	2390	});
2224	2391	presetpanel.add(halo);
2225	2392
2226		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2393	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2227	2394	candle.setToolTipText("Candle");
2228	2395	candle.addMouseListener(new MouseAdapter()
2229	2396	{
..	..	@@ -2245,7 +2412,7 @@
2245	2412	});
2246	2413	presetpanel.add(candle);
2247	2414
2248		- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2415	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2249	2416	shadowShader.setToolTipText("Shadow");
2250	2417	shadowShader.addMouseListener(new MouseAdapter()
2251	2418	{
..	..	@@ -2280,19 +2447,19 @@
2280	2447
2281	2448	cGridBag editBar = new cGridBag().setVertical(false);
2282	2449
2283		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2450	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2284	2451	createMaterialButton.setToolTipText("Create material");
2285	2452
2286	2453	/*
2287	2454	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2288	2455	*/
2289	2456
2290		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2457	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2291	2458	clearMaterialButton.setToolTipText("Clear material");
2292	2459
2293	2460	if (Globals.ADVANCED)
2294	2461	{
2295		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2462	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2296	2463	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2297	2464	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2298	2465	}
..	..	@@ -3913,7 +4080,7 @@
3913	4080	//System.out.println("ObjEditor " + event);
3914	4081	applySelf0(true);
3915	4082	//parent.applySelf();
3916		- objEditor.refreshContents();
	4083	+ // conflicts with requestFocus objEditor.refreshContents();
3917	4084	} else if (source == resetButton)
3918	4085	{
3919	4086	CameraPane.fullreset = true;
..	..	@@ -4093,11 +4260,18 @@
4093	4260
4094	4261	void New()
4095	4262	{
4096		- while (copy.Size() > 1)
	4263	+ while (copy.Size() > 0)
4097	4264	{
4098		- copy.remove(1);
	4265	+ copy.remove(0);
4099	4266	}
4100	4267
	4268	+ copy.selection.clear();
	4269	+
	4270	+ if (copy == Grafreed.grafreed.universe)
	4271	+ {
	4272	+ CreateCameras();
	4273	+ cameraView.SetCamera(GetCamera(copy, 0));
	4274	+ }
4101	4275	ResetModel();
4102	4276	objEditor.refreshContents();
4103	4277	}
..	..	@@ -4225,8 +4399,6 @@
4225	4399	return true;
4226	4400	}
4227	4401
4228		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4229		-
4230	4402	void DeleteVersion()
4231	4403	{
4232	4404	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4234,7 +4406,11 @@
4234	4406	copy.versionlist[i] = copy.versionlist[i+1];
4235	4407	}
4236	4408
4237		- CopyChanged();
	4409	+ if (copy.versionlist[copy.versionindex] == null)
	4410	+ copy.versionindex -= 1;
	4411	+
	4412	+ if (copy.versionindex != -1)
	4413	+ CopyChanged();
4238	4414
4239	4415	SetVersionStates();
4240	4416	}
..	..	@@ -4347,7 +4523,7 @@
4347	4523	boolean temp = CameraPane.SWITCH;
4348	4524	CameraPane.SWITCH = false;
4349	4525
4350		- copy.ExtractBigData(versiontable);
	4526	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4351	4527
4352	4528	copy.clear();
4353	4529
..	..	@@ -4359,7 +4535,7 @@
4359	4535	copy.add(obj.get(i));
4360	4536	}
4361	4537
4362		- copy.RestoreBigData(versiontable);
	4538	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4363	4539
4364	4540	CameraPane.SWITCH = temp;
4365	4541
..	..	@@ -4409,6 +4585,8 @@
4409	4585	return count;
4410	4586	}
4411	4587
	4588	+ public cGridBag versionSliderPane;
	4589	+
4412	4590	void SetVersionStates()
4413	4591	{
4414	4592	//if (true)
..	..	@@ -4416,21 +4594,36 @@
4416	4594
4417	4595	//cRadio tab = GetCurrentTab();
4418	4596
4419		- restoreButton.setEnabled(copy.versionindex != -1);
4420		- replaceButton.setEnabled(copy.versionindex != -1);
4421		-
4422		- previousVersionButton.setEnabled(copy.versionindex > 0);
4423		- nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4424		-
4425		- deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4426		- copy.versionlist[copy.versionindex + 1] != null);
4427		-
4428		- muteSlider = true;
4429		- versionSlider.setMinimum(0);
4430		- versionSlider.setMaximum(VersionCount() - 1);
4431		- versionSlider.setInteger(copy.versionindex);
4432		- versionSlider.setEnabled(copy.versionindex != -1);
4433		- 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	+ }
4434	4627	}
4435	4628
4436	4629	public boolean PreviousVersion()
..	..	@@ -4488,7 +4681,7 @@
4488	4681
4489	4682	public boolean Replace()
4490	4683	{
4491		- System.err.println("Replace");
	4684	+ //System.err.println("Replace");
4492	4685
4493	4686	//cRadio tab = GetCurrentTab();
4494	4687
..	..	@@ -4715,6 +4908,12 @@
4715	4908	// else
4716	4909	// applySelf(true);
4717	4910	// }
	4911	+
	4912	+ boolean Equal(double a, double b)
	4913	+ {
	4914	+ return Math.abs(a - b) < 0.001;
	4915	+ }
	4916	+
4718	4917	void applySelf0(boolean name)
4719	4918	{
4720	4919	if (name)
..	..	@@ -4764,29 +4963,52 @@
4764	4963	{
4765	4964	cMaterial mat = copy.material;
4766	4965
4767		- colorField.SetToolTipValue((mat.color));
4768		- saturationField.SetToolTipValue((mat.modulation));
4769		- metalnessField.SetToolTipValue((mat.metalness));
4770		- diffuseField.SetToolTipValue((mat.diffuse));
4771		- specularField.SetToolTipValue((mat.specular));
4772		- shininessField.SetToolTipValue((mat.shininess));
4773		- shiftField.SetToolTipValue((mat.shift));
4774		- ambientField.SetToolTipValue((mat.ambient));
4775		- lightareaField.SetToolTipValue((mat.lightarea));
4776		- diffusenessField.SetToolTipValue((mat.factor));
4777		- velvetField.SetToolTipValue((mat.velvet));
4778		- sheenField.SetToolTipValue((mat.sheen));
4779		- subsurfaceField.SetToolTipValue((mat.subsurface));
4780		- backlitField.SetToolTipValue((mat.bump));
4781		- anisoField.SetToolTipValue((mat.aniso));
4782		- anisoVField.SetToolTipValue((mat.anisoV));
4783		- cameraField.SetToolTipValue((mat.cameralight));
4784		- selfshadowField.SetToolTipValue((mat.diffuseness));
4785		- shadowField.SetToolTipValue((mat.shadow));
4786		- textureField.SetToolTipValue((mat.texture));
4787		- opacityField.SetToolTipValue((mat.opacity));
4788		- fakedepthField.SetToolTipValue((mat.fakedepth));
4789		- 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));
4790	5012	}
4791	5013
4792	5014	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4821,7 +5043,7 @@
4821	5043
4822	5044	public void stateChanged(ChangeEvent e)
4823	5045	{
4824		- // assert(false);
	5046	+ // assert(false);
4825	5047	if (e.getSource() == versionSlider)
4826	5048	{
4827	5049	if (muteSlider)
..	..	@@ -5578,6 +5800,7 @@
5578	5800
5579	5801	copy.versionlist = readobj.versionlist;
5580	5802	copy.versionindex = readobj.versionindex;
	5803	+ copy.versiontable = readobj.versiontable;
5581	5804
5582	5805	if (copy.versionlist == null)
5583	5806	{
..	..	@@ -5933,6 +6156,7 @@
5933	6156	boolean materialFlushed;
5934	6157	Object3D latestObject;
5935	6158
	6159	+ cGridBag transformPanel;
5936	6160	cGridBag XYZPanel;
5937	6161
5938	6162	JSplitPane gridPanel;