~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -43,6 +43,35 @@
43	43
44	44	static ObjEditor theFrame;
45	45
	46	+ public void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
46	75	public cGridBag GetSeparator()
47	76	{
48	77	cGridBag separator = new cGridBag();
..	..	@@ -54,7 +83,10 @@
54	83	cButton GetButton(String name, boolean border)
55	84	{
56	85	ImageIcon icon = GetIcon(name);
57		- return new cButton(icon, border);
	86	+ if (icon != null \|\| name.contains("/"))
	87	+ return new cButton(icon, border);
	88	+ else
	89	+ return new cButton(name, border);
58	90	}
59	91
60	92	cLabel GetLabel(String name, boolean border)
..	..	@@ -77,7 +109,7 @@
77	109
78	110	static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
79	111
80		- ImageIcon GetIcon(String name)
	112	+ static ImageIcon GetIcon(String name)
81	113	{
82	114	javax.swing.ImageIcon iconCache = icons.get(name);
83	115	if (iconCache != null)
..	..	@@ -87,7 +119,7 @@
87	119
88	120	try
89	121	{
90		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	122	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
91	123
92	124	// if (image.getWidth() > 48 && image.getHeight() > 48)
93	125	// {
..	..	@@ -359,7 +391,8 @@
359	391	//parent = p;
360	392
361	393	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
362		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	394	+ if (Globals.DEBUG)
	395	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
363	396	//gd.setFullScreenWindow(this);
364	397	//setResizable(false);
365	398	//if (!isDisplayable())
..	..	@@ -396,6 +429,9 @@
396	429
397	430	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
398	431
	432	+ // This is to refresh the UI of the material panel.
	433	+ boolean patchMaterial;
	434	+
399	435	void SetupMenu()
400	436	{
401	437	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -921,18 +957,29 @@
921	957	boolean temp = CameraPane.SWITCH;
922	958	CameraPane.SWITCH = false;
923	959
924		- object.ExtractBigData(versiontable);
	960	+ if (Grafreed.grafreed.universe.versiontable == null)
	961	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	962	+
	963	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
925	964	// if (copy == client)
926	965
927	966	Object3D versions[] = object.versionlist;
	967	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
928	968	object.versionlist = null;
	969	+ object.versiontable = null;
	970	+
	971	+ Object3D parent = object.parent;
	972	+ object.parent = null;
929	973
930	974	//byte[] compress = Compress(copy);
931	975	Object3D compress = (Object3D)Grafreed.clone(object);
932	976
933		- object.versionlist = versions;
	977	+ object.parent = parent;
934	978
935		- object.RestoreBigData(versiontable);
	979	+ object.versionlist = versions;
	980	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	981	+
	982	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
936	983
937	984	CameraPane.SWITCH = temp;
938	985
..	..	@@ -1271,7 +1318,7 @@
1271	1318
1272	1319	//if (copy.pinned)
1273	1320	{
1274		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1321	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1275	1322	pinButton.setSelected(copy.pinned);
1276	1323	cGridBag t = new cGridBag();
1277	1324	t.preferredWidth = 2;
..	..	@@ -1294,14 +1341,14 @@
1294	1341
1295	1342	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1296	1343	liveCB.setToolTipText("Animate object");
	1344	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1345	+ markCB.setToolTipText("Set target transform");
1297	1346	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1298	1347	selectableCB.setToolTipText("Make object selectable");
1299	1348	// Return();
1300	1349
1301	1350	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1302	1351	hideCB.setToolTipText("Hide object");
1303		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1304		- markCB.setToolTipText("As animation target transform");
1305	1352
1306	1353	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1307	1354
..	..	@@ -1503,6 +1550,7 @@
1503	1550
1504	1551	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1505	1552	{
	1553	+ if (Globals.DEBUG)
1506	1554	System.out.println("CREATE CAMERAS");
1507	1555	cams = new cTemplate();
1508	1556	cams.name = "Cameras";
..	..	@@ -1584,6 +1632,45 @@
1584	1632	//frontView.object = copy;
1585	1633	//sideView.object = copy;
1586	1634
	1635	+ transformPanel = new cGridBag().setVertical(true);
	1636	+
	1637	+ cGridBag resetTransformPanel = new cGridBag();
	1638	+
	1639	+ resetTransformPanel.preferredHeight = 2;
	1640	+
	1641	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1642	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1643	+ resetTransform.addMouseListener(new MouseAdapter()
	1644	+ {
	1645	+ public void mouseClicked(MouseEvent e)
	1646	+ {
	1647	+ ResetTransform();
	1648	+ }
	1649	+ });
	1650	+ resetTransformPanel.add(resetTransform);
	1651	+
	1652	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1653	+ resetTransform.setToolTipText("Reset Translation only");
	1654	+ resetTransform.addMouseListener(new MouseAdapter()
	1655	+ {
	1656	+ public void mouseClicked(MouseEvent e)
	1657	+ {
	1658	+ ResetTransform(1);
	1659	+ }
	1660	+ });
	1661	+ resetTransformPanel.add(resetTransform);
	1662	+
	1663	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1664	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1665	+ resetTransform.addMouseListener(new MouseAdapter()
	1666	+ {
	1667	+ public void mouseClicked(MouseEvent e)
	1668	+ {
	1669	+ ResetTransform(2);
	1670	+ }
	1671	+ });
	1672	+ resetTransformPanel.add(resetTransform);
	1673	+
1587	1674	XYZPanel = new cGridBag().setVertical(true);
1588	1675	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1589	1676
..	..	@@ -1593,6 +1680,9 @@
1593	1680	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1594	1681	//XYZPanel.setName("XYZ");
1595	1682
	1683	+ transformPanel.add(resetTransformPanel);
	1684	+ transformPanel.add(XYZPanel);
	1685	+
1596	1686	/*
1597	1687	gridPanel = new JPanel(); //new BorderLayout());
1598	1688	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1600,12 +1690,12 @@
1600	1690	gridPanel.add(cameraView);
1601	1691	gridPanel.add(XYZPanel);
1602	1692	*/
1603		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1604		- gridPanel.setContinuousLayout(true);
1605		- gridPanel.setOneTouchExpandable(true);
1606		- gridPanel.setDividerLocation(1.0);
1607		- gridPanel.setDividerSize(9);
1608		- gridPanel.setResizeWeight(0.85);
	1693	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1694	+// gridPanel.setContinuousLayout(true);
	1695	+// gridPanel.setOneTouchExpandable(true);
	1696	+// gridPanel.setDividerLocation(1.0);
	1697	+// gridPanel.setDividerSize(9);
	1698	+// gridPanel.setResizeWeight(0.85);
1609	1699
1610	1700	// aConstraints.weighty = 0;
1611	1701	//System.out.println("THIS = " + this);
..	..	@@ -1628,14 +1718,14 @@
1628	1718
1629	1719	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1630	1720	//tmp.setName("Edit");
1631		- objectPanel.add(materialPanel);
1632		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1633		- objectPanel.setToolTipTextAt(0, "Material");
1634		-
1635	1721	objectPanel.add(toolboxPanel);
1636		- objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1637		- objectPanel.setToolTipTextAt(1, "Objects & textures");
	1722	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1723	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
1638	1724
	1725	+ objectPanel.add(materialPanel);
	1726	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1727	+ objectPanel.setToolTipTextAt(1, "Material");
	1728	+
1639	1729	objectPanel.add(skyboxPanel);
1640	1730	objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1641	1731	objectPanel.setToolTipTextAt(2, "Backgrounds");
..	..	@@ -1648,10 +1738,14 @@
1648	1738	objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1649	1739	objectPanel.setToolTipTextAt(3, "Edit controls");
1650	1740
1651		- objectPanel.add(XYZPanel);
	1741	+ objectPanel.add(transformPanel);
1652	1742	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1653		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1743	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1654	1744
	1745	+ patchMaterial = true;
	1746	+ cameraView.patchMaterial = this;
	1747	+ objectPanel.setSelectedIndex(1);
	1748	+
1655	1749	/*
1656	1750	aConstraints.gridx = 0;
1657	1751	aConstraints.gridwidth = 1;
..	..	@@ -1671,7 +1765,7 @@
1671	1765	scrollpane.addMouseWheelListener(this); // Default not fast enough
1672	1766
1673	1767	/JTabbedPane/ scenePanel = new cGridBag();
1674		- scenePanel.preferredWidth = 5;
	1768	+ scenePanel.preferredWidth = 6;
1675	1769
1676	1770	JTabbedPane tabbedPane = new JTabbedPane();
1677	1771	tabbedPane.add(scrollpane);
..	..	@@ -1682,17 +1776,52 @@
1682	1776
1683	1777	AddOptions(optionsPanel); //, aConstraints);
1684	1778
1685		- tabbedPane.add(optionsPanel);
1686		-
1687	1779	tabbedPane.add(FSPane = new cFileSystemPane(this));
1688	1780
	1781	+ tabbedPane.add(optionsPanel);
	1782	+
1689	1783	scenePanel.add(tabbedPane);
1690	1784
1691		- //if (Globals.ADVANCED)
1692		-// tabbedPane.add(infoPanel);
1693		-// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1694		-// tabbedPane.setToolTipTextAt(3, "Information");
	1785	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1786	+ creditsPanel.setName("Credits");
1695	1787
	1788	+ cLabel ogaLabel = new cLabel(" Most Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1789	+ creditsPanel.add(ogaLabel);
	1790	+
	1791	+ cButton opengameartButton;
	1792	+ creditsPanel.add(opengameartButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1793	+ opengameartButton.setToolTipText("https://opengameart.org");
	1794	+
	1795	+ opengameartButton.addMouseListener(new MouseAdapter()
	1796	+ {
	1797	+ public void mouseClicked(MouseEvent e)
	1798	+ {
	1799	+ try
	1800	+ {
	1801	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1802	+ } catch (Exception e1)
	1803	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1804	+ {
	1805	+ e1.printStackTrace();
	1806	+ }
	1807	+ }
	1808	+ });
	1809	+
	1810	+ for (int i=10; --i>=0;)
	1811	+ {
	1812	+ creditsPanel.add(new cGridBag());
	1813	+ }
	1814	+
	1815	+ tabbedPane.add(creditsPanel);
	1816	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1817	+
	1818	+ if (Globals.ADVANCED)
	1819	+ {
	1820	+ tabbedPane.add(infoPanel);
	1821	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1822	+ tabbedPane.setToolTipTextAt(4, "Information");
	1823	+ }
	1824	+
1696	1825	/*
1697	1826	cTree jTree = new cTree(null);
1698	1827	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1713,13 +1842,13 @@
1713	1842	jtp.add(tree);
1714	1843	*/
1715	1844
1716		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1717		- bigPanel.setContinuousLayout(true);
1718		- bigPanel.setOneTouchExpandable(true);
1719		- bigPanel.setDividerLocation(0.8);
1720		- bigPanel.setDividerSize(15);
1721		- bigPanel.setResizeWeight(0.15);
1722		- bigPanel.setName("Scene");
	1845	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1846	+// bigPanel.setContinuousLayout(true);
	1847	+// bigPanel.setOneTouchExpandable(true);
	1848	+// bigPanel.setDividerLocation(0.8);
	1849	+// bigPanel.setDividerSize(15);
	1850	+// bigPanel.setResizeWeight(0.15);
	1851	+// bigPanel.setName("Scene");
1723	1852
1724	1853	//bigPanel.setLayout(new BorderLayout());
1725	1854	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1789,7 +1918,7 @@
1789	1918
1790	1919	frame.getContentPane().setLayout(new BorderLayout());
1791	1920	/**/
1792		- JTabbedPane worldPane = new JTabbedPane();
	1921	+ //JTabbedPane worldPane = new JTabbedPane();
1793	1922	//worldPane.add(bigPanel);
1794	1923	//worldPane.add(worldPanel);
1795	1924	/**/
..	..	@@ -1803,7 +1932,7 @@
1803	1932
1804	1933	cameraView.requestFocusInWindow();
1805	1934
1806		- gridPanel.setDividerLocation(1.0);
	1935	+// gridPanel.setDividerLocation(1.0);
1807	1936
1808	1937	frame.validate();
1809	1938
..	..	@@ -1838,7 +1967,7 @@
1838	1967	{
1839	1968	cGridBag presetpanel = new cGridBag().setVertical(true);
1840	1969
1841		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1970	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1842	1971	skin.setToolTipText("Skin");
1843	1972	skin.addMouseListener(new MouseAdapter()
1844	1973	{
..	..	@@ -1849,7 +1978,15 @@
1849	1978
1850	1979	// Skin
1851	1980	colorField.setFloat(material.color);
1852		- saturationField.setFloat(material.modulation);
	1981	+ float saturation = material.modulation;
	1982	+
	1983	+ if (!cameraView.Skinshader)
	1984	+ {
	1985	+ saturation /= 1.5;
	1986	+ }
	1987	+
	1988	+ saturationField.setFloat(saturation);
	1989	+
1853	1990	subsurfaceField.setFloat(material.subsurface);
1854	1991	selfshadowField.setFloat(material.diffuseness);
1855	1992	diffusenessField.setFloat(material.factor);
..	..	@@ -1868,7 +2005,7 @@
1868	2005	});
1869	2006	presetpanel.add(skin);
1870	2007
1871		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2008	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1872	2009	lambert.setToolTipText("Diffuse");
1873	2010	lambert.addMouseListener(new MouseAdapter()
1874	2011	{
..	..	@@ -1886,7 +2023,7 @@
1886	2023	});
1887	2024	presetpanel.add(lambert);
1888	2025
1889		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2026	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1890	2027	diffuse2.setToolTipText("Diffuse2");
1891	2028	diffuse2.addMouseListener(new MouseAdapter()
1892	2029	{
..	..	@@ -1904,7 +2041,7 @@
1904	2041	});
1905	2042	presetpanel.add(diffuse2);
1906	2043
1907		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2044	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1908	2045	diffusemoon.setToolTipText("Moon");
1909	2046	diffusemoon.addMouseListener(new MouseAdapter()
1910	2047	{
..	..	@@ -1922,7 +2059,7 @@
1922	2059	});
1923	2060	presetpanel.add(diffusemoon);
1924	2061
1925		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2062	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1926	2063	diffusemoon2.setToolTipText("Moon2");
1927	2064	diffusemoon2.addMouseListener(new MouseAdapter()
1928	2065	{
..	..	@@ -1940,7 +2077,7 @@
1940	2077	});
1941	2078	presetpanel.add(diffusemoon2);
1942	2079
1943		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2080	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1944	2081	diffusemoon3.setToolTipText("Moon3");
1945	2082	diffusemoon3.addMouseListener(new MouseAdapter()
1946	2083	{
..	..	@@ -1958,7 +2095,7 @@
1958	2095	});
1959	2096	presetpanel.add(diffusemoon3);
1960	2097
1961		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2098	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1962	2099	diffusesheen.setToolTipText("Sheen");
1963	2100	diffusesheen.addMouseListener(new MouseAdapter()
1964	2101	{
..	..	@@ -1975,7 +2112,7 @@
1975	2112	});
1976	2113	presetpanel.add(diffusesheen);
1977	2114
1978		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2115	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
1979	2116	rough.setToolTipText("Rough metal");
1980	2117	rough.addMouseListener(new MouseAdapter()
1981	2118	{
..	..	@@ -1993,7 +2130,7 @@
1993	2130	});
1994	2131	presetpanel.add(rough);
1995	2132
1996		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2133	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
1997	2134	rough2.setToolTipText("Medium metal");
1998	2135	rough2.addMouseListener(new MouseAdapter()
1999	2136	{
..	..	@@ -2011,7 +2148,7 @@
2011	2148	});
2012	2149	presetpanel.add(rough2);
2013	2150
2014		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2151	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
2015	2152	shini0.setToolTipText("Shiny");
2016	2153	shini0.addMouseListener(new MouseAdapter()
2017	2154	{
..	..	@@ -2029,7 +2166,7 @@
2029	2166	});
2030	2167	presetpanel.add(shini0);
2031	2168
2032		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2169	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
2033	2170	shini1.setToolTipText("Shiny2");
2034	2171	shini1.addMouseListener(new MouseAdapter()
2035	2172	{
..	..	@@ -2047,7 +2184,7 @@
2047	2184	});
2048	2185	presetpanel.add(shini1);
2049	2186
2050		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2187	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2051	2188	shini2.setToolTipText("Shiny3");
2052	2189	shini2.addMouseListener(new MouseAdapter()
2053	2190	{
..	..	@@ -2065,7 +2202,7 @@
2065	2202	});
2066	2203	presetpanel.add(shini2);
2067	2204
2068		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2205	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2069	2206	aniso.setToolTipText("AnisoU");
2070	2207	aniso.addMouseListener(new MouseAdapter()
2071	2208	{
..	..	@@ -2083,7 +2220,7 @@
2083	2220	});
2084	2221	presetpanel.add(aniso);
2085	2222
2086		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2223	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2087	2224	aniso2.setToolTipText("AnisoV");
2088	2225	aniso2.addMouseListener(new MouseAdapter()
2089	2226	{
..	..	@@ -2101,7 +2238,7 @@
2101	2238	});
2102	2239	presetpanel.add(aniso2);
2103	2240
2104		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2241	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2105	2242	aniso3.setToolTipText("AnisoUV");
2106	2243	aniso3.addMouseListener(new MouseAdapter()
2107	2244	{
..	..	@@ -2119,7 +2256,7 @@
2119	2256	});
2120	2257	presetpanel.add(aniso3);
2121	2258
2122		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2259	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2123	2260	velvet0.setToolTipText("Velvet");
2124	2261	velvet0.addMouseListener(new MouseAdapter()
2125	2262	{
..	..	@@ -2141,7 +2278,7 @@
2141	2278	});
2142	2279	presetpanel.add(velvet0);
2143	2280
2144		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2281	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2145	2282	bump0.setToolTipText("Bump texture");
2146	2283	bump0.addMouseListener(new MouseAdapter()
2147	2284	{
..	..	@@ -2160,7 +2297,22 @@
2160	2297	});
2161	2298	presetpanel.add(bump0);
2162	2299
2163		- cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2300	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2301	+ borderShader.setToolTipText("Border fade");
	2302	+ borderShader.addMouseListener(new MouseAdapter()
	2303	+ {
	2304	+ public void mouseClicked(MouseEvent e)
	2305	+ {
	2306	+ borderfadeField.setFloat(0.5);
	2307	+ opacityField.setFloat(0.75);
	2308	+
	2309	+ materialtouched = true;
	2310	+ applySelf();
	2311	+ }
	2312	+ });
	2313	+ presetpanel.add(borderShader);
	2314	+
	2315	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2164	2316	halo.setToolTipText("Halo");
2165	2317	halo.addMouseListener(new MouseAdapter()
2166	2318	{
..	..	@@ -2177,7 +2329,7 @@
2177	2329	});
2178	2330	presetpanel.add(halo);
2179	2331
2180		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2332	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2181	2333	candle.setToolTipText("Candle");
2182	2334	candle.addMouseListener(new MouseAdapter()
2183	2335	{
..	..	@@ -2199,7 +2351,7 @@
2199	2351	});
2200	2352	presetpanel.add(candle);
2201	2353
2202		- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2354	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2203	2355	shadowShader.setToolTipText("Shadow");
2204	2356	shadowShader.addMouseListener(new MouseAdapter()
2205	2357	{
..	..	@@ -2234,19 +2386,19 @@
2234	2386
2235	2387	cGridBag editBar = new cGridBag().setVertical(false);
2236	2388
2237		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2389	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2238	2390	createMaterialButton.setToolTipText("Create material");
2239	2391
2240	2392	/*
2241	2393	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2242	2394	*/
2243	2395
2244		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2396	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2245	2397	clearMaterialButton.setToolTipText("Clear material");
2246	2398
2247	2399	if (Globals.ADVANCED)
2248	2400	{
2249		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2401	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2250	2402	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2251	2403	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2252	2404	}
..	..	@@ -2267,9 +2419,20 @@
2267	2419
2268	2420	cGridBag huepanel = new cGridBag();
2269	2421	cGridBag huelabel = new cGridBag();
2270		- skin = GetLabel("icons/hue.png", false);
2271		- skin.fit = true;
2272		- huelabel.add(skin);
	2422	+ cLabel hue = GetLabel("icons/hue.png", false);
	2423	+ hue.fit = true;
	2424	+
	2425	+ hue.addMouseListener(new MouseAdapter()
	2426	+ {
	2427	+ public void mousePressed(MouseEvent e)
	2428	+ {
	2429	+ int x = e.getX();
	2430	+
	2431	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2432	+ }
	2433	+ });
	2434	+
	2435	+ huelabel.add(hue);
2273	2436	huelabel.preferredWidth = 20;
2274	2437	huepanel.add(new cGridBag()); // Label
2275	2438	huepanel.add(huelabel); // Field/slider
..	..	@@ -3545,32 +3708,8 @@
3545	3708
3546	3709	if (multiplyToggle != null)
3547	3710	multiplyToggle.setSelected(mat.multiply);
3548		-
3549		- assert (object.projectedVertices != null);
3550		-
3551		- if (object.projectedVertices.length <= 2)
3552		- {
3553		- // Side effect...
3554		- Object3D.cVector2[] keep = object.projectedVertices;
3555		- object.projectedVertices = new Object3D.cVector2[3];
3556		- for (int i = 0; i < 3; i++)
3557		- {
3558		- if (i < keep.length)
3559		- {
3560		- object.projectedVertices[i] = keep[i];
3561		- } else
3562		- {
3563		- object.projectedVertices[i] = new Object3D.cVector2();
3564		- }
3565		- /*
3566		- if(keep.length == 0)
3567		- object.projectedVertices[0] = new Object3D.cVector2();
3568		- else
3569		- object.projectedVertices[0] = keep[0];
3570		- object.projectedVertices[1] = new Object3D.cVector2();
3571		- */
3572		- }
3573		- }
	3711	+
	3712	+ AllocProjectedVertices(object);
3574	3713
3575	3714	SetMaterial(mat, object.projectedVertices);
3576	3715	}
..	..	@@ -3880,7 +4019,7 @@
3880	4019	//System.out.println("ObjEditor " + event);
3881	4020	applySelf0(true);
3882	4021	//parent.applySelf();
3883		- objEditor.refreshContents();
	4022	+ // conflicts with requestFocus objEditor.refreshContents();
3884	4023	} else if (source == resetButton)
3885	4024	{
3886	4025	CameraPane.fullreset = true;
..	..	@@ -4060,12 +4199,15 @@
4060	4199
4061	4200	void New()
4062	4201	{
4063		- while (copy.Size() > 1)
	4202	+ while (copy.Size() > 0)
4064	4203	{
4065		- copy.remove(1);
	4204	+ copy.remove(0);
4066	4205	}
4067	4206
	4207	+ copy.selection.clear();
	4208	+
4068	4209	ResetModel();
	4210	+ SetupViews();
4069	4211	objEditor.refreshContents();
4070	4212	}
4071	4213
..	..	@@ -4192,8 +4334,6 @@
4192	4334	return true;
4193	4335	}
4194	4336
4195		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4196		-
4197	4337	void DeleteVersion()
4198	4338	{
4199	4339	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4201,7 +4341,11 @@
4201	4341	copy.versionlist[i] = copy.versionlist[i+1];
4202	4342	}
4203	4343
4204		- CopyChanged();
	4344	+ if (copy.versionlist[copy.versionindex] == null)
	4345	+ copy.versionindex -= 1;
	4346	+
	4347	+ if (copy.versionindex != -1)
	4348	+ CopyChanged();
4205	4349
4206	4350	SetVersionStates();
4207	4351	}
..	..	@@ -4314,7 +4458,7 @@
4314	4458	boolean temp = CameraPane.SWITCH;
4315	4459	CameraPane.SWITCH = false;
4316	4460
4317		- copy.ExtractBigData(versiontable);
	4461	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4318	4462
4319	4463	copy.clear();
4320	4464
..	..	@@ -4326,7 +4470,7 @@
4326	4470	copy.add(obj.get(i));
4327	4471	}
4328	4472
4329		- copy.RestoreBigData(versiontable);
	4473	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4330	4474
4331	4475	CameraPane.SWITCH = temp;
4332	4476
..	..	@@ -4376,6 +4520,8 @@
4376	4520	return count;
4377	4521	}
4378	4522
	4523	+ public cGridBag versionSliderPane;
	4524	+
4379	4525	void SetVersionStates()
4380	4526	{
4381	4527	//if (true)
..	..	@@ -4383,21 +4529,36 @@
4383	4529
4384	4530	//cRadio tab = GetCurrentTab();
4385	4531
4386		- restoreButton.setEnabled(copy.versionindex != -1);
4387		- replaceButton.setEnabled(copy.versionindex != -1);
4388		-
4389		- previousVersionButton.setEnabled(copy.versionindex > 0);
4390		- nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4391		-
4392		- deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4393		- copy.versionlist[copy.versionindex + 1] != null);
4394		-
4395		- muteSlider = true;
4396		- versionSlider.setMinimum(0);
4397		- versionSlider.setMaximum(VersionCount() - 1);
4398		- versionSlider.setInteger(copy.versionindex);
4399		- versionSlider.setEnabled(copy.versionindex != -1);
4400		- muteSlider = false;
	4532	+ if (copy.versionlist == null)
	4533	+ {
	4534	+ saveVersionButton.setEnabled(false);
	4535	+ restoreButton.setEnabled(false);
	4536	+ replaceButton.setEnabled(false);
	4537	+ previousVersionButton.setEnabled(false);
	4538	+ nextVersionButton.setEnabled(false);
	4539	+ deleteVersionButton.setEnabled(false);
	4540	+ versionSliderPane.setVisible(false);
	4541	+ }
	4542	+ else
	4543	+ {
	4544	+ restoreButton.setEnabled(copy.versionindex != -1);
	4545	+ replaceButton.setEnabled(copy.versionindex != -1);
	4546	+
	4547	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4548	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4549	+
	4550	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4551	+ //copy.versionlist[copy.versionindex + 1] != null);
	4552	+
	4553	+ muteSlider = true;
	4554	+ versionSlider.setMinimum(0);
	4555	+ versionSlider.setMaximum(VersionCount() - 1);
	4556	+ versionSlider.setInteger(copy.versionindex);
	4557	+ versionSlider.setEnabled(copy.versionindex != -1);
	4558	+ muteSlider = false;
	4559	+
	4560	+ versionSliderPane.setVisible(true);
	4561	+ }
4401	4562	}
4402	4563
4403	4564	public boolean PreviousVersion()
..	..	@@ -4455,7 +4616,7 @@
4455	4616
4456	4617	public boolean Replace()
4457	4618	{
4458		- System.err.println("Replace");
	4619	+ //System.err.println("Replace");
4459	4620
4460	4621	//cRadio tab = GetCurrentTab();
4461	4622
..	..	@@ -4682,6 +4843,12 @@
4682	4843	// else
4683	4844	// applySelf(true);
4684	4845	// }
	4846	+
	4847	+ boolean Equal(double a, double b)
	4848	+ {
	4849	+ return Math.abs(a - b) < 0.001;
	4850	+ }
	4851	+
4685	4852	void applySelf0(boolean name)
4686	4853	{
4687	4854	if (name)
..	..	@@ -4731,29 +4898,52 @@
4731	4898	{
4732	4899	cMaterial mat = copy.material;
4733	4900
4734		- colorField.SetToolTipValue((mat.color));
4735		- saturationField.SetToolTipValue((mat.modulation));
4736		- metalnessField.SetToolTipValue((mat.metalness));
4737		- diffuseField.SetToolTipValue((mat.diffuse));
4738		- specularField.SetToolTipValue((mat.specular));
4739		- shininessField.SetToolTipValue((mat.shininess));
4740		- shiftField.SetToolTipValue((mat.shift));
4741		- ambientField.SetToolTipValue((mat.ambient));
4742		- lightareaField.SetToolTipValue((mat.lightarea));
4743		- diffusenessField.SetToolTipValue((mat.factor));
4744		- velvetField.SetToolTipValue((mat.velvet));
4745		- sheenField.SetToolTipValue((mat.sheen));
4746		- subsurfaceField.SetToolTipValue((mat.subsurface));
4747		- backlitField.SetToolTipValue((mat.bump));
4748		- anisoField.SetToolTipValue((mat.aniso));
4749		- anisoVField.SetToolTipValue((mat.anisoV));
4750		- cameraField.SetToolTipValue((mat.cameralight));
4751		- selfshadowField.SetToolTipValue((mat.diffuseness));
4752		- shadowField.SetToolTipValue((mat.shadow));
4753		- textureField.SetToolTipValue((mat.texture));
4754		- opacityField.SetToolTipValue((mat.opacity));
4755		- fakedepthField.SetToolTipValue((mat.fakedepth));
4756		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	4901	+ if (!Equal(colorField.getFloat(), mat.color))
	4902	+ colorField.SetToolTipValue((mat.color));
	4903	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4904	+ saturationField.SetToolTipValue((mat.modulation));
	4905	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4906	+ metalnessField.SetToolTipValue((mat.metalness));
	4907	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4908	+ diffuseField.SetToolTipValue((mat.diffuse));
	4909	+ if (!Equal(specularField.getFloat(), mat.specular))
	4910	+ specularField.SetToolTipValue((mat.specular));
	4911	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4912	+ shininessField.SetToolTipValue((mat.shininess));
	4913	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4914	+ shiftField.SetToolTipValue((mat.shift));
	4915	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4916	+ ambientField.SetToolTipValue((mat.ambient));
	4917	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4918	+ lightareaField.SetToolTipValue((mat.lightarea));
	4919	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4920	+ diffusenessField.SetToolTipValue((mat.factor));
	4921	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4922	+ velvetField.SetToolTipValue((mat.velvet));
	4923	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4924	+ sheenField.SetToolTipValue((mat.sheen));
	4925	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4926	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4927	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4928	+ backlitField.SetToolTipValue((mat.bump));
	4929	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4930	+ anisoField.SetToolTipValue((mat.aniso));
	4931	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4932	+ anisoVField.SetToolTipValue((mat.anisoV));
	4933	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4934	+ cameraField.SetToolTipValue((mat.cameralight));
	4935	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	4936	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4937	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	4938	+ shadowField.SetToolTipValue((mat.shadow));
	4939	+ if (!Equal(textureField.getFloat(), mat.texture))
	4940	+ textureField.SetToolTipValue((mat.texture));
	4941	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	4942	+ opacityField.SetToolTipValue((mat.opacity));
	4943	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	4944	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4945	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	4946	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4757	4947	}
4758	4948
4759	4949	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4788,7 +4978,7 @@
4788	4978
4789	4979	public void stateChanged(ChangeEvent e)
4790	4980	{
4791		- // assert(false);
	4981	+ // assert(false);
4792	4982	if (e.getSource() == versionSlider)
4793	4983	{
4794	4984	if (muteSlider)
..	..	@@ -5158,6 +5348,8 @@
5158	5348
5159	5349	if (previousVersionButton != null && copy.versionlist != null)
5160	5350	SetVersionStates();
	5351	+
	5352	+ cameraView.requestFocusInWindow();
5161	5353	}
5162	5354
5163	5355	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5189,7 +5381,7 @@
5189	5381	// group = (Composite) group.get(0);
5190	5382	// }
5191	5383
5192		- System.out.println("makeSomething of " + thing);
	5384	+ //System.out.println("makeSomething of " + thing);
5193	5385
5194	5386	/*
5195	5387	if (deselect && jList != null)
..	..	@@ -5543,6 +5735,7 @@
5543	5735
5544	5736	copy.versionlist = readobj.versionlist;
5545	5737	copy.versionindex = readobj.versionindex;
	5738	+ copy.versiontable = readobj.versiontable;
5546	5739
5547	5740	if (copy.versionlist == null)
5548	5741	{
..	..	@@ -5550,7 +5743,7 @@
5550	5743	copy.versionlist = new Object3D[100];
5551	5744	copy.versionindex = -1;
5552	5745
5553		- Save(true);
	5746	+ //Save(true);
5554	5747	}
5555	5748
5556	5749	//? SetUndoStates();
..	..	@@ -5898,6 +6091,7 @@
5898	6091	boolean materialFlushed;
5899	6092	Object3D latestObject;
5900	6093
	6094	+ cGridBag transformPanel;
5901	6095	cGridBag XYZPanel;
5902	6096
5903	6097	JSplitPane gridPanel;