~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -43,6 +43,35 @@
43	43
44	44	static ObjEditor theFrame;
45	45
	46	+ public void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
46	75	public cGridBag GetSeparator()
47	76	{
48	77	cGridBag separator = new cGridBag();
..	..	@@ -54,7 +83,10 @@
54	83	cButton GetButton(String name, boolean border)
55	84	{
56	85	ImageIcon icon = GetIcon(name);
57		- return new cButton(icon, border);
	86	+ if (icon != null \|\| name.contains("/"))
	87	+ return new cButton(icon, border);
	88	+ else
	89	+ return new cButton(name, border);
58	90	}
59	91
60	92	cLabel GetLabel(String name, boolean border)
..	..	@@ -75,11 +107,19 @@
75	107	return new cCheckBox(icon, border);
76	108	}
77	109
78		- ImageIcon GetIcon(String name)
	110	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	111	+
	112	+ static ImageIcon GetIcon(String name)
79	113	{
	114	+ javax.swing.ImageIcon iconCache = icons.get(name);
	115	+ if (iconCache != null)
	116	+ {
	117	+ return iconCache;
	118	+ }
	119	+
80	120	try
81	121	{
82		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	122	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
83	123
84	124	// if (image.getWidth() > 48 && image.getHeight() > 48)
85	125	// {
..	..	@@ -94,10 +134,14 @@
94	134	// }
95	135
96	136	javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	137	+
	138	+ icons.put(name, icon);
	139	+
97	140	return icon;
98	141	}
99	142	catch (Exception e)
100	143	{
	144	+ //icons.put(name, null);
101	145	return null;
102	146	}
103	147	}
..	..	@@ -347,7 +391,8 @@
347	391	//parent = p;
348	392
349	393	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
350		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	394	+ if (Globals.DEBUG)
	395	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
351	396	//gd.setFullScreenWindow(this);
352	397	//setResizable(false);
353	398	//if (!isDisplayable())
..	..	@@ -384,6 +429,9 @@
384	429
385	430	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
386	431
	432	+ // This is to refresh the UI of the material panel.
	433	+ boolean patchMaterial;
	434	+
387	435	void SetupMenu()
388	436	{
389	437	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -433,6 +481,8 @@
433	481
434	482	ChangeListener changeListener = new ChangeListener()
435	483	{
	484	+ //String name;
	485	+
436	486	public void stateChanged(ChangeEvent changeEvent)
437	487	{
438	488	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -451,7 +501,37 @@
451	501	// EditSelection(false);
452	502	// }
453	503
	504	+// if (objectPanel.getSelectedIndex() == 4)
	505	+// {
	506	+// name = copy.skyboxname;
	507	+//
	508	+// if (name == null)
	509	+// {
	510	+// name = "";
	511	+// }
	512	+//
	513	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	514	+// copy.skyboxext = "jpg";
	515	+// }
	516	+// else
	517	+// {
	518	+// if (name != null)
	519	+// {
	520	+// if (name.equals(""))
	521	+// {
	522	+// copy.skyboxname = null;
	523	+// copy.skyboxext = null;
	524	+// }
	525	+// else
	526	+// {
	527	+// copy.skyboxname = name;
	528	+// }
	529	+// }
	530	+// }
	531	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	532	+
454	533	// refreshContents(false); // To refresh Info tab
	534	+ cameraView.repaint();
455	535	}
456	536	};
457	537	objectPanel.addChangeListener(changeListener);
..	..	@@ -877,18 +957,29 @@
877	957	boolean temp = CameraPane.SWITCH;
878	958	CameraPane.SWITCH = false;
879	959
880		- object.ExtractBigData(versiontable);
	960	+ if (Grafreed.grafreed.universe.versiontable == null)
	961	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	962	+
	963	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
881	964	// if (copy == client)
882	965
883	966	Object3D versions[] = object.versionlist;
	967	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
884	968	object.versionlist = null;
	969	+ object.versiontable = null;
	970	+
	971	+ Object3D parent = object.parent;
	972	+ object.parent = null;
885	973
886	974	//byte[] compress = Compress(copy);
887	975	Object3D compress = (Object3D)Grafreed.clone(object);
888	976
889		- object.versionlist = versions;
	977	+ object.parent = parent;
890	978
891		- object.RestoreBigData(versiontable);
	979	+ object.versionlist = versions;
	980	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	981	+
	982	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
892	983
893	984	CameraPane.SWITCH = temp;
894	985
..	..	@@ -1227,7 +1318,7 @@
1227	1318
1228	1319	//if (copy.pinned)
1229	1320	{
1230		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1321	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1231	1322	pinButton.setSelected(copy.pinned);
1232	1323	cGridBag t = new cGridBag();
1233	1324	t.preferredWidth = 2;
..	..	@@ -1250,14 +1341,14 @@
1250	1341
1251	1342	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1252	1343	liveCB.setToolTipText("Animate object");
	1344	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1345	+ markCB.setToolTipText("Set target transform");
1253	1346	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1254	1347	selectableCB.setToolTipText("Make object selectable");
1255	1348	// Return();
1256	1349
1257	1350	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1258	1351	hideCB.setToolTipText("Hide object");
1259		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1260		- markCB.setToolTipText("As animation target transform");
1261	1352
1262	1353	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1263	1354
..	..	@@ -1459,6 +1550,7 @@
1459	1550
1460	1551	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1461	1552	{
	1553	+ if (Globals.DEBUG)
1462	1554	System.out.println("CREATE CAMERAS");
1463	1555	cams = new cTemplate();
1464	1556	cams.name = "Cameras";
..	..	@@ -1540,6 +1632,45 @@
1540	1632	//frontView.object = copy;
1541	1633	//sideView.object = copy;
1542	1634
	1635	+ transformPanel = new cGridBag().setVertical(true);
	1636	+
	1637	+ cGridBag resetTransformPanel = new cGridBag();
	1638	+
	1639	+ resetTransformPanel.preferredHeight = 2;
	1640	+
	1641	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1642	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1643	+ resetTransform.addMouseListener(new MouseAdapter()
	1644	+ {
	1645	+ public void mouseClicked(MouseEvent e)
	1646	+ {
	1647	+ ResetTransform();
	1648	+ }
	1649	+ });
	1650	+ resetTransformPanel.add(resetTransform);
	1651	+
	1652	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1653	+ resetTransform.setToolTipText("Reset Translation only");
	1654	+ resetTransform.addMouseListener(new MouseAdapter()
	1655	+ {
	1656	+ public void mouseClicked(MouseEvent e)
	1657	+ {
	1658	+ ResetTransform(1);
	1659	+ }
	1660	+ });
	1661	+ resetTransformPanel.add(resetTransform);
	1662	+
	1663	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1664	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1665	+ resetTransform.addMouseListener(new MouseAdapter()
	1666	+ {
	1667	+ public void mouseClicked(MouseEvent e)
	1668	+ {
	1669	+ ResetTransform(2);
	1670	+ }
	1671	+ });
	1672	+ resetTransformPanel.add(resetTransform);
	1673	+
1543	1674	XYZPanel = new cGridBag().setVertical(true);
1544	1675	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1545	1676
..	..	@@ -1549,6 +1680,9 @@
1549	1680	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1550	1681	//XYZPanel.setName("XYZ");
1551	1682
	1683	+ transformPanel.add(resetTransformPanel);
	1684	+ transformPanel.add(XYZPanel);
	1685	+
1552	1686	/*
1553	1687	gridPanel = new JPanel(); //new BorderLayout());
1554	1688	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1556,12 +1690,12 @@
1556	1690	gridPanel.add(cameraView);
1557	1691	gridPanel.add(XYZPanel);
1558	1692	*/
1559		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1560		- gridPanel.setContinuousLayout(true);
1561		- gridPanel.setOneTouchExpandable(true);
1562		- gridPanel.setDividerLocation(1.0);
1563		- gridPanel.setDividerSize(9);
1564		- gridPanel.setResizeWeight(0.85);
	1693	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1694	+// gridPanel.setContinuousLayout(true);
	1695	+// gridPanel.setOneTouchExpandable(true);
	1696	+// gridPanel.setDividerLocation(1.0);
	1697	+// gridPanel.setDividerSize(9);
	1698	+// gridPanel.setResizeWeight(0.85);
1565	1699
1566	1700	// aConstraints.weighty = 0;
1567	1701	//System.out.println("THIS = " + this);
..	..	@@ -1584,14 +1718,14 @@
1584	1718
1585	1719	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1586	1720	//tmp.setName("Edit");
1587		- objectPanel.add(materialPanel);
1588		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1589		- objectPanel.setToolTipTextAt(0, "Material");
1590		-
1591	1721	objectPanel.add(toolboxPanel);
1592		- objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1593		- objectPanel.setToolTipTextAt(1, "Objects & textures");
	1722	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1723	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
1594	1724
	1725	+ objectPanel.add(materialPanel);
	1726	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1727	+ objectPanel.setToolTipTextAt(1, "Material");
	1728	+
1595	1729	objectPanel.add(skyboxPanel);
1596	1730	objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1597	1731	objectPanel.setToolTipTextAt(2, "Backgrounds");
..	..	@@ -1604,10 +1738,14 @@
1604	1738	objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1605	1739	objectPanel.setToolTipTextAt(3, "Edit controls");
1606	1740
1607		- objectPanel.add(XYZPanel);
	1741	+ objectPanel.add(transformPanel);
1608	1742	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1609		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1743	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1610	1744
	1745	+ patchMaterial = true;
	1746	+ cameraView.patchMaterial = this;
	1747	+ objectPanel.setSelectedIndex(1);
	1748	+
1611	1749	/*
1612	1750	aConstraints.gridx = 0;
1613	1751	aConstraints.gridwidth = 1;
..	..	@@ -1627,7 +1765,7 @@
1627	1765	scrollpane.addMouseWheelListener(this); // Default not fast enough
1628	1766
1629	1767	/JTabbedPane/ scenePanel = new cGridBag();
1630		- scenePanel.preferredWidth = 5;
	1768	+ scenePanel.preferredWidth = 6;
1631	1769
1632	1770	JTabbedPane tabbedPane = new JTabbedPane();
1633	1771	tabbedPane.add(scrollpane);
..	..	@@ -1638,17 +1776,52 @@
1638	1776
1639	1777	AddOptions(optionsPanel); //, aConstraints);
1640	1778
1641		- tabbedPane.add(optionsPanel);
1642		-
1643	1779	tabbedPane.add(FSPane = new cFileSystemPane(this));
1644	1780
	1781	+ tabbedPane.add(optionsPanel);
	1782	+
1645	1783	scenePanel.add(tabbedPane);
1646	1784
1647		- //if (Globals.ADVANCED)
1648		- tabbedPane.add(infoPanel);
1649		- tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1650		- tabbedPane.setToolTipTextAt(3, "Information");
	1785	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1786	+ creditsPanel.setName("Credits");
1651	1787
	1788	+ cLabel ogaLabel = new cLabel(" Most Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1789	+ creditsPanel.add(ogaLabel);
	1790	+
	1791	+ cButton opengameartButton;
	1792	+ creditsPanel.add(opengameartButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1793	+ opengameartButton.setToolTipText("https://opengameart.org");
	1794	+
	1795	+ opengameartButton.addMouseListener(new MouseAdapter()
	1796	+ {
	1797	+ public void mouseClicked(MouseEvent e)
	1798	+ {
	1799	+ try
	1800	+ {
	1801	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1802	+ } catch (Exception e1)
	1803	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1804	+ {
	1805	+ e1.printStackTrace();
	1806	+ }
	1807	+ }
	1808	+ });
	1809	+
	1810	+ for (int i=10; --i>=0;)
	1811	+ {
	1812	+ creditsPanel.add(new cGridBag());
	1813	+ }
	1814	+
	1815	+ tabbedPane.add(creditsPanel);
	1816	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1817	+
	1818	+ if (Globals.ADVANCED)
	1819	+ {
	1820	+ tabbedPane.add(infoPanel);
	1821	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1822	+ tabbedPane.setToolTipTextAt(4, "Information");
	1823	+ }
	1824	+
1652	1825	/*
1653	1826	cTree jTree = new cTree(null);
1654	1827	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1669,13 +1842,13 @@
1669	1842	jtp.add(tree);
1670	1843	*/
1671	1844
1672		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1673		- bigPanel.setContinuousLayout(true);
1674		- bigPanel.setOneTouchExpandable(true);
1675		- bigPanel.setDividerLocation(0.8);
1676		- bigPanel.setDividerSize(15);
1677		- bigPanel.setResizeWeight(0.15);
1678		- bigPanel.setName("Scene");
	1845	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1846	+// bigPanel.setContinuousLayout(true);
	1847	+// bigPanel.setOneTouchExpandable(true);
	1848	+// bigPanel.setDividerLocation(0.8);
	1849	+// bigPanel.setDividerSize(15);
	1850	+// bigPanel.setResizeWeight(0.15);
	1851	+// bigPanel.setName("Scene");
1679	1852
1680	1853	//bigPanel.setLayout(new BorderLayout());
1681	1854	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1745,7 +1918,7 @@
1745	1918
1746	1919	frame.getContentPane().setLayout(new BorderLayout());
1747	1920	/**/
1748		- JTabbedPane worldPane = new JTabbedPane();
	1921	+ //JTabbedPane worldPane = new JTabbedPane();
1749	1922	//worldPane.add(bigPanel);
1750	1923	//worldPane.add(worldPanel);
1751	1924	/**/
..	..	@@ -1759,7 +1932,7 @@
1759	1932
1760	1933	cameraView.requestFocusInWindow();
1761	1934
1762		- gridPanel.setDividerLocation(1.0);
	1935	+// gridPanel.setDividerLocation(1.0);
1763	1936
1764	1937	frame.validate();
1765	1938
..	..	@@ -1794,7 +1967,7 @@
1794	1967	{
1795	1968	cGridBag presetpanel = new cGridBag().setVertical(true);
1796	1969
1797		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1970	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1798	1971	skin.setToolTipText("Skin");
1799	1972	skin.addMouseListener(new MouseAdapter()
1800	1973	{
..	..	@@ -1805,7 +1978,15 @@
1805	1978
1806	1979	// Skin
1807	1980	colorField.setFloat(material.color);
1808		- saturationField.setFloat(material.modulation);
	1981	+ float saturation = material.modulation;
	1982	+
	1983	+ if (!cameraView.Skinshader)
	1984	+ {
	1985	+ saturation /= 1.5;
	1986	+ }
	1987	+
	1988	+ saturationField.setFloat(saturation);
	1989	+
1809	1990	subsurfaceField.setFloat(material.subsurface);
1810	1991	selfshadowField.setFloat(material.diffuseness);
1811	1992	diffusenessField.setFloat(material.factor);
..	..	@@ -1824,7 +2005,7 @@
1824	2005	});
1825	2006	presetpanel.add(skin);
1826	2007
1827		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2008	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1828	2009	lambert.setToolTipText("Diffuse");
1829	2010	lambert.addMouseListener(new MouseAdapter()
1830	2011	{
..	..	@@ -1842,7 +2023,7 @@
1842	2023	});
1843	2024	presetpanel.add(lambert);
1844	2025
1845		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2026	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1846	2027	diffuse2.setToolTipText("Diffuse2");
1847	2028	diffuse2.addMouseListener(new MouseAdapter()
1848	2029	{
..	..	@@ -1860,7 +2041,7 @@
1860	2041	});
1861	2042	presetpanel.add(diffuse2);
1862	2043
1863		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2044	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1864	2045	diffusemoon.setToolTipText("Moon");
1865	2046	diffusemoon.addMouseListener(new MouseAdapter()
1866	2047	{
..	..	@@ -1878,7 +2059,7 @@
1878	2059	});
1879	2060	presetpanel.add(diffusemoon);
1880	2061
1881		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2062	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1882	2063	diffusemoon2.setToolTipText("Moon2");
1883	2064	diffusemoon2.addMouseListener(new MouseAdapter()
1884	2065	{
..	..	@@ -1896,7 +2077,7 @@
1896	2077	});
1897	2078	presetpanel.add(diffusemoon2);
1898	2079
1899		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2080	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1900	2081	diffusemoon3.setToolTipText("Moon3");
1901	2082	diffusemoon3.addMouseListener(new MouseAdapter()
1902	2083	{
..	..	@@ -1914,7 +2095,7 @@
1914	2095	});
1915	2096	presetpanel.add(diffusemoon3);
1916	2097
1917		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2098	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1918	2099	diffusesheen.setToolTipText("Sheen");
1919	2100	diffusesheen.addMouseListener(new MouseAdapter()
1920	2101	{
..	..	@@ -1931,7 +2112,7 @@
1931	2112	});
1932	2113	presetpanel.add(diffusesheen);
1933	2114
1934		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2115	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
1935	2116	rough.setToolTipText("Rough metal");
1936	2117	rough.addMouseListener(new MouseAdapter()
1937	2118	{
..	..	@@ -1949,7 +2130,7 @@
1949	2130	});
1950	2131	presetpanel.add(rough);
1951	2132
1952		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2133	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
1953	2134	rough2.setToolTipText("Medium metal");
1954	2135	rough2.addMouseListener(new MouseAdapter()
1955	2136	{
..	..	@@ -1967,7 +2148,7 @@
1967	2148	});
1968	2149	presetpanel.add(rough2);
1969	2150
1970		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2151	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
1971	2152	shini0.setToolTipText("Shiny");
1972	2153	shini0.addMouseListener(new MouseAdapter()
1973	2154	{
..	..	@@ -1985,7 +2166,7 @@
1985	2166	});
1986	2167	presetpanel.add(shini0);
1987	2168
1988		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2169	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
1989	2170	shini1.setToolTipText("Shiny2");
1990	2171	shini1.addMouseListener(new MouseAdapter()
1991	2172	{
..	..	@@ -2003,7 +2184,7 @@
2003	2184	});
2004	2185	presetpanel.add(shini1);
2005	2186
2006		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2187	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2007	2188	shini2.setToolTipText("Shiny3");
2008	2189	shini2.addMouseListener(new MouseAdapter()
2009	2190	{
..	..	@@ -2021,7 +2202,7 @@
2021	2202	});
2022	2203	presetpanel.add(shini2);
2023	2204
2024		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2205	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2025	2206	aniso.setToolTipText("AnisoU");
2026	2207	aniso.addMouseListener(new MouseAdapter()
2027	2208	{
..	..	@@ -2039,7 +2220,7 @@
2039	2220	});
2040	2221	presetpanel.add(aniso);
2041	2222
2042		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2223	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2043	2224	aniso2.setToolTipText("AnisoV");
2044	2225	aniso2.addMouseListener(new MouseAdapter()
2045	2226	{
..	..	@@ -2057,7 +2238,7 @@
2057	2238	});
2058	2239	presetpanel.add(aniso2);
2059	2240
2060		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2241	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2061	2242	aniso3.setToolTipText("AnisoUV");
2062	2243	aniso3.addMouseListener(new MouseAdapter()
2063	2244	{
..	..	@@ -2075,7 +2256,7 @@
2075	2256	});
2076	2257	presetpanel.add(aniso3);
2077	2258
2078		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2259	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2079	2260	velvet0.setToolTipText("Velvet");
2080	2261	velvet0.addMouseListener(new MouseAdapter()
2081	2262	{
..	..	@@ -2097,7 +2278,7 @@
2097	2278	});
2098	2279	presetpanel.add(velvet0);
2099	2280
2100		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2281	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2101	2282	bump0.setToolTipText("Bump texture");
2102	2283	bump0.addMouseListener(new MouseAdapter()
2103	2284	{
..	..	@@ -2116,7 +2297,22 @@
2116	2297	});
2117	2298	presetpanel.add(bump0);
2118	2299
2119		- cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2300	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2301	+ borderShader.setToolTipText("Border fade");
	2302	+ borderShader.addMouseListener(new MouseAdapter()
	2303	+ {
	2304	+ public void mouseClicked(MouseEvent e)
	2305	+ {
	2306	+ borderfadeField.setFloat(0.5);
	2307	+ opacityField.setFloat(0.75);
	2308	+
	2309	+ materialtouched = true;
	2310	+ applySelf();
	2311	+ }
	2312	+ });
	2313	+ presetpanel.add(borderShader);
	2314	+
	2315	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2120	2316	halo.setToolTipText("Halo");
2121	2317	halo.addMouseListener(new MouseAdapter()
2122	2318	{
..	..	@@ -2133,7 +2329,7 @@
2133	2329	});
2134	2330	presetpanel.add(halo);
2135	2331
2136		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2332	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2137	2333	candle.setToolTipText("Candle");
2138	2334	candle.addMouseListener(new MouseAdapter()
2139	2335	{
..	..	@@ -2155,7 +2351,7 @@
2155	2351	});
2156	2352	presetpanel.add(candle);
2157	2353
2158		- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2354	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2159	2355	shadowShader.setToolTipText("Shadow");
2160	2356	shadowShader.addMouseListener(new MouseAdapter()
2161	2357	{
..	..	@@ -2190,19 +2386,19 @@
2190	2386
2191	2387	cGridBag editBar = new cGridBag().setVertical(false);
2192	2388
2193		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2389	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2194	2390	createMaterialButton.setToolTipText("Create material");
2195	2391
2196	2392	/*
2197	2393	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2198	2394	*/
2199	2395
2200		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2396	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2201	2397	clearMaterialButton.setToolTipText("Clear material");
2202	2398
2203	2399	if (Globals.ADVANCED)
2204	2400	{
2205		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2401	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2206	2402	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2207	2403	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2208	2404	}
..	..	@@ -2223,9 +2419,20 @@
2223	2419
2224	2420	cGridBag huepanel = new cGridBag();
2225	2421	cGridBag huelabel = new cGridBag();
2226		- skin = GetLabel("icons/hue.png", false);
2227		- skin.fit = true;
2228		- huelabel.add(skin);
	2422	+ cLabel hue = GetLabel("icons/hue.png", false);
	2423	+ hue.fit = true;
	2424	+
	2425	+ hue.addMouseListener(new MouseAdapter()
	2426	+ {
	2427	+ public void mousePressed(MouseEvent e)
	2428	+ {
	2429	+ int x = e.getX();
	2430	+
	2431	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2432	+ }
	2433	+ });
	2434	+
	2435	+ huelabel.add(hue);
2229	2436	huelabel.preferredWidth = 20;
2230	2437	huepanel.add(new cGridBag()); // Label
2231	2438	huepanel.add(huelabel); // Field/slider
..	..	@@ -3501,32 +3708,8 @@
3501	3708
3502	3709	if (multiplyToggle != null)
3503	3710	multiplyToggle.setSelected(mat.multiply);
3504		-
3505		- assert (object.projectedVertices != null);
3506		-
3507		- if (object.projectedVertices.length <= 2)
3508		- {
3509		- // Side effect...
3510		- Object3D.cVector2[] keep = object.projectedVertices;
3511		- object.projectedVertices = new Object3D.cVector2[3];
3512		- for (int i = 0; i < 3; i++)
3513		- {
3514		- if (i < keep.length)
3515		- {
3516		- object.projectedVertices[i] = keep[i];
3517		- } else
3518		- {
3519		- object.projectedVertices[i] = new Object3D.cVector2();
3520		- }
3521		- /*
3522		- if(keep.length == 0)
3523		- object.projectedVertices[0] = new Object3D.cVector2();
3524		- else
3525		- object.projectedVertices[0] = keep[0];
3526		- object.projectedVertices[1] = new Object3D.cVector2();
3527		- */
3528		- }
3529		- }
	3711	+
	3712	+ AllocProjectedVertices(object);
3530	3713
3531	3714	SetMaterial(mat, object.projectedVertices);
3532	3715	}
..	..	@@ -3836,7 +4019,7 @@
3836	4019	//System.out.println("ObjEditor " + event);
3837	4020	applySelf0(true);
3838	4021	//parent.applySelf();
3839		- objEditor.refreshContents();
	4022	+ // conflicts with requestFocus objEditor.refreshContents();
3840	4023	} else if (source == resetButton)
3841	4024	{
3842	4025	CameraPane.fullreset = true;
..	..	@@ -4016,12 +4199,15 @@
4016	4199
4017	4200	void New()
4018	4201	{
4019		- while (copy.Size() > 1)
	4202	+ while (copy.Size() > 0)
4020	4203	{
4021		- copy.remove(1);
	4204	+ copy.remove(0);
4022	4205	}
4023	4206
	4207	+ copy.selection.clear();
	4208	+
4024	4209	ResetModel();
	4210	+ SetupViews();
4025	4211	objEditor.refreshContents();
4026	4212	}
4027	4213
..	..	@@ -4129,7 +4315,7 @@
4129	4315	{
4130	4316	//Save(true);
4131	4317	Replace();
4132		- SetUndoStates();
	4318	+ SetVersionStates();
4133	4319	}
4134	4320
4135	4321	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -4148,8 +4334,6 @@
4148	4334	return true;
4149	4335	}
4150	4336
4151		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4152		-
4153	4337	void DeleteVersion()
4154	4338	{
4155	4339	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4157,9 +4341,13 @@
4157	4341	copy.versionlist[i] = copy.versionlist[i+1];
4158	4342	}
4159	4343
4160		- CopyChanged();
	4344	+ if (copy.versionlist[copy.versionindex] == null)
	4345	+ copy.versionindex -= 1;
4161	4346
4162		- SetUndoStates();
	4347	+ if (copy.versionindex != -1)
	4348	+ CopyChanged();
	4349	+
	4350	+ SetVersionStates();
4163	4351	}
4164	4352
4165	4353	public boolean Save(boolean user)
..	..	@@ -4205,7 +4393,7 @@
4205	4393	// copy.versionlist[i] = null;
4206	4394	// }
4207	4395
4208		- SetUndoStates();
	4396	+ SetVersionStates();
4209	4397
4210	4398	// test save
4211	4399	if (false)
..	..	@@ -4265,12 +4453,12 @@
4265	4453	{
4266	4454	Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4267	4455
4268		- SetUndoStates();
	4456	+ SetVersionStates();
4269	4457
4270	4458	boolean temp = CameraPane.SWITCH;
4271	4459	CameraPane.SWITCH = false;
4272	4460
4273		- copy.ExtractBigData(versiontable);
	4461	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4274	4462
4275	4463	copy.clear();
4276	4464
..	..	@@ -4282,7 +4470,7 @@
4282	4470	copy.add(obj.get(i));
4283	4471	}
4284	4472
4285		- copy.RestoreBigData(versiontable);
	4473	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4286	4474
4287	4475	CameraPane.SWITCH = temp;
4288	4476
..	..	@@ -4332,28 +4520,45 @@
4332	4520	return count;
4333	4521	}
4334	4522
4335		- void SetUndoStates()
	4523	+ public cGridBag versionSliderPane;
	4524	+
	4525	+ void SetVersionStates()
4336	4526	{
4337	4527	//if (true)
4338	4528	// return;
4339	4529
4340	4530	//cRadio tab = GetCurrentTab();
4341	4531
4342		- restoreButton.setEnabled(copy.versionindex != -1);
4343		- replaceButton.setEnabled(copy.versionindex != -1);
4344		-
4345		- previousVersionButton.setEnabled(copy.versionindex > 0);
4346		- nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4347		-
4348		- deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4349		- copy.versionlist[copy.versionindex + 1] != null);
4350		-
4351		- muteSlider = true;
4352		- versionSlider.setMinimum(0);
4353		- versionSlider.setMaximum(VersionCount() - 1);
4354		- versionSlider.setInteger(copy.versionindex);
4355		- versionSlider.setEnabled(copy.versionindex != -1);
4356		- muteSlider = false;
	4532	+ if (copy.versionlist == null)
	4533	+ {
	4534	+ saveVersionButton.setEnabled(false);
	4535	+ restoreButton.setEnabled(false);
	4536	+ replaceButton.setEnabled(false);
	4537	+ previousVersionButton.setEnabled(false);
	4538	+ nextVersionButton.setEnabled(false);
	4539	+ deleteVersionButton.setEnabled(false);
	4540	+ versionSliderPane.setVisible(false);
	4541	+ }
	4542	+ else
	4543	+ {
	4544	+ restoreButton.setEnabled(copy.versionindex != -1);
	4545	+ replaceButton.setEnabled(copy.versionindex != -1);
	4546	+
	4547	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4548	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4549	+
	4550	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4551	+ //copy.versionlist[copy.versionindex + 1] != null);
	4552	+
	4553	+ muteSlider = true;
	4554	+ versionSlider.setMinimum(0);
	4555	+ versionSlider.setMaximum(VersionCount() - 1);
	4556	+ versionSlider.setInteger(copy.versionindex);
	4557	+ versionSlider.setEnabled(copy.versionindex != -1);
	4558	+ muteSlider = false;
	4559	+
	4560	+ versionSliderPane.setVisible(true);
	4561	+ }
4357	4562	}
4358	4563
4359	4564	public boolean PreviousVersion()
..	..	@@ -4411,7 +4616,7 @@
4411	4616
4412	4617	public boolean Replace()
4413	4618	{
4414		- System.err.println("Replace");
	4619	+ //System.err.println("Replace");
4415	4620
4416	4621	//cRadio tab = GetCurrentTab();
4417	4622
..	..	@@ -4638,6 +4843,12 @@
4638	4843	// else
4639	4844	// applySelf(true);
4640	4845	// }
	4846	+
	4847	+ boolean Equal(double a, double b)
	4848	+ {
	4849	+ return Math.abs(a - b) < 0.001;
	4850	+ }
	4851	+
4641	4852	void applySelf0(boolean name)
4642	4853	{
4643	4854	if (name)
..	..	@@ -4687,29 +4898,52 @@
4687	4898	{
4688	4899	cMaterial mat = copy.material;
4689	4900
4690		- colorField.SetToolTipValue((mat.color));
4691		- saturationField.SetToolTipValue((mat.modulation));
4692		- metalnessField.SetToolTipValue((mat.metalness));
4693		- diffuseField.SetToolTipValue((mat.diffuse));
4694		- specularField.SetToolTipValue((mat.specular));
4695		- shininessField.SetToolTipValue((mat.shininess));
4696		- shiftField.SetToolTipValue((mat.shift));
4697		- ambientField.SetToolTipValue((mat.ambient));
4698		- lightareaField.SetToolTipValue((mat.lightarea));
4699		- diffusenessField.SetToolTipValue((mat.factor));
4700		- velvetField.SetToolTipValue((mat.velvet));
4701		- sheenField.SetToolTipValue((mat.sheen));
4702		- subsurfaceField.SetToolTipValue((mat.subsurface));
4703		- backlitField.SetToolTipValue((mat.bump));
4704		- anisoField.SetToolTipValue((mat.aniso));
4705		- anisoVField.SetToolTipValue((mat.anisoV));
4706		- cameraField.SetToolTipValue((mat.cameralight));
4707		- selfshadowField.SetToolTipValue((mat.diffuseness));
4708		- shadowField.SetToolTipValue((mat.shadow));
4709		- textureField.SetToolTipValue((mat.texture));
4710		- opacityField.SetToolTipValue((mat.opacity));
4711		- fakedepthField.SetToolTipValue((mat.fakedepth));
4712		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	4901	+ if (!Equal(colorField.getFloat(), mat.color))
	4902	+ colorField.SetToolTipValue((mat.color));
	4903	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4904	+ saturationField.SetToolTipValue((mat.modulation));
	4905	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4906	+ metalnessField.SetToolTipValue((mat.metalness));
	4907	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4908	+ diffuseField.SetToolTipValue((mat.diffuse));
	4909	+ if (!Equal(specularField.getFloat(), mat.specular))
	4910	+ specularField.SetToolTipValue((mat.specular));
	4911	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4912	+ shininessField.SetToolTipValue((mat.shininess));
	4913	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4914	+ shiftField.SetToolTipValue((mat.shift));
	4915	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4916	+ ambientField.SetToolTipValue((mat.ambient));
	4917	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4918	+ lightareaField.SetToolTipValue((mat.lightarea));
	4919	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4920	+ diffusenessField.SetToolTipValue((mat.factor));
	4921	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4922	+ velvetField.SetToolTipValue((mat.velvet));
	4923	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4924	+ sheenField.SetToolTipValue((mat.sheen));
	4925	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4926	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4927	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4928	+ backlitField.SetToolTipValue((mat.bump));
	4929	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4930	+ anisoField.SetToolTipValue((mat.aniso));
	4931	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4932	+ anisoVField.SetToolTipValue((mat.anisoV));
	4933	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4934	+ cameraField.SetToolTipValue((mat.cameralight));
	4935	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	4936	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4937	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	4938	+ shadowField.SetToolTipValue((mat.shadow));
	4939	+ if (!Equal(textureField.getFloat(), mat.texture))
	4940	+ textureField.SetToolTipValue((mat.texture));
	4941	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	4942	+ opacityField.SetToolTipValue((mat.opacity));
	4943	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	4944	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4945	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	4946	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4713	4947	}
4714	4948
4715	4949	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4744,11 +4978,13 @@
4744	4978
4745	4979	public void stateChanged(ChangeEvent e)
4746	4980	{
4747		- // assert(false);
	4981	+ // assert(false);
4748	4982	if (e.getSource() == versionSlider)
4749	4983	{
4750	4984	if (muteSlider)
4751	4985	return;
	4986	+
	4987	+ Replace();
4752	4988
4753	4989	int version = versionSlider.getInteger();
4754	4990
..	..	@@ -5111,7 +5347,9 @@
5111	5347	}
5112	5348
5113	5349	if (previousVersionButton != null && copy.versionlist != null)
5114		- SetUndoStates();
	5350	+ SetVersionStates();
	5351	+
	5352	+ cameraView.requestFocusInWindow();
5115	5353	}
5116	5354
5117	5355	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5143,7 +5381,7 @@
5143	5381	// group = (Composite) group.get(0);
5144	5382	// }
5145	5383
5146		- System.out.println("makeSomething of " + thing);
	5384	+ //System.out.println("makeSomething of " + thing);
5147	5385
5148	5386	/*
5149	5387	if (deselect && jList != null)
..	..	@@ -5497,6 +5735,7 @@
5497	5735
5498	5736	copy.versionlist = readobj.versionlist;
5499	5737	copy.versionindex = readobj.versionindex;
	5738	+ copy.versiontable = readobj.versiontable;
5500	5739
5501	5740	if (copy.versionlist == null)
5502	5741	{
..	..	@@ -5504,7 +5743,7 @@
5504	5743	copy.versionlist = new Object3D[100];
5505	5744	copy.versionindex = -1;
5506	5745
5507		- Save(true);
	5746	+ //Save(true);
5508	5747	}
5509	5748
5510	5749	//? SetUndoStates();
..	..	@@ -5596,6 +5835,8 @@
5596	5835
5597	5836	void save()
5598	5837	{
	5838	+ Replace();
	5839	+
5599	5840	if (lastname == null)
5600	5841	{
5601	5842	return;
..	..	@@ -5850,6 +6091,7 @@
5850	6091	boolean materialFlushed;
5851	6092	Object3D latestObject;
5852	6093
	6094	+ cGridBag transformPanel;
5853	6095	cGridBag XYZPanel;
5854	6096
5855	6097	JSplitPane gridPanel;