~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());
..	..	@@ -950,18 +972,29 @@
950	972	boolean temp = CameraPane.SWITCH;
951	973	CameraPane.SWITCH = false;
952	974
953		- object.ExtractBigData(versiontable);
	975	+ if (Grafreed.grafreed.universe.versiontable == null)
	976	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	977	+
	978	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
954	979	// if (copy == client)
955	980
956	981	Object3D versions[] = object.versionlist;
	982	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
957	983	object.versionlist = null;
	984	+ object.versiontable = null;
	985	+
	986	+ Object3D parent = object.parent;
	987	+ object.parent = null;
958	988
959	989	//byte[] compress = Compress(copy);
960	990	Object3D compress = (Object3D)Grafreed.clone(object);
961	991
962		- object.versionlist = versions;
	992	+ object.parent = parent;
963	993
964		- object.RestoreBigData(versiontable);
	994	+ object.versionlist = versions;
	995	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	996	+
	997	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
965	998
966	999	CameraPane.SWITCH = temp;
967	1000
..	..	@@ -1300,7 +1333,7 @@
1300	1333
1301	1334	//if (copy.pinned)
1302	1335	{
1303		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1336	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1304	1337	pinButton.setSelected(copy.pinned);
1305	1338	cGridBag t = new cGridBag();
1306	1339	t.preferredWidth = 2;
..	..	@@ -1323,14 +1356,14 @@
1323	1356
1324	1357	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1325	1358	liveCB.setToolTipText("Animate object");
	1359	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1360	+ markCB.setToolTipText("Set target transform");
1326	1361	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1327	1362	selectableCB.setToolTipText("Make object selectable");
1328	1363	// Return();
1329	1364
1330	1365	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1331	1366	hideCB.setToolTipText("Hide object");
1332		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1333		- markCB.setToolTipText("As animation target transform");
1334	1367
1335	1368	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1336	1369
..	..	@@ -1532,22 +1565,9 @@
1532	1565
1533	1566	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1534	1567	{
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);
	1568	+ if (Globals.DEBUG)
	1569	+ System.out.println("CREATE CAMERAS");
	1570	+ cams = CreateCameras();
1551	1571	} else
1552	1572	{
1553	1573	cams = (cGroup) copy.get(0);
..	..	@@ -1613,6 +1633,45 @@
1613	1633	//frontView.object = copy;
1614	1634	//sideView.object = copy;
1615	1635
	1636	+ transformPanel = new cGridBag().setVertical(true);
	1637	+
	1638	+ cGridBag resetTransformPanel = new cGridBag();
	1639	+
	1640	+ resetTransformPanel.preferredHeight = 2;
	1641	+
	1642	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1643	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1644	+ resetTransform.addMouseListener(new MouseAdapter()
	1645	+ {
	1646	+ public void mouseClicked(MouseEvent e)
	1647	+ {
	1648	+ ResetTransform();
	1649	+ }
	1650	+ });
	1651	+ resetTransformPanel.add(resetTransform);
	1652	+
	1653	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1654	+ resetTransform.setToolTipText("Reset Translation only");
	1655	+ resetTransform.addMouseListener(new MouseAdapter()
	1656	+ {
	1657	+ public void mouseClicked(MouseEvent e)
	1658	+ {
	1659	+ ResetTransform(1);
	1660	+ }
	1661	+ });
	1662	+ resetTransformPanel.add(resetTransform);
	1663	+
	1664	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1665	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1666	+ resetTransform.addMouseListener(new MouseAdapter()
	1667	+ {
	1668	+ public void mouseClicked(MouseEvent e)
	1669	+ {
	1670	+ ResetTransform(2);
	1671	+ }
	1672	+ });
	1673	+ resetTransformPanel.add(resetTransform);
	1674	+
1616	1675	XYZPanel = new cGridBag().setVertical(true);
1617	1676	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1618	1677
..	..	@@ -1622,6 +1681,9 @@
1622	1681	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1623	1682	//XYZPanel.setName("XYZ");
1624	1683
	1684	+ transformPanel.add(resetTransformPanel);
	1685	+ transformPanel.add(XYZPanel);
	1686	+
1625	1687	/*
1626	1688	gridPanel = new JPanel(); //new BorderLayout());
1627	1689	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1629,12 +1691,12 @@
1629	1691	gridPanel.add(cameraView);
1630	1692	gridPanel.add(XYZPanel);
1631	1693	*/
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);
	1694	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1695	+// gridPanel.setContinuousLayout(true);
	1696	+// gridPanel.setOneTouchExpandable(true);
	1697	+// gridPanel.setDividerLocation(1.0);
	1698	+// gridPanel.setDividerSize(9);
	1699	+// gridPanel.setResizeWeight(0.85);
1638	1700
1639	1701	// aConstraints.weighty = 0;
1640	1702	//System.out.println("THIS = " + this);
..	..	@@ -1657,30 +1719,34 @@
1657	1719
1658	1720	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1659	1721	//tmp.setName("Edit");
1660		- objectPanel.add(materialPanel);
1661		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1662		- objectPanel.setToolTipTextAt(0, "Material");
1663		-
	1722	+ objectPanel.add(skyboxPanel);
	1723	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1724	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1725	+
1664	1726	objectPanel.add(toolboxPanel);
1665	1727	objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1666	1728	objectPanel.setToolTipTextAt(1, "Objects & textures");
1667	1729
1668		- objectPanel.add(skyboxPanel);
1669		- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1670		- objectPanel.setToolTipTextAt(2, "Backgrounds");
1671		-
	1730	+ objectPanel.add(materialPanel);
	1731	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1732	+ objectPanel.setToolTipTextAt(2, "Material");
	1733	+
1672	1734	// JPanel north = new JPanel(new BorderLayout());
1673	1735	// north.setName("Edit");
1674	1736	// north.add(ctrlPanel, BorderLayout.NORTH);
1675	1737	// objectPanel.add(north);
1676	1738	objectPanel.add(editPanel);
1677		- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1739	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1678	1740	objectPanel.setToolTipTextAt(3, "Edit controls");
1679	1741
1680		- objectPanel.add(XYZPanel);
	1742	+ objectPanel.add(transformPanel);
1681	1743	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1682		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1744	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1683	1745
	1746	+ patchMaterial = true;
	1747	+ cameraView.patchMaterial = this;
	1748	+ objectPanel.setSelectedIndex(2);
	1749	+
1684	1750	/*
1685	1751	aConstraints.gridx = 0;
1686	1752	aConstraints.gridwidth = 1;
..	..	@@ -1700,7 +1766,7 @@
1700	1766	scrollpane.addMouseWheelListener(this); // Default not fast enough
1701	1767
1702	1768	/JTabbedPane/ scenePanel = new cGridBag();
1703		- scenePanel.preferredWidth = 5;
	1769	+ scenePanel.preferredWidth = 6;
1704	1770
1705	1771	JTabbedPane tabbedPane = new JTabbedPane();
1706	1772	tabbedPane.add(scrollpane);
..	..	@@ -1711,17 +1777,52 @@
1711	1777
1712	1778	AddOptions(optionsPanel); //, aConstraints);
1713	1779
1714		- tabbedPane.add(optionsPanel);
1715		-
1716	1780	tabbedPane.add(FSPane = new cFileSystemPane(this));
1717	1781
	1782	+ tabbedPane.add(optionsPanel);
	1783	+
1718	1784	scenePanel.add(tabbedPane);
1719	1785
1720		- //if (Globals.ADVANCED)
1721		-// tabbedPane.add(infoPanel);
1722		-// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1723		-// tabbedPane.setToolTipTextAt(3, "Information");
	1786	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1787	+ creditsPanel.setName("Credits");
1724	1788
	1789	+ cLabel ogaLabel = new cLabel(" Most Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1790	+ creditsPanel.add(ogaLabel);
	1791	+
	1792	+ cButton opengameartButton;
	1793	+ creditsPanel.add(opengameartButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1794	+ opengameartButton.setToolTipText("https://opengameart.org");
	1795	+
	1796	+ opengameartButton.addMouseListener(new MouseAdapter()
	1797	+ {
	1798	+ public void mouseClicked(MouseEvent e)
	1799	+ {
	1800	+ try
	1801	+ {
	1802	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1803	+ } catch (Exception e1)
	1804	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1805	+ {
	1806	+ e1.printStackTrace();
	1807	+ }
	1808	+ }
	1809	+ });
	1810	+
	1811	+ for (int i=10; --i>=0;)
	1812	+ {
	1813	+ creditsPanel.add(new cGridBag());
	1814	+ }
	1815	+
	1816	+ tabbedPane.add(creditsPanel);
	1817	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1818	+
	1819	+ if (Globals.ADVANCED)
	1820	+ {
	1821	+ tabbedPane.add(infoPanel);
	1822	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1823	+ tabbedPane.setToolTipTextAt(4, "Information");
	1824	+ }
	1825	+
1725	1826	/*
1726	1827	cTree jTree = new cTree(null);
1727	1828	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1742,13 +1843,13 @@
1742	1843	jtp.add(tree);
1743	1844	*/
1744	1845
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");
	1846	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1847	+// bigPanel.setContinuousLayout(true);
	1848	+// bigPanel.setOneTouchExpandable(true);
	1849	+// bigPanel.setDividerLocation(0.8);
	1850	+// bigPanel.setDividerSize(15);
	1851	+// bigPanel.setResizeWeight(0.15);
	1852	+// bigPanel.setName("Scene");
1752	1853
1753	1854	//bigPanel.setLayout(new BorderLayout());
1754	1855	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1832,7 +1933,7 @@
1832	1933
1833	1934	cameraView.requestFocusInWindow();
1834	1935
1835		- gridPanel.setDividerLocation(1.0);
	1936	+// gridPanel.setDividerLocation(1.0);
1836	1937
1837	1938	frame.validate();
1838	1939
..	..	@@ -1867,7 +1968,7 @@
1867	1968	{
1868	1969	cGridBag presetpanel = new cGridBag().setVertical(true);
1869	1970
1870		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1971	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1871	1972	skin.setToolTipText("Skin");
1872	1973	skin.addMouseListener(new MouseAdapter()
1873	1974	{
..	..	@@ -1878,7 +1979,15 @@
1878	1979
1879	1980	// Skin
1880	1981	colorField.setFloat(material.color);
1881		- saturationField.setFloat(material.modulation);
	1982	+ float saturation = material.modulation;
	1983	+
	1984	+ if (!cameraView.Skinshader)
	1985	+ {
	1986	+ saturation /= 1.5;
	1987	+ }
	1988	+
	1989	+ saturationField.setFloat(saturation);
	1990	+
1882	1991	subsurfaceField.setFloat(material.subsurface);
1883	1992	selfshadowField.setFloat(material.diffuseness);
1884	1993	diffusenessField.setFloat(material.factor);
..	..	@@ -1897,7 +2006,7 @@
1897	2006	});
1898	2007	presetpanel.add(skin);
1899	2008
1900		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2009	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1901	2010	lambert.setToolTipText("Diffuse");
1902	2011	lambert.addMouseListener(new MouseAdapter()
1903	2012	{
..	..	@@ -1915,7 +2024,7 @@
1915	2024	});
1916	2025	presetpanel.add(lambert);
1917	2026
1918		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2027	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1919	2028	diffuse2.setToolTipText("Diffuse2");
1920	2029	diffuse2.addMouseListener(new MouseAdapter()
1921	2030	{
..	..	@@ -1933,7 +2042,7 @@
1933	2042	});
1934	2043	presetpanel.add(diffuse2);
1935	2044
1936		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2045	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1937	2046	diffusemoon.setToolTipText("Moon");
1938	2047	diffusemoon.addMouseListener(new MouseAdapter()
1939	2048	{
..	..	@@ -1951,7 +2060,7 @@
1951	2060	});
1952	2061	presetpanel.add(diffusemoon);
1953	2062
1954		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2063	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1955	2064	diffusemoon2.setToolTipText("Moon2");
1956	2065	diffusemoon2.addMouseListener(new MouseAdapter()
1957	2066	{
..	..	@@ -1969,7 +2078,7 @@
1969	2078	});
1970	2079	presetpanel.add(diffusemoon2);
1971	2080
1972		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2081	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1973	2082	diffusemoon3.setToolTipText("Moon3");
1974	2083	diffusemoon3.addMouseListener(new MouseAdapter()
1975	2084	{
..	..	@@ -1987,7 +2096,7 @@
1987	2096	});
1988	2097	presetpanel.add(diffusemoon3);
1989	2098
1990		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2099	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1991	2100	diffusesheen.setToolTipText("Sheen");
1992	2101	diffusesheen.addMouseListener(new MouseAdapter()
1993	2102	{
..	..	@@ -2004,7 +2113,7 @@
2004	2113	});
2005	2114	presetpanel.add(diffusesheen);
2006	2115
2007		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2116	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
2008	2117	rough.setToolTipText("Rough metal");
2009	2118	rough.addMouseListener(new MouseAdapter()
2010	2119	{
..	..	@@ -2022,7 +2131,7 @@
2022	2131	});
2023	2132	presetpanel.add(rough);
2024	2133
2025		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2134	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
2026	2135	rough2.setToolTipText("Medium metal");
2027	2136	rough2.addMouseListener(new MouseAdapter()
2028	2137	{
..	..	@@ -2040,7 +2149,7 @@
2040	2149	});
2041	2150	presetpanel.add(rough2);
2042	2151
2043		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2152	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
2044	2153	shini0.setToolTipText("Shiny");
2045	2154	shini0.addMouseListener(new MouseAdapter()
2046	2155	{
..	..	@@ -2058,7 +2167,7 @@
2058	2167	});
2059	2168	presetpanel.add(shini0);
2060	2169
2061		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2170	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
2062	2171	shini1.setToolTipText("Shiny2");
2063	2172	shini1.addMouseListener(new MouseAdapter()
2064	2173	{
..	..	@@ -2076,7 +2185,7 @@
2076	2185	});
2077	2186	presetpanel.add(shini1);
2078	2187
2079		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2188	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2080	2189	shini2.setToolTipText("Shiny3");
2081	2190	shini2.addMouseListener(new MouseAdapter()
2082	2191	{
..	..	@@ -2094,7 +2203,7 @@
2094	2203	});
2095	2204	presetpanel.add(shini2);
2096	2205
2097		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2206	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2098	2207	aniso.setToolTipText("AnisoU");
2099	2208	aniso.addMouseListener(new MouseAdapter()
2100	2209	{
..	..	@@ -2112,7 +2221,7 @@
2112	2221	});
2113	2222	presetpanel.add(aniso);
2114	2223
2115		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2224	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2116	2225	aniso2.setToolTipText("AnisoV");
2117	2226	aniso2.addMouseListener(new MouseAdapter()
2118	2227	{
..	..	@@ -2130,7 +2239,7 @@
2130	2239	});
2131	2240	presetpanel.add(aniso2);
2132	2241
2133		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2242	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2134	2243	aniso3.setToolTipText("AnisoUV");
2135	2244	aniso3.addMouseListener(new MouseAdapter()
2136	2245	{
..	..	@@ -2148,7 +2257,7 @@
2148	2257	});
2149	2258	presetpanel.add(aniso3);
2150	2259
2151		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2260	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2152	2261	velvet0.setToolTipText("Velvet");
2153	2262	velvet0.addMouseListener(new MouseAdapter()
2154	2263	{
..	..	@@ -2170,7 +2279,7 @@
2170	2279	});
2171	2280	presetpanel.add(velvet0);
2172	2281
2173		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2282	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2174	2283	bump0.setToolTipText("Bump texture");
2175	2284	bump0.addMouseListener(new MouseAdapter()
2176	2285	{
..	..	@@ -2189,14 +2298,14 @@
2189	2298	});
2190	2299	presetpanel.add(bump0);
2191	2300
2192		- cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2301	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
2193	2302	borderShader.setToolTipText("Border fade");
2194	2303	borderShader.addMouseListener(new MouseAdapter()
2195	2304	{
2196	2305	public void mouseClicked(MouseEvent e)
2197	2306	{
2198	2307	borderfadeField.setFloat(0.5);
2199		- opacityField.setFloat(0.6);
	2308	+ opacityField.setFloat(0.75);
2200	2309
2201	2310	materialtouched = true;
2202	2311	applySelf();
..	..	@@ -2204,7 +2313,7 @@
2204	2313	});
2205	2314	presetpanel.add(borderShader);
2206	2315
2207		- cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2316	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2208	2317	halo.setToolTipText("Halo");
2209	2318	halo.addMouseListener(new MouseAdapter()
2210	2319	{
..	..	@@ -2221,7 +2330,7 @@
2221	2330	});
2222	2331	presetpanel.add(halo);
2223	2332
2224		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2333	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2225	2334	candle.setToolTipText("Candle");
2226	2335	candle.addMouseListener(new MouseAdapter()
2227	2336	{
..	..	@@ -2243,7 +2352,7 @@
2243	2352	});
2244	2353	presetpanel.add(candle);
2245	2354
2246		- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2355	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2247	2356	shadowShader.setToolTipText("Shadow");
2248	2357	shadowShader.addMouseListener(new MouseAdapter()
2249	2358	{
..	..	@@ -2278,19 +2387,19 @@
2278	2387
2279	2388	cGridBag editBar = new cGridBag().setVertical(false);
2280	2389
2281		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2390	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2282	2391	createMaterialButton.setToolTipText("Create material");
2283	2392
2284	2393	/*
2285	2394	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2286	2395	*/
2287	2396
2288		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2397	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2289	2398	clearMaterialButton.setToolTipText("Clear material");
2290	2399
2291	2400	if (Globals.ADVANCED)
2292	2401	{
2293		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2402	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2294	2403	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2295	2404	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2296	2405	}
..	..	@@ -2311,9 +2420,20 @@
2311	2420
2312	2421	cGridBag huepanel = new cGridBag();
2313	2422	cGridBag huelabel = new cGridBag();
2314		- skin = GetLabel("icons/hue.png", false);
2315		- skin.fit = true;
2316		- huelabel.add(skin);
	2423	+ cLabel hue = GetLabel("icons/hue.png", false);
	2424	+ hue.fit = true;
	2425	+
	2426	+ hue.addMouseListener(new MouseAdapter()
	2427	+ {
	2428	+ public void mousePressed(MouseEvent e)
	2429	+ {
	2430	+ int x = e.getX();
	2431	+
	2432	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2433	+ }
	2434	+ });
	2435	+
	2436	+ huelabel.add(hue);
2317	2437	huelabel.preferredWidth = 20;
2318	2438	huepanel.add(new cGridBag()); // Label
2319	2439	huepanel.add(huelabel); // Field/slider
..	..	@@ -3900,7 +4020,7 @@
3900	4020	//System.out.println("ObjEditor " + event);
3901	4021	applySelf0(true);
3902	4022	//parent.applySelf();
3903		- objEditor.refreshContents();
	4023	+ // conflicts with requestFocus objEditor.refreshContents();
3904	4024	} else if (source == resetButton)
3905	4025	{
3906	4026	CameraPane.fullreset = true;
..	..	@@ -4080,11 +4200,18 @@
4080	4200
4081	4201	void New()
4082	4202	{
4083		- while (copy.Size() > 1)
	4203	+ while (copy.Size() > 0)
4084	4204	{
4085		- copy.remove(1);
	4205	+ copy.remove(0);
4086	4206	}
4087	4207
	4208	+ copy.selection.clear();
	4209	+
	4210	+ if (copy == Grafreed.grafreed.universe)
	4211	+ {
	4212	+ CreateCameras();
	4213	+ cameraView.SetCamera(GetCamera(copy, 0));
	4214	+ }
4088	4215	ResetModel();
4089	4216	objEditor.refreshContents();
4090	4217	}
..	..	@@ -4212,8 +4339,6 @@
4212	4339	return true;
4213	4340	}
4214	4341
4215		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4216		-
4217	4342	void DeleteVersion()
4218	4343	{
4219	4344	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4221,7 +4346,11 @@
4221	4346	copy.versionlist[i] = copy.versionlist[i+1];
4222	4347	}
4223	4348
4224		- CopyChanged();
	4349	+ if (copy.versionlist[copy.versionindex] == null)
	4350	+ copy.versionindex -= 1;
	4351	+
	4352	+ if (copy.versionindex != -1)
	4353	+ CopyChanged();
4225	4354
4226	4355	SetVersionStates();
4227	4356	}
..	..	@@ -4334,7 +4463,7 @@
4334	4463	boolean temp = CameraPane.SWITCH;
4335	4464	CameraPane.SWITCH = false;
4336	4465
4337		- copy.ExtractBigData(versiontable);
	4466	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4338	4467
4339	4468	copy.clear();
4340	4469
..	..	@@ -4346,7 +4475,7 @@
4346	4475	copy.add(obj.get(i));
4347	4476	}
4348	4477
4349		- copy.RestoreBigData(versiontable);
	4478	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4350	4479
4351	4480	CameraPane.SWITCH = temp;
4352	4481
..	..	@@ -4396,6 +4525,8 @@
4396	4525	return count;
4397	4526	}
4398	4527
	4528	+ public cGridBag versionSliderPane;
	4529	+
4399	4530	void SetVersionStates()
4400	4531	{
4401	4532	//if (true)
..	..	@@ -4403,21 +4534,36 @@
4403	4534
4404	4535	//cRadio tab = GetCurrentTab();
4405	4536
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;
	4537	+ if (copy.versionlist == null)
	4538	+ {
	4539	+ saveVersionButton.setEnabled(false);
	4540	+ restoreButton.setEnabled(false);
	4541	+ replaceButton.setEnabled(false);
	4542	+ previousVersionButton.setEnabled(false);
	4543	+ nextVersionButton.setEnabled(false);
	4544	+ deleteVersionButton.setEnabled(false);
	4545	+ versionSliderPane.setVisible(false);
	4546	+ }
	4547	+ else
	4548	+ {
	4549	+ restoreButton.setEnabled(copy.versionindex != -1);
	4550	+ replaceButton.setEnabled(copy.versionindex != -1);
	4551	+
	4552	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4553	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4554	+
	4555	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4556	+ //copy.versionlist[copy.versionindex + 1] != null);
	4557	+
	4558	+ muteSlider = true;
	4559	+ versionSlider.setMinimum(0);
	4560	+ versionSlider.setMaximum(VersionCount() - 1);
	4561	+ versionSlider.setInteger(copy.versionindex);
	4562	+ versionSlider.setEnabled(copy.versionindex != -1);
	4563	+ muteSlider = false;
	4564	+
	4565	+ versionSliderPane.setVisible(true);
	4566	+ }
4421	4567	}
4422	4568
4423	4569	public boolean PreviousVersion()
..	..	@@ -4475,7 +4621,7 @@
4475	4621
4476	4622	public boolean Replace()
4477	4623	{
4478		- System.err.println("Replace");
	4624	+ //System.err.println("Replace");
4479	4625
4480	4626	//cRadio tab = GetCurrentTab();
4481	4627
..	..	@@ -4702,6 +4848,12 @@
4702	4848	// else
4703	4849	// applySelf(true);
4704	4850	// }
	4851	+
	4852	+ boolean Equal(double a, double b)
	4853	+ {
	4854	+ return Math.abs(a - b) < 0.001;
	4855	+ }
	4856	+
4705	4857	void applySelf0(boolean name)
4706	4858	{
4707	4859	if (name)
..	..	@@ -4751,29 +4903,52 @@
4751	4903	{
4752	4904	cMaterial mat = copy.material;
4753	4905
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));
	4906	+ if (!Equal(colorField.getFloat(), mat.color))
	4907	+ colorField.SetToolTipValue((mat.color));
	4908	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4909	+ saturationField.SetToolTipValue((mat.modulation));
	4910	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4911	+ metalnessField.SetToolTipValue((mat.metalness));
	4912	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4913	+ diffuseField.SetToolTipValue((mat.diffuse));
	4914	+ if (!Equal(specularField.getFloat(), mat.specular))
	4915	+ specularField.SetToolTipValue((mat.specular));
	4916	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4917	+ shininessField.SetToolTipValue((mat.shininess));
	4918	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4919	+ shiftField.SetToolTipValue((mat.shift));
	4920	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4921	+ ambientField.SetToolTipValue((mat.ambient));
	4922	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4923	+ lightareaField.SetToolTipValue((mat.lightarea));
	4924	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4925	+ diffusenessField.SetToolTipValue((mat.factor));
	4926	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4927	+ velvetField.SetToolTipValue((mat.velvet));
	4928	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4929	+ sheenField.SetToolTipValue((mat.sheen));
	4930	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4931	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4932	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4933	+ backlitField.SetToolTipValue((mat.bump));
	4934	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4935	+ anisoField.SetToolTipValue((mat.aniso));
	4936	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4937	+ anisoVField.SetToolTipValue((mat.anisoV));
	4938	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4939	+ cameraField.SetToolTipValue((mat.cameralight));
	4940	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	4941	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4942	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	4943	+ shadowField.SetToolTipValue((mat.shadow));
	4944	+ if (!Equal(textureField.getFloat(), mat.texture))
	4945	+ textureField.SetToolTipValue((mat.texture));
	4946	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	4947	+ opacityField.SetToolTipValue((mat.opacity));
	4948	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	4949	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4950	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	4951	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4777	4952	}
4778	4953
4779	4954	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4808,7 +4983,7 @@
4808	4983
4809	4984	public void stateChanged(ChangeEvent e)
4810	4985	{
4811		- // assert(false);
	4986	+ // assert(false);
4812	4987	if (e.getSource() == versionSlider)
4813	4988	{
4814	4989	if (muteSlider)
..	..	@@ -5178,6 +5353,8 @@
5178	5353
5179	5354	if (previousVersionButton != null && copy.versionlist != null)
5180	5355	SetVersionStates();
	5356	+
	5357	+ cameraView.requestFocusInWindow();
5181	5358	}
5182	5359
5183	5360	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5209,7 +5386,7 @@
5209	5386	// group = (Composite) group.get(0);
5210	5387	// }
5211	5388
5212		- System.out.println("makeSomething of " + thing);
	5389	+ //System.out.println("makeSomething of " + thing);
5213	5390
5214	5391	/*
5215	5392	if (deselect && jList != null)
..	..	@@ -5563,6 +5740,7 @@
5563	5740
5564	5741	copy.versionlist = readobj.versionlist;
5565	5742	copy.versionindex = readobj.versionindex;
	5743	+ copy.versiontable = readobj.versiontable;
5566	5744
5567	5745	if (copy.versionlist == null)
5568	5746	{
..	..	@@ -5918,6 +6096,7 @@
5918	6096	boolean materialFlushed;
5919	6097	Object3D latestObject;
5920	6098
	6099	+ cGridBag transformPanel;
5921	6100	cGridBag XYZPanel;
5922	6101
5923	6102	JSplitPane gridPanel;