~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	// {
..	..	@@ -388,7 +406,8 @@
388	406	//parent = p;
389	407
390	408	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
391		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	409	+ if (Globals.DEBUG)
	410	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
392	411	//gd.setFullScreenWindow(this);
393	412	//setResizable(false);
394	413	//if (!isDisplayable())
..	..	@@ -425,6 +444,9 @@
425	444
426	445	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
427	446
	447	+ // This is to refresh the UI of the material panel.
	448	+ boolean patchMaterial;
	449	+
428	450	void SetupMenu()
429	451	{
430	452	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -438,8 +460,11 @@
438	460	importOBJItem.addActionListener(this);
439	461	import3DSItem = menu.add(new MenuItem("3DS file..."));
440	462	import3DSItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
441	465	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
442	466	importVRMLX3DItem.addActionListener(this);
	467	+ }
443	468	menu.add("-");
444	469	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
445	470	importGFDItem.addActionListener(this);
..	..	@@ -950,18 +975,29 @@
950	975	boolean temp = CameraPane.SWITCH;
951	976	CameraPane.SWITCH = false;
952	977
953		- 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);
954	982	// if (copy == client)
955	983
956	984	Object3D versions[] = object.versionlist;
	985	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
957	986	object.versionlist = null;
	987	+ object.versiontable = null;
	988	+
	989	+ Object3D parent = object.parent;
	990	+ object.parent = null;
958	991
959	992	//byte[] compress = Compress(copy);
960	993	Object3D compress = (Object3D)Grafreed.clone(object);
961	994
962		- object.versionlist = versions;
	995	+ object.parent = parent;
963	996
964		- object.RestoreBigData(versiontable);
	997	+ object.versionlist = versions;
	998	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	999	+
	1000	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
965	1001
966	1002	CameraPane.SWITCH = temp;
967	1003
..	..	@@ -1300,7 +1336,7 @@
1300	1336
1301	1337	//if (copy.pinned)
1302	1338	{
1303		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1339	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1304	1340	pinButton.setSelected(copy.pinned);
1305	1341	cGridBag t = new cGridBag();
1306	1342	t.preferredWidth = 2;
..	..	@@ -1323,14 +1359,14 @@
1323	1359
1324	1360	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1325	1361	liveCB.setToolTipText("Animate object");
	1362	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1363	+ markCB.setToolTipText("Set target transform");
1326	1364	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1327	1365	selectableCB.setToolTipText("Make object selectable");
1328	1366	// Return();
1329	1367
1330	1368	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1331	1369	hideCB.setToolTipText("Hide object");
1332		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1333		- markCB.setToolTipText("As animation target transform");
1334	1370
1335	1371	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1336	1372
..	..	@@ -1532,22 +1568,9 @@
1532	1568
1533	1569	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1534	1570	{
1535		- System.out.println("CREATE CAMERAS");
1536		- cams = new cTemplate();
1537		- cams.name = "Cameras";
1538		- copy.insertElementAt(cams, 0);
1539		- //cams.parent = copy;
1540		-
1541		- cam = new Camera(); // LA.newVector(3, 2, 1));
1542		- cams.addChild(cam);
1543		- cam = new Camera(1);
1544		- cams.addChild(cam);
1545		- cam = new Camera(2);
1546		- cams.addChild(cam);
1547		- cam = new Camera(3);
1548		- cams.addChild(cam);
1549		- cam = new Camera(4); // Light
1550		- cams.addChild(cam);
	1571	+ if (Globals.DEBUG)
	1572	+ System.out.println("CREATE CAMERAS");
	1573	+ cams = CreateCameras();
1551	1574	} else
1552	1575	{
1553	1576	cams = (cGroup) copy.get(0);
..	..	@@ -1613,6 +1636,45 @@
1613	1636	//frontView.object = copy;
1614	1637	//sideView.object = copy;
1615	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	+
1616	1678	XYZPanel = new cGridBag().setVertical(true);
1617	1679	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1618	1680
..	..	@@ -1622,6 +1684,9 @@
1622	1684	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1623	1685	//XYZPanel.setName("XYZ");
1624	1686
	1687	+ transformPanel.add(resetTransformPanel);
	1688	+ transformPanel.add(XYZPanel);
	1689	+
1625	1690	/*
1626	1691	gridPanel = new JPanel(); //new BorderLayout());
1627	1692	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1629,12 +1694,12 @@
1629	1694	gridPanel.add(cameraView);
1630	1695	gridPanel.add(XYZPanel);
1631	1696	*/
1632		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1633		- gridPanel.setContinuousLayout(true);
1634		- gridPanel.setOneTouchExpandable(true);
1635		- gridPanel.setDividerLocation(1.0);
1636		- gridPanel.setDividerSize(9);
1637		- 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);
1638	1703
1639	1704	// aConstraints.weighty = 0;
1640	1705	//System.out.println("THIS = " + this);
..	..	@@ -1657,30 +1722,34 @@
1657	1722
1658	1723	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1659	1724	//tmp.setName("Edit");
1660		- objectPanel.add(materialPanel);
1661		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1662		- objectPanel.setToolTipTextAt(0, "Material");
1663		-
	1725	+ objectPanel.add(skyboxPanel);
	1726	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1727	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1728	+
1664	1729	objectPanel.add(toolboxPanel);
1665	1730	objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1666	1731	objectPanel.setToolTipTextAt(1, "Objects & textures");
1667	1732
1668		- objectPanel.add(skyboxPanel);
1669		- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1670		- objectPanel.setToolTipTextAt(2, "Backgrounds");
1671		-
	1733	+ objectPanel.add(materialPanel);
	1734	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1735	+ objectPanel.setToolTipTextAt(2, "Material");
	1736	+
1672	1737	// JPanel north = new JPanel(new BorderLayout());
1673	1738	// north.setName("Edit");
1674	1739	// north.add(ctrlPanel, BorderLayout.NORTH);
1675	1740	// objectPanel.add(north);
1676	1741	objectPanel.add(editPanel);
1677		- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1742	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1678	1743	objectPanel.setToolTipTextAt(3, "Edit controls");
1679	1744
1680		- objectPanel.add(XYZPanel);
	1745	+ objectPanel.add(transformPanel);
1681	1746	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1682		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1747	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1683	1748
	1749	+ patchMaterial = true;
	1750	+ cameraView.patchMaterial = this;
	1751	+ objectPanel.setSelectedIndex(2);
	1752	+
1684	1753	/*
1685	1754	aConstraints.gridx = 0;
1686	1755	aConstraints.gridwidth = 1;
..	..	@@ -1700,7 +1769,7 @@
1700	1769	scrollpane.addMouseWheelListener(this); // Default not fast enough
1701	1770
1702	1771	/JTabbedPane/ scenePanel = new cGridBag();
1703		- scenePanel.preferredWidth = 5;
	1772	+ scenePanel.preferredWidth = 6;
1704	1773
1705	1774	JTabbedPane tabbedPane = new JTabbedPane();
1706	1775	tabbedPane.add(scrollpane);
..	..	@@ -1711,17 +1780,109 @@
1711	1780
1712	1781	AddOptions(optionsPanel); //, aConstraints);
1713	1782
1714		- tabbedPane.add(optionsPanel);
1715		-
1716	1783	tabbedPane.add(FSPane = new cFileSystemPane(this));
1717	1784
	1785	+ tabbedPane.add(optionsPanel);
	1786	+
1718	1787	scenePanel.add(tabbedPane);
1719	1788
1720		- //if (Globals.ADVANCED)
1721		-// tabbedPane.add(infoPanel);
1722		-// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1723		-// tabbedPane.setToolTipTextAt(3, "Information");
	1789	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1790	+ creditsPanel.setName("Credits");
1724	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	+
1725	1886	/*
1726	1887	cTree jTree = new cTree(null);
1727	1888	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1742,13 +1903,13 @@
1742	1903	jtp.add(tree);
1743	1904	*/
1744	1905
1745		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1746		- bigPanel.setContinuousLayout(true);
1747		- bigPanel.setOneTouchExpandable(true);
1748		- bigPanel.setDividerLocation(0.8);
1749		- bigPanel.setDividerSize(15);
1750		- bigPanel.setResizeWeight(0.15);
1751		- 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");
1752	1913
1753	1914	//bigPanel.setLayout(new BorderLayout());
1754	1915	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1832,7 +1993,7 @@
1832	1993
1833	1994	cameraView.requestFocusInWindow();
1834	1995
1835		- gridPanel.setDividerLocation(1.0);
	1996	+// gridPanel.setDividerLocation(1.0);
1836	1997
1837	1998	frame.validate();
1838	1999
..	..	@@ -1867,7 +2028,7 @@
1867	2028	{
1868	2029	cGridBag presetpanel = new cGridBag().setVertical(true);
1869	2030
1870		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	2031	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1871	2032	skin.setToolTipText("Skin");
1872	2033	skin.addMouseListener(new MouseAdapter()
1873	2034	{
..	..	@@ -1878,7 +2039,15 @@
1878	2039
1879	2040	// Skin
1880	2041	colorField.setFloat(material.color);
1881		- 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	+
1882	2051	subsurfaceField.setFloat(material.subsurface);
1883	2052	selfshadowField.setFloat(material.diffuseness);
1884	2053	diffusenessField.setFloat(material.factor);
..	..	@@ -1897,7 +2066,7 @@
1897	2066	});
1898	2067	presetpanel.add(skin);
1899	2068
1900		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2069	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1901	2070	lambert.setToolTipText("Diffuse");
1902	2071	lambert.addMouseListener(new MouseAdapter()
1903	2072	{
..	..	@@ -1915,7 +2084,7 @@
1915	2084	});
1916	2085	presetpanel.add(lambert);
1917	2086
1918		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2087	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1919	2088	diffuse2.setToolTipText("Diffuse2");
1920	2089	diffuse2.addMouseListener(new MouseAdapter()
1921	2090	{
..	..	@@ -1933,7 +2102,7 @@
1933	2102	});
1934	2103	presetpanel.add(diffuse2);
1935	2104
1936		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2105	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1937	2106	diffusemoon.setToolTipText("Moon");
1938	2107	diffusemoon.addMouseListener(new MouseAdapter()
1939	2108	{
..	..	@@ -1951,7 +2120,7 @@
1951	2120	});
1952	2121	presetpanel.add(diffusemoon);
1953	2122
1954		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2123	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1955	2124	diffusemoon2.setToolTipText("Moon2");
1956	2125	diffusemoon2.addMouseListener(new MouseAdapter()
1957	2126	{
..	..	@@ -1969,7 +2138,7 @@
1969	2138	});
1970	2139	presetpanel.add(diffusemoon2);
1971	2140
1972		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2141	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1973	2142	diffusemoon3.setToolTipText("Moon3");
1974	2143	diffusemoon3.addMouseListener(new MouseAdapter()
1975	2144	{
..	..	@@ -1987,7 +2156,7 @@
1987	2156	});
1988	2157	presetpanel.add(diffusemoon3);
1989	2158
1990		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2159	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1991	2160	diffusesheen.setToolTipText("Sheen");
1992	2161	diffusesheen.addMouseListener(new MouseAdapter()
1993	2162	{
..	..	@@ -2004,7 +2173,7 @@
2004	2173	});
2005	2174	presetpanel.add(diffusesheen);
2006	2175
2007		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2176	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
2008	2177	rough.setToolTipText("Rough metal");
2009	2178	rough.addMouseListener(new MouseAdapter()
2010	2179	{
..	..	@@ -2022,7 +2191,7 @@
2022	2191	});
2023	2192	presetpanel.add(rough);
2024	2193
2025		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2194	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
2026	2195	rough2.setToolTipText("Medium metal");
2027	2196	rough2.addMouseListener(new MouseAdapter()
2028	2197	{
..	..	@@ -2040,7 +2209,7 @@
2040	2209	});
2041	2210	presetpanel.add(rough2);
2042	2211
2043		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2212	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
2044	2213	shini0.setToolTipText("Shiny");
2045	2214	shini0.addMouseListener(new MouseAdapter()
2046	2215	{
..	..	@@ -2058,7 +2227,7 @@
2058	2227	});
2059	2228	presetpanel.add(shini0);
2060	2229
2061		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2230	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
2062	2231	shini1.setToolTipText("Shiny2");
2063	2232	shini1.addMouseListener(new MouseAdapter()
2064	2233	{
..	..	@@ -2076,7 +2245,7 @@
2076	2245	});
2077	2246	presetpanel.add(shini1);
2078	2247
2079		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2248	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2080	2249	shini2.setToolTipText("Shiny3");
2081	2250	shini2.addMouseListener(new MouseAdapter()
2082	2251	{
..	..	@@ -2094,7 +2263,7 @@
2094	2263	});
2095	2264	presetpanel.add(shini2);
2096	2265
2097		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2266	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2098	2267	aniso.setToolTipText("AnisoU");
2099	2268	aniso.addMouseListener(new MouseAdapter()
2100	2269	{
..	..	@@ -2112,7 +2281,7 @@
2112	2281	});
2113	2282	presetpanel.add(aniso);
2114	2283
2115		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2284	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2116	2285	aniso2.setToolTipText("AnisoV");
2117	2286	aniso2.addMouseListener(new MouseAdapter()
2118	2287	{
..	..	@@ -2130,7 +2299,7 @@
2130	2299	});
2131	2300	presetpanel.add(aniso2);
2132	2301
2133		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2302	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2134	2303	aniso3.setToolTipText("AnisoUV");
2135	2304	aniso3.addMouseListener(new MouseAdapter()
2136	2305	{
..	..	@@ -2148,7 +2317,7 @@
2148	2317	});
2149	2318	presetpanel.add(aniso3);
2150	2319
2151		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2320	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2152	2321	velvet0.setToolTipText("Velvet");
2153	2322	velvet0.addMouseListener(new MouseAdapter()
2154	2323	{
..	..	@@ -2170,7 +2339,7 @@
2170	2339	});
2171	2340	presetpanel.add(velvet0);
2172	2341
2173		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2342	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2174	2343	bump0.setToolTipText("Bump texture");
2175	2344	bump0.addMouseListener(new MouseAdapter()
2176	2345	{
..	..	@@ -2189,14 +2358,14 @@
2189	2358	});
2190	2359	presetpanel.add(bump0);
2191	2360
2192		- cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2361	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
2193	2362	borderShader.setToolTipText("Border fade");
2194	2363	borderShader.addMouseListener(new MouseAdapter()
2195	2364	{
2196	2365	public void mouseClicked(MouseEvent e)
2197	2366	{
2198	2367	borderfadeField.setFloat(0.5);
2199		- opacityField.setFloat(0.6);
	2368	+ opacityField.setFloat(0.75);
2200	2369
2201	2370	materialtouched = true;
2202	2371	applySelf();
..	..	@@ -2204,7 +2373,7 @@
2204	2373	});
2205	2374	presetpanel.add(borderShader);
2206	2375
2207		- cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2376	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2208	2377	halo.setToolTipText("Halo");
2209	2378	halo.addMouseListener(new MouseAdapter()
2210	2379	{
..	..	@@ -2221,7 +2390,7 @@
2221	2390	});
2222	2391	presetpanel.add(halo);
2223	2392
2224		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2393	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2225	2394	candle.setToolTipText("Candle");
2226	2395	candle.addMouseListener(new MouseAdapter()
2227	2396	{
..	..	@@ -2243,7 +2412,7 @@
2243	2412	});
2244	2413	presetpanel.add(candle);
2245	2414
2246		- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2415	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2247	2416	shadowShader.setToolTipText("Shadow");
2248	2417	shadowShader.addMouseListener(new MouseAdapter()
2249	2418	{
..	..	@@ -2278,19 +2447,19 @@
2278	2447
2279	2448	cGridBag editBar = new cGridBag().setVertical(false);
2280	2449
2281		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2450	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2282	2451	createMaterialButton.setToolTipText("Create material");
2283	2452
2284	2453	/*
2285	2454	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2286	2455	*/
2287	2456
2288		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2457	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2289	2458	clearMaterialButton.setToolTipText("Clear material");
2290	2459
2291	2460	if (Globals.ADVANCED)
2292	2461	{
2293		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2462	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2294	2463	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2295	2464	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2296	2465	}
..	..	@@ -2311,9 +2480,20 @@
2311	2480
2312	2481	cGridBag huepanel = new cGridBag();
2313	2482	cGridBag huelabel = new cGridBag();
2314		- skin = GetLabel("icons/hue.png", false);
2315		- skin.fit = true;
2316		- huelabel.add(skin);
	2483	+ cLabel hue = GetLabel("icons/hue.png", false);
	2484	+ hue.fit = true;
	2485	+
	2486	+ hue.addMouseListener(new MouseAdapter()
	2487	+ {
	2488	+ public void mousePressed(MouseEvent e)
	2489	+ {
	2490	+ int x = e.getX();
	2491	+
	2492	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2493	+ }
	2494	+ });
	2495	+
	2496	+ huelabel.add(hue);
2317	2497	huelabel.preferredWidth = 20;
2318	2498	huepanel.add(new cGridBag()); // Label
2319	2499	huepanel.add(huelabel); // Field/slider
..	..	@@ -3900,7 +4080,7 @@
3900	4080	//System.out.println("ObjEditor " + event);
3901	4081	applySelf0(true);
3902	4082	//parent.applySelf();
3903		- objEditor.refreshContents();
	4083	+ // conflicts with requestFocus objEditor.refreshContents();
3904	4084	} else if (source == resetButton)
3905	4085	{
3906	4086	CameraPane.fullreset = true;
..	..	@@ -4080,11 +4260,18 @@
4080	4260
4081	4261	void New()
4082	4262	{
4083		- while (copy.Size() > 1)
	4263	+ while (copy.Size() > 0)
4084	4264	{
4085		- copy.remove(1);
	4265	+ copy.remove(0);
4086	4266	}
4087	4267
	4268	+ copy.selection.clear();
	4269	+
	4270	+ if (copy == Grafreed.grafreed.universe)
	4271	+ {
	4272	+ CreateCameras();
	4273	+ cameraView.SetCamera(GetCamera(copy, 0));
	4274	+ }
4088	4275	ResetModel();
4089	4276	objEditor.refreshContents();
4090	4277	}
..	..	@@ -4212,8 +4399,6 @@
4212	4399	return true;
4213	4400	}
4214	4401
4215		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4216		-
4217	4402	void DeleteVersion()
4218	4403	{
4219	4404	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4221,7 +4406,11 @@
4221	4406	copy.versionlist[i] = copy.versionlist[i+1];
4222	4407	}
4223	4408
4224		- CopyChanged();
	4409	+ if (copy.versionlist[copy.versionindex] == null)
	4410	+ copy.versionindex -= 1;
	4411	+
	4412	+ if (copy.versionindex != -1)
	4413	+ CopyChanged();
4225	4414
4226	4415	SetVersionStates();
4227	4416	}
..	..	@@ -4334,7 +4523,7 @@
4334	4523	boolean temp = CameraPane.SWITCH;
4335	4524	CameraPane.SWITCH = false;
4336	4525
4337		- copy.ExtractBigData(versiontable);
	4526	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4338	4527
4339	4528	copy.clear();
4340	4529
..	..	@@ -4346,7 +4535,7 @@
4346	4535	copy.add(obj.get(i));
4347	4536	}
4348	4537
4349		- copy.RestoreBigData(versiontable);
	4538	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4350	4539
4351	4540	CameraPane.SWITCH = temp;
4352	4541
..	..	@@ -4396,6 +4585,8 @@
4396	4585	return count;
4397	4586	}
4398	4587
	4588	+ public cGridBag versionSliderPane;
	4589	+
4399	4590	void SetVersionStates()
4400	4591	{
4401	4592	//if (true)
..	..	@@ -4403,21 +4594,36 @@
4403	4594
4404	4595	//cRadio tab = GetCurrentTab();
4405	4596
4406		- restoreButton.setEnabled(copy.versionindex != -1);
4407		- replaceButton.setEnabled(copy.versionindex != -1);
4408		-
4409		- previousVersionButton.setEnabled(copy.versionindex > 0);
4410		- nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4411		-
4412		- deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4413		- copy.versionlist[copy.versionindex + 1] != null);
4414		-
4415		- muteSlider = true;
4416		- versionSlider.setMinimum(0);
4417		- versionSlider.setMaximum(VersionCount() - 1);
4418		- versionSlider.setInteger(copy.versionindex);
4419		- versionSlider.setEnabled(copy.versionindex != -1);
4420		- 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	+ }
4421	4627	}
4422	4628
4423	4629	public boolean PreviousVersion()
..	..	@@ -4475,7 +4681,7 @@
4475	4681
4476	4682	public boolean Replace()
4477	4683	{
4478		- System.err.println("Replace");
	4684	+ //System.err.println("Replace");
4479	4685
4480	4686	//cRadio tab = GetCurrentTab();
4481	4687
..	..	@@ -4702,6 +4908,12 @@
4702	4908	// else
4703	4909	// applySelf(true);
4704	4910	// }
	4911	+
	4912	+ boolean Equal(double a, double b)
	4913	+ {
	4914	+ return Math.abs(a - b) < 0.001;
	4915	+ }
	4916	+
4705	4917	void applySelf0(boolean name)
4706	4918	{
4707	4919	if (name)
..	..	@@ -4751,29 +4963,52 @@
4751	4963	{
4752	4964	cMaterial mat = copy.material;
4753	4965
4754		- colorField.SetToolTipValue((mat.color));
4755		- saturationField.SetToolTipValue((mat.modulation));
4756		- metalnessField.SetToolTipValue((mat.metalness));
4757		- diffuseField.SetToolTipValue((mat.diffuse));
4758		- specularField.SetToolTipValue((mat.specular));
4759		- shininessField.SetToolTipValue((mat.shininess));
4760		- shiftField.SetToolTipValue((mat.shift));
4761		- ambientField.SetToolTipValue((mat.ambient));
4762		- lightareaField.SetToolTipValue((mat.lightarea));
4763		- diffusenessField.SetToolTipValue((mat.factor));
4764		- velvetField.SetToolTipValue((mat.velvet));
4765		- sheenField.SetToolTipValue((mat.sheen));
4766		- subsurfaceField.SetToolTipValue((mat.subsurface));
4767		- backlitField.SetToolTipValue((mat.bump));
4768		- anisoField.SetToolTipValue((mat.aniso));
4769		- anisoVField.SetToolTipValue((mat.anisoV));
4770		- cameraField.SetToolTipValue((mat.cameralight));
4771		- selfshadowField.SetToolTipValue((mat.diffuseness));
4772		- shadowField.SetToolTipValue((mat.shadow));
4773		- textureField.SetToolTipValue((mat.texture));
4774		- opacityField.SetToolTipValue((mat.opacity));
4775		- fakedepthField.SetToolTipValue((mat.fakedepth));
4776		- 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));
4777	5012	}
4778	5013
4779	5014	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4808,7 +5043,7 @@
4808	5043
4809	5044	public void stateChanged(ChangeEvent e)
4810	5045	{
4811		- // assert(false);
	5046	+ // assert(false);
4812	5047	if (e.getSource() == versionSlider)
4813	5048	{
4814	5049	if (muteSlider)
..	..	@@ -5178,6 +5413,8 @@
5178	5413
5179	5414	if (previousVersionButton != null && copy.versionlist != null)
5180	5415	SetVersionStates();
	5416	+
	5417	+ cameraView.requestFocusInWindow();
5181	5418	}
5182	5419
5183	5420	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5209,7 +5446,7 @@
5209	5446	// group = (Composite) group.get(0);
5210	5447	// }
5211	5448
5212		- System.out.println("makeSomething of " + thing);
	5449	+ //System.out.println("makeSomething of " + thing);
5213	5450
5214	5451	/*
5215	5452	if (deselect && jList != null)
..	..	@@ -5563,6 +5800,7 @@
5563	5800
5564	5801	copy.versionlist = readobj.versionlist;
5565	5802	copy.versionindex = readobj.versionindex;
	5803	+ copy.versiontable = readobj.versiontable;
5566	5804
5567	5805	if (copy.versionlist == null)
5568	5806	{
..	..	@@ -5918,6 +6156,7 @@
5918	6156	boolean materialFlushed;
5919	6157	Object3D latestObject;
5920	6158
	6159	+ cGridBag transformPanel;
5921	6160	cGridBag XYZPanel;
5922	6161
5923	6162	JSplitPane gridPanel;