~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,7 +134,7 @@
87	134
88	135	try
89	136	{
90		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	137	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
91	138
92	139	// if (image.getWidth() > 48 && image.getHeight() > 48)
93	140	// {
..	..	@@ -359,7 +406,8 @@
359	406	//parent = p;
360	407
361	408	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
362		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	409	+ if (Globals.DEBUG)
	410	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
363	411	//gd.setFullScreenWindow(this);
364	412	//setResizable(false);
365	413	//if (!isDisplayable())
..	..	@@ -396,6 +444,9 @@
396	444
397	445	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
398	446
	447	+ // This is to refresh the UI of the material panel.
	448	+ boolean patchMaterial;
	449	+
399	450	void SetupMenu()
400	451	{
401	452	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -409,8 +460,11 @@
409	460	importOBJItem.addActionListener(this);
410	461	import3DSItem = menu.add(new MenuItem("3DS file..."));
411	462	import3DSItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
412	465	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
413	466	importVRMLX3DItem.addActionListener(this);
	467	+ }
414	468	menu.add("-");
415	469	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
416	470	importGFDItem.addActionListener(this);
..	..	@@ -921,18 +975,29 @@
921	975	boolean temp = CameraPane.SWITCH;
922	976	CameraPane.SWITCH = false;
923	977
924		- object.ExtractBigData(versiontable);
	978	+ if (Grafreed.grafreed.universe.versiontable == null)
	979	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	980	+
	981	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
925	982	// if (copy == client)
926	983
927	984	Object3D versions[] = object.versionlist;
	985	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
928	986	object.versionlist = null;
	987	+ object.versiontable = null;
	988	+
	989	+ Object3D parent = object.parent;
	990	+ object.parent = null;
929	991
930	992	//byte[] compress = Compress(copy);
931	993	Object3D compress = (Object3D)Grafreed.clone(object);
932	994
933		- object.versionlist = versions;
	995	+ object.parent = parent;
934	996
935		- object.RestoreBigData(versiontable);
	997	+ object.versionlist = versions;
	998	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	999	+
	1000	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
936	1001
937	1002	CameraPane.SWITCH = temp;
938	1003
..	..	@@ -1271,7 +1336,7 @@
1271	1336
1272	1337	//if (copy.pinned)
1273	1338	{
1274		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1339	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1275	1340	pinButton.setSelected(copy.pinned);
1276	1341	cGridBag t = new cGridBag();
1277	1342	t.preferredWidth = 2;
..	..	@@ -1294,14 +1359,14 @@
1294	1359
1295	1360	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1296	1361	liveCB.setToolTipText("Animate object");
	1362	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1363	+ markCB.setToolTipText("Set target transform");
1297	1364	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1298	1365	selectableCB.setToolTipText("Make object selectable");
1299	1366	// Return();
1300	1367
1301	1368	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1302	1369	hideCB.setToolTipText("Hide object");
1303		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1304		- markCB.setToolTipText("As animation target transform");
1305	1370
1306	1371	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1307	1372
..	..	@@ -1503,22 +1568,9 @@
1503	1568
1504	1569	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1505	1570	{
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);
	1571	+ if (Globals.DEBUG)
	1572	+ System.out.println("CREATE CAMERAS");
	1573	+ cams = CreateCameras();
1522	1574	} else
1523	1575	{
1524	1576	cams = (cGroup) copy.get(0);
..	..	@@ -1584,6 +1636,45 @@
1584	1636	//frontView.object = copy;
1585	1637	//sideView.object = copy;
1586	1638
	1639	+ transformPanel = new cGridBag().setVertical(true);
	1640	+
	1641	+ cGridBag resetTransformPanel = new cGridBag();
	1642	+
	1643	+ resetTransformPanel.preferredHeight = 2;
	1644	+
	1645	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1646	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1647	+ resetTransform.addMouseListener(new MouseAdapter()
	1648	+ {
	1649	+ public void mouseClicked(MouseEvent e)
	1650	+ {
	1651	+ ResetTransform();
	1652	+ }
	1653	+ });
	1654	+ resetTransformPanel.add(resetTransform);
	1655	+
	1656	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1657	+ resetTransform.setToolTipText("Reset Translation only");
	1658	+ resetTransform.addMouseListener(new MouseAdapter()
	1659	+ {
	1660	+ public void mouseClicked(MouseEvent e)
	1661	+ {
	1662	+ ResetTransform(1);
	1663	+ }
	1664	+ });
	1665	+ resetTransformPanel.add(resetTransform);
	1666	+
	1667	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1668	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1669	+ resetTransform.addMouseListener(new MouseAdapter()
	1670	+ {
	1671	+ public void mouseClicked(MouseEvent e)
	1672	+ {
	1673	+ ResetTransform(2);
	1674	+ }
	1675	+ });
	1676	+ resetTransformPanel.add(resetTransform);
	1677	+
1587	1678	XYZPanel = new cGridBag().setVertical(true);
1588	1679	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1589	1680
..	..	@@ -1593,6 +1684,9 @@
1593	1684	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1594	1685	//XYZPanel.setName("XYZ");
1595	1686
	1687	+ transformPanel.add(resetTransformPanel);
	1688	+ transformPanel.add(XYZPanel);
	1689	+
1596	1690	/*
1597	1691	gridPanel = new JPanel(); //new BorderLayout());
1598	1692	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1600,12 +1694,12 @@
1600	1694	gridPanel.add(cameraView);
1601	1695	gridPanel.add(XYZPanel);
1602	1696	*/
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);
	1697	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1698	+// gridPanel.setContinuousLayout(true);
	1699	+// gridPanel.setOneTouchExpandable(true);
	1700	+// gridPanel.setDividerLocation(1.0);
	1701	+// gridPanel.setDividerSize(9);
	1702	+// gridPanel.setResizeWeight(0.85);
1609	1703
1610	1704	// aConstraints.weighty = 0;
1611	1705	//System.out.println("THIS = " + this);
..	..	@@ -1628,30 +1722,34 @@
1628	1722
1629	1723	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1630	1724	//tmp.setName("Edit");
1631		- objectPanel.add(materialPanel);
1632		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1633		- objectPanel.setToolTipTextAt(0, "Material");
1634		-
	1725	+ objectPanel.add(skyboxPanel);
	1726	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1727	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1728	+
1635	1729	objectPanel.add(toolboxPanel);
1636	1730	objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1637	1731	objectPanel.setToolTipTextAt(1, "Objects & textures");
1638	1732
1639		- objectPanel.add(skyboxPanel);
1640		- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1641		- objectPanel.setToolTipTextAt(2, "Backgrounds");
1642		-
	1733	+ objectPanel.add(materialPanel);
	1734	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1735	+ objectPanel.setToolTipTextAt(2, "Material");
	1736	+
1643	1737	// JPanel north = new JPanel(new BorderLayout());
1644	1738	// north.setName("Edit");
1645	1739	// north.add(ctrlPanel, BorderLayout.NORTH);
1646	1740	// objectPanel.add(north);
1647	1741	objectPanel.add(editPanel);
1648		- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1742	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1649	1743	objectPanel.setToolTipTextAt(3, "Edit controls");
1650	1744
1651		- objectPanel.add(XYZPanel);
	1745	+ objectPanel.add(transformPanel);
1652	1746	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1653		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1747	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1654	1748
	1749	+ patchMaterial = true;
	1750	+ cameraView.patchMaterial = this;
	1751	+ objectPanel.setSelectedIndex(2);
	1752	+
1655	1753	/*
1656	1754	aConstraints.gridx = 0;
1657	1755	aConstraints.gridwidth = 1;
..	..	@@ -1671,7 +1769,7 @@
1671	1769	scrollpane.addMouseWheelListener(this); // Default not fast enough
1672	1770
1673	1771	/JTabbedPane/ scenePanel = new cGridBag();
1674		- scenePanel.preferredWidth = 5;
	1772	+ scenePanel.preferredWidth = 6;
1675	1773
1676	1774	JTabbedPane tabbedPane = new JTabbedPane();
1677	1775	tabbedPane.add(scrollpane);
..	..	@@ -1682,17 +1780,109 @@
1682	1780
1683	1781	AddOptions(optionsPanel); //, aConstraints);
1684	1782
1685		- tabbedPane.add(optionsPanel);
1686		-
1687	1783	tabbedPane.add(FSPane = new cFileSystemPane(this));
1688	1784
	1785	+ tabbedPane.add(optionsPanel);
	1786	+
1689	1787	scenePanel.add(tabbedPane);
1690	1788
1691		- //if (Globals.ADVANCED)
1692		-// tabbedPane.add(infoPanel);
1693		-// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1694		-// tabbedPane.setToolTipTextAt(3, "Information");
	1789	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1790	+ creditsPanel.setName("Credits");
1695	1791
	1792	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1793	+ creditsPanel.add(ogaLabel);
	1794	+
	1795	+ cButton creditButton;
	1796	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1797	+ creditButton.setToolTipText("https://opengameart.org");
	1798	+
	1799	+ creditButton.addMouseListener(new MouseAdapter()
	1800	+ {
	1801	+ public void mouseClicked(MouseEvent e)
	1802	+ {
	1803	+ try
	1804	+ {
	1805	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1806	+ } catch (Exception e1)
	1807	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1808	+ {
	1809	+ e1.printStackTrace();
	1810	+ }
	1811	+ }
	1812	+ });
	1813	+
	1814	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1815	+ creditsPanel.add(ogaLabel);
	1816	+
	1817	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1818	+ creditButton.setToolTipText("https://3delicious.net");
	1819	+
	1820	+ creditButton.addMouseListener(new MouseAdapter()
	1821	+ {
	1822	+ public void mouseClicked(MouseEvent e)
	1823	+ {
	1824	+ try
	1825	+ {
	1826	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1827	+ } catch (Exception e1)
	1828	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1829	+ {
	1830	+ e1.printStackTrace();
	1831	+ }
	1832	+ }
	1833	+ });
	1834	+
	1835	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1836	+ creditButton.setToolTipText("https://archive3d.net");
	1837	+
	1838	+ creditButton.addMouseListener(new MouseAdapter()
	1839	+ {
	1840	+ public void mouseClicked(MouseEvent e)
	1841	+ {
	1842	+ try
	1843	+ {
	1844	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1845	+ } catch (Exception e1)
	1846	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1847	+ {
	1848	+ e1.printStackTrace();
	1849	+ }
	1850	+ }
	1851	+ });
	1852	+
	1853	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1854	+ creditButton.setToolTipText("https://turbosquid.com");
	1855	+
	1856	+ creditButton.addMouseListener(new MouseAdapter()
	1857	+ {
	1858	+ public void mouseClicked(MouseEvent e)
	1859	+ {
	1860	+ try
	1861	+ {
	1862	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1863	+ } catch (Exception e1)
	1864	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1865	+ {
	1866	+ e1.printStackTrace();
	1867	+ }
	1868	+ }
	1869	+ });
	1870	+
	1871	+ for (int i=6; --i>=0;)
	1872	+ {
	1873	+ creditsPanel.add(new cGridBag());
	1874	+ }
	1875	+
	1876	+ tabbedPane.add(creditsPanel);
	1877	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1878	+
	1879	+ if (Globals.ADVANCED)
	1880	+ {
	1881	+ tabbedPane.add(infoPanel);
	1882	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1883	+ tabbedPane.setToolTipTextAt(4, "Information");
	1884	+ }
	1885	+
1696	1886	/*
1697	1887	cTree jTree = new cTree(null);
1698	1888	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1713,13 +1903,13 @@
1713	1903	jtp.add(tree);
1714	1904	*/
1715	1905
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");
	1906	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1907	+// bigPanel.setContinuousLayout(true);
	1908	+// bigPanel.setOneTouchExpandable(true);
	1909	+// bigPanel.setDividerLocation(0.8);
	1910	+// bigPanel.setDividerSize(15);
	1911	+// bigPanel.setResizeWeight(0.15);
	1912	+// bigPanel.setName("Scene");
1723	1913
1724	1914	//bigPanel.setLayout(new BorderLayout());
1725	1915	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1789,7 +1979,7 @@
1789	1979
1790	1980	frame.getContentPane().setLayout(new BorderLayout());
1791	1981	/**/
1792		- JTabbedPane worldPane = new JTabbedPane();
	1982	+ //JTabbedPane worldPane = new JTabbedPane();
1793	1983	//worldPane.add(bigPanel);
1794	1984	//worldPane.add(worldPanel);
1795	1985	/**/
..	..	@@ -1803,7 +1993,7 @@
1803	1993
1804	1994	cameraView.requestFocusInWindow();
1805	1995
1806		- gridPanel.setDividerLocation(1.0);
	1996	+// gridPanel.setDividerLocation(1.0);
1807	1997
1808	1998	frame.validate();
1809	1999
..	..	@@ -1838,7 +2028,7 @@
1838	2028	{
1839	2029	cGridBag presetpanel = new cGridBag().setVertical(true);
1840	2030
1841		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	2031	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1842	2032	skin.setToolTipText("Skin");
1843	2033	skin.addMouseListener(new MouseAdapter()
1844	2034	{
..	..	@@ -1849,7 +2039,15 @@
1849	2039
1850	2040	// Skin
1851	2041	colorField.setFloat(material.color);
1852		- saturationField.setFloat(material.modulation);
	2042	+ float saturation = material.modulation;
	2043	+
	2044	+ if (!cameraView.Skinshader)
	2045	+ {
	2046	+ saturation /= 1.5;
	2047	+ }
	2048	+
	2049	+ saturationField.setFloat(saturation);
	2050	+
1853	2051	subsurfaceField.setFloat(material.subsurface);
1854	2052	selfshadowField.setFloat(material.diffuseness);
1855	2053	diffusenessField.setFloat(material.factor);
..	..	@@ -1868,7 +2066,7 @@
1868	2066	});
1869	2067	presetpanel.add(skin);
1870	2068
1871		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2069	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1872	2070	lambert.setToolTipText("Diffuse");
1873	2071	lambert.addMouseListener(new MouseAdapter()
1874	2072	{
..	..	@@ -1886,7 +2084,7 @@
1886	2084	});
1887	2085	presetpanel.add(lambert);
1888	2086
1889		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2087	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1890	2088	diffuse2.setToolTipText("Diffuse2");
1891	2089	diffuse2.addMouseListener(new MouseAdapter()
1892	2090	{
..	..	@@ -1904,7 +2102,7 @@
1904	2102	});
1905	2103	presetpanel.add(diffuse2);
1906	2104
1907		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2105	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1908	2106	diffusemoon.setToolTipText("Moon");
1909	2107	diffusemoon.addMouseListener(new MouseAdapter()
1910	2108	{
..	..	@@ -1922,7 +2120,7 @@
1922	2120	});
1923	2121	presetpanel.add(diffusemoon);
1924	2122
1925		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2123	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1926	2124	diffusemoon2.setToolTipText("Moon2");
1927	2125	diffusemoon2.addMouseListener(new MouseAdapter()
1928	2126	{
..	..	@@ -1940,7 +2138,7 @@
1940	2138	});
1941	2139	presetpanel.add(diffusemoon2);
1942	2140
1943		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2141	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1944	2142	diffusemoon3.setToolTipText("Moon3");
1945	2143	diffusemoon3.addMouseListener(new MouseAdapter()
1946	2144	{
..	..	@@ -1958,7 +2156,7 @@
1958	2156	});
1959	2157	presetpanel.add(diffusemoon3);
1960	2158
1961		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2159	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1962	2160	diffusesheen.setToolTipText("Sheen");
1963	2161	diffusesheen.addMouseListener(new MouseAdapter()
1964	2162	{
..	..	@@ -1975,7 +2173,7 @@
1975	2173	});
1976	2174	presetpanel.add(diffusesheen);
1977	2175
1978		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2176	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
1979	2177	rough.setToolTipText("Rough metal");
1980	2178	rough.addMouseListener(new MouseAdapter()
1981	2179	{
..	..	@@ -1993,7 +2191,7 @@
1993	2191	});
1994	2192	presetpanel.add(rough);
1995	2193
1996		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2194	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
1997	2195	rough2.setToolTipText("Medium metal");
1998	2196	rough2.addMouseListener(new MouseAdapter()
1999	2197	{
..	..	@@ -2011,7 +2209,7 @@
2011	2209	});
2012	2210	presetpanel.add(rough2);
2013	2211
2014		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2212	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
2015	2213	shini0.setToolTipText("Shiny");
2016	2214	shini0.addMouseListener(new MouseAdapter()
2017	2215	{
..	..	@@ -2029,7 +2227,7 @@
2029	2227	});
2030	2228	presetpanel.add(shini0);
2031	2229
2032		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2230	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
2033	2231	shini1.setToolTipText("Shiny2");
2034	2232	shini1.addMouseListener(new MouseAdapter()
2035	2233	{
..	..	@@ -2047,7 +2245,7 @@
2047	2245	});
2048	2246	presetpanel.add(shini1);
2049	2247
2050		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2248	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2051	2249	shini2.setToolTipText("Shiny3");
2052	2250	shini2.addMouseListener(new MouseAdapter()
2053	2251	{
..	..	@@ -2065,7 +2263,7 @@
2065	2263	});
2066	2264	presetpanel.add(shini2);
2067	2265
2068		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2266	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2069	2267	aniso.setToolTipText("AnisoU");
2070	2268	aniso.addMouseListener(new MouseAdapter()
2071	2269	{
..	..	@@ -2083,7 +2281,7 @@
2083	2281	});
2084	2282	presetpanel.add(aniso);
2085	2283
2086		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2284	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2087	2285	aniso2.setToolTipText("AnisoV");
2088	2286	aniso2.addMouseListener(new MouseAdapter()
2089	2287	{
..	..	@@ -2101,7 +2299,7 @@
2101	2299	});
2102	2300	presetpanel.add(aniso2);
2103	2301
2104		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2302	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2105	2303	aniso3.setToolTipText("AnisoUV");
2106	2304	aniso3.addMouseListener(new MouseAdapter()
2107	2305	{
..	..	@@ -2119,7 +2317,7 @@
2119	2317	});
2120	2318	presetpanel.add(aniso3);
2121	2319
2122		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2320	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2123	2321	velvet0.setToolTipText("Velvet");
2124	2322	velvet0.addMouseListener(new MouseAdapter()
2125	2323	{
..	..	@@ -2141,7 +2339,7 @@
2141	2339	});
2142	2340	presetpanel.add(velvet0);
2143	2341
2144		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2342	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2145	2343	bump0.setToolTipText("Bump texture");
2146	2344	bump0.addMouseListener(new MouseAdapter()
2147	2345	{
..	..	@@ -2160,7 +2358,22 @@
2160	2358	});
2161	2359	presetpanel.add(bump0);
2162	2360
2163		- cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2361	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2362	+ borderShader.setToolTipText("Border fade");
	2363	+ borderShader.addMouseListener(new MouseAdapter()
	2364	+ {
	2365	+ public void mouseClicked(MouseEvent e)
	2366	+ {
	2367	+ borderfadeField.setFloat(0.5);
	2368	+ opacityField.setFloat(0.75);
	2369	+
	2370	+ materialtouched = true;
	2371	+ applySelf();
	2372	+ }
	2373	+ });
	2374	+ presetpanel.add(borderShader);
	2375	+
	2376	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2164	2377	halo.setToolTipText("Halo");
2165	2378	halo.addMouseListener(new MouseAdapter()
2166	2379	{
..	..	@@ -2177,7 +2390,7 @@
2177	2390	});
2178	2391	presetpanel.add(halo);
2179	2392
2180		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2393	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2181	2394	candle.setToolTipText("Candle");
2182	2395	candle.addMouseListener(new MouseAdapter()
2183	2396	{
..	..	@@ -2199,7 +2412,7 @@
2199	2412	});
2200	2413	presetpanel.add(candle);
2201	2414
2202		- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2415	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2203	2416	shadowShader.setToolTipText("Shadow");
2204	2417	shadowShader.addMouseListener(new MouseAdapter()
2205	2418	{
..	..	@@ -2234,19 +2447,19 @@
2234	2447
2235	2448	cGridBag editBar = new cGridBag().setVertical(false);
2236	2449
2237		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2450	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2238	2451	createMaterialButton.setToolTipText("Create material");
2239	2452
2240	2453	/*
2241	2454	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2242	2455	*/
2243	2456
2244		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2457	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2245	2458	clearMaterialButton.setToolTipText("Clear material");
2246	2459
2247	2460	if (Globals.ADVANCED)
2248	2461	{
2249		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2462	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2250	2463	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2251	2464	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2252	2465	}
..	..	@@ -2267,9 +2480,20 @@
2267	2480
2268	2481	cGridBag huepanel = new cGridBag();
2269	2482	cGridBag huelabel = new cGridBag();
2270		- skin = GetLabel("icons/hue.png", false);
2271		- skin.fit = true;
2272		- huelabel.add(skin);
	2483	+ cLabel hue = GetLabel("icons/hue.png", false);
	2484	+ hue.fit = true;
	2485	+
	2486	+ hue.addMouseListener(new MouseAdapter()
	2487	+ {
	2488	+ public void mousePressed(MouseEvent e)
	2489	+ {
	2490	+ int x = e.getX();
	2491	+
	2492	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2493	+ }
	2494	+ });
	2495	+
	2496	+ huelabel.add(hue);
2273	2497	huelabel.preferredWidth = 20;
2274	2498	huepanel.add(new cGridBag()); // Label
2275	2499	huepanel.add(huelabel); // Field/slider
..	..	@@ -3545,32 +3769,8 @@
3545	3769
3546	3770	if (multiplyToggle != null)
3547	3771	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		- }
	3772	+
	3773	+ AllocProjectedVertices(object);
3574	3774
3575	3775	SetMaterial(mat, object.projectedVertices);
3576	3776	}
..	..	@@ -3880,7 +4080,7 @@
3880	4080	//System.out.println("ObjEditor " + event);
3881	4081	applySelf0(true);
3882	4082	//parent.applySelf();
3883		- objEditor.refreshContents();
	4083	+ // conflicts with requestFocus objEditor.refreshContents();
3884	4084	} else if (source == resetButton)
3885	4085	{
3886	4086	CameraPane.fullreset = true;
..	..	@@ -4060,11 +4260,18 @@
4060	4260
4061	4261	void New()
4062	4262	{
4063		- while (copy.Size() > 1)
	4263	+ while (copy.Size() > 0)
4064	4264	{
4065		- copy.remove(1);
	4265	+ copy.remove(0);
4066	4266	}
4067	4267
	4268	+ copy.selection.clear();
	4269	+
	4270	+ if (copy == Grafreed.grafreed.universe)
	4271	+ {
	4272	+ CreateCameras();
	4273	+ cameraView.SetCamera(GetCamera(copy, 0));
	4274	+ }
4068	4275	ResetModel();
4069	4276	objEditor.refreshContents();
4070	4277	}
..	..	@@ -4192,8 +4399,6 @@
4192	4399	return true;
4193	4400	}
4194	4401
4195		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4196		-
4197	4402	void DeleteVersion()
4198	4403	{
4199	4404	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4201,7 +4406,11 @@
4201	4406	copy.versionlist[i] = copy.versionlist[i+1];
4202	4407	}
4203	4408
4204		- CopyChanged();
	4409	+ if (copy.versionlist[copy.versionindex] == null)
	4410	+ copy.versionindex -= 1;
	4411	+
	4412	+ if (copy.versionindex != -1)
	4413	+ CopyChanged();
4205	4414
4206	4415	SetVersionStates();
4207	4416	}
..	..	@@ -4314,7 +4523,7 @@
4314	4523	boolean temp = CameraPane.SWITCH;
4315	4524	CameraPane.SWITCH = false;
4316	4525
4317		- copy.ExtractBigData(versiontable);
	4526	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4318	4527
4319	4528	copy.clear();
4320	4529
..	..	@@ -4326,7 +4535,7 @@
4326	4535	copy.add(obj.get(i));
4327	4536	}
4328	4537
4329		- copy.RestoreBigData(versiontable);
	4538	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4330	4539
4331	4540	CameraPane.SWITCH = temp;
4332	4541
..	..	@@ -4376,6 +4585,8 @@
4376	4585	return count;
4377	4586	}
4378	4587
	4588	+ public cGridBag versionSliderPane;
	4589	+
4379	4590	void SetVersionStates()
4380	4591	{
4381	4592	//if (true)
..	..	@@ -4383,21 +4594,36 @@
4383	4594
4384	4595	//cRadio tab = GetCurrentTab();
4385	4596
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;
	4597	+ if (copy.versionlist == null)
	4598	+ {
	4599	+ saveVersionButton.setEnabled(false);
	4600	+ restoreButton.setEnabled(false);
	4601	+ replaceButton.setEnabled(false);
	4602	+ previousVersionButton.setEnabled(false);
	4603	+ nextVersionButton.setEnabled(false);
	4604	+ deleteVersionButton.setEnabled(false);
	4605	+ versionSliderPane.setVisible(false);
	4606	+ }
	4607	+ else
	4608	+ {
	4609	+ restoreButton.setEnabled(copy.versionindex != -1);
	4610	+ replaceButton.setEnabled(copy.versionindex != -1);
	4611	+
	4612	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4613	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4614	+
	4615	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4616	+ //copy.versionlist[copy.versionindex + 1] != null);
	4617	+
	4618	+ muteSlider = true;
	4619	+ versionSlider.setMinimum(0);
	4620	+ versionSlider.setMaximum(VersionCount() - 1);
	4621	+ versionSlider.setInteger(copy.versionindex);
	4622	+ versionSlider.setEnabled(copy.versionindex != -1);
	4623	+ muteSlider = false;
	4624	+
	4625	+ versionSliderPane.setVisible(true);
	4626	+ }
4401	4627	}
4402	4628
4403	4629	public boolean PreviousVersion()
..	..	@@ -4455,7 +4681,7 @@
4455	4681
4456	4682	public boolean Replace()
4457	4683	{
4458		- System.err.println("Replace");
	4684	+ //System.err.println("Replace");
4459	4685
4460	4686	//cRadio tab = GetCurrentTab();
4461	4687
..	..	@@ -4682,6 +4908,12 @@
4682	4908	// else
4683	4909	// applySelf(true);
4684	4910	// }
	4911	+
	4912	+ boolean Equal(double a, double b)
	4913	+ {
	4914	+ return Math.abs(a - b) < 0.001;
	4915	+ }
	4916	+
4685	4917	void applySelf0(boolean name)
4686	4918	{
4687	4919	if (name)
..	..	@@ -4731,29 +4963,52 @@
4731	4963	{
4732	4964	cMaterial mat = copy.material;
4733	4965
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));
	4966	+ if (!Equal(colorField.getFloat(), mat.color))
	4967	+ colorField.SetToolTipValue((mat.color));
	4968	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4969	+ saturationField.SetToolTipValue((mat.modulation));
	4970	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4971	+ metalnessField.SetToolTipValue((mat.metalness));
	4972	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4973	+ diffuseField.SetToolTipValue((mat.diffuse));
	4974	+ if (!Equal(specularField.getFloat(), mat.specular))
	4975	+ specularField.SetToolTipValue((mat.specular));
	4976	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4977	+ shininessField.SetToolTipValue((mat.shininess));
	4978	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4979	+ shiftField.SetToolTipValue((mat.shift));
	4980	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4981	+ ambientField.SetToolTipValue((mat.ambient));
	4982	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4983	+ lightareaField.SetToolTipValue((mat.lightarea));
	4984	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4985	+ diffusenessField.SetToolTipValue((mat.factor));
	4986	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4987	+ velvetField.SetToolTipValue((mat.velvet));
	4988	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4989	+ sheenField.SetToolTipValue((mat.sheen));
	4990	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4991	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4992	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4993	+ backlitField.SetToolTipValue((mat.bump));
	4994	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4995	+ anisoField.SetToolTipValue((mat.aniso));
	4996	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4997	+ anisoVField.SetToolTipValue((mat.anisoV));
	4998	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4999	+ cameraField.SetToolTipValue((mat.cameralight));
	5000	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5001	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5002	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5003	+ shadowField.SetToolTipValue((mat.shadow));
	5004	+ if (!Equal(textureField.getFloat(), mat.texture))
	5005	+ textureField.SetToolTipValue((mat.texture));
	5006	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5007	+ opacityField.SetToolTipValue((mat.opacity));
	5008	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5009	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5010	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5011	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4757	5012	}
4758	5013
4759	5014	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4788,7 +5043,7 @@
4788	5043
4789	5044	public void stateChanged(ChangeEvent e)
4790	5045	{
4791		- // assert(false);
	5046	+ // assert(false);
4792	5047	if (e.getSource() == versionSlider)
4793	5048	{
4794	5049	if (muteSlider)
..	..	@@ -5158,6 +5413,8 @@
5158	5413
5159	5414	if (previousVersionButton != null && copy.versionlist != null)
5160	5415	SetVersionStates();
	5416	+
	5417	+ cameraView.requestFocusInWindow();
5161	5418	}
5162	5419
5163	5420	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5189,7 +5446,7 @@
5189	5446	// group = (Composite) group.get(0);
5190	5447	// }
5191	5448
5192		- System.out.println("makeSomething of " + thing);
	5449	+ //System.out.println("makeSomething of " + thing);
5193	5450
5194	5451	/*
5195	5452	if (deselect && jList != null)
..	..	@@ -5543,6 +5800,7 @@
5543	5800
5544	5801	copy.versionlist = readobj.versionlist;
5545	5802	copy.versionindex = readobj.versionindex;
	5803	+ copy.versiontable = readobj.versiontable;
5546	5804
5547	5805	if (copy.versionlist == null)
5548	5806	{
..	..	@@ -5550,7 +5808,7 @@
5550	5808	copy.versionlist = new Object3D[100];
5551	5809	copy.versionindex = -1;
5552	5810
5553		- Save(true);
	5811	+ //Save(true);
5554	5812	}
5555	5813
5556	5814	//? SetUndoStates();
..	..	@@ -5898,6 +6156,7 @@
5898	6156	boolean materialFlushed;
5899	6157	Object3D latestObject;
5900	6158
	6159	+ cGridBag transformPanel;
5901	6160	cGridBag XYZPanel;
5902	6161
5903	6162	JSplitPane gridPanel;