~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)
..	..	@@ -75,11 +122,19 @@
75	122	return new cCheckBox(icon, border);
76	123	}
77	124
78		- ImageIcon GetIcon(String name)
	125	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	126	+
	127	+ static ImageIcon GetIcon(String name)
79	128	{
	129	+ javax.swing.ImageIcon iconCache = icons.get(name);
	130	+ if (iconCache != null)
	131	+ {
	132	+ return iconCache;
	133	+ }
	134	+
80	135	try
81	136	{
82		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	137	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
83	138
84	139	// if (image.getWidth() > 48 && image.getHeight() > 48)
85	140	// {
..	..	@@ -94,10 +149,14 @@
94	149	// }
95	150
96	151	javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	152	+
	153	+ icons.put(name, icon);
	154	+
97	155	return icon;
98	156	}
99	157	catch (Exception e)
100	158	{
	159	+ //icons.put(name, null);
101	160	return null;
102	161	}
103	162	}
..	..	@@ -347,7 +406,8 @@
347	406	//parent = p;
348	407
349	408	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
350		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	409	+ if (Globals.DEBUG)
	410	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
351	411	//gd.setFullScreenWindow(this);
352	412	//setResizable(false);
353	413	//if (!isDisplayable())
..	..	@@ -384,6 +444,9 @@
384	444
385	445	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
386	446
	447	+ // This is to refresh the UI of the material panel.
	448	+ boolean patchMaterial;
	449	+
387	450	void SetupMenu()
388	451	{
389	452	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -397,8 +460,11 @@
397	460	importOBJItem.addActionListener(this);
398	461	import3DSItem = menu.add(new MenuItem("3DS file..."));
399	462	import3DSItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
400	465	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
401	466	importVRMLX3DItem.addActionListener(this);
	467	+ }
402	468	menu.add("-");
403	469	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
404	470	importGFDItem.addActionListener(this);
..	..	@@ -433,7 +499,7 @@
433	499
434	500	ChangeListener changeListener = new ChangeListener()
435	501	{
436		- String name;
	502	+ //String name;
437	503
438	504	public void stateChanged(ChangeEvent changeEvent)
439	505	{
..	..	@@ -453,33 +519,34 @@
453	519	// EditSelection(false);
454	520	// }
455	521
456		- if (objectPanel.getSelectedIndex() == 4)
457		- {
458		- name = copy.skyboxname;
459		-
460		- if (name == null)
461		- {
462		- name = "";
463		- }
464		-
465		- copy.skyboxname = "cubemaps/default-skyboxes/rgb";
466		- copy.skyboxext = "jpg";
467		- }
468		- else
469		- {
470		- if (name != null)
471		- {
472		- if (name.equals(""))
473		- {
474		- copy.skyboxname = null;
475		- copy.skyboxext = null;
476		- }
477		- else
478		- {
479		- copy.skyboxname = name;
480		- }
481		- }
482		- }
	522	+// if (objectPanel.getSelectedIndex() == 4)
	523	+// {
	524	+// name = copy.skyboxname;
	525	+//
	526	+// if (name == null)
	527	+// {
	528	+// name = "";
	529	+// }
	530	+//
	531	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	532	+// copy.skyboxext = "jpg";
	533	+// }
	534	+// else
	535	+// {
	536	+// if (name != null)
	537	+// {
	538	+// if (name.equals(""))
	539	+// {
	540	+// copy.skyboxname = null;
	541	+// copy.skyboxext = null;
	542	+// }
	543	+// else
	544	+// {
	545	+// copy.skyboxname = name;
	546	+// }
	547	+// }
	548	+// }
	549	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
483	550
484	551	// refreshContents(false); // To refresh Info tab
485	552	cameraView.repaint();
..	..	@@ -908,18 +975,29 @@
908	975	boolean temp = CameraPane.SWITCH;
909	976	CameraPane.SWITCH = false;
910	977
911		- 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);
912	982	// if (copy == client)
913	983
914	984	Object3D versions[] = object.versionlist;
	985	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
915	986	object.versionlist = null;
	987	+ object.versiontable = null;
	988	+
	989	+ Object3D parent = object.parent;
	990	+ object.parent = null;
916	991
917	992	//byte[] compress = Compress(copy);
918	993	Object3D compress = (Object3D)Grafreed.clone(object);
919	994
920		- object.versionlist = versions;
	995	+ object.parent = parent;
921	996
922		- object.RestoreBigData(versiontable);
	997	+ object.versionlist = versions;
	998	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	999	+
	1000	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
923	1001
924	1002	CameraPane.SWITCH = temp;
925	1003
..	..	@@ -1258,7 +1336,7 @@
1258	1336
1259	1337	//if (copy.pinned)
1260	1338	{
1261		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1339	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1262	1340	pinButton.setSelected(copy.pinned);
1263	1341	cGridBag t = new cGridBag();
1264	1342	t.preferredWidth = 2;
..	..	@@ -1281,14 +1359,14 @@
1281	1359
1282	1360	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1283	1361	liveCB.setToolTipText("Animate object");
	1362	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1363	+ markCB.setToolTipText("Set target transform");
1284	1364	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1285	1365	selectableCB.setToolTipText("Make object selectable");
1286	1366	// Return();
1287	1367
1288	1368	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1289	1369	hideCB.setToolTipText("Hide object");
1290		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1291		- markCB.setToolTipText("As animation target transform");
1292	1370
1293	1371	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1294	1372
..	..	@@ -1490,22 +1568,9 @@
1490	1568
1491	1569	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1492	1570	{
1493		- System.out.println("CREATE CAMERAS");
1494		- cams = new cTemplate();
1495		- cams.name = "Cameras";
1496		- copy.insertElementAt(cams, 0);
1497		- //cams.parent = copy;
1498		-
1499		- cam = new Camera(); // LA.newVector(3, 2, 1));
1500		- cams.addChild(cam);
1501		- cam = new Camera(1);
1502		- cams.addChild(cam);
1503		- cam = new Camera(2);
1504		- cams.addChild(cam);
1505		- cam = new Camera(3);
1506		- cams.addChild(cam);
1507		- cam = new Camera(4); // Light
1508		- cams.addChild(cam);
	1571	+ if (Globals.DEBUG)
	1572	+ System.out.println("CREATE CAMERAS");
	1573	+ cams = CreateCameras();
1509	1574	} else
1510	1575	{
1511	1576	cams = (cGroup) copy.get(0);
..	..	@@ -1571,6 +1636,45 @@
1571	1636	//frontView.object = copy;
1572	1637	//sideView.object = copy;
1573	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	+
1574	1678	XYZPanel = new cGridBag().setVertical(true);
1575	1679	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1576	1680
..	..	@@ -1580,6 +1684,9 @@
1580	1684	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1581	1685	//XYZPanel.setName("XYZ");
1582	1686
	1687	+ transformPanel.add(resetTransformPanel);
	1688	+ transformPanel.add(XYZPanel);
	1689	+
1583	1690	/*
1584	1691	gridPanel = new JPanel(); //new BorderLayout());
1585	1692	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1587,12 +1694,12 @@
1587	1694	gridPanel.add(cameraView);
1588	1695	gridPanel.add(XYZPanel);
1589	1696	*/
1590		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1591		- gridPanel.setContinuousLayout(true);
1592		- gridPanel.setOneTouchExpandable(true);
1593		- gridPanel.setDividerLocation(1.0);
1594		- gridPanel.setDividerSize(9);
1595		- 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);
1596	1703
1597	1704	// aConstraints.weighty = 0;
1598	1705	//System.out.println("THIS = " + this);
..	..	@@ -1615,30 +1722,34 @@
1615	1722
1616	1723	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1617	1724	//tmp.setName("Edit");
1618		- objectPanel.add(materialPanel);
1619		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1620		- objectPanel.setToolTipTextAt(0, "Material");
1621		-
	1725	+ objectPanel.add(skyboxPanel);
	1726	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1727	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1728	+
1622	1729	objectPanel.add(toolboxPanel);
1623	1730	objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1624	1731	objectPanel.setToolTipTextAt(1, "Objects & textures");
1625	1732
1626		- objectPanel.add(skyboxPanel);
1627		- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1628		- objectPanel.setToolTipTextAt(2, "Backgrounds");
1629		-
	1733	+ objectPanel.add(materialPanel);
	1734	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1735	+ objectPanel.setToolTipTextAt(2, "Material");
	1736	+
1630	1737	// JPanel north = new JPanel(new BorderLayout());
1631	1738	// north.setName("Edit");
1632	1739	// north.add(ctrlPanel, BorderLayout.NORTH);
1633	1740	// objectPanel.add(north);
1634	1741	objectPanel.add(editPanel);
1635		- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1742	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1636	1743	objectPanel.setToolTipTextAt(3, "Edit controls");
1637	1744
1638		- objectPanel.add(XYZPanel);
	1745	+ objectPanel.add(transformPanel);
1639	1746	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1640		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1747	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1641	1748
	1749	+ patchMaterial = true;
	1750	+ cameraView.patchMaterial = this;
	1751	+ objectPanel.setSelectedIndex(2);
	1752	+
1642	1753	/*
1643	1754	aConstraints.gridx = 0;
1644	1755	aConstraints.gridwidth = 1;
..	..	@@ -1658,7 +1769,7 @@
1658	1769	scrollpane.addMouseWheelListener(this); // Default not fast enough
1659	1770
1660	1771	/JTabbedPane/ scenePanel = new cGridBag();
1661		- scenePanel.preferredWidth = 5;
	1772	+ scenePanel.preferredWidth = 6;
1662	1773
1663	1774	JTabbedPane tabbedPane = new JTabbedPane();
1664	1775	tabbedPane.add(scrollpane);
..	..	@@ -1669,17 +1780,109 @@
1669	1780
1670	1781	AddOptions(optionsPanel); //, aConstraints);
1671	1782
1672		- tabbedPane.add(optionsPanel);
1673		-
1674	1783	tabbedPane.add(FSPane = new cFileSystemPane(this));
1675	1784
	1785	+ tabbedPane.add(optionsPanel);
	1786	+
1676	1787	scenePanel.add(tabbedPane);
1677	1788
1678		- //if (Globals.ADVANCED)
1679		- tabbedPane.add(infoPanel);
1680		- tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1681		- tabbedPane.setToolTipTextAt(3, "Information");
	1789	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1790	+ creditsPanel.setName("Credits");
1682	1791
	1792	+ cLabel ogaLabel = new cLabel(" Most 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	+
1683	1886	/*
1684	1887	cTree jTree = new cTree(null);
1685	1888	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1700,13 +1903,13 @@
1700	1903	jtp.add(tree);
1701	1904	*/
1702	1905
1703		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1704		- bigPanel.setContinuousLayout(true);
1705		- bigPanel.setOneTouchExpandable(true);
1706		- bigPanel.setDividerLocation(0.8);
1707		- bigPanel.setDividerSize(15);
1708		- bigPanel.setResizeWeight(0.15);
1709		- 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");
1710	1913
1711	1914	//bigPanel.setLayout(new BorderLayout());
1712	1915	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1776,7 +1979,7 @@
1776	1979
1777	1980	frame.getContentPane().setLayout(new BorderLayout());
1778	1981	/**/
1779		- JTabbedPane worldPane = new JTabbedPane();
	1982	+ //JTabbedPane worldPane = new JTabbedPane();
1780	1983	//worldPane.add(bigPanel);
1781	1984	//worldPane.add(worldPanel);
1782	1985	/**/
..	..	@@ -1790,7 +1993,7 @@
1790	1993
1791	1994	cameraView.requestFocusInWindow();
1792	1995
1793		- gridPanel.setDividerLocation(1.0);
	1996	+// gridPanel.setDividerLocation(1.0);
1794	1997
1795	1998	frame.validate();
1796	1999
..	..	@@ -1825,7 +2028,7 @@
1825	2028	{
1826	2029	cGridBag presetpanel = new cGridBag().setVertical(true);
1827	2030
1828		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	2031	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1829	2032	skin.setToolTipText("Skin");
1830	2033	skin.addMouseListener(new MouseAdapter()
1831	2034	{
..	..	@@ -1836,7 +2039,15 @@
1836	2039
1837	2040	// Skin
1838	2041	colorField.setFloat(material.color);
1839		- 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	+
1840	2051	subsurfaceField.setFloat(material.subsurface);
1841	2052	selfshadowField.setFloat(material.diffuseness);
1842	2053	diffusenessField.setFloat(material.factor);
..	..	@@ -1855,7 +2066,7 @@
1855	2066	});
1856	2067	presetpanel.add(skin);
1857	2068
1858		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2069	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1859	2070	lambert.setToolTipText("Diffuse");
1860	2071	lambert.addMouseListener(new MouseAdapter()
1861	2072	{
..	..	@@ -1873,7 +2084,7 @@
1873	2084	});
1874	2085	presetpanel.add(lambert);
1875	2086
1876		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2087	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1877	2088	diffuse2.setToolTipText("Diffuse2");
1878	2089	diffuse2.addMouseListener(new MouseAdapter()
1879	2090	{
..	..	@@ -1891,7 +2102,7 @@
1891	2102	});
1892	2103	presetpanel.add(diffuse2);
1893	2104
1894		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2105	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1895	2106	diffusemoon.setToolTipText("Moon");
1896	2107	diffusemoon.addMouseListener(new MouseAdapter()
1897	2108	{
..	..	@@ -1909,7 +2120,7 @@
1909	2120	});
1910	2121	presetpanel.add(diffusemoon);
1911	2122
1912		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2123	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1913	2124	diffusemoon2.setToolTipText("Moon2");
1914	2125	diffusemoon2.addMouseListener(new MouseAdapter()
1915	2126	{
..	..	@@ -1927,7 +2138,7 @@
1927	2138	});
1928	2139	presetpanel.add(diffusemoon2);
1929	2140
1930		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2141	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1931	2142	diffusemoon3.setToolTipText("Moon3");
1932	2143	diffusemoon3.addMouseListener(new MouseAdapter()
1933	2144	{
..	..	@@ -1945,7 +2156,7 @@
1945	2156	});
1946	2157	presetpanel.add(diffusemoon3);
1947	2158
1948		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2159	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1949	2160	diffusesheen.setToolTipText("Sheen");
1950	2161	diffusesheen.addMouseListener(new MouseAdapter()
1951	2162	{
..	..	@@ -1962,7 +2173,7 @@
1962	2173	});
1963	2174	presetpanel.add(diffusesheen);
1964	2175
1965		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2176	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
1966	2177	rough.setToolTipText("Rough metal");
1967	2178	rough.addMouseListener(new MouseAdapter()
1968	2179	{
..	..	@@ -1980,7 +2191,7 @@
1980	2191	});
1981	2192	presetpanel.add(rough);
1982	2193
1983		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2194	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
1984	2195	rough2.setToolTipText("Medium metal");
1985	2196	rough2.addMouseListener(new MouseAdapter()
1986	2197	{
..	..	@@ -1998,7 +2209,7 @@
1998	2209	});
1999	2210	presetpanel.add(rough2);
2000	2211
2001		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2212	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
2002	2213	shini0.setToolTipText("Shiny");
2003	2214	shini0.addMouseListener(new MouseAdapter()
2004	2215	{
..	..	@@ -2016,7 +2227,7 @@
2016	2227	});
2017	2228	presetpanel.add(shini0);
2018	2229
2019		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2230	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
2020	2231	shini1.setToolTipText("Shiny2");
2021	2232	shini1.addMouseListener(new MouseAdapter()
2022	2233	{
..	..	@@ -2034,7 +2245,7 @@
2034	2245	});
2035	2246	presetpanel.add(shini1);
2036	2247
2037		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2248	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2038	2249	shini2.setToolTipText("Shiny3");
2039	2250	shini2.addMouseListener(new MouseAdapter()
2040	2251	{
..	..	@@ -2052,7 +2263,7 @@
2052	2263	});
2053	2264	presetpanel.add(shini2);
2054	2265
2055		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2266	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2056	2267	aniso.setToolTipText("AnisoU");
2057	2268	aniso.addMouseListener(new MouseAdapter()
2058	2269	{
..	..	@@ -2070,7 +2281,7 @@
2070	2281	});
2071	2282	presetpanel.add(aniso);
2072	2283
2073		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2284	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2074	2285	aniso2.setToolTipText("AnisoV");
2075	2286	aniso2.addMouseListener(new MouseAdapter()
2076	2287	{
..	..	@@ -2088,7 +2299,7 @@
2088	2299	});
2089	2300	presetpanel.add(aniso2);
2090	2301
2091		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2302	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2092	2303	aniso3.setToolTipText("AnisoUV");
2093	2304	aniso3.addMouseListener(new MouseAdapter()
2094	2305	{
..	..	@@ -2106,7 +2317,7 @@
2106	2317	});
2107	2318	presetpanel.add(aniso3);
2108	2319
2109		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2320	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2110	2321	velvet0.setToolTipText("Velvet");
2111	2322	velvet0.addMouseListener(new MouseAdapter()
2112	2323	{
..	..	@@ -2128,7 +2339,7 @@
2128	2339	});
2129	2340	presetpanel.add(velvet0);
2130	2341
2131		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2342	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2132	2343	bump0.setToolTipText("Bump texture");
2133	2344	bump0.addMouseListener(new MouseAdapter()
2134	2345	{
..	..	@@ -2147,7 +2358,22 @@
2147	2358	});
2148	2359	presetpanel.add(bump0);
2149	2360
2150		- 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);
2151	2377	halo.setToolTipText("Halo");
2152	2378	halo.addMouseListener(new MouseAdapter()
2153	2379	{
..	..	@@ -2164,7 +2390,7 @@
2164	2390	});
2165	2391	presetpanel.add(halo);
2166	2392
2167		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2393	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2168	2394	candle.setToolTipText("Candle");
2169	2395	candle.addMouseListener(new MouseAdapter()
2170	2396	{
..	..	@@ -2186,7 +2412,7 @@
2186	2412	});
2187	2413	presetpanel.add(candle);
2188	2414
2189		- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2415	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2190	2416	shadowShader.setToolTipText("Shadow");
2191	2417	shadowShader.addMouseListener(new MouseAdapter()
2192	2418	{
..	..	@@ -2221,19 +2447,19 @@
2221	2447
2222	2448	cGridBag editBar = new cGridBag().setVertical(false);
2223	2449
2224		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2450	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2225	2451	createMaterialButton.setToolTipText("Create material");
2226	2452
2227	2453	/*
2228	2454	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2229	2455	*/
2230	2456
2231		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2457	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2232	2458	clearMaterialButton.setToolTipText("Clear material");
2233	2459
2234	2460	if (Globals.ADVANCED)
2235	2461	{
2236		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2462	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2237	2463	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2238	2464	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2239	2465	}
..	..	@@ -2254,9 +2480,20 @@
2254	2480
2255	2481	cGridBag huepanel = new cGridBag();
2256	2482	cGridBag huelabel = new cGridBag();
2257		- skin = GetLabel("icons/hue.png", false);
2258		- skin.fit = true;
2259		- 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);
2260	2497	huelabel.preferredWidth = 20;
2261	2498	huepanel.add(new cGridBag()); // Label
2262	2499	huepanel.add(huelabel); // Field/slider
..	..	@@ -3532,32 +3769,8 @@
3532	3769
3533	3770	if (multiplyToggle != null)
3534	3771	multiplyToggle.setSelected(mat.multiply);
3535		-
3536		- assert (object.projectedVertices != null);
3537		-
3538		- if (object.projectedVertices.length <= 2)
3539		- {
3540		- // Side effect...
3541		- Object3D.cVector2[] keep = object.projectedVertices;
3542		- object.projectedVertices = new Object3D.cVector2[3];
3543		- for (int i = 0; i < 3; i++)
3544		- {
3545		- if (i < keep.length)
3546		- {
3547		- object.projectedVertices[i] = keep[i];
3548		- } else
3549		- {
3550		- object.projectedVertices[i] = new Object3D.cVector2();
3551		- }
3552		- /*
3553		- if(keep.length == 0)
3554		- object.projectedVertices[0] = new Object3D.cVector2();
3555		- else
3556		- object.projectedVertices[0] = keep[0];
3557		- object.projectedVertices[1] = new Object3D.cVector2();
3558		- */
3559		- }
3560		- }
	3772	+
	3773	+ AllocProjectedVertices(object);
3561	3774
3562	3775	SetMaterial(mat, object.projectedVertices);
3563	3776	}
..	..	@@ -3867,7 +4080,7 @@
3867	4080	//System.out.println("ObjEditor " + event);
3868	4081	applySelf0(true);
3869	4082	//parent.applySelf();
3870		- objEditor.refreshContents();
	4083	+ // conflicts with requestFocus objEditor.refreshContents();
3871	4084	} else if (source == resetButton)
3872	4085	{
3873	4086	CameraPane.fullreset = true;
..	..	@@ -4047,11 +4260,18 @@
4047	4260
4048	4261	void New()
4049	4262	{
4050		- while (copy.Size() > 1)
	4263	+ while (copy.Size() > 0)
4051	4264	{
4052		- copy.remove(1);
	4265	+ copy.remove(0);
4053	4266	}
4054	4267
	4268	+ copy.selection.clear();
	4269	+
	4270	+ if (copy == Grafreed.grafreed.universe)
	4271	+ {
	4272	+ CreateCameras();
	4273	+ cameraView.SetCamera(GetCamera(copy, 0));
	4274	+ }
4055	4275	ResetModel();
4056	4276	objEditor.refreshContents();
4057	4277	}
..	..	@@ -4179,8 +4399,6 @@
4179	4399	return true;
4180	4400	}
4181	4401
4182		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4183		-
4184	4402	void DeleteVersion()
4185	4403	{
4186	4404	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4188,7 +4406,11 @@
4188	4406	copy.versionlist[i] = copy.versionlist[i+1];
4189	4407	}
4190	4408
4191		- CopyChanged();
	4409	+ if (copy.versionlist[copy.versionindex] == null)
	4410	+ copy.versionindex -= 1;
	4411	+
	4412	+ if (copy.versionindex != -1)
	4413	+ CopyChanged();
4192	4414
4193	4415	SetVersionStates();
4194	4416	}
..	..	@@ -4301,7 +4523,7 @@
4301	4523	boolean temp = CameraPane.SWITCH;
4302	4524	CameraPane.SWITCH = false;
4303	4525
4304		- copy.ExtractBigData(versiontable);
	4526	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4305	4527
4306	4528	copy.clear();
4307	4529
..	..	@@ -4313,7 +4535,7 @@
4313	4535	copy.add(obj.get(i));
4314	4536	}
4315	4537
4316		- copy.RestoreBigData(versiontable);
	4538	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4317	4539
4318	4540	CameraPane.SWITCH = temp;
4319	4541
..	..	@@ -4363,6 +4585,8 @@
4363	4585	return count;
4364	4586	}
4365	4587
	4588	+ public cGridBag versionSliderPane;
	4589	+
4366	4590	void SetVersionStates()
4367	4591	{
4368	4592	//if (true)
..	..	@@ -4370,21 +4594,36 @@
4370	4594
4371	4595	//cRadio tab = GetCurrentTab();
4372	4596
4373		- restoreButton.setEnabled(copy.versionindex != -1);
4374		- replaceButton.setEnabled(copy.versionindex != -1);
4375		-
4376		- previousVersionButton.setEnabled(copy.versionindex > 0);
4377		- nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4378		-
4379		- deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4380		- copy.versionlist[copy.versionindex + 1] != null);
4381		-
4382		- muteSlider = true;
4383		- versionSlider.setMinimum(0);
4384		- versionSlider.setMaximum(VersionCount() - 1);
4385		- versionSlider.setInteger(copy.versionindex);
4386		- versionSlider.setEnabled(copy.versionindex != -1);
4387		- 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	+ }
4388	4627	}
4389	4628
4390	4629	public boolean PreviousVersion()
..	..	@@ -4442,7 +4681,7 @@
4442	4681
4443	4682	public boolean Replace()
4444	4683	{
4445		- System.err.println("Replace");
	4684	+ //System.err.println("Replace");
4446	4685
4447	4686	//cRadio tab = GetCurrentTab();
4448	4687
..	..	@@ -4669,6 +4908,12 @@
4669	4908	// else
4670	4909	// applySelf(true);
4671	4910	// }
	4911	+
	4912	+ boolean Equal(double a, double b)
	4913	+ {
	4914	+ return Math.abs(a - b) < 0.001;
	4915	+ }
	4916	+
4672	4917	void applySelf0(boolean name)
4673	4918	{
4674	4919	if (name)
..	..	@@ -4718,29 +4963,52 @@
4718	4963	{
4719	4964	cMaterial mat = copy.material;
4720	4965
4721		- colorField.SetToolTipValue((mat.color));
4722		- saturationField.SetToolTipValue((mat.modulation));
4723		- metalnessField.SetToolTipValue((mat.metalness));
4724		- diffuseField.SetToolTipValue((mat.diffuse));
4725		- specularField.SetToolTipValue((mat.specular));
4726		- shininessField.SetToolTipValue((mat.shininess));
4727		- shiftField.SetToolTipValue((mat.shift));
4728		- ambientField.SetToolTipValue((mat.ambient));
4729		- lightareaField.SetToolTipValue((mat.lightarea));
4730		- diffusenessField.SetToolTipValue((mat.factor));
4731		- velvetField.SetToolTipValue((mat.velvet));
4732		- sheenField.SetToolTipValue((mat.sheen));
4733		- subsurfaceField.SetToolTipValue((mat.subsurface));
4734		- backlitField.SetToolTipValue((mat.bump));
4735		- anisoField.SetToolTipValue((mat.aniso));
4736		- anisoVField.SetToolTipValue((mat.anisoV));
4737		- cameraField.SetToolTipValue((mat.cameralight));
4738		- selfshadowField.SetToolTipValue((mat.diffuseness));
4739		- shadowField.SetToolTipValue((mat.shadow));
4740		- textureField.SetToolTipValue((mat.texture));
4741		- opacityField.SetToolTipValue((mat.opacity));
4742		- fakedepthField.SetToolTipValue((mat.fakedepth));
4743		- 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));
4744	5012	}
4745	5013
4746	5014	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4775,11 +5043,13 @@
4775	5043
4776	5044	public void stateChanged(ChangeEvent e)
4777	5045	{
4778		- // assert(false);
	5046	+ // assert(false);
4779	5047	if (e.getSource() == versionSlider)
4780	5048	{
4781	5049	if (muteSlider)
4782	5050	return;
	5051	+
	5052	+ Replace();
4783	5053
4784	5054	int version = versionSlider.getInteger();
4785	5055
..	..	@@ -5143,6 +5413,8 @@
5143	5413
5144	5414	if (previousVersionButton != null && copy.versionlist != null)
5145	5415	SetVersionStates();
	5416	+
	5417	+ cameraView.requestFocusInWindow();
5146	5418	}
5147	5419
5148	5420	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5174,7 +5446,7 @@
5174	5446	// group = (Composite) group.get(0);
5175	5447	// }
5176	5448
5177		- System.out.println("makeSomething of " + thing);
	5449	+ //System.out.println("makeSomething of " + thing);
5178	5450
5179	5451	/*
5180	5452	if (deselect && jList != null)
..	..	@@ -5528,6 +5800,7 @@
5528	5800
5529	5801	copy.versionlist = readobj.versionlist;
5530	5802	copy.versionindex = readobj.versionindex;
	5803	+ copy.versiontable = readobj.versiontable;
5531	5804
5532	5805	if (copy.versionlist == null)
5533	5806	{
..	..	@@ -5535,7 +5808,7 @@
5535	5808	copy.versionlist = new Object3D[100];
5536	5809	copy.versionindex = -1;
5537	5810
5538		- Save(true);
	5811	+ //Save(true);
5539	5812	}
5540	5813
5541	5814	//? SetUndoStates();
..	..	@@ -5883,6 +6156,7 @@
5883	6156	boolean materialFlushed;
5884	6157	Object3D latestObject;
5885	6158
	6159	+ cGridBag transformPanel;
5886	6160	cGridBag XYZPanel;
5887	6161
5888	6162	JSplitPane gridPanel;