~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	}
..	..	@@ -297,11 +356,13 @@
297	356	client = inClient;
298	357	copy = client;
299	358
300		- if (copy.versionlist == null)
301		- {
302		- copy.versionlist = new Object3D[100];
303		- copy.versionindex = -1;
304		- }
	359	+// if (copy.versionlist == null)
	360	+// {
	361	+// copy.versionlist = new Object3D[100];
	362	+// copy.versionindex = -1;
	363	+//
	364	+// callee.Save(true);
	365	+// }
305	366
306	367	// "this" is not called: SetupUI2(objEditor);
307	368	}
..	..	@@ -320,6 +381,8 @@
320	381	{
321	382	copy.versionlist = new Object3D[100];
322	383	copy.versionindex = -1;
	384	+
	385	+// Save(true);
323	386	}
324	387
325	388	SetupUI2(callee.GetEditor());
..	..	@@ -343,7 +406,8 @@
343	406	//parent = p;
344	407
345	408	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
346		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	409	+ if (Globals.DEBUG)
	410	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
347	411	//gd.setFullScreenWindow(this);
348	412	//setResizable(false);
349	413	//if (!isDisplayable())
..	..	@@ -354,11 +418,13 @@
354	418	copy = localCopy;
355	419	copy.editWindow = this;
356	420
357		- if (copy.versionlist == null)
358		- {
359		-// copy.versions = new byte[100][];
	421	+// if (copy.versionlist == null)
	422	+// {
	423	+// copy.versionlist = new Object3D[100];
360	424	// copy.versionindex = -1;
361		- }
	425	+//
	426	+// Save(true);
	427	+// }
362	428
363	429	SetupMenu();
364	430
..	..	@@ -378,6 +444,9 @@
378	444
379	445	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
380	446
	447	+ // This is to refresh the UI of the material panel.
	448	+ boolean patchMaterial;
	449	+
381	450	void SetupMenu()
382	451	{
383	452	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -391,8 +460,11 @@
391	460	importOBJItem.addActionListener(this);
392	461	import3DSItem = menu.add(new MenuItem("3DS file..."));
393	462	import3DSItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
394	465	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
395	466	importVRMLX3DItem.addActionListener(this);
	467	+ }
396	468	menu.add("-");
397	469	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
398	470	importGFDItem.addActionListener(this);
..	..	@@ -427,6 +499,8 @@
427	499
428	500	ChangeListener changeListener = new ChangeListener()
429	501	{
	502	+ //String name;
	503	+
430	504	public void stateChanged(ChangeEvent changeEvent)
431	505	{
432	506	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -445,7 +519,37 @@
445	519	// EditSelection(false);
446	520	// }
447	521
448		- refreshContents(false); // To refresh Info tab
	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;
	550	+
	551	+// refreshContents(false); // To refresh Info tab
	552	+ cameraView.repaint();
449	553	}
450	554	};
451	555	objectPanel.addChangeListener(changeListener);
..	..	@@ -871,18 +975,29 @@
871	975	boolean temp = CameraPane.SWITCH;
872	976	CameraPane.SWITCH = false;
873	977
874		- 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);
875	982	// if (copy == client)
876	983
877	984	Object3D versions[] = object.versionlist;
	985	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
878	986	object.versionlist = null;
	987	+ object.versiontable = null;
	988	+
	989	+ Object3D parent = object.parent;
	990	+ object.parent = null;
879	991
880	992	//byte[] compress = Compress(copy);
881	993	Object3D compress = (Object3D)Grafreed.clone(object);
882	994
883		- object.versionlist = versions;
	995	+ object.parent = parent;
884	996
885		- object.RestoreBigData(versiontable);
	997	+ object.versionlist = versions;
	998	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	999	+
	1000	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
886	1001
887	1002	CameraPane.SWITCH = temp;
888	1003
..	..	@@ -1221,7 +1336,7 @@
1221	1336
1222	1337	//if (copy.pinned)
1223	1338	{
1224		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1339	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1225	1340	pinButton.setSelected(copy.pinned);
1226	1341	cGridBag t = new cGridBag();
1227	1342	t.preferredWidth = 2;
..	..	@@ -1244,14 +1359,14 @@
1244	1359
1245	1360	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1246	1361	liveCB.setToolTipText("Animate object");
	1362	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1363	+ markCB.setToolTipText("Set target transform");
1247	1364	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1248	1365	selectableCB.setToolTipText("Make object selectable");
1249	1366	// Return();
1250	1367
1251	1368	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1252	1369	hideCB.setToolTipText("Hide object");
1253		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1254		- markCB.setToolTipText("As animation target transform");
1255	1370
1256	1371	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1257	1372
..	..	@@ -1453,22 +1568,9 @@
1453	1568
1454	1569	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1455	1570	{
1456		- System.out.println("CREATE CAMERAS");
1457		- cams = new cTemplate();
1458		- cams.name = "Cameras";
1459		- copy.insertElementAt(cams, 0);
1460		- //cams.parent = copy;
1461		-
1462		- cam = new Camera(); // LA.newVector(3, 2, 1));
1463		- cams.addChild(cam);
1464		- cam = new Camera(1);
1465		- cams.addChild(cam);
1466		- cam = new Camera(2);
1467		- cams.addChild(cam);
1468		- cam = new Camera(3);
1469		- cams.addChild(cam);
1470		- cam = new Camera(4); // Light
1471		- cams.addChild(cam);
	1571	+ if (Globals.DEBUG)
	1572	+ System.out.println("CREATE CAMERAS");
	1573	+ cams = CreateCameras();
1472	1574	} else
1473	1575	{
1474	1576	cams = (cGroup) copy.get(0);
..	..	@@ -1534,6 +1636,45 @@
1534	1636	//frontView.object = copy;
1535	1637	//sideView.object = copy;
1536	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	+
1537	1678	XYZPanel = new cGridBag().setVertical(true);
1538	1679	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1539	1680
..	..	@@ -1543,6 +1684,9 @@
1543	1684	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1544	1685	//XYZPanel.setName("XYZ");
1545	1686
	1687	+ transformPanel.add(resetTransformPanel);
	1688	+ transformPanel.add(XYZPanel);
	1689	+
1546	1690	/*
1547	1691	gridPanel = new JPanel(); //new BorderLayout());
1548	1692	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1550,12 +1694,12 @@
1550	1694	gridPanel.add(cameraView);
1551	1695	gridPanel.add(XYZPanel);
1552	1696	*/
1553		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1554		- gridPanel.setContinuousLayout(true);
1555		- gridPanel.setOneTouchExpandable(true);
1556		- gridPanel.setDividerLocation(1.0);
1557		- gridPanel.setDividerSize(9);
1558		- 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);
1559	1703
1560	1704	// aConstraints.weighty = 0;
1561	1705	//System.out.println("THIS = " + this);
..	..	@@ -1578,30 +1722,34 @@
1578	1722
1579	1723	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1580	1724	//tmp.setName("Edit");
1581		- objectPanel.add(materialPanel);
1582		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1583		- objectPanel.setToolTipTextAt(0, "Material");
1584		-
	1725	+ objectPanel.add(skyboxPanel);
	1726	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1727	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1728	+
1585	1729	objectPanel.add(toolboxPanel);
1586	1730	objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1587	1731	objectPanel.setToolTipTextAt(1, "Objects & textures");
1588	1732
1589		- objectPanel.add(skyboxPanel);
1590		- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1591		- objectPanel.setToolTipTextAt(2, "Backgrounds");
1592		-
	1733	+ objectPanel.add(materialPanel);
	1734	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1735	+ objectPanel.setToolTipTextAt(2, "Material");
	1736	+
1593	1737	// JPanel north = new JPanel(new BorderLayout());
1594	1738	// north.setName("Edit");
1595	1739	// north.add(ctrlPanel, BorderLayout.NORTH);
1596	1740	// objectPanel.add(north);
1597	1741	objectPanel.add(editPanel);
1598		- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1742	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1599	1743	objectPanel.setToolTipTextAt(3, "Edit controls");
1600	1744
1601		- objectPanel.add(XYZPanel);
	1745	+ objectPanel.add(transformPanel);
1602	1746	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1603		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1747	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1604	1748
	1749	+ patchMaterial = true;
	1750	+ cameraView.patchMaterial = this;
	1751	+ objectPanel.setSelectedIndex(2);
	1752	+
1605	1753	/*
1606	1754	aConstraints.gridx = 0;
1607	1755	aConstraints.gridwidth = 1;
..	..	@@ -1621,7 +1769,7 @@
1621	1769	scrollpane.addMouseWheelListener(this); // Default not fast enough
1622	1770
1623	1771	/JTabbedPane/ scenePanel = new cGridBag();
1624		- scenePanel.preferredWidth = 5;
	1772	+ scenePanel.preferredWidth = 6;
1625	1773
1626	1774	JTabbedPane tabbedPane = new JTabbedPane();
1627	1775	tabbedPane.add(scrollpane);
..	..	@@ -1632,17 +1780,109 @@
1632	1780
1633	1781	AddOptions(optionsPanel); //, aConstraints);
1634	1782
1635		- tabbedPane.add(optionsPanel);
1636		-
1637	1783	tabbedPane.add(FSPane = new cFileSystemPane(this));
1638	1784
	1785	+ tabbedPane.add(optionsPanel);
	1786	+
1639	1787	scenePanel.add(tabbedPane);
1640	1788
1641		- //if (Globals.ADVANCED)
1642		- tabbedPane.add(infoPanel);
1643		- tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1644		- tabbedPane.setToolTipTextAt(3, "Information");
	1789	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1790	+ creditsPanel.setName("Credits");
1645	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	+
1646	1886	/*
1647	1887	cTree jTree = new cTree(null);
1648	1888	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1663,13 +1903,13 @@
1663	1903	jtp.add(tree);
1664	1904	*/
1665	1905
1666		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1667		- bigPanel.setContinuousLayout(true);
1668		- bigPanel.setOneTouchExpandable(true);
1669		- bigPanel.setDividerLocation(0.8);
1670		- bigPanel.setDividerSize(15);
1671		- bigPanel.setResizeWeight(0.15);
1672		- 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");
1673	1913
1674	1914	//bigPanel.setLayout(new BorderLayout());
1675	1915	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1739,7 +1979,7 @@
1739	1979
1740	1980	frame.getContentPane().setLayout(new BorderLayout());
1741	1981	/**/
1742		- JTabbedPane worldPane = new JTabbedPane();
	1982	+ //JTabbedPane worldPane = new JTabbedPane();
1743	1983	//worldPane.add(bigPanel);
1744	1984	//worldPane.add(worldPanel);
1745	1985	/**/
..	..	@@ -1753,7 +1993,7 @@
1753	1993
1754	1994	cameraView.requestFocusInWindow();
1755	1995
1756		- gridPanel.setDividerLocation(1.0);
	1996	+// gridPanel.setDividerLocation(1.0);
1757	1997
1758	1998	frame.validate();
1759	1999
..	..	@@ -1788,7 +2028,7 @@
1788	2028	{
1789	2029	cGridBag presetpanel = new cGridBag().setVertical(true);
1790	2030
1791		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	2031	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1792	2032	skin.setToolTipText("Skin");
1793	2033	skin.addMouseListener(new MouseAdapter()
1794	2034	{
..	..	@@ -1799,7 +2039,15 @@
1799	2039
1800	2040	// Skin
1801	2041	colorField.setFloat(material.color);
1802		- 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	+
1803	2051	subsurfaceField.setFloat(material.subsurface);
1804	2052	selfshadowField.setFloat(material.diffuseness);
1805	2053	diffusenessField.setFloat(material.factor);
..	..	@@ -1818,7 +2066,7 @@
1818	2066	});
1819	2067	presetpanel.add(skin);
1820	2068
1821		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2069	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1822	2070	lambert.setToolTipText("Diffuse");
1823	2071	lambert.addMouseListener(new MouseAdapter()
1824	2072	{
..	..	@@ -1836,7 +2084,7 @@
1836	2084	});
1837	2085	presetpanel.add(lambert);
1838	2086
1839		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2087	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1840	2088	diffuse2.setToolTipText("Diffuse2");
1841	2089	diffuse2.addMouseListener(new MouseAdapter()
1842	2090	{
..	..	@@ -1854,7 +2102,7 @@
1854	2102	});
1855	2103	presetpanel.add(diffuse2);
1856	2104
1857		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2105	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1858	2106	diffusemoon.setToolTipText("Moon");
1859	2107	diffusemoon.addMouseListener(new MouseAdapter()
1860	2108	{
..	..	@@ -1872,7 +2120,7 @@
1872	2120	});
1873	2121	presetpanel.add(diffusemoon);
1874	2122
1875		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2123	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1876	2124	diffusemoon2.setToolTipText("Moon2");
1877	2125	diffusemoon2.addMouseListener(new MouseAdapter()
1878	2126	{
..	..	@@ -1890,7 +2138,7 @@
1890	2138	});
1891	2139	presetpanel.add(diffusemoon2);
1892	2140
1893		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2141	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1894	2142	diffusemoon3.setToolTipText("Moon3");
1895	2143	diffusemoon3.addMouseListener(new MouseAdapter()
1896	2144	{
..	..	@@ -1908,7 +2156,7 @@
1908	2156	});
1909	2157	presetpanel.add(diffusemoon3);
1910	2158
1911		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2159	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1912	2160	diffusesheen.setToolTipText("Sheen");
1913	2161	diffusesheen.addMouseListener(new MouseAdapter()
1914	2162	{
..	..	@@ -1925,7 +2173,7 @@
1925	2173	});
1926	2174	presetpanel.add(diffusesheen);
1927	2175
1928		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2176	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
1929	2177	rough.setToolTipText("Rough metal");
1930	2178	rough.addMouseListener(new MouseAdapter()
1931	2179	{
..	..	@@ -1943,7 +2191,7 @@
1943	2191	});
1944	2192	presetpanel.add(rough);
1945	2193
1946		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2194	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
1947	2195	rough2.setToolTipText("Medium metal");
1948	2196	rough2.addMouseListener(new MouseAdapter()
1949	2197	{
..	..	@@ -1961,7 +2209,7 @@
1961	2209	});
1962	2210	presetpanel.add(rough2);
1963	2211
1964		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2212	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
1965	2213	shini0.setToolTipText("Shiny");
1966	2214	shini0.addMouseListener(new MouseAdapter()
1967	2215	{
..	..	@@ -1979,7 +2227,7 @@
1979	2227	});
1980	2228	presetpanel.add(shini0);
1981	2229
1982		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2230	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
1983	2231	shini1.setToolTipText("Shiny2");
1984	2232	shini1.addMouseListener(new MouseAdapter()
1985	2233	{
..	..	@@ -1997,7 +2245,7 @@
1997	2245	});
1998	2246	presetpanel.add(shini1);
1999	2247
2000		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2248	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2001	2249	shini2.setToolTipText("Shiny3");
2002	2250	shini2.addMouseListener(new MouseAdapter()
2003	2251	{
..	..	@@ -2015,7 +2263,7 @@
2015	2263	});
2016	2264	presetpanel.add(shini2);
2017	2265
2018		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2266	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2019	2267	aniso.setToolTipText("AnisoU");
2020	2268	aniso.addMouseListener(new MouseAdapter()
2021	2269	{
..	..	@@ -2033,7 +2281,7 @@
2033	2281	});
2034	2282	presetpanel.add(aniso);
2035	2283
2036		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2284	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2037	2285	aniso2.setToolTipText("AnisoV");
2038	2286	aniso2.addMouseListener(new MouseAdapter()
2039	2287	{
..	..	@@ -2051,7 +2299,7 @@
2051	2299	});
2052	2300	presetpanel.add(aniso2);
2053	2301
2054		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2302	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2055	2303	aniso3.setToolTipText("AnisoUV");
2056	2304	aniso3.addMouseListener(new MouseAdapter()
2057	2305	{
..	..	@@ -2069,7 +2317,7 @@
2069	2317	});
2070	2318	presetpanel.add(aniso3);
2071	2319
2072		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2320	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2073	2321	velvet0.setToolTipText("Velvet");
2074	2322	velvet0.addMouseListener(new MouseAdapter()
2075	2323	{
..	..	@@ -2091,7 +2339,7 @@
2091	2339	});
2092	2340	presetpanel.add(velvet0);
2093	2341
2094		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2342	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2095	2343	bump0.setToolTipText("Bump texture");
2096	2344	bump0.addMouseListener(new MouseAdapter()
2097	2345	{
..	..	@@ -2110,7 +2358,22 @@
2110	2358	});
2111	2359	presetpanel.add(bump0);
2112	2360
2113		- 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);
2114	2377	halo.setToolTipText("Halo");
2115	2378	halo.addMouseListener(new MouseAdapter()
2116	2379	{
..	..	@@ -2127,7 +2390,7 @@
2127	2390	});
2128	2391	presetpanel.add(halo);
2129	2392
2130		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2393	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2131	2394	candle.setToolTipText("Candle");
2132	2395	candle.addMouseListener(new MouseAdapter()
2133	2396	{
..	..	@@ -2149,7 +2412,7 @@
2149	2412	});
2150	2413	presetpanel.add(candle);
2151	2414
2152		- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2415	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2153	2416	shadowShader.setToolTipText("Shadow");
2154	2417	shadowShader.addMouseListener(new MouseAdapter()
2155	2418	{
..	..	@@ -2184,19 +2447,19 @@
2184	2447
2185	2448	cGridBag editBar = new cGridBag().setVertical(false);
2186	2449
2187		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2450	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2188	2451	createMaterialButton.setToolTipText("Create material");
2189	2452
2190	2453	/*
2191	2454	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2192	2455	*/
2193	2456
2194		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2457	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2195	2458	clearMaterialButton.setToolTipText("Clear material");
2196	2459
2197	2460	if (Globals.ADVANCED)
2198	2461	{
2199		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2462	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2200	2463	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2201	2464	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2202	2465	}
..	..	@@ -2217,9 +2480,20 @@
2217	2480
2218	2481	cGridBag huepanel = new cGridBag();
2219	2482	cGridBag huelabel = new cGridBag();
2220		- skin = GetLabel("icons/hue.png", false);
2221		- skin.fit = true;
2222		- 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);
2223	2497	huelabel.preferredWidth = 20;
2224	2498	huepanel.add(new cGridBag()); // Label
2225	2499	huepanel.add(huelabel); // Field/slider
..	..	@@ -3495,32 +3769,8 @@
3495	3769
3496	3770	if (multiplyToggle != null)
3497	3771	multiplyToggle.setSelected(mat.multiply);
3498		-
3499		- assert (object.projectedVertices != null);
3500		-
3501		- if (object.projectedVertices.length <= 2)
3502		- {
3503		- // Side effect...
3504		- Object3D.cVector2[] keep = object.projectedVertices;
3505		- object.projectedVertices = new Object3D.cVector2[3];
3506		- for (int i = 0; i < 3; i++)
3507		- {
3508		- if (i < keep.length)
3509		- {
3510		- object.projectedVertices[i] = keep[i];
3511		- } else
3512		- {
3513		- object.projectedVertices[i] = new Object3D.cVector2();
3514		- }
3515		- /*
3516		- if(keep.length == 0)
3517		- object.projectedVertices[0] = new Object3D.cVector2();
3518		- else
3519		- object.projectedVertices[0] = keep[0];
3520		- object.projectedVertices[1] = new Object3D.cVector2();
3521		- */
3522		- }
3523		- }
	3772	+
	3773	+ AllocProjectedVertices(object);
3524	3774
3525	3775	SetMaterial(mat, object.projectedVertices);
3526	3776	}
..	..	@@ -3830,7 +4080,7 @@
3830	4080	//System.out.println("ObjEditor " + event);
3831	4081	applySelf0(true);
3832	4082	//parent.applySelf();
3833		- objEditor.refreshContents();
	4083	+ // conflicts with requestFocus objEditor.refreshContents();
3834	4084	} else if (source == resetButton)
3835	4085	{
3836	4086	CameraPane.fullreset = true;
..	..	@@ -4010,11 +4260,18 @@
4010	4260
4011	4261	void New()
4012	4262	{
4013		- while (copy.Size() > 1)
	4263	+ while (copy.Size() > 0)
4014	4264	{
4015		- copy.remove(1);
	4265	+ copy.remove(0);
4016	4266	}
4017	4267
	4268	+ copy.selection.clear();
	4269	+
	4270	+ if (copy == Grafreed.grafreed.universe)
	4271	+ {
	4272	+ CreateCameras();
	4273	+ cameraView.SetCamera(GetCamera(copy, 0));
	4274	+ }
4018	4275	ResetModel();
4019	4276	objEditor.refreshContents();
4020	4277	}
..	..	@@ -4123,7 +4380,7 @@
4123	4380	{
4124	4381	//Save(true);
4125	4382	Replace();
4126		- SetUndoStates();
	4383	+ SetVersionStates();
4127	4384	}
4128	4385
4129	4386	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -4142,8 +4399,6 @@
4142	4399	return true;
4143	4400	}
4144	4401
4145		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4146		-
4147	4402	void DeleteVersion()
4148	4403	{
4149	4404	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4151,9 +4406,13 @@
4151	4406	copy.versionlist[i] = copy.versionlist[i+1];
4152	4407	}
4153	4408
4154		- CopyChanged();
	4409	+ if (copy.versionlist[copy.versionindex] == null)
	4410	+ copy.versionindex -= 1;
4155	4411
4156		- SetUndoStates();
	4412	+ if (copy.versionindex != -1)
	4413	+ CopyChanged();
	4414	+
	4415	+ SetVersionStates();
4157	4416	}
4158	4417
4159	4418	public boolean Save(boolean user)
..	..	@@ -4161,7 +4420,7 @@
4161	4420	System.err.println("Save");
4162	4421	Replace();
4163	4422
4164		- cRadio tab = GetCurrentTab();
	4423	+ //cRadio tab = GetCurrentTab();
4165	4424
4166	4425	Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4167	4426
..	..	@@ -4199,7 +4458,7 @@
4199	4458	// copy.versionlist[i] = null;
4200	4459	// }
4201	4460
4202		- SetUndoStates();
	4461	+ SetVersionStates();
4203	4462
4204	4463	// test save
4205	4464	if (false)
..	..	@@ -4259,12 +4518,12 @@
4259	4518	{
4260	4519	Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4261	4520
4262		- SetUndoStates();
	4521	+ SetVersionStates();
4263	4522
4264	4523	boolean temp = CameraPane.SWITCH;
4265	4524	CameraPane.SWITCH = false;
4266	4525
4267		- copy.ExtractBigData(versiontable);
	4526	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4268	4527
4269	4528	copy.clear();
4270	4529
..	..	@@ -4276,7 +4535,7 @@
4276	4535	copy.add(obj.get(i));
4277	4536	}
4278	4537
4279		- copy.RestoreBigData(versiontable);
	4538	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4280	4539
4281	4540	CameraPane.SWITCH = temp;
4282	4541
..	..	@@ -4326,23 +4585,45 @@
4326	4585	return count;
4327	4586	}
4328	4587
4329		- void SetUndoStates()
	4588	+ public cGridBag versionSliderPane;
	4589	+
	4590	+ void SetVersionStates()
4330	4591	{
4331		- cRadio tab = GetCurrentTab();
	4592	+ //if (true)
	4593	+ // return;
	4594	+
	4595	+ //cRadio tab = GetCurrentTab();
4332	4596
4333		- restoreButton.setEnabled(true); // copy.versionindex != -1);
4334		- replaceButton.setEnabled(true); // copy.versionindex != -1);
4335		-
4336		- previousVersionButton.setEnabled(copy.versionindex > 0);
4337		- nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4338		-
4339		- deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4340		- copy.versionlist[copy.versionindex + 1] != null);
4341		-
4342		- muteSlider = true;
4343		- versionSlider.setMaximum(VersionCount() - 1);
4344		- versionSlider.setInteger(copy.versionindex);
4345		- 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	+ }
4346	4627	}
4347	4628
4348	4629	public boolean PreviousVersion()
..	..	@@ -4352,7 +4633,7 @@
4352	4633
4353	4634	System.err.println("Undo");
4354	4635
4355		- cRadio tab = GetCurrentTab();
	4636	+ //cRadio tab = GetCurrentTab();
4356	4637
4357	4638	if (copy.versionindex == 0)
4358	4639	{
..	..	@@ -4384,7 +4665,7 @@
4384	4665	{
4385	4666	System.err.println("Restore");
4386	4667
4387		- cRadio tab = GetCurrentTab();
	4668	+ //cRadio tab = GetCurrentTab();
4388	4669
4389	4670	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4390	4671	{
..	..	@@ -4400,9 +4681,9 @@
4400	4681
4401	4682	public boolean Replace()
4402	4683	{
4403		- System.err.println("Replace");
	4684	+ //System.err.println("Replace");
4404	4685
4405		- cRadio tab = GetCurrentTab();
	4686	+ //cRadio tab = GetCurrentTab();
4406	4687
4407	4688	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4408	4689	{
..	..	@@ -4420,7 +4701,7 @@
4420	4701	// Option?
4421	4702	Replace();
4422	4703
4423		- cRadio tab = GetCurrentTab();
	4704	+ //cRadio tab = GetCurrentTab();
4424	4705
4425	4706	if (copy.versionlist[copy.versionindex + 1] == null)
4426	4707	{
..	..	@@ -4627,6 +4908,12 @@
4627	4908	// else
4628	4909	// applySelf(true);
4629	4910	// }
	4911	+
	4912	+ boolean Equal(double a, double b)
	4913	+ {
	4914	+ return Math.abs(a - b) < 0.001;
	4915	+ }
	4916	+
4630	4917	void applySelf0(boolean name)
4631	4918	{
4632	4919	if (name)
..	..	@@ -4676,29 +4963,52 @@
4676	4963	{
4677	4964	cMaterial mat = copy.material;
4678	4965
4679		- colorField.SetToolTipValue((mat.color));
4680		- saturationField.SetToolTipValue((mat.modulation));
4681		- metalnessField.SetToolTipValue((mat.metalness));
4682		- diffuseField.SetToolTipValue((mat.diffuse));
4683		- specularField.SetToolTipValue((mat.specular));
4684		- shininessField.SetToolTipValue((mat.shininess));
4685		- shiftField.SetToolTipValue((mat.shift));
4686		- ambientField.SetToolTipValue((mat.ambient));
4687		- lightareaField.SetToolTipValue((mat.lightarea));
4688		- diffusenessField.SetToolTipValue((mat.factor));
4689		- velvetField.SetToolTipValue((mat.velvet));
4690		- sheenField.SetToolTipValue((mat.sheen));
4691		- subsurfaceField.SetToolTipValue((mat.subsurface));
4692		- backlitField.SetToolTipValue((mat.bump));
4693		- anisoField.SetToolTipValue((mat.aniso));
4694		- anisoVField.SetToolTipValue((mat.anisoV));
4695		- cameraField.SetToolTipValue((mat.cameralight));
4696		- selfshadowField.SetToolTipValue((mat.diffuseness));
4697		- shadowField.SetToolTipValue((mat.shadow));
4698		- textureField.SetToolTipValue((mat.texture));
4699		- opacityField.SetToolTipValue((mat.opacity));
4700		- fakedepthField.SetToolTipValue((mat.fakedepth));
4701		- 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));
4702	5012	}
4703	5013
4704	5014	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4733,15 +5043,17 @@
4733	5043
4734	5044	public void stateChanged(ChangeEvent e)
4735	5045	{
4736		- // assert(false);
	5046	+ // assert(false);
4737	5047	if (e.getSource() == versionSlider)
4738	5048	{
4739	5049	if (muteSlider)
4740	5050	return;
4741	5051
	5052	+ Replace();
	5053	+
4742	5054	int version = versionSlider.getInteger();
4743	5055
4744		- if (copy.versionlist[version] != null)
	5056	+ if (version != -1 && copy.versionlist[version] != null)
4745	5057	{
4746	5058	copy.versionindex = version;
4747	5059	CopyChanged();
..	..	@@ -5100,7 +5412,9 @@
5100	5412	}
5101	5413
5102	5414	if (previousVersionButton != null && copy.versionlist != null)
5103		- SetUndoStates();
	5415	+ SetVersionStates();
	5416	+
	5417	+ cameraView.requestFocusInWindow();
5104	5418	}
5105	5419
5106	5420	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5132,7 +5446,7 @@
5132	5446	// group = (Composite) group.get(0);
5133	5447	// }
5134	5448
5135		- System.out.println("makeSomething of " + thing);
	5449	+ //System.out.println("makeSomething of " + thing);
5136	5450
5137	5451	/*
5138	5452	if (deselect && jList != null)
..	..	@@ -5486,11 +5800,15 @@
5486	5800
5487	5801	copy.versionlist = readobj.versionlist;
5488	5802	copy.versionindex = readobj.versionindex;
	5803	+ copy.versiontable = readobj.versiontable;
5489	5804
5490	5805	if (copy.versionlist == null)
5491	5806	{
	5807	+ // Backward compatibility
5492	5808	copy.versionlist = new Object3D[100];
5493	5809	copy.versionindex = -1;
	5810	+
	5811	+ //Save(true);
5494	5812	}
5495	5813
5496	5814	//? SetUndoStates();
..	..	@@ -5582,6 +5900,8 @@
5582	5900
5583	5901	void save()
5584	5902	{
	5903	+ Replace();
	5904	+
5585	5905	if (lastname == null)
5586	5906	{
5587	5907	return;
..	..	@@ -5836,6 +6156,7 @@
5836	6156	boolean materialFlushed;
5837	6157	Object3D latestObject;
5838	6158
	6159	+ cGridBag transformPanel;
5839	6160	cGridBag XYZPanel;
5840	6161
5841	6162	JSplitPane gridPanel;