~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -72,6 +72,21 @@
72	72	}
73	73	}
74	74
	75	+ public Composite CreateCameras()
	76	+ {
	77	+ Composite cams = new cTemplate();
	78	+ cams.name = "Cameras";
	79	+ copy.insertElementAt(cams, 0);
	80	+
	81	+ cams.addChild(new Camera());
	82	+ cams.addChild(new Camera(1));
	83	+ cams.addChild(new Camera(2));
	84	+ cams.addChild(new Camera(3));
	85	+ cams.addChild(new Camera(4));
	86	+
	87	+ return cams;
	88	+ }
	89	+
75	90	public cGridBag GetSeparator()
76	91	{
77	92	cGridBag separator = new cGridBag();
..	..	@@ -83,7 +98,10 @@
83	98	cButton GetButton(String name, boolean border)
84	99	{
85	100	ImageIcon icon = GetIcon(name);
86		- return new cButton(icon, border);
	101	+ if (icon != null \|\| name.contains("/"))
	102	+ return new cButton(icon, border);
	103	+ else
	104	+ return new cButton(name, border);
87	105	}
88	106
89	107	cLabel GetLabel(String name, boolean border)
..	..	@@ -106,7 +124,7 @@
106	124
107	125	static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
108	126
109		- ImageIcon GetIcon(String name)
	127	+ static ImageIcon GetIcon(String name)
110	128	{
111	129	javax.swing.ImageIcon iconCache = icons.get(name);
112	130	if (iconCache != null)
..	..	@@ -116,8 +134,14 @@
116	134
117	135	try
118	136	{
119		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
120		-
	137	+ BufferedImage image;
	138	+
	139	+ if (name.endsWith("jpg"))
	140	+ // Much faster!
	141	+ image = new sun.awt.image.codec.JPEGImageDecoderImpl(ObjEditor.class.getClassLoader().getResourceAsStream(name)).decodeAsBufferedImage();
	142	+ else
	143	+ image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	144	+
121	145	// if (image.getWidth() > 48 && image.getHeight() > 48)
122	146	// {
123	147	// BufferedImage resized = new BufferedImage(48, 48, image.getType());
..	..	@@ -388,7 +412,8 @@
388	412	//parent = p;
389	413
390	414	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
391		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	415	+ if (Globals.DEBUG)
	416	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
392	417	//gd.setFullScreenWindow(this);
393	418	//setResizable(false);
394	419	//if (!isDisplayable())
..	..	@@ -425,6 +450,9 @@
425	450
426	451	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
427	452
	453	+ // This is to refresh the UI of the material panel.
	454	+ boolean patchMaterial;
	455	+
428	456	void SetupMenu()
429	457	{
430	458	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -438,8 +466,11 @@
438	466	importOBJItem.addActionListener(this);
439	467	import3DSItem = menu.add(new MenuItem("3DS file..."));
440	468	import3DSItem.addActionListener(this);
	469	+ if (Globals.ADVANCED)
	470	+ {
441	471	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
442	472	importVRMLX3DItem.addActionListener(this);
	473	+ }
443	474	menu.add("-");
444	475	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
445	476	importGFDItem.addActionListener(this);
..	..	@@ -950,18 +981,29 @@
950	981	boolean temp = CameraPane.SWITCH;
951	982	CameraPane.SWITCH = false;
952	983
953		- object.ExtractBigData(versiontable);
	984	+ if (Grafreed.grafreed.universe.versiontable == null)
	985	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	986	+
	987	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
954	988	// if (copy == client)
955	989
956	990	Object3D versions[] = object.versionlist;
	991	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
957	992	object.versionlist = null;
	993	+ object.versiontable = null;
	994	+
	995	+ Object3D parent = object.parent;
	996	+ object.parent = null;
958	997
959	998	//byte[] compress = Compress(copy);
960	999	Object3D compress = (Object3D)Grafreed.clone(object);
961	1000
962		- object.versionlist = versions;
	1001	+ object.parent = parent;
963	1002
964		- object.RestoreBigData(versiontable);
	1003	+ object.versionlist = versions;
	1004	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	1005	+
	1006	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
965	1007
966	1008	CameraPane.SWITCH = temp;
967	1009
..	..	@@ -1300,7 +1342,7 @@
1300	1342
1301	1343	//if (copy.pinned)
1302	1344	{
1303		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1345	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1304	1346	pinButton.setSelected(copy.pinned);
1305	1347	cGridBag t = new cGridBag();
1306	1348	t.preferredWidth = 2;
..	..	@@ -1323,14 +1365,14 @@
1323	1365
1324	1366	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1325	1367	liveCB.setToolTipText("Animate object");
	1368	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1369	+ markCB.setToolTipText("Set target transform");
1326	1370	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1327	1371	selectableCB.setToolTipText("Make object selectable");
1328	1372	// Return();
1329	1373
1330	1374	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1331	1375	hideCB.setToolTipText("Hide object");
1332		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1333		- markCB.setToolTipText("As animation target transform");
1334	1376
1335	1377	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1336	1378
..	..	@@ -1532,22 +1574,9 @@
1532	1574
1533	1575	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1534	1576	{
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);
	1577	+ if (Globals.DEBUG)
	1578	+ System.out.println("CREATE CAMERAS");
	1579	+ cams = CreateCameras();
1551	1580	} else
1552	1581	{
1553	1582	cams = (cGroup) copy.get(0);
..	..	@@ -1613,6 +1642,45 @@
1613	1642	//frontView.object = copy;
1614	1643	//sideView.object = copy;
1615	1644
	1645	+ transformPanel = new cGridBag().setVertical(true);
	1646	+
	1647	+ cGridBag resetTransformPanel = new cGridBag();
	1648	+
	1649	+ resetTransformPanel.preferredHeight = 2;
	1650	+
	1651	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1652	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1653	+ resetTransform.addMouseListener(new MouseAdapter()
	1654	+ {
	1655	+ public void mouseClicked(MouseEvent e)
	1656	+ {
	1657	+ ResetTransform();
	1658	+ }
	1659	+ });
	1660	+ resetTransformPanel.add(resetTransform);
	1661	+
	1662	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1663	+ resetTransform.setToolTipText("Reset Translation only");
	1664	+ resetTransform.addMouseListener(new MouseAdapter()
	1665	+ {
	1666	+ public void mouseClicked(MouseEvent e)
	1667	+ {
	1668	+ ResetTransform(1);
	1669	+ }
	1670	+ });
	1671	+ resetTransformPanel.add(resetTransform);
	1672	+
	1673	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1674	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1675	+ resetTransform.addMouseListener(new MouseAdapter()
	1676	+ {
	1677	+ public void mouseClicked(MouseEvent e)
	1678	+ {
	1679	+ ResetTransform(2);
	1680	+ }
	1681	+ });
	1682	+ resetTransformPanel.add(resetTransform);
	1683	+
1616	1684	XYZPanel = new cGridBag().setVertical(true);
1617	1685	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1618	1686
..	..	@@ -1622,6 +1690,9 @@
1622	1690	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1623	1691	//XYZPanel.setName("XYZ");
1624	1692
	1693	+ transformPanel.add(resetTransformPanel);
	1694	+ transformPanel.add(XYZPanel);
	1695	+
1625	1696	/*
1626	1697	gridPanel = new JPanel(); //new BorderLayout());
1627	1698	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1629,12 +1700,12 @@
1629	1700	gridPanel.add(cameraView);
1630	1701	gridPanel.add(XYZPanel);
1631	1702	*/
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);
	1703	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1704	+// gridPanel.setContinuousLayout(true);
	1705	+// gridPanel.setOneTouchExpandable(true);
	1706	+// gridPanel.setDividerLocation(1.0);
	1707	+// gridPanel.setDividerSize(9);
	1708	+// gridPanel.setResizeWeight(0.85);
1638	1709
1639	1710	// aConstraints.weighty = 0;
1640	1711	//System.out.println("THIS = " + this);
..	..	@@ -1657,30 +1728,34 @@
1657	1728
1658	1729	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1659	1730	//tmp.setName("Edit");
1660		- objectPanel.add(materialPanel);
1661		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1662		- objectPanel.setToolTipTextAt(0, "Material");
1663		-
	1731	+ objectPanel.add(skyboxPanel);
	1732	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1733	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1734	+
1664	1735	objectPanel.add(toolboxPanel);
1665	1736	objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1666	1737	objectPanel.setToolTipTextAt(1, "Objects & textures");
1667	1738
1668		- objectPanel.add(skyboxPanel);
1669		- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1670		- objectPanel.setToolTipTextAt(2, "Backgrounds");
1671		-
	1739	+ objectPanel.add(materialPanel);
	1740	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1741	+ objectPanel.setToolTipTextAt(2, "Material");
	1742	+
1672	1743	// JPanel north = new JPanel(new BorderLayout());
1673	1744	// north.setName("Edit");
1674	1745	// north.add(ctrlPanel, BorderLayout.NORTH);
1675	1746	// objectPanel.add(north);
1676	1747	objectPanel.add(editPanel);
1677		- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1748	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1678	1749	objectPanel.setToolTipTextAt(3, "Edit controls");
1679	1750
1680		- objectPanel.add(XYZPanel);
	1751	+ objectPanel.add(transformPanel);
1681	1752	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1682		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1753	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1683	1754
	1755	+ patchMaterial = true;
	1756	+ cameraView.patchMaterial = this;
	1757	+ objectPanel.setSelectedIndex(2);
	1758	+
1684	1759	/*
1685	1760	aConstraints.gridx = 0;
1686	1761	aConstraints.gridwidth = 1;
..	..	@@ -1700,7 +1775,7 @@
1700	1775	scrollpane.addMouseWheelListener(this); // Default not fast enough
1701	1776
1702	1777	/JTabbedPane/ scenePanel = new cGridBag();
1703		- scenePanel.preferredWidth = 5;
	1778	+ scenePanel.preferredWidth = 6;
1704	1779
1705	1780	JTabbedPane tabbedPane = new JTabbedPane();
1706	1781	tabbedPane.add(scrollpane);
..	..	@@ -1711,17 +1786,109 @@
1711	1786
1712	1787	AddOptions(optionsPanel); //, aConstraints);
1713	1788
1714		- tabbedPane.add(optionsPanel);
1715		-
1716	1789	tabbedPane.add(FSPane = new cFileSystemPane(this));
1717	1790
	1791	+ tabbedPane.add(optionsPanel);
	1792	+
1718	1793	scenePanel.add(tabbedPane);
1719	1794
1720		- //if (Globals.ADVANCED)
1721		-// tabbedPane.add(infoPanel);
1722		-// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1723		-// tabbedPane.setToolTipTextAt(3, "Information");
	1795	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1796	+ creditsPanel.setName("Credits");
1724	1797
	1798	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1799	+ creditsPanel.add(ogaLabel);
	1800	+
	1801	+ cButton creditButton;
	1802	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1803	+ creditButton.setToolTipText("https://opengameart.org");
	1804	+
	1805	+ creditButton.addMouseListener(new MouseAdapter()
	1806	+ {
	1807	+ public void mouseClicked(MouseEvent e)
	1808	+ {
	1809	+ try
	1810	+ {
	1811	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1812	+ } catch (Exception e1)
	1813	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1814	+ {
	1815	+ e1.printStackTrace();
	1816	+ }
	1817	+ }
	1818	+ });
	1819	+
	1820	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1821	+ creditsPanel.add(ogaLabel);
	1822	+
	1823	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1824	+ creditButton.setToolTipText("https://3delicious.net");
	1825	+
	1826	+ creditButton.addMouseListener(new MouseAdapter()
	1827	+ {
	1828	+ public void mouseClicked(MouseEvent e)
	1829	+ {
	1830	+ try
	1831	+ {
	1832	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1833	+ } catch (Exception e1)
	1834	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1835	+ {
	1836	+ e1.printStackTrace();
	1837	+ }
	1838	+ }
	1839	+ });
	1840	+
	1841	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1842	+ creditButton.setToolTipText("https://archive3d.net");
	1843	+
	1844	+ creditButton.addMouseListener(new MouseAdapter()
	1845	+ {
	1846	+ public void mouseClicked(MouseEvent e)
	1847	+ {
	1848	+ try
	1849	+ {
	1850	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1851	+ } catch (Exception e1)
	1852	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1853	+ {
	1854	+ e1.printStackTrace();
	1855	+ }
	1856	+ }
	1857	+ });
	1858	+
	1859	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1860	+ creditButton.setToolTipText("https://turbosquid.com");
	1861	+
	1862	+ creditButton.addMouseListener(new MouseAdapter()
	1863	+ {
	1864	+ public void mouseClicked(MouseEvent e)
	1865	+ {
	1866	+ try
	1867	+ {
	1868	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1869	+ } catch (Exception e1)
	1870	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1871	+ {
	1872	+ e1.printStackTrace();
	1873	+ }
	1874	+ }
	1875	+ });
	1876	+
	1877	+ for (int i=6; --i>=0;)
	1878	+ {
	1879	+ creditsPanel.add(new cGridBag());
	1880	+ }
	1881	+
	1882	+ tabbedPane.add(creditsPanel);
	1883	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1884	+
	1885	+ if (Globals.ADVANCED)
	1886	+ {
	1887	+ tabbedPane.add(infoPanel);
	1888	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1889	+ tabbedPane.setToolTipTextAt(4, "Information");
	1890	+ }
	1891	+
1725	1892	/*
1726	1893	cTree jTree = new cTree(null);
1727	1894	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1742,13 +1909,13 @@
1742	1909	jtp.add(tree);
1743	1910	*/
1744	1911
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");
	1912	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1913	+// bigPanel.setContinuousLayout(true);
	1914	+// bigPanel.setOneTouchExpandable(true);
	1915	+// bigPanel.setDividerLocation(0.8);
	1916	+// bigPanel.setDividerSize(15);
	1917	+// bigPanel.setResizeWeight(0.15);
	1918	+// bigPanel.setName("Scene");
1752	1919
1753	1920	//bigPanel.setLayout(new BorderLayout());
1754	1921	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1832,7 +1999,7 @@
1832	1999
1833	2000	cameraView.requestFocusInWindow();
1834	2001
1835		- gridPanel.setDividerLocation(1.0);
	2002	+// gridPanel.setDividerLocation(1.0);
1836	2003
1837	2004	frame.validate();
1838	2005
..	..	@@ -1867,7 +2034,7 @@
1867	2034	{
1868	2035	cGridBag presetpanel = new cGridBag().setVertical(true);
1869	2036
1870		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	2037	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1871	2038	skin.setToolTipText("Skin");
1872	2039	skin.addMouseListener(new MouseAdapter()
1873	2040	{
..	..	@@ -1878,7 +2045,15 @@
1878	2045
1879	2046	// Skin
1880	2047	colorField.setFloat(material.color);
1881		- saturationField.setFloat(material.modulation);
	2048	+ float saturation = material.modulation;
	2049	+
	2050	+ if (!cameraView.Skinshader)
	2051	+ {
	2052	+ saturation /= 1.5;
	2053	+ }
	2054	+
	2055	+ saturationField.setFloat(saturation);
	2056	+
1882	2057	subsurfaceField.setFloat(material.subsurface);
1883	2058	selfshadowField.setFloat(material.diffuseness);
1884	2059	diffusenessField.setFloat(material.factor);
..	..	@@ -1897,7 +2072,7 @@
1897	2072	});
1898	2073	presetpanel.add(skin);
1899	2074
1900		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2075	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1901	2076	lambert.setToolTipText("Diffuse");
1902	2077	lambert.addMouseListener(new MouseAdapter()
1903	2078	{
..	..	@@ -1915,7 +2090,7 @@
1915	2090	});
1916	2091	presetpanel.add(lambert);
1917	2092
1918		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2093	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1919	2094	diffuse2.setToolTipText("Diffuse2");
1920	2095	diffuse2.addMouseListener(new MouseAdapter()
1921	2096	{
..	..	@@ -1933,7 +2108,7 @@
1933	2108	});
1934	2109	presetpanel.add(diffuse2);
1935	2110
1936		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2111	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1937	2112	diffusemoon.setToolTipText("Moon");
1938	2113	diffusemoon.addMouseListener(new MouseAdapter()
1939	2114	{
..	..	@@ -1951,7 +2126,7 @@
1951	2126	});
1952	2127	presetpanel.add(diffusemoon);
1953	2128
1954		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2129	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1955	2130	diffusemoon2.setToolTipText("Moon2");
1956	2131	diffusemoon2.addMouseListener(new MouseAdapter()
1957	2132	{
..	..	@@ -1969,7 +2144,7 @@
1969	2144	});
1970	2145	presetpanel.add(diffusemoon2);
1971	2146
1972		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2147	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1973	2148	diffusemoon3.setToolTipText("Moon3");
1974	2149	diffusemoon3.addMouseListener(new MouseAdapter()
1975	2150	{
..	..	@@ -1987,7 +2162,7 @@
1987	2162	});
1988	2163	presetpanel.add(diffusemoon3);
1989	2164
1990		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2165	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1991	2166	diffusesheen.setToolTipText("Sheen");
1992	2167	diffusesheen.addMouseListener(new MouseAdapter()
1993	2168	{
..	..	@@ -2004,7 +2179,7 @@
2004	2179	});
2005	2180	presetpanel.add(diffusesheen);
2006	2181
2007		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2182	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
2008	2183	rough.setToolTipText("Rough metal");
2009	2184	rough.addMouseListener(new MouseAdapter()
2010	2185	{
..	..	@@ -2022,7 +2197,7 @@
2022	2197	});
2023	2198	presetpanel.add(rough);
2024	2199
2025		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2200	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
2026	2201	rough2.setToolTipText("Medium metal");
2027	2202	rough2.addMouseListener(new MouseAdapter()
2028	2203	{
..	..	@@ -2040,7 +2215,7 @@
2040	2215	});
2041	2216	presetpanel.add(rough2);
2042	2217
2043		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2218	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
2044	2219	shini0.setToolTipText("Shiny");
2045	2220	shini0.addMouseListener(new MouseAdapter()
2046	2221	{
..	..	@@ -2058,7 +2233,7 @@
2058	2233	});
2059	2234	presetpanel.add(shini0);
2060	2235
2061		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2236	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
2062	2237	shini1.setToolTipText("Shiny2");
2063	2238	shini1.addMouseListener(new MouseAdapter()
2064	2239	{
..	..	@@ -2076,7 +2251,7 @@
2076	2251	});
2077	2252	presetpanel.add(shini1);
2078	2253
2079		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2254	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2080	2255	shini2.setToolTipText("Shiny3");
2081	2256	shini2.addMouseListener(new MouseAdapter()
2082	2257	{
..	..	@@ -2094,7 +2269,7 @@
2094	2269	});
2095	2270	presetpanel.add(shini2);
2096	2271
2097		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2272	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2098	2273	aniso.setToolTipText("AnisoU");
2099	2274	aniso.addMouseListener(new MouseAdapter()
2100	2275	{
..	..	@@ -2112,7 +2287,7 @@
2112	2287	});
2113	2288	presetpanel.add(aniso);
2114	2289
2115		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2290	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2116	2291	aniso2.setToolTipText("AnisoV");
2117	2292	aniso2.addMouseListener(new MouseAdapter()
2118	2293	{
..	..	@@ -2130,7 +2305,7 @@
2130	2305	});
2131	2306	presetpanel.add(aniso2);
2132	2307
2133		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2308	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2134	2309	aniso3.setToolTipText("AnisoUV");
2135	2310	aniso3.addMouseListener(new MouseAdapter()
2136	2311	{
..	..	@@ -2148,7 +2323,7 @@
2148	2323	});
2149	2324	presetpanel.add(aniso3);
2150	2325
2151		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2326	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2152	2327	velvet0.setToolTipText("Velvet");
2153	2328	velvet0.addMouseListener(new MouseAdapter()
2154	2329	{
..	..	@@ -2170,7 +2345,7 @@
2170	2345	});
2171	2346	presetpanel.add(velvet0);
2172	2347
2173		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2348	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2174	2349	bump0.setToolTipText("Bump texture");
2175	2350	bump0.addMouseListener(new MouseAdapter()
2176	2351	{
..	..	@@ -2189,14 +2364,14 @@
2189	2364	});
2190	2365	presetpanel.add(bump0);
2191	2366
2192		- cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2367	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
2193	2368	borderShader.setToolTipText("Border fade");
2194	2369	borderShader.addMouseListener(new MouseAdapter()
2195	2370	{
2196	2371	public void mouseClicked(MouseEvent e)
2197	2372	{
2198	2373	borderfadeField.setFloat(0.5);
2199		- opacityField.setFloat(0.6);
	2374	+ opacityField.setFloat(0.75);
2200	2375
2201	2376	materialtouched = true;
2202	2377	applySelf();
..	..	@@ -2204,7 +2379,7 @@
2204	2379	});
2205	2380	presetpanel.add(borderShader);
2206	2381
2207		- cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2382	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2208	2383	halo.setToolTipText("Halo");
2209	2384	halo.addMouseListener(new MouseAdapter()
2210	2385	{
..	..	@@ -2221,7 +2396,7 @@
2221	2396	});
2222	2397	presetpanel.add(halo);
2223	2398
2224		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2399	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2225	2400	candle.setToolTipText("Candle");
2226	2401	candle.addMouseListener(new MouseAdapter()
2227	2402	{
..	..	@@ -2243,7 +2418,7 @@
2243	2418	});
2244	2419	presetpanel.add(candle);
2245	2420
2246		- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2421	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2247	2422	shadowShader.setToolTipText("Shadow");
2248	2423	shadowShader.addMouseListener(new MouseAdapter()
2249	2424	{
..	..	@@ -2278,19 +2453,19 @@
2278	2453
2279	2454	cGridBag editBar = new cGridBag().setVertical(false);
2280	2455
2281		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2456	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2282	2457	createMaterialButton.setToolTipText("Create material");
2283	2458
2284	2459	/*
2285	2460	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2286	2461	*/
2287	2462
2288		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2463	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2289	2464	clearMaterialButton.setToolTipText("Clear material");
2290	2465
2291	2466	if (Globals.ADVANCED)
2292	2467	{
2293		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2468	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2294	2469	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2295	2470	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2296	2471	}
..	..	@@ -2311,9 +2486,20 @@
2311	2486
2312	2487	cGridBag huepanel = new cGridBag();
2313	2488	cGridBag huelabel = new cGridBag();
2314		- skin = GetLabel("icons/hue.png", false);
2315		- skin.fit = true;
2316		- huelabel.add(skin);
	2489	+ cLabel hue = GetLabel("icons/hue.png", false);
	2490	+ hue.fit = true;
	2491	+
	2492	+ hue.addMouseListener(new MouseAdapter()
	2493	+ {
	2494	+ public void mousePressed(MouseEvent e)
	2495	+ {
	2496	+ int x = e.getX();
	2497	+
	2498	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2499	+ }
	2500	+ });
	2501	+
	2502	+ huelabel.add(hue);
2317	2503	huelabel.preferredWidth = 20;
2318	2504	huepanel.add(new cGridBag()); // Label
2319	2505	huepanel.add(huelabel); // Field/slider
..	..	@@ -3900,7 +4086,7 @@
3900	4086	//System.out.println("ObjEditor " + event);
3901	4087	applySelf0(true);
3902	4088	//parent.applySelf();
3903		- objEditor.refreshContents();
	4089	+ // conflicts with requestFocus objEditor.refreshContents();
3904	4090	} else if (source == resetButton)
3905	4091	{
3906	4092	CameraPane.fullreset = true;
..	..	@@ -4080,11 +4266,18 @@
4080	4266
4081	4267	void New()
4082	4268	{
4083		- while (copy.Size() > 1)
	4269	+ while (copy.Size() > 0)
4084	4270	{
4085		- copy.remove(1);
	4271	+ copy.remove(0);
4086	4272	}
4087	4273
	4274	+ copy.selection.clear();
	4275	+
	4276	+ if (copy == Grafreed.grafreed.universe)
	4277	+ {
	4278	+ CreateCameras();
	4279	+ cameraView.SetCamera(GetCamera(copy, 0));
	4280	+ }
4088	4281	ResetModel();
4089	4282	objEditor.refreshContents();
4090	4283	}
..	..	@@ -4212,8 +4405,6 @@
4212	4405	return true;
4213	4406	}
4214	4407
4215		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4216		-
4217	4408	void DeleteVersion()
4218	4409	{
4219	4410	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4221,7 +4412,11 @@
4221	4412	copy.versionlist[i] = copy.versionlist[i+1];
4222	4413	}
4223	4414
4224		- CopyChanged();
	4415	+ if (copy.versionlist[copy.versionindex] == null)
	4416	+ copy.versionindex -= 1;
	4417	+
	4418	+ if (copy.versionindex != -1)
	4419	+ CopyChanged();
4225	4420
4226	4421	SetVersionStates();
4227	4422	}
..	..	@@ -4334,7 +4529,7 @@
4334	4529	boolean temp = CameraPane.SWITCH;
4335	4530	CameraPane.SWITCH = false;
4336	4531
4337		- copy.ExtractBigData(versiontable);
	4532	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4338	4533
4339	4534	copy.clear();
4340	4535
..	..	@@ -4346,7 +4541,7 @@
4346	4541	copy.add(obj.get(i));
4347	4542	}
4348	4543
4349		- copy.RestoreBigData(versiontable);
	4544	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4350	4545
4351	4546	CameraPane.SWITCH = temp;
4352	4547
..	..	@@ -4396,6 +4591,8 @@
4396	4591	return count;
4397	4592	}
4398	4593
	4594	+ public cGridBag versionSliderPane;
	4595	+
4399	4596	void SetVersionStates()
4400	4597	{
4401	4598	//if (true)
..	..	@@ -4403,21 +4600,36 @@
4403	4600
4404	4601	//cRadio tab = GetCurrentTab();
4405	4602
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;
	4603	+ if (copy.versionlist == null)
	4604	+ {
	4605	+ saveVersionButton.setEnabled(false);
	4606	+ restoreButton.setEnabled(false);
	4607	+ replaceButton.setEnabled(false);
	4608	+ previousVersionButton.setEnabled(false);
	4609	+ nextVersionButton.setEnabled(false);
	4610	+ deleteVersionButton.setEnabled(false);
	4611	+ versionSliderPane.setVisible(false);
	4612	+ }
	4613	+ else
	4614	+ {
	4615	+ restoreButton.setEnabled(copy.versionindex != -1);
	4616	+ replaceButton.setEnabled(copy.versionindex != -1);
	4617	+
	4618	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4619	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4620	+
	4621	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4622	+ //copy.versionlist[copy.versionindex + 1] != null);
	4623	+
	4624	+ muteSlider = true;
	4625	+ versionSlider.setMinimum(0);
	4626	+ versionSlider.setMaximum(VersionCount() - 1);
	4627	+ versionSlider.setInteger(copy.versionindex);
	4628	+ versionSlider.setEnabled(copy.versionindex != -1);
	4629	+ muteSlider = false;
	4630	+
	4631	+ versionSliderPane.setVisible(true);
	4632	+ }
4421	4633	}
4422	4634
4423	4635	public boolean PreviousVersion()
..	..	@@ -4475,7 +4687,7 @@
4475	4687
4476	4688	public boolean Replace()
4477	4689	{
4478		- System.err.println("Replace");
	4690	+ //System.err.println("Replace");
4479	4691
4480	4692	//cRadio tab = GetCurrentTab();
4481	4693
..	..	@@ -4702,6 +4914,12 @@
4702	4914	// else
4703	4915	// applySelf(true);
4704	4916	// }
	4917	+
	4918	+ boolean Equal(double a, double b)
	4919	+ {
	4920	+ return Math.abs(a - b) < 0.001;
	4921	+ }
	4922	+
4705	4923	void applySelf0(boolean name)
4706	4924	{
4707	4925	if (name)
..	..	@@ -4751,29 +4969,52 @@
4751	4969	{
4752	4970	cMaterial mat = copy.material;
4753	4971
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));
	4972	+ if (!Equal(colorField.getFloat(), mat.color))
	4973	+ colorField.SetToolTipValue((mat.color));
	4974	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4975	+ saturationField.SetToolTipValue((mat.modulation));
	4976	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4977	+ metalnessField.SetToolTipValue((mat.metalness));
	4978	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4979	+ diffuseField.SetToolTipValue((mat.diffuse));
	4980	+ if (!Equal(specularField.getFloat(), mat.specular))
	4981	+ specularField.SetToolTipValue((mat.specular));
	4982	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4983	+ shininessField.SetToolTipValue((mat.shininess));
	4984	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4985	+ shiftField.SetToolTipValue((mat.shift));
	4986	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4987	+ ambientField.SetToolTipValue((mat.ambient));
	4988	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4989	+ lightareaField.SetToolTipValue((mat.lightarea));
	4990	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4991	+ diffusenessField.SetToolTipValue((mat.factor));
	4992	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4993	+ velvetField.SetToolTipValue((mat.velvet));
	4994	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4995	+ sheenField.SetToolTipValue((mat.sheen));
	4996	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4997	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4998	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4999	+ backlitField.SetToolTipValue((mat.bump));
	5000	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5001	+ anisoField.SetToolTipValue((mat.aniso));
	5002	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5003	+ anisoVField.SetToolTipValue((mat.anisoV));
	5004	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5005	+ cameraField.SetToolTipValue((mat.cameralight));
	5006	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5007	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5008	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5009	+ shadowField.SetToolTipValue((mat.shadow));
	5010	+ if (!Equal(textureField.getFloat(), mat.texture))
	5011	+ textureField.SetToolTipValue((mat.texture));
	5012	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5013	+ opacityField.SetToolTipValue((mat.opacity));
	5014	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5015	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5016	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5017	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4777	5018	}
4778	5019
4779	5020	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4808,7 +5049,7 @@
4808	5049
4809	5050	public void stateChanged(ChangeEvent e)
4810	5051	{
4811		- // assert(false);
	5052	+ // assert(false);
4812	5053	if (e.getSource() == versionSlider)
4813	5054	{
4814	5055	if (muteSlider)
..	..	@@ -5178,6 +5419,8 @@
5178	5419
5179	5420	if (previousVersionButton != null && copy.versionlist != null)
5180	5421	SetVersionStates();
	5422	+
	5423	+ cameraView.requestFocusInWindow();
5181	5424	}
5182	5425
5183	5426	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5209,7 +5452,7 @@
5209	5452	// group = (Composite) group.get(0);
5210	5453	// }
5211	5454
5212		- System.out.println("makeSomething of " + thing);
	5455	+ //System.out.println("makeSomething of " + thing);
5213	5456
5214	5457	/*
5215	5458	if (deselect && jList != null)
..	..	@@ -5563,6 +5806,7 @@
5563	5806
5564	5807	copy.versionlist = readobj.versionlist;
5565	5808	copy.versionindex = readobj.versionindex;
	5809	+ copy.versiontable = readobj.versiontable;
5566	5810
5567	5811	if (copy.versionlist == null)
5568	5812	{
..	..	@@ -5918,6 +6162,7 @@
5918	6162	boolean materialFlushed;
5919	6163	Object3D latestObject;
5920	6164
	6165	+ cGridBag transformPanel;
5921	6166	cGridBag XYZPanel;
5922	6167
5923	6168	JSplitPane gridPanel;