~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	}
..	..	@@ -297,11 +341,13 @@
297	341	client = inClient;
298	342	copy = client;
299	343
300		- if (copy.versionlist == null)
301		- {
302		- copy.versionlist = new Object3D[100];
303		- copy.versionindex = -1;
304		- }
	344	+// if (copy.versionlist == null)
	345	+// {
	346	+// copy.versionlist = new Object3D[100];
	347	+// copy.versionindex = -1;
	348	+//
	349	+// callee.Save(true);
	350	+// }
305	351
306	352	// "this" is not called: SetupUI2(objEditor);
307	353	}
..	..	@@ -320,6 +366,8 @@
320	366	{
321	367	copy.versionlist = new Object3D[100];
322	368	copy.versionindex = -1;
	369	+
	370	+// Save(true);
323	371	}
324	372
325	373	SetupUI2(callee.GetEditor());
..	..	@@ -343,7 +391,8 @@
343	391	//parent = p;
344	392
345	393	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
346		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	394	+ if (Globals.DEBUG)
	395	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
347	396	//gd.setFullScreenWindow(this);
348	397	//setResizable(false);
349	398	//if (!isDisplayable())
..	..	@@ -354,11 +403,13 @@
354	403	copy = localCopy;
355	404	copy.editWindow = this;
356	405
357		- if (copy.versionlist == null)
358		- {
359		-// copy.versions = new byte[100][];
	406	+// if (copy.versionlist == null)
	407	+// {
	408	+// copy.versionlist = new Object3D[100];
360	409	// copy.versionindex = -1;
361		- }
	410	+//
	411	+// Save(true);
	412	+// }
362	413
363	414	SetupMenu();
364	415
..	..	@@ -378,6 +429,9 @@
378	429
379	430	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
380	431
	432	+ // This is to refresh the UI of the material panel.
	433	+ boolean patchMaterial;
	434	+
381	435	void SetupMenu()
382	436	{
383	437	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -427,6 +481,8 @@
427	481
428	482	ChangeListener changeListener = new ChangeListener()
429	483	{
	484	+ //String name;
	485	+
430	486	public void stateChanged(ChangeEvent changeEvent)
431	487	{
432	488	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -445,7 +501,37 @@
445	501	// EditSelection(false);
446	502	// }
447	503
448		- refreshContents(false); // To refresh Info tab
	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	+
	533	+// refreshContents(false); // To refresh Info tab
	534	+ cameraView.repaint();
449	535	}
450	536	};
451	537	objectPanel.addChangeListener(changeListener);
..	..	@@ -754,6 +840,7 @@
754	840	boolean maximized;
755	841
756	842	cButton fullscreenLayout;
	843	+ cButton expandedLayout;
757	844
758	845	void Minimize()
759	846	{
..	..	@@ -793,10 +880,12 @@
793	880	cButton minButton;
794	881	cButton maxButton;
795	882	cButton fullButton;
	883	+ cButton collapseButton;
	884	+ cButton maximize3DButton;
796	885
797	886	void ToggleFullScreen()
798	887	{
799		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	888	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
800	889
801	890	cameraView.ToggleFullScreen();
802	891
..	..	@@ -817,13 +906,13 @@
817	906	// X frame.getContentPane().remove(/"Center",/bigThree);
818	907	// X framePanel.add(bigThree);
819	908	// X frame.getContentPane().add(/"Center",/framePanel);
820		- framePanel.setDividerLocation(46);
	909	+// framePanel.setDividerLocation(46); // icons are 24x24
821	910
822	911	//frame.setVisible(true);
823		- radio.layout = keepButton;
	912	+// radio.layout = keepButton;
824	913	//theFrame = null;
825	914	keepButton = null;
826		- radio.layout.doClick();
	915	+// radio.layout.doClick();
827	916
828	917	} else
829	918	{
..	..	@@ -844,10 +933,10 @@
844	933	// X frame.getContentPane().remove(/"Center",/framePanel);
845	934	// X framePanel.remove(bigThree);
846	935	// X frame.getContentPane().add(/"Center",/bigThree);
847		- framePanel.setDividerLocation(0);
	936	+// framePanel.setDividerLocation(0);
848	937
849		- radio.layout = fullscreenLayout;
850		- radio.layout.doClick();
	938	+// radio.layout = fullscreenLayout;
	939	+// radio.layout.doClick();
851	940	//frame.setVisible(true);
852	941	}
853	942	frame.validate();
..	..	@@ -855,23 +944,42 @@
855	944	cameraView.requestFocusInWindow();
856	945	}
857	946
858		- private Object3D CompressCopy()
	947	+ void CollapseToolbar()
	948	+ {
	949	+ framePanel.setDividerLocation(0);
	950	+ //frame.validate();
	951	+
	952	+ cameraView.requestFocusInWindow();
	953	+ }
	954	+
	955	+ private Object3D Duplicate(Object3D object)
859	956	{
860	957	boolean temp = CameraPane.SWITCH;
861	958	CameraPane.SWITCH = false;
862	959
863		- copy.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);
864	964	// if (copy == client)
865	965
866		- Object3D versions[] = copy.versionlist;
867		- copy.versionlist = null;
	966	+ Object3D versions[] = object.versionlist;
	967	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	968	+ object.versionlist = null;
	969	+ object.versiontable = null;
	970	+
	971	+ Object3D parent = object.parent;
	972	+ object.parent = null;
868	973
869	974	//byte[] compress = Compress(copy);
870		- Object3D compress = (Object3D)Grafreed.clone(copy);
	975	+ Object3D compress = (Object3D)Grafreed.clone(object);
871	976
872		- copy.versionlist = versions;
	977	+ object.parent = parent;
873	978
874		- copy.RestoreBigData(versiontable);
	979	+ object.versionlist = versions;
	980	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	981	+
	982	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
875	983
876	984	CameraPane.SWITCH = temp;
877	985
..	..	@@ -1210,7 +1318,7 @@
1210	1318
1211	1319	//if (copy.pinned)
1212	1320	{
1213		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1321	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1214	1322	pinButton.setSelected(copy.pinned);
1215	1323	cGridBag t = new cGridBag();
1216	1324	t.preferredWidth = 2;
..	..	@@ -1233,14 +1341,14 @@
1233	1341
1234	1342	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1235	1343	liveCB.setToolTipText("Animate object");
	1344	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1345	+ markCB.setToolTipText("Set target transform");
1236	1346	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1237	1347	selectableCB.setToolTipText("Make object selectable");
1238	1348	// Return();
1239	1349
1240	1350	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1241	1351	hideCB.setToolTipText("Hide object");
1242		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1243		- markCB.setToolTipText("As animation target transform");
1244	1352
1245	1353	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1246	1354
..	..	@@ -1442,6 +1550,7 @@
1442	1550
1443	1551	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1444	1552	{
	1553	+ if (Globals.DEBUG)
1445	1554	System.out.println("CREATE CAMERAS");
1446	1555	cams = new cTemplate();
1447	1556	cams.name = "Cameras";
..	..	@@ -1523,6 +1632,45 @@
1523	1632	//frontView.object = copy;
1524	1633	//sideView.object = copy;
1525	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	+
1526	1674	XYZPanel = new cGridBag().setVertical(true);
1527	1675	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1528	1676
..	..	@@ -1532,6 +1680,9 @@
1532	1680	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1533	1681	//XYZPanel.setName("XYZ");
1534	1682
	1683	+ transformPanel.add(resetTransformPanel);
	1684	+ transformPanel.add(XYZPanel);
	1685	+
1535	1686	/*
1536	1687	gridPanel = new JPanel(); //new BorderLayout());
1537	1688	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1539,12 +1690,12 @@
1539	1690	gridPanel.add(cameraView);
1540	1691	gridPanel.add(XYZPanel);
1541	1692	*/
1542		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1543		- gridPanel.setContinuousLayout(true);
1544		- gridPanel.setOneTouchExpandable(true);
1545		- gridPanel.setDividerLocation(1.0);
1546		- gridPanel.setDividerSize(9);
1547		- 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);
1548	1699
1549	1700	// aConstraints.weighty = 0;
1550	1701	//System.out.println("THIS = " + this);
..	..	@@ -1567,14 +1718,14 @@
1567	1718
1568	1719	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1569	1720	//tmp.setName("Edit");
1570		- objectPanel.add(materialPanel);
1571		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1572		- objectPanel.setToolTipTextAt(0, "Material");
1573		-
1574	1721	objectPanel.add(toolboxPanel);
1575		- objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1576		- objectPanel.setToolTipTextAt(1, "Objects & textures");
	1722	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1723	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
1577	1724
	1725	+ objectPanel.add(materialPanel);
	1726	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1727	+ objectPanel.setToolTipTextAt(1, "Material");
	1728	+
1578	1729	objectPanel.add(skyboxPanel);
1579	1730	objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1580	1731	objectPanel.setToolTipTextAt(2, "Backgrounds");
..	..	@@ -1587,10 +1738,14 @@
1587	1738	objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1588	1739	objectPanel.setToolTipTextAt(3, "Edit controls");
1589	1740
1590		- objectPanel.add(XYZPanel);
	1741	+ objectPanel.add(transformPanel);
1591	1742	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1592		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1743	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1593	1744
	1745	+ patchMaterial = true;
	1746	+ cameraView.patchMaterial = this;
	1747	+ objectPanel.setSelectedIndex(1);
	1748	+
1594	1749	/*
1595	1750	aConstraints.gridx = 0;
1596	1751	aConstraints.gridwidth = 1;
..	..	@@ -1610,7 +1765,7 @@
1610	1765	scrollpane.addMouseWheelListener(this); // Default not fast enough
1611	1766
1612	1767	/JTabbedPane/ scenePanel = new cGridBag();
1613		- scenePanel.preferredWidth = 5;
	1768	+ scenePanel.preferredWidth = 6;
1614	1769
1615	1770	JTabbedPane tabbedPane = new JTabbedPane();
1616	1771	tabbedPane.add(scrollpane);
..	..	@@ -1621,17 +1776,52 @@
1621	1776
1622	1777	AddOptions(optionsPanel); //, aConstraints);
1623	1778
1624		- tabbedPane.add(optionsPanel);
1625		-
1626	1779	tabbedPane.add(FSPane = new cFileSystemPane(this));
1627	1780
	1781	+ tabbedPane.add(optionsPanel);
	1782	+
1628	1783	scenePanel.add(tabbedPane);
1629	1784
1630		- //if (Globals.ADVANCED)
1631		- tabbedPane.add(infoPanel);
1632		- tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1633		- tabbedPane.setToolTipTextAt(3, "Information");
	1785	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1786	+ creditsPanel.setName("Credits");
1634	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	+
1635	1825	/*
1636	1826	cTree jTree = new cTree(null);
1637	1827	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1652,13 +1842,13 @@
1652	1842	jtp.add(tree);
1653	1843	*/
1654	1844
1655		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1656		- bigPanel.setContinuousLayout(true);
1657		- bigPanel.setOneTouchExpandable(true);
1658		- bigPanel.setDividerLocation(0.8);
1659		- bigPanel.setDividerSize(15);
1660		- bigPanel.setResizeWeight(0.15);
1661		- 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");
1662	1852
1663	1853	//bigPanel.setLayout(new BorderLayout());
1664	1854	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1702,6 +1892,23 @@
1702	1892	// aConstraints.gridheight = 1;
1703	1893
1704	1894	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1895	+
	1896	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1897	+ new java.beans.PropertyChangeListener()
	1898	+ {
	1899	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1900	+ {
	1901	+ if ((Integer)pce.getOldValue() == 1)
	1902	+ {
	1903	+ if (radio.layout != expandedLayout)
	1904	+ {
	1905	+ radio.layout = expandedLayout;
	1906	+ radio.layout.doClick();
	1907	+ }
	1908	+ }
	1909	+ }
	1910	+ });
	1911	+
1705	1912	framePanel.setContinuousLayout(false);
1706	1913	framePanel.setOneTouchExpandable(false);
1707	1914	//.setDividerLocation(0.8);
..	..	@@ -1711,7 +1918,7 @@
1711	1918
1712	1919	frame.getContentPane().setLayout(new BorderLayout());
1713	1920	/**/
1714		- JTabbedPane worldPane = new JTabbedPane();
	1921	+ //JTabbedPane worldPane = new JTabbedPane();
1715	1922	//worldPane.add(bigPanel);
1716	1923	//worldPane.add(worldPanel);
1717	1924	/**/
..	..	@@ -1725,7 +1932,7 @@
1725	1932
1726	1933	cameraView.requestFocusInWindow();
1727	1934
1728		- gridPanel.setDividerLocation(1.0);
	1935	+// gridPanel.setDividerLocation(1.0);
1729	1936
1730	1937	frame.validate();
1731	1938
..	..	@@ -1760,7 +1967,7 @@
1760	1967	{
1761	1968	cGridBag presetpanel = new cGridBag().setVertical(true);
1762	1969
1763		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1970	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1764	1971	skin.setToolTipText("Skin");
1765	1972	skin.addMouseListener(new MouseAdapter()
1766	1973	{
..	..	@@ -1771,7 +1978,15 @@
1771	1978
1772	1979	// Skin
1773	1980	colorField.setFloat(material.color);
1774		- 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	+
1775	1990	subsurfaceField.setFloat(material.subsurface);
1776	1991	selfshadowField.setFloat(material.diffuseness);
1777	1992	diffusenessField.setFloat(material.factor);
..	..	@@ -1790,7 +2005,7 @@
1790	2005	});
1791	2006	presetpanel.add(skin);
1792	2007
1793		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2008	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1794	2009	lambert.setToolTipText("Diffuse");
1795	2010	lambert.addMouseListener(new MouseAdapter()
1796	2011	{
..	..	@@ -1808,7 +2023,7 @@
1808	2023	});
1809	2024	presetpanel.add(lambert);
1810	2025
1811		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2026	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1812	2027	diffuse2.setToolTipText("Diffuse2");
1813	2028	diffuse2.addMouseListener(new MouseAdapter()
1814	2029	{
..	..	@@ -1826,7 +2041,7 @@
1826	2041	});
1827	2042	presetpanel.add(diffuse2);
1828	2043
1829		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2044	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1830	2045	diffusemoon.setToolTipText("Moon");
1831	2046	diffusemoon.addMouseListener(new MouseAdapter()
1832	2047	{
..	..	@@ -1844,7 +2059,7 @@
1844	2059	});
1845	2060	presetpanel.add(diffusemoon);
1846	2061
1847		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2062	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1848	2063	diffusemoon2.setToolTipText("Moon2");
1849	2064	diffusemoon2.addMouseListener(new MouseAdapter()
1850	2065	{
..	..	@@ -1862,7 +2077,7 @@
1862	2077	});
1863	2078	presetpanel.add(diffusemoon2);
1864	2079
1865		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2080	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1866	2081	diffusemoon3.setToolTipText("Moon3");
1867	2082	diffusemoon3.addMouseListener(new MouseAdapter()
1868	2083	{
..	..	@@ -1880,7 +2095,7 @@
1880	2095	});
1881	2096	presetpanel.add(diffusemoon3);
1882	2097
1883		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2098	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1884	2099	diffusesheen.setToolTipText("Sheen");
1885	2100	diffusesheen.addMouseListener(new MouseAdapter()
1886	2101	{
..	..	@@ -1897,7 +2112,7 @@
1897	2112	});
1898	2113	presetpanel.add(diffusesheen);
1899	2114
1900		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2115	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
1901	2116	rough.setToolTipText("Rough metal");
1902	2117	rough.addMouseListener(new MouseAdapter()
1903	2118	{
..	..	@@ -1915,7 +2130,7 @@
1915	2130	});
1916	2131	presetpanel.add(rough);
1917	2132
1918		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2133	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
1919	2134	rough2.setToolTipText("Medium metal");
1920	2135	rough2.addMouseListener(new MouseAdapter()
1921	2136	{
..	..	@@ -1933,7 +2148,7 @@
1933	2148	});
1934	2149	presetpanel.add(rough2);
1935	2150
1936		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2151	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
1937	2152	shini0.setToolTipText("Shiny");
1938	2153	shini0.addMouseListener(new MouseAdapter()
1939	2154	{
..	..	@@ -1951,7 +2166,7 @@
1951	2166	});
1952	2167	presetpanel.add(shini0);
1953	2168
1954		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2169	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
1955	2170	shini1.setToolTipText("Shiny2");
1956	2171	shini1.addMouseListener(new MouseAdapter()
1957	2172	{
..	..	@@ -1969,7 +2184,7 @@
1969	2184	});
1970	2185	presetpanel.add(shini1);
1971	2186
1972		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2187	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
1973	2188	shini2.setToolTipText("Shiny3");
1974	2189	shini2.addMouseListener(new MouseAdapter()
1975	2190	{
..	..	@@ -1987,7 +2202,7 @@
1987	2202	});
1988	2203	presetpanel.add(shini2);
1989	2204
1990		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2205	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
1991	2206	aniso.setToolTipText("AnisoU");
1992	2207	aniso.addMouseListener(new MouseAdapter()
1993	2208	{
..	..	@@ -2005,7 +2220,7 @@
2005	2220	});
2006	2221	presetpanel.add(aniso);
2007	2222
2008		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2223	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2009	2224	aniso2.setToolTipText("AnisoV");
2010	2225	aniso2.addMouseListener(new MouseAdapter()
2011	2226	{
..	..	@@ -2023,7 +2238,7 @@
2023	2238	});
2024	2239	presetpanel.add(aniso2);
2025	2240
2026		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2241	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2027	2242	aniso3.setToolTipText("AnisoUV");
2028	2243	aniso3.addMouseListener(new MouseAdapter()
2029	2244	{
..	..	@@ -2041,7 +2256,7 @@
2041	2256	});
2042	2257	presetpanel.add(aniso3);
2043	2258
2044		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2259	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2045	2260	velvet0.setToolTipText("Velvet");
2046	2261	velvet0.addMouseListener(new MouseAdapter()
2047	2262	{
..	..	@@ -2063,7 +2278,7 @@
2063	2278	});
2064	2279	presetpanel.add(velvet0);
2065	2280
2066		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2281	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2067	2282	bump0.setToolTipText("Bump texture");
2068	2283	bump0.addMouseListener(new MouseAdapter()
2069	2284	{
..	..	@@ -2082,7 +2297,22 @@
2082	2297	});
2083	2298	presetpanel.add(bump0);
2084	2299
2085		- 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);
2086	2316	halo.setToolTipText("Halo");
2087	2317	halo.addMouseListener(new MouseAdapter()
2088	2318	{
..	..	@@ -2099,7 +2329,7 @@
2099	2329	});
2100	2330	presetpanel.add(halo);
2101	2331
2102		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2332	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2103	2333	candle.setToolTipText("Candle");
2104	2334	candle.addMouseListener(new MouseAdapter()
2105	2335	{
..	..	@@ -2121,6 +2351,25 @@
2121	2351	});
2122	2352	presetpanel.add(candle);
2123	2353
	2354	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2355	+ shadowShader.setToolTipText("Shadow");
	2356	+ shadowShader.addMouseListener(new MouseAdapter()
	2357	+ {
	2358	+ public void mouseClicked(MouseEvent e)
	2359	+ {
	2360	+ diffuseField.setFloat(0.001);
	2361	+ ambientField.setFloat(0.001);
	2362	+ cameraField.setFloat(0.001);
	2363	+ specularField.setFloat(0.001);
	2364	+ fakedepthField.setFloat(0.001);
	2365	+ opacityField.setFloat(0.6);
	2366	+
	2367	+ materialtouched = true;
	2368	+ applySelf();
	2369	+ }
	2370	+ });
	2371	+ presetpanel.add(shadowShader);
	2372	+
2124	2373	cGridBag panel = new cGridBag().setVertical(true);
2125	2374
2126	2375	presetpanel.preferredWidth = 1;
..	..	@@ -2137,19 +2386,19 @@
2137	2386
2138	2387	cGridBag editBar = new cGridBag().setVertical(false);
2139	2388
2140		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2389	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2141	2390	createMaterialButton.setToolTipText("Create material");
2142	2391
2143	2392	/*
2144	2393	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2145	2394	*/
2146	2395
2147		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2396	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2148	2397	clearMaterialButton.setToolTipText("Clear material");
2149	2398
2150	2399	if (Globals.ADVANCED)
2151	2400	{
2152		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2401	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2153	2402	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2154	2403	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2155	2404	}
..	..	@@ -2170,9 +2419,20 @@
2170	2419
2171	2420	cGridBag huepanel = new cGridBag();
2172	2421	cGridBag huelabel = new cGridBag();
2173		- skin = GetLabel("icons/hue.png", false);
2174		- skin.fit = true;
2175		- 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);
2176	2436	huelabel.preferredWidth = 20;
2177	2437	huepanel.add(new cGridBag()); // Label
2178	2438	huepanel.add(huelabel); // Field/slider
..	..	@@ -3448,32 +3708,8 @@
3448	3708
3449	3709	if (multiplyToggle != null)
3450	3710	multiplyToggle.setSelected(mat.multiply);
3451		-
3452		- assert (object.projectedVertices != null);
3453		-
3454		- if (object.projectedVertices.length <= 2)
3455		- {
3456		- // Side effect...
3457		- Object3D.cVector2[] keep = object.projectedVertices;
3458		- object.projectedVertices = new Object3D.cVector2[3];
3459		- for (int i = 0; i < 3; i++)
3460		- {
3461		- if (i < keep.length)
3462		- {
3463		- object.projectedVertices[i] = keep[i];
3464		- } else
3465		- {
3466		- object.projectedVertices[i] = new Object3D.cVector2();
3467		- }
3468		- /*
3469		- if(keep.length == 0)
3470		- object.projectedVertices[0] = new Object3D.cVector2();
3471		- else
3472		- object.projectedVertices[0] = keep[0];
3473		- object.projectedVertices[1] = new Object3D.cVector2();
3474		- */
3475		- }
3476		- }
	3711	+
	3712	+ AllocProjectedVertices(object);
3477	3713
3478	3714	SetMaterial(mat, object.projectedVertices);
3479	3715	}
..	..	@@ -3783,7 +4019,7 @@
3783	4019	//System.out.println("ObjEditor " + event);
3784	4020	applySelf0(true);
3785	4021	//parent.applySelf();
3786		- objEditor.refreshContents();
	4022	+ // conflicts with requestFocus objEditor.refreshContents();
3787	4023	} else if (source == resetButton)
3788	4024	{
3789	4025	CameraPane.fullreset = true;
..	..	@@ -3963,12 +4199,15 @@
3963	4199
3964	4200	void New()
3965	4201	{
3966		- while (copy.Size() > 1)
	4202	+ while (copy.Size() > 0)
3967	4203	{
3968		- copy.remove(1);
	4204	+ copy.remove(0);
3969	4205	}
3970	4206
	4207	+ copy.selection.clear();
	4208	+
3971	4209	ResetModel();
	4210	+ SetupViews();
3972	4211	objEditor.refreshContents();
3973	4212	}
3974	4213
..	..	@@ -4076,7 +4315,7 @@
4076	4315	{
4077	4316	//Save(true);
4078	4317	Replace();
4079		- SetUndoStates();
	4318	+ SetVersionStates();
4080	4319	}
4081	4320
4082	4321	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -4095,8 +4334,6 @@
4095	4334	return true;
4096	4335	}
4097	4336
4098		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4099		-
4100	4337	void DeleteVersion()
4101	4338	{
4102	4339	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4104,19 +4341,23 @@
4104	4341	copy.versionlist[i] = copy.versionlist[i+1];
4105	4342	}
4106	4343
4107		- CopyChanged();
	4344	+ if (copy.versionlist[copy.versionindex] == null)
	4345	+ copy.versionindex -= 1;
4108	4346
4109		- SetUndoStates();
	4347	+ if (copy.versionindex != -1)
	4348	+ CopyChanged();
	4349	+
	4350	+ SetVersionStates();
4110	4351	}
4111	4352
4112	4353	public boolean Save(boolean user)
4113	4354	{
4114	4355	System.err.println("Save");
4115		- //Replace();
	4356	+ Replace();
4116	4357
4117		- cRadio tab = GetCurrentTab();
	4358	+ //cRadio tab = GetCurrentTab();
4118	4359
4119		- Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
	4360	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4120	4361
4121	4362	boolean thesame = false;
4122	4363
..	..	@@ -4152,7 +4393,7 @@
4152	4393	// copy.versionlist[i] = null;
4153	4394	// }
4154	4395
4155		- SetUndoStates();
	4396	+ SetVersionStates();
4156	4397
4157	4398	// test save
4158	4399	if (false)
..	..	@@ -4210,14 +4451,14 @@
4210	4451
4211	4452	void CopyChanged()
4212	4453	{
4213		- Object3D obj = copy.versionlist[copy.versionindex];
	4454	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4214	4455
4215		- SetUndoStates();
	4456	+ SetVersionStates();
4216	4457
4217	4458	boolean temp = CameraPane.SWITCH;
4218	4459	CameraPane.SWITCH = false;
4219	4460
4220		- copy.ExtractBigData(versiontable);
	4461	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4221	4462
4222	4463	copy.clear();
4223	4464
..	..	@@ -4229,7 +4470,7 @@
4229	4470	copy.add(obj.get(i));
4230	4471	}
4231	4472
4232		- copy.RestoreBigData(versiontable);
	4473	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4233	4474
4234	4475	CameraPane.SWITCH = temp;
4235	4476
..	..	@@ -4279,23 +4520,45 @@
4279	4520	return count;
4280	4521	}
4281	4522
4282		- void SetUndoStates()
	4523	+ public cGridBag versionSliderPane;
	4524	+
	4525	+ void SetVersionStates()
4283	4526	{
4284		- cRadio tab = GetCurrentTab();
	4527	+ //if (true)
	4528	+ // return;
	4529	+
	4530	+ //cRadio tab = GetCurrentTab();
4285	4531
4286		- restoreButton.setEnabled(true); // copy.versionindex != -1);
4287		- replaceButton.setEnabled(true); // copy.versionindex != -1);
4288		-
4289		- previousVersionButton.setEnabled(copy.versionindex > 0);
4290		- nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4291		-
4292		- deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4293		- copy.versionlist[copy.versionindex + 1] != null);
4294		-
4295		- muteSlider = true;
4296		- versionSlider.setMaximum(VersionCount() - 1);
4297		- versionSlider.setInteger(copy.versionindex);
4298		- 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	+ }
4299	4562	}
4300	4563
4301	4564	public boolean PreviousVersion()
..	..	@@ -4305,7 +4568,7 @@
4305	4568
4306	4569	System.err.println("Undo");
4307	4570
4308		- cRadio tab = GetCurrentTab();
	4571	+ //cRadio tab = GetCurrentTab();
4309	4572
4310	4573	if (copy.versionindex == 0)
4311	4574	{
..	..	@@ -4337,7 +4600,7 @@
4337	4600	{
4338	4601	System.err.println("Restore");
4339	4602
4340		- cRadio tab = GetCurrentTab();
	4603	+ //cRadio tab = GetCurrentTab();
4341	4604
4342	4605	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4343	4606	{
..	..	@@ -4353,9 +4616,9 @@
4353	4616
4354	4617	public boolean Replace()
4355	4618	{
4356		- System.err.println("Replace");
	4619	+ //System.err.println("Replace");
4357	4620
4358		- cRadio tab = GetCurrentTab();
	4621	+ //cRadio tab = GetCurrentTab();
4359	4622
4360	4623	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4361	4624	{
..	..	@@ -4363,7 +4626,7 @@
4363	4626	return false;
4364	4627	}
4365	4628
4366		- copy.versionlist[copy.versionindex] = CompressCopy();
	4629	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
4367	4630
4368	4631	return true;
4369	4632	}
..	..	@@ -4373,7 +4636,7 @@
4373	4636	// Option?
4374	4637	Replace();
4375	4638
4376		- cRadio tab = GetCurrentTab();
	4639	+ //cRadio tab = GetCurrentTab();
4377	4640
4378	4641	if (copy.versionlist[copy.versionindex + 1] == null)
4379	4642	{
..	..	@@ -4580,6 +4843,12 @@
4580	4843	// else
4581	4844	// applySelf(true);
4582	4845	// }
	4846	+
	4847	+ boolean Equal(double a, double b)
	4848	+ {
	4849	+ return Math.abs(a - b) < 0.001;
	4850	+ }
	4851	+
4583	4852	void applySelf0(boolean name)
4584	4853	{
4585	4854	if (name)
..	..	@@ -4629,29 +4898,52 @@
4629	4898	{
4630	4899	cMaterial mat = copy.material;
4631	4900
4632		- colorField.SetToolTipValue((mat.color));
4633		- saturationField.SetToolTipValue((mat.modulation));
4634		- metalnessField.SetToolTipValue((mat.metalness));
4635		- diffuseField.SetToolTipValue((mat.diffuse));
4636		- specularField.SetToolTipValue((mat.specular));
4637		- shininessField.SetToolTipValue((mat.shininess));
4638		- shiftField.SetToolTipValue((mat.shift));
4639		- ambientField.SetToolTipValue((mat.ambient));
4640		- lightareaField.SetToolTipValue((mat.lightarea));
4641		- diffusenessField.SetToolTipValue((mat.factor));
4642		- velvetField.SetToolTipValue((mat.velvet));
4643		- sheenField.SetToolTipValue((mat.sheen));
4644		- subsurfaceField.SetToolTipValue((mat.subsurface));
4645		- backlitField.SetToolTipValue((mat.bump));
4646		- anisoField.SetToolTipValue((mat.aniso));
4647		- anisoVField.SetToolTipValue((mat.anisoV));
4648		- cameraField.SetToolTipValue((mat.cameralight));
4649		- selfshadowField.SetToolTipValue((mat.diffuseness));
4650		- shadowField.SetToolTipValue((mat.shadow));
4651		- textureField.SetToolTipValue((mat.texture));
4652		- opacityField.SetToolTipValue((mat.opacity));
4653		- fakedepthField.SetToolTipValue((mat.fakedepth));
4654		- 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));
4655	4947	}
4656	4948
4657	4949	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4686,15 +4978,17 @@
4686	4978
4687	4979	public void stateChanged(ChangeEvent e)
4688	4980	{
4689		- // assert(false);
	4981	+ // assert(false);
4690	4982	if (e.getSource() == versionSlider)
4691	4983	{
4692	4984	if (muteSlider)
4693	4985	return;
4694	4986
	4987	+ Replace();
	4988	+
4695	4989	int version = versionSlider.getInteger();
4696	4990
4697		- if (copy.versionlist[version] != null)
	4991	+ if (version != -1 && copy.versionlist[version] != null)
4698	4992	{
4699	4993	copy.versionindex = version;
4700	4994	CopyChanged();
..	..	@@ -4738,7 +5032,7 @@
4738	5032	//System.out.println("stateChanged = " + this);
4739	5033	materialtouched = true;
4740	5034
4741		- if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5035	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
4742	5036	{
4743	5037	saturationField.setFloat(1);
4744	5038	}
..	..	@@ -5053,7 +5347,9 @@
5053	5347	}
5054	5348
5055	5349	if (previousVersionButton != null && copy.versionlist != null)
5056		- SetUndoStates();
	5350	+ SetVersionStates();
	5351	+
	5352	+ cameraView.requestFocusInWindow();
5057	5353	}
5058	5354
5059	5355	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5085,7 +5381,7 @@
5085	5381	// group = (Composite) group.get(0);
5086	5382	// }
5087	5383
5088		- System.out.println("makeSomething of " + thing);
	5384	+ //System.out.println("makeSomething of " + thing);
5089	5385
5090	5386	/*
5091	5387	if (deselect && jList != null)
..	..	@@ -5439,11 +5735,15 @@
5439	5735
5440	5736	copy.versionlist = readobj.versionlist;
5441	5737	copy.versionindex = readobj.versionindex;
	5738	+ copy.versiontable = readobj.versiontable;
5442	5739
5443	5740	if (copy.versionlist == null)
5444	5741	{
	5742	+ // Backward compatibility
5445	5743	copy.versionlist = new Object3D[100];
5446	5744	copy.versionindex = -1;
	5745	+
	5746	+ //Save(true);
5447	5747	}
5448	5748
5449	5749	//? SetUndoStates();
..	..	@@ -5535,6 +5835,8 @@
5535	5835
5536	5836	void save()
5537	5837	{
	5838	+ Replace();
	5839	+
5538	5840	if (lastname == null)
5539	5841	{
5540	5842	return;
..	..	@@ -5789,6 +6091,7 @@
5789	6091	boolean materialFlushed;
5790	6092	Object3D latestObject;
5791	6093
	6094	+ cGridBag transformPanel;
5792	6095	cGridBag XYZPanel;
5793	6096
5794	6097	JSplitPane gridPanel;
..	..	@@ -5882,6 +6185,7 @@
5882	6185	cNumberSlider anisoField;
5883	6186	JLabel anisoVLabel;
5884	6187	cNumberSlider anisoVField;
	6188	+
5885	6189	JLabel cameraLabel;
5886	6190	cNumberSlider cameraField;
5887	6191	JLabel selfshadowLabel;
..	..	@@ -5896,6 +6200,7 @@
5896	6200	cNumberSlider fakedepthField;
5897	6201	JLabel shadowbiasLabel;
5898	6202	cNumberSlider shadowbiasField;
	6203	+
5899	6204	JLabel bumpLabel;
5900	6205	cNumberSlider bumpField;
5901	6206	JLabel noiseLabel;