~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -43,6 +43,50 @@
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	+
	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	+
46	90	public cGridBag GetSeparator()
47	91	{
48	92	cGridBag separator = new cGridBag();
..	..	@@ -54,7 +98,10 @@
54	98	cButton GetButton(String name, boolean border)
55	99	{
56	100	ImageIcon icon = GetIcon(name);
57		- 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);
58	105	}
59	106
60	107	cLabel GetLabel(String name, boolean border)
..	..	@@ -77,7 +124,7 @@
77	124
78	125	static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
79	126
80		- ImageIcon GetIcon(String name)
	127	+ static ImageIcon GetIcon(String name)
81	128	{
82	129	javax.swing.ImageIcon iconCache = icons.get(name);
83	130	if (iconCache != null)
..	..	@@ -87,8 +134,14 @@
87	134
88	135	try
89	136	{
90		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
91		-
	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	+
92	145	// if (image.getWidth() > 48 && image.getHeight() > 48)
93	146	// {
94	147	// BufferedImage resized = new BufferedImage(48, 48, image.getType());
..	..	@@ -330,14 +383,6 @@
330	383	client = inClient;
331	384	copy = client;
332	385
333		- if (copy.versionlist == null)
334		- {
335		- copy.versionlist = new Object3D[100];
336		- copy.versionindex = -1;
337		-
338		-// Save(true);
339		- }
340		-
341	386	SetupUI2(callee.GetEditor());
342	387	}
343	388
..	..	@@ -359,7 +404,8 @@
359	404	//parent = p;
360	405
361	406	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
362		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	407	+ if (Globals.DEBUG)
	408	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
363	409	//gd.setFullScreenWindow(this);
364	410	//setResizable(false);
365	411	//if (!isDisplayable())
..	..	@@ -396,6 +442,9 @@
396	442
397	443	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
398	444
	445	+ // This is to refresh the UI of the material panel.
	446	+ boolean patchMaterial;
	447	+
399	448	void SetupMenu()
400	449	{
401	450	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -409,8 +458,11 @@
409	458	importOBJItem.addActionListener(this);
410	459	import3DSItem = menu.add(new MenuItem("3DS file..."));
411	460	import3DSItem.addActionListener(this);
	461	+ if (Globals.ADVANCED)
	462	+ {
412	463	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
413	464	importVRMLX3DItem.addActionListener(this);
	465	+ }
414	466	menu.add("-");
415	467	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
416	468	importGFDItem.addActionListener(this);
..	..	@@ -921,18 +973,29 @@
921	973	boolean temp = CameraPane.SWITCH;
922	974	CameraPane.SWITCH = false;
923	975
924		- object.ExtractBigData(versiontable);
	976	+ if (Grafreed.grafreed.universe.versiontable == null)
	977	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	978	+
	979	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
925	980	// if (copy == client)
926	981
927	982	Object3D versions[] = object.versionlist;
	983	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
928	984	object.versionlist = null;
	985	+ object.versiontable = null;
	986	+
	987	+ Object3D parent = object.parent;
	988	+ object.parent = null;
929	989
930	990	//byte[] compress = Compress(copy);
931	991	Object3D compress = (Object3D)Grafreed.clone(object);
932	992
933		- object.versionlist = versions;
	993	+ object.parent = parent;
934	994
935		- object.RestoreBigData(versiontable);
	995	+ object.versionlist = versions;
	996	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	997	+
	998	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
936	999
937	1000	CameraPane.SWITCH = temp;
938	1001
..	..	@@ -1271,7 +1334,7 @@
1271	1334
1272	1335	//if (copy.pinned)
1273	1336	{
1274		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1337	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1275	1338	pinButton.setSelected(copy.pinned);
1276	1339	cGridBag t = new cGridBag();
1277	1340	t.preferredWidth = 2;
..	..	@@ -1294,14 +1357,14 @@
1294	1357
1295	1358	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1296	1359	liveCB.setToolTipText("Animate object");
	1360	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1361	+ markCB.setToolTipText("Set target transform");
1297	1362	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1298	1363	selectableCB.setToolTipText("Make object selectable");
1299	1364	// Return();
1300	1365
1301	1366	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1302	1367	hideCB.setToolTipText("Hide object");
1303		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1304		- markCB.setToolTipText("As animation target transform");
1305	1368
1306	1369	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1307	1370
..	..	@@ -1503,22 +1566,9 @@
1503	1566
1504	1567	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1505	1568	{
1506		- System.out.println("CREATE CAMERAS");
1507		- cams = new cTemplate();
1508		- cams.name = "Cameras";
1509		- copy.insertElementAt(cams, 0);
1510		- //cams.parent = copy;
1511		-
1512		- cam = new Camera(); // LA.newVector(3, 2, 1));
1513		- cams.addChild(cam);
1514		- cam = new Camera(1);
1515		- cams.addChild(cam);
1516		- cam = new Camera(2);
1517		- cams.addChild(cam);
1518		- cam = new Camera(3);
1519		- cams.addChild(cam);
1520		- cam = new Camera(4); // Light
1521		- cams.addChild(cam);
	1569	+ if (Globals.DEBUG)
	1570	+ System.out.println("CREATE CAMERAS");
	1571	+ cams = CreateCameras();
1522	1572	} else
1523	1573	{
1524	1574	cams = (cGroup) copy.get(0);
..	..	@@ -1584,6 +1634,45 @@
1584	1634	//frontView.object = copy;
1585	1635	//sideView.object = copy;
1586	1636
	1637	+ transformPanel = new cGridBag().setVertical(true);
	1638	+
	1639	+ cGridBag resetTransformPanel = new cGridBag();
	1640	+
	1641	+ resetTransformPanel.preferredHeight = 2;
	1642	+
	1643	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1644	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1645	+ resetTransform.addMouseListener(new MouseAdapter()
	1646	+ {
	1647	+ public void mouseClicked(MouseEvent e)
	1648	+ {
	1649	+ ResetTransform();
	1650	+ }
	1651	+ });
	1652	+ resetTransformPanel.add(resetTransform);
	1653	+
	1654	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1655	+ resetTransform.setToolTipText("Reset Translation only");
	1656	+ resetTransform.addMouseListener(new MouseAdapter()
	1657	+ {
	1658	+ public void mouseClicked(MouseEvent e)
	1659	+ {
	1660	+ ResetTransform(1);
	1661	+ }
	1662	+ });
	1663	+ resetTransformPanel.add(resetTransform);
	1664	+
	1665	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1666	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1667	+ resetTransform.addMouseListener(new MouseAdapter()
	1668	+ {
	1669	+ public void mouseClicked(MouseEvent e)
	1670	+ {
	1671	+ ResetTransform(2);
	1672	+ }
	1673	+ });
	1674	+ resetTransformPanel.add(resetTransform);
	1675	+
1587	1676	XYZPanel = new cGridBag().setVertical(true);
1588	1677	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1589	1678
..	..	@@ -1593,6 +1682,9 @@
1593	1682	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1594	1683	//XYZPanel.setName("XYZ");
1595	1684
	1685	+ transformPanel.add(resetTransformPanel);
	1686	+ transformPanel.add(XYZPanel);
	1687	+
1596	1688	/*
1597	1689	gridPanel = new JPanel(); //new BorderLayout());
1598	1690	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1600,12 +1692,12 @@
1600	1692	gridPanel.add(cameraView);
1601	1693	gridPanel.add(XYZPanel);
1602	1694	*/
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);
	1695	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1696	+// gridPanel.setContinuousLayout(true);
	1697	+// gridPanel.setOneTouchExpandable(true);
	1698	+// gridPanel.setDividerLocation(1.0);
	1699	+// gridPanel.setDividerSize(9);
	1700	+// gridPanel.setResizeWeight(0.85);
1609	1701
1610	1702	// aConstraints.weighty = 0;
1611	1703	//System.out.println("THIS = " + this);
..	..	@@ -1628,30 +1720,34 @@
1628	1720
1629	1721	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1630	1722	//tmp.setName("Edit");
1631		- objectPanel.add(materialPanel);
1632		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1633		- objectPanel.setToolTipTextAt(0, "Material");
1634		-
	1723	+ objectPanel.add(skyboxPanel);
	1724	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1725	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1726	+
1635	1727	objectPanel.add(toolboxPanel);
1636	1728	objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1637	1729	objectPanel.setToolTipTextAt(1, "Objects & textures");
1638	1730
1639		- objectPanel.add(skyboxPanel);
1640		- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1641		- objectPanel.setToolTipTextAt(2, "Backgrounds");
1642		-
	1731	+ objectPanel.add(materialPanel);
	1732	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1733	+ objectPanel.setToolTipTextAt(2, "Material");
	1734	+
1643	1735	// JPanel north = new JPanel(new BorderLayout());
1644	1736	// north.setName("Edit");
1645	1737	// north.add(ctrlPanel, BorderLayout.NORTH);
1646	1738	// objectPanel.add(north);
1647	1739	objectPanel.add(editPanel);
1648		- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1740	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1649	1741	objectPanel.setToolTipTextAt(3, "Edit controls");
1650	1742
1651		- objectPanel.add(XYZPanel);
	1743	+ objectPanel.add(transformPanel);
1652	1744	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1653		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1745	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1654	1746
	1747	+ patchMaterial = true;
	1748	+ cameraView.patchMaterial = this;
	1749	+ objectPanel.setSelectedIndex(2);
	1750	+
1655	1751	/*
1656	1752	aConstraints.gridx = 0;
1657	1753	aConstraints.gridwidth = 1;
..	..	@@ -1671,7 +1767,7 @@
1671	1767	scrollpane.addMouseWheelListener(this); // Default not fast enough
1672	1768
1673	1769	/JTabbedPane/ scenePanel = new cGridBag();
1674		- scenePanel.preferredWidth = 5;
	1770	+ scenePanel.preferredWidth = 6;
1675	1771
1676	1772	JTabbedPane tabbedPane = new JTabbedPane();
1677	1773	tabbedPane.add(scrollpane);
..	..	@@ -1682,17 +1778,109 @@
1682	1778
1683	1779	AddOptions(optionsPanel); //, aConstraints);
1684	1780
1685		- tabbedPane.add(optionsPanel);
1686		-
1687	1781	tabbedPane.add(FSPane = new cFileSystemPane(this));
1688	1782
	1783	+ tabbedPane.add(optionsPanel);
	1784	+
1689	1785	scenePanel.add(tabbedPane);
1690	1786
1691		- //if (Globals.ADVANCED)
1692		-// tabbedPane.add(infoPanel);
1693		-// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1694		-// tabbedPane.setToolTipTextAt(3, "Information");
	1787	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1788	+ creditsPanel.setName("Credits");
1695	1789
	1790	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1791	+ creditsPanel.add(ogaLabel);
	1792	+
	1793	+ cButton creditButton;
	1794	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1795	+ creditButton.setToolTipText("https://opengameart.org");
	1796	+
	1797	+ creditButton.addMouseListener(new MouseAdapter()
	1798	+ {
	1799	+ public void mouseClicked(MouseEvent e)
	1800	+ {
	1801	+ try
	1802	+ {
	1803	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1804	+ } catch (Exception e1)
	1805	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1806	+ {
	1807	+ e1.printStackTrace();
	1808	+ }
	1809	+ }
	1810	+ });
	1811	+
	1812	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1813	+ creditsPanel.add(ogaLabel);
	1814	+
	1815	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1816	+ creditButton.setToolTipText("https://3delicious.net");
	1817	+
	1818	+ creditButton.addMouseListener(new MouseAdapter()
	1819	+ {
	1820	+ public void mouseClicked(MouseEvent e)
	1821	+ {
	1822	+ try
	1823	+ {
	1824	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1825	+ } catch (Exception e1)
	1826	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1827	+ {
	1828	+ e1.printStackTrace();
	1829	+ }
	1830	+ }
	1831	+ });
	1832	+
	1833	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1834	+ creditButton.setToolTipText("https://archive3d.net");
	1835	+
	1836	+ creditButton.addMouseListener(new MouseAdapter()
	1837	+ {
	1838	+ public void mouseClicked(MouseEvent e)
	1839	+ {
	1840	+ try
	1841	+ {
	1842	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1843	+ } catch (Exception e1)
	1844	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1845	+ {
	1846	+ e1.printStackTrace();
	1847	+ }
	1848	+ }
	1849	+ });
	1850	+
	1851	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1852	+ creditButton.setToolTipText("https://turbosquid.com");
	1853	+
	1854	+ creditButton.addMouseListener(new MouseAdapter()
	1855	+ {
	1856	+ public void mouseClicked(MouseEvent e)
	1857	+ {
	1858	+ try
	1859	+ {
	1860	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1861	+ } catch (Exception e1)
	1862	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1863	+ {
	1864	+ e1.printStackTrace();
	1865	+ }
	1866	+ }
	1867	+ });
	1868	+
	1869	+ for (int i=6; --i>=0;)
	1870	+ {
	1871	+ creditsPanel.add(new cGridBag());
	1872	+ }
	1873	+
	1874	+ tabbedPane.add(creditsPanel);
	1875	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1876	+
	1877	+ if (Globals.ADVANCED)
	1878	+ {
	1879	+ objectPanel.add(infoPanel);
	1880	+ objectPanel.setIconAt(5, GetIcon("icons/info.png"));
	1881	+ objectPanel.setToolTipTextAt(4, "Information");
	1882	+ }
	1883	+
1696	1884	/*
1697	1885	cTree jTree = new cTree(null);
1698	1886	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1713,13 +1901,13 @@
1713	1901	jtp.add(tree);
1714	1902	*/
1715	1903
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");
	1904	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1905	+// bigPanel.setContinuousLayout(true);
	1906	+// bigPanel.setOneTouchExpandable(true);
	1907	+// bigPanel.setDividerLocation(0.8);
	1908	+// bigPanel.setDividerSize(15);
	1909	+// bigPanel.setResizeWeight(0.15);
	1910	+// bigPanel.setName("Scene");
1723	1911
1724	1912	//bigPanel.setLayout(new BorderLayout());
1725	1913	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1789,7 +1977,7 @@
1789	1977
1790	1978	frame.getContentPane().setLayout(new BorderLayout());
1791	1979	/**/
1792		- JTabbedPane worldPane = new JTabbedPane();
	1980	+ //JTabbedPane worldPane = new JTabbedPane();
1793	1981	//worldPane.add(bigPanel);
1794	1982	//worldPane.add(worldPanel);
1795	1983	/**/
..	..	@@ -1803,7 +1991,7 @@
1803	1991
1804	1992	cameraView.requestFocusInWindow();
1805	1993
1806		- gridPanel.setDividerLocation(1.0);
	1994	+// gridPanel.setDividerLocation(1.0);
1807	1995
1808	1996	frame.validate();
1809	1997
..	..	@@ -1838,7 +2026,7 @@
1838	2026	{
1839	2027	cGridBag presetpanel = new cGridBag().setVertical(true);
1840	2028
1841		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	2029	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1842	2030	skin.setToolTipText("Skin");
1843	2031	skin.addMouseListener(new MouseAdapter()
1844	2032	{
..	..	@@ -1849,7 +2037,15 @@
1849	2037
1850	2038	// Skin
1851	2039	colorField.setFloat(material.color);
1852		- saturationField.setFloat(material.modulation);
	2040	+ float saturation = material.modulation;
	2041	+
	2042	+ if (!cameraView.Skinshader)
	2043	+ {
	2044	+ saturation /= 1.5;
	2045	+ }
	2046	+
	2047	+ saturationField.setFloat(saturation);
	2048	+
1853	2049	subsurfaceField.setFloat(material.subsurface);
1854	2050	selfshadowField.setFloat(material.diffuseness);
1855	2051	diffusenessField.setFloat(material.factor);
..	..	@@ -1868,7 +2064,7 @@
1868	2064	});
1869	2065	presetpanel.add(skin);
1870	2066
1871		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2067	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1872	2068	lambert.setToolTipText("Diffuse");
1873	2069	lambert.addMouseListener(new MouseAdapter()
1874	2070	{
..	..	@@ -1886,7 +2082,7 @@
1886	2082	});
1887	2083	presetpanel.add(lambert);
1888	2084
1889		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2085	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1890	2086	diffuse2.setToolTipText("Diffuse2");
1891	2087	diffuse2.addMouseListener(new MouseAdapter()
1892	2088	{
..	..	@@ -1904,7 +2100,7 @@
1904	2100	});
1905	2101	presetpanel.add(diffuse2);
1906	2102
1907		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2103	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1908	2104	diffusemoon.setToolTipText("Moon");
1909	2105	diffusemoon.addMouseListener(new MouseAdapter()
1910	2106	{
..	..	@@ -1922,7 +2118,7 @@
1922	2118	});
1923	2119	presetpanel.add(diffusemoon);
1924	2120
1925		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2121	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1926	2122	diffusemoon2.setToolTipText("Moon2");
1927	2123	diffusemoon2.addMouseListener(new MouseAdapter()
1928	2124	{
..	..	@@ -1940,7 +2136,7 @@
1940	2136	});
1941	2137	presetpanel.add(diffusemoon2);
1942	2138
1943		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2139	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1944	2140	diffusemoon3.setToolTipText("Moon3");
1945	2141	diffusemoon3.addMouseListener(new MouseAdapter()
1946	2142	{
..	..	@@ -1958,7 +2154,7 @@
1958	2154	});
1959	2155	presetpanel.add(diffusemoon3);
1960	2156
1961		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2157	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1962	2158	diffusesheen.setToolTipText("Sheen");
1963	2159	diffusesheen.addMouseListener(new MouseAdapter()
1964	2160	{
..	..	@@ -1975,7 +2171,7 @@
1975	2171	});
1976	2172	presetpanel.add(diffusesheen);
1977	2173
1978		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2174	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
1979	2175	rough.setToolTipText("Rough metal");
1980	2176	rough.addMouseListener(new MouseAdapter()
1981	2177	{
..	..	@@ -1993,7 +2189,7 @@
1993	2189	});
1994	2190	presetpanel.add(rough);
1995	2191
1996		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2192	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
1997	2193	rough2.setToolTipText("Medium metal");
1998	2194	rough2.addMouseListener(new MouseAdapter()
1999	2195	{
..	..	@@ -2011,7 +2207,7 @@
2011	2207	});
2012	2208	presetpanel.add(rough2);
2013	2209
2014		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2210	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
2015	2211	shini0.setToolTipText("Shiny");
2016	2212	shini0.addMouseListener(new MouseAdapter()
2017	2213	{
..	..	@@ -2029,7 +2225,7 @@
2029	2225	});
2030	2226	presetpanel.add(shini0);
2031	2227
2032		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2228	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
2033	2229	shini1.setToolTipText("Shiny2");
2034	2230	shini1.addMouseListener(new MouseAdapter()
2035	2231	{
..	..	@@ -2047,7 +2243,7 @@
2047	2243	});
2048	2244	presetpanel.add(shini1);
2049	2245
2050		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2246	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2051	2247	shini2.setToolTipText("Shiny3");
2052	2248	shini2.addMouseListener(new MouseAdapter()
2053	2249	{
..	..	@@ -2065,7 +2261,7 @@
2065	2261	});
2066	2262	presetpanel.add(shini2);
2067	2263
2068		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2264	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2069	2265	aniso.setToolTipText("AnisoU");
2070	2266	aniso.addMouseListener(new MouseAdapter()
2071	2267	{
..	..	@@ -2083,7 +2279,7 @@
2083	2279	});
2084	2280	presetpanel.add(aniso);
2085	2281
2086		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2282	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2087	2283	aniso2.setToolTipText("AnisoV");
2088	2284	aniso2.addMouseListener(new MouseAdapter()
2089	2285	{
..	..	@@ -2101,7 +2297,7 @@
2101	2297	});
2102	2298	presetpanel.add(aniso2);
2103	2299
2104		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2300	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2105	2301	aniso3.setToolTipText("AnisoUV");
2106	2302	aniso3.addMouseListener(new MouseAdapter()
2107	2303	{
..	..	@@ -2119,7 +2315,7 @@
2119	2315	});
2120	2316	presetpanel.add(aniso3);
2121	2317
2122		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2318	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2123	2319	velvet0.setToolTipText("Velvet");
2124	2320	velvet0.addMouseListener(new MouseAdapter()
2125	2321	{
..	..	@@ -2141,7 +2337,7 @@
2141	2337	});
2142	2338	presetpanel.add(velvet0);
2143	2339
2144		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2340	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2145	2341	bump0.setToolTipText("Bump texture");
2146	2342	bump0.addMouseListener(new MouseAdapter()
2147	2343	{
..	..	@@ -2160,7 +2356,22 @@
2160	2356	});
2161	2357	presetpanel.add(bump0);
2162	2358
2163		- cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2359	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2360	+ borderShader.setToolTipText("Border fade");
	2361	+ borderShader.addMouseListener(new MouseAdapter()
	2362	+ {
	2363	+ public void mouseClicked(MouseEvent e)
	2364	+ {
	2365	+ borderfadeField.setFloat(0.4);
	2366	+ opacityField.setFloat(0.75);
	2367	+
	2368	+ materialtouched = true;
	2369	+ applySelf();
	2370	+ }
	2371	+ });
	2372	+ presetpanel.add(borderShader);
	2373	+
	2374	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2164	2375	halo.setToolTipText("Halo");
2165	2376	halo.addMouseListener(new MouseAdapter()
2166	2377	{
..	..	@@ -2177,7 +2388,7 @@
2177	2388	});
2178	2389	presetpanel.add(halo);
2179	2390
2180		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2391	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2181	2392	candle.setToolTipText("Candle");
2182	2393	candle.addMouseListener(new MouseAdapter()
2183	2394	{
..	..	@@ -2199,7 +2410,7 @@
2199	2410	});
2200	2411	presetpanel.add(candle);
2201	2412
2202		- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2413	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2203	2414	shadowShader.setToolTipText("Shadow");
2204	2415	shadowShader.addMouseListener(new MouseAdapter()
2205	2416	{
..	..	@@ -2218,6 +2429,48 @@
2218	2429	});
2219	2430	presetpanel.add(shadowShader);
2220	2431
	2432	+ cLabel para0 = GetLabel("icons/shadericons/parallax0.png", !Globals.NIMBUSLAF);
	2433	+ para0.setToolTipText("No parallax");
	2434	+ para0.addMouseListener(new MouseAdapter()
	2435	+ {
	2436	+ public void mouseClicked(MouseEvent e)
	2437	+ {
	2438	+ parallaxField.setFloat(0.125);
	2439	+
	2440	+ materialtouched = true;
	2441	+ applySelf();
	2442	+ }
	2443	+ });
	2444	+ presetpanel.add(para0);
	2445	+
	2446	+ cLabel para1 = GetLabel("icons/shadericons/parallax1.png", !Globals.NIMBUSLAF);
	2447	+ para1.setToolTipText("With parallax");
	2448	+ para1.addMouseListener(new MouseAdapter()
	2449	+ {
	2450	+ public void mouseClicked(MouseEvent e)
	2451	+ {
	2452	+ parallaxField.setFloat(0.13);
	2453	+
	2454	+ materialtouched = true;
	2455	+ applySelf();
	2456	+ }
	2457	+ });
	2458	+ presetpanel.add(para1);
	2459	+
	2460	+ cLabel para2 = GetLabel("icons/shadericons/parallax2.png", !Globals.NIMBUSLAF);
	2461	+ para2.setToolTipText("Reset parallax");
	2462	+ para2.addMouseListener(new MouseAdapter()
	2463	+ {
	2464	+ public void mouseClicked(MouseEvent e)
	2465	+ {
	2466	+ parallaxField.setFloat(0.14);
	2467	+
	2468	+ materialtouched = true;
	2469	+ applySelf();
	2470	+ }
	2471	+ });
	2472	+ presetpanel.add(para2);
	2473	+
2221	2474	cGridBag panel = new cGridBag().setVertical(true);
2222	2475
2223	2476	presetpanel.preferredWidth = 1;
..	..	@@ -2234,19 +2487,19 @@
2234	2487
2235	2488	cGridBag editBar = new cGridBag().setVertical(false);
2236	2489
2237		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2490	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2238	2491	createMaterialButton.setToolTipText("Create material");
2239	2492
2240	2493	/*
2241	2494	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2242	2495	*/
2243	2496
2244		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2497	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2245	2498	clearMaterialButton.setToolTipText("Clear material");
2246	2499
2247	2500	if (Globals.ADVANCED)
2248	2501	{
2249		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2502	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2250	2503	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2251	2504	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2252	2505	}
..	..	@@ -2267,9 +2520,20 @@
2267	2520
2268	2521	cGridBag huepanel = new cGridBag();
2269	2522	cGridBag huelabel = new cGridBag();
2270		- skin = GetLabel("icons/hue.png", false);
2271		- skin.fit = true;
2272		- huelabel.add(skin);
	2523	+ cLabel hue = GetLabel("icons/hue.png", false);
	2524	+ hue.fit = true;
	2525	+
	2526	+ hue.addMouseListener(new MouseAdapter()
	2527	+ {
	2528	+ public void mousePressed(MouseEvent e)
	2529	+ {
	2530	+ int x = e.getX();
	2531	+
	2532	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2533	+ }
	2534	+ });
	2535	+
	2536	+ huelabel.add(hue);
2273	2537	huelabel.preferredWidth = 20;
2274	2538	huepanel.add(new cGridBag()); // Label
2275	2539	huepanel.add(huelabel); // Field/slider
..	..	@@ -2452,6 +2716,12 @@
2452	2716	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
2453	2717	colorSection.add(backlit);
2454	2718
	2719	+ cGridBag parallax = new cGridBag();
	2720	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2721	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2722	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.25, -0.125)); // , aConstraints);
	2723	+ colorSection.add(parallax);
	2724	+
2455	2725	//panel.add(new JSeparator());
2456	2726
2457	2727	//panel.add(globalSection);
..	..	@@ -3503,6 +3773,7 @@
3503	3773	shadowField.setFloat(mat.shadow);
3504	3774	textureField.setFloat(mat.texture);
3505	3775	opacityField.setFloat(mat.opacity);
	3776	+ parallaxField.setFloat(mat.parallax + 0.125f);
3506	3777	fakedepthField.setFloat(mat.fakedepth);
3507	3778	shadowbiasField.setFloat(mat.shadowbias);
3508	3779	bumpField.setInteger(1); // dec 2013
..	..	@@ -3545,32 +3816,8 @@
3545	3816
3546	3817	if (multiplyToggle != null)
3547	3818	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		- }
	3819	+
	3820	+ AllocProjectedVertices(object);
3574	3821
3575	3822	SetMaterial(mat, object.projectedVertices);
3576	3823	}
..	..	@@ -3880,7 +4127,7 @@
3880	4127	//System.out.println("ObjEditor " + event);
3881	4128	applySelf0(true);
3882	4129	//parent.applySelf();
3883		- objEditor.refreshContents();
	4130	+ // conflicts with requestFocus objEditor.refreshContents();
3884	4131	} else if (source == resetButton)
3885	4132	{
3886	4133	CameraPane.fullreset = true;
..	..	@@ -4060,11 +4307,18 @@
4060	4307
4061	4308	void New()
4062	4309	{
4063		- while (copy.Size() > 1)
	4310	+ while (copy.Size() > 0)
4064	4311	{
4065		- copy.remove(1);
	4312	+ copy.remove(0);
4066	4313	}
4067	4314
	4315	+ copy.selection.clear();
	4316	+
	4317	+ if (copy == Grafreed.grafreed.universe)
	4318	+ {
	4319	+ CreateCameras();
	4320	+ cameraView.SetCamera(GetCamera(copy, 0));
	4321	+ }
4068	4322	ResetModel();
4069	4323	objEditor.refreshContents();
4070	4324	}
..	..	@@ -4192,8 +4446,6 @@
4192	4446	return true;
4193	4447	}
4194	4448
4195		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4196		-
4197	4449	void DeleteVersion()
4198	4450	{
4199	4451	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4201,7 +4453,11 @@
4201	4453	copy.versionlist[i] = copy.versionlist[i+1];
4202	4454	}
4203	4455
4204		- CopyChanged();
	4456	+ if (copy.versionlist[copy.versionindex] == null)
	4457	+ copy.versionindex -= 1;
	4458	+
	4459	+ if (copy.versionindex != -1)
	4460	+ CopyChanged();
4205	4461
4206	4462	SetVersionStates();
4207	4463	}
..	..	@@ -4211,7 +4467,11 @@
4211	4467	System.err.println("Save");
4212	4468	Replace();
4213	4469
4214		- //cRadio tab = GetCurrentTab();
	4470	+ if (copy.versionlist == null)
	4471	+ {
	4472	+ copy.versionlist = new Object3D[100];
	4473	+ copy.versionindex = -1;
	4474	+ }
4215	4475
4216	4476	Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4217	4477
..	..	@@ -4314,7 +4574,7 @@
4314	4574	boolean temp = CameraPane.SWITCH;
4315	4575	CameraPane.SWITCH = false;
4316	4576
4317		- copy.ExtractBigData(versiontable);
	4577	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4318	4578
4319	4579	copy.clear();
4320	4580
..	..	@@ -4326,7 +4586,7 @@
4326	4586	copy.add(obj.get(i));
4327	4587	}
4328	4588
4329		- copy.RestoreBigData(versiontable);
	4589	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4330	4590
4331	4591	CameraPane.SWITCH = temp;
4332	4592
..	..	@@ -4376,6 +4636,8 @@
4376	4636	return count;
4377	4637	}
4378	4638
	4639	+ public cGridBag versionSliderPane;
	4640	+
4379	4641	void SetVersionStates()
4380	4642	{
4381	4643	//if (true)
..	..	@@ -4383,21 +4645,36 @@
4383	4645
4384	4646	//cRadio tab = GetCurrentTab();
4385	4647
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;
	4648	+ if (copy.versionindex == -2)
	4649	+ {
	4650	+ saveVersionButton.setEnabled(false);
	4651	+ restoreButton.setEnabled(false);
	4652	+ replaceButton.setEnabled(false);
	4653	+ previousVersionButton.setEnabled(false);
	4654	+ nextVersionButton.setEnabled(false);
	4655	+ deleteVersionButton.setEnabled(false);
	4656	+ versionSliderPane.setVisible(false);
	4657	+ }
	4658	+ else
	4659	+ {
	4660	+ restoreButton.setEnabled(copy.versionindex != -1);
	4661	+ replaceButton.setEnabled(copy.versionindex != -1);
	4662	+
	4663	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4664	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4665	+
	4666	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4667	+ //copy.versionlist[copy.versionindex + 1] != null);
	4668	+
	4669	+ muteSlider = true;
	4670	+ versionSlider.setMinimum(0);
	4671	+ versionSlider.setMaximum(VersionCount() - 1);
	4672	+ versionSlider.setInteger(copy.versionindex);
	4673	+ versionSlider.setEnabled(copy.versionindex != -1);
	4674	+ muteSlider = false;
	4675	+
	4676	+ versionSliderPane.setVisible(true);
	4677	+ }
4401	4678	}
4402	4679
4403	4680	public boolean PreviousVersion()
..	..	@@ -4455,7 +4732,7 @@
4455	4732
4456	4733	public boolean Replace()
4457	4734	{
4458		- System.err.println("Replace");
	4735	+ //System.err.println("Replace");
4459	4736
4460	4737	//cRadio tab = GetCurrentTab();
4461	4738
..	..	@@ -4682,6 +4959,12 @@
4682	4959	// else
4683	4960	// applySelf(true);
4684	4961	// }
	4962	+
	4963	+ boolean Equal(double a, double b)
	4964	+ {
	4965	+ return Math.abs(a - b) < 0.001;
	4966	+ }
	4967	+
4685	4968	void applySelf0(boolean name)
4686	4969	{
4687	4970	if (name)
..	..	@@ -4719,6 +5002,7 @@
4719	5002	current.shadow = (float) shadowField.getFloat();
4720	5003	current.texture = (float) textureField.getFloat();
4721	5004	current.opacity = (float) opacityField.getFloat();
	5005	+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
4722	5006	current.fakedepth = (float) fakedepthField.getFloat();
4723	5007	current.shadowbias = (float) shadowbiasField.getFloat();
4724	5008
..	..	@@ -4731,29 +5015,54 @@
4731	5015	{
4732	5016	cMaterial mat = copy.material;
4733	5017
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));
	5018	+ if (!Equal(colorField.getFloat(), mat.color))
	5019	+ colorField.SetToolTipValue((mat.color));
	5020	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	5021	+ saturationField.SetToolTipValue((mat.modulation));
	5022	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	5023	+ metalnessField.SetToolTipValue((mat.metalness));
	5024	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	5025	+ diffuseField.SetToolTipValue((mat.diffuse));
	5026	+ if (!Equal(specularField.getFloat(), mat.specular))
	5027	+ specularField.SetToolTipValue((mat.specular));
	5028	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	5029	+ shininessField.SetToolTipValue((mat.shininess));
	5030	+ if (!Equal(shiftField.getFloat(), mat.shift))
	5031	+ shiftField.SetToolTipValue((mat.shift));
	5032	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	5033	+ ambientField.SetToolTipValue((mat.ambient));
	5034	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	5035	+ lightareaField.SetToolTipValue((mat.lightarea));
	5036	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	5037	+ diffusenessField.SetToolTipValue((mat.factor));
	5038	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	5039	+ velvetField.SetToolTipValue((mat.velvet));
	5040	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	5041	+ sheenField.SetToolTipValue((mat.sheen));
	5042	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	5043	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	5044	+ if (!Equal(backlitField.getFloat(), mat.bump))
	5045	+ backlitField.SetToolTipValue((mat.bump));
	5046	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5047	+ anisoField.SetToolTipValue((mat.aniso));
	5048	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5049	+ anisoVField.SetToolTipValue((mat.anisoV));
	5050	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5051	+ cameraField.SetToolTipValue((mat.cameralight));
	5052	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5053	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5054	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5055	+ shadowField.SetToolTipValue((mat.shadow));
	5056	+ if (!Equal(textureField.getFloat(), mat.texture))
	5057	+ textureField.SetToolTipValue((mat.texture));
	5058	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5059	+ opacityField.SetToolTipValue((mat.opacity));
	5060	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5061	+ parallaxField.SetToolTipValue((mat.parallax));
	5062	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5063	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5064	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5065	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4757	5066	}
4758	5067
4759	5068	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4788,7 +5097,7 @@
4788	5097
4789	5098	public void stateChanged(ChangeEvent e)
4790	5099	{
4791		- // assert(false);
	5100	+ // assert(false);
4792	5101	if (e.getSource() == versionSlider)
4793	5102	{
4794	5103	if (muteSlider)
..	..	@@ -5158,6 +5467,8 @@
5158	5467
5159	5468	if (previousVersionButton != null && copy.versionlist != null)
5160	5469	SetVersionStates();
	5470	+
	5471	+ cameraView.requestFocusInWindow();
5161	5472	}
5162	5473
5163	5474	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5189,7 +5500,7 @@
5189	5500	// group = (Composite) group.get(0);
5190	5501	// }
5191	5502
5192		- System.out.println("makeSomething of " + thing);
	5503	+ //System.out.println("makeSomething of " + thing);
5193	5504
5194	5505	/*
5195	5506	if (deselect && jList != null)
..	..	@@ -5543,6 +5854,7 @@
5543	5854
5544	5855	copy.versionlist = readobj.versionlist;
5545	5856	copy.versionindex = readobj.versionindex;
	5857	+ copy.versiontable = readobj.versiontable;
5546	5858
5547	5859	if (copy.versionlist == null)
5548	5860	{
..	..	@@ -5550,7 +5862,7 @@
5550	5862	copy.versionlist = new Object3D[100];
5551	5863	copy.versionindex = -1;
5552	5864
5553		- Save(true);
	5865	+ //Save(true);
5554	5866	}
5555	5867
5556	5868	//? SetUndoStates();
..	..	@@ -5898,6 +6210,7 @@
5898	6210	boolean materialFlushed;
5899	6211	Object3D latestObject;
5900	6212
	6213	+ cGridBag transformPanel;
5901	6214	cGridBag XYZPanel;
5902	6215
5903	6216	JSplitPane gridPanel;
..	..	@@ -6002,6 +6315,8 @@
6002	6315	cNumberSlider textureField;
6003	6316	JLabel opacityLabel;
6004	6317	cNumberSlider opacityField;
	6318	+ JLabel parallaxLabel;
	6319	+ cNumberSlider parallaxField;
6005	6320	JLabel fakedepthLabel;
6006	6321	cNumberSlider fakedepthField;
6007	6322	JLabel shadowbiasLabel;