~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,12 +122,26 @@
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));
83		-
	137	+ BufferedImage image;
	138	+
	139	+ if (name.endsWith("jpg"))
	140	+ // Much faster!
	141	+ image = new sun.awt.image.codec.JPEGImageDecoderImpl(ObjEditor.class.getClassLoader().getResourceAsStream(name)).decodeAsBufferedImage();
	142	+ else
	143	+ image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	144	+
84	145	// if (image.getWidth() > 48 && image.getHeight() > 48)
85	146	// {
86	147	// BufferedImage resized = new BufferedImage(48, 48, image.getType());
..	..	@@ -94,10 +155,14 @@
94	155	// }
95	156
96	157	javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	158	+
	159	+ icons.put(name, icon);
	160	+
97	161	return icon;
98	162	}
99	163	catch (Exception e)
100	164	{
	165	+ //icons.put(name, null);
101	166	return null;
102	167	}
103	168	}
..	..	@@ -318,14 +383,6 @@
318	383	client = inClient;
319	384	copy = client;
320	385
321		- if (copy.versionlist == null)
322		- {
323		- copy.versionlist = new Object3D[100];
324		- copy.versionindex = -1;
325		-
326		-// Save(true);
327		- }
328		-
329	386	SetupUI2(callee.GetEditor());
330	387	}
331	388
..	..	@@ -347,7 +404,8 @@
347	404	//parent = p;
348	405
349	406	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
350		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	407	+ if (Globals.DEBUG)
	408	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
351	409	//gd.setFullScreenWindow(this);
352	410	//setResizable(false);
353	411	//if (!isDisplayable())
..	..	@@ -384,6 +442,9 @@
384	442
385	443	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
386	444
	445	+ // This is to refresh the UI of the material panel.
	446	+ boolean patchMaterial;
	447	+
387	448	void SetupMenu()
388	449	{
389	450	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -397,8 +458,11 @@
397	458	importOBJItem.addActionListener(this);
398	459	import3DSItem = menu.add(new MenuItem("3DS file..."));
399	460	import3DSItem.addActionListener(this);
	461	+ if (Globals.ADVANCED)
	462	+ {
400	463	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
401	464	importVRMLX3DItem.addActionListener(this);
	465	+ }
402	466	menu.add("-");
403	467	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
404	468	importGFDItem.addActionListener(this);
..	..	@@ -433,6 +497,8 @@
433	497
434	498	ChangeListener changeListener = new ChangeListener()
435	499	{
	500	+ //String name;
	501	+
436	502	public void stateChanged(ChangeEvent changeEvent)
437	503	{
438	504	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -451,7 +517,37 @@
451	517	// EditSelection(false);
452	518	// }
453	519
	520	+// if (objectPanel.getSelectedIndex() == 4)
	521	+// {
	522	+// name = copy.skyboxname;
	523	+//
	524	+// if (name == null)
	525	+// {
	526	+// name = "";
	527	+// }
	528	+//
	529	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	530	+// copy.skyboxext = "jpg";
	531	+// }
	532	+// else
	533	+// {
	534	+// if (name != null)
	535	+// {
	536	+// if (name.equals(""))
	537	+// {
	538	+// copy.skyboxname = null;
	539	+// copy.skyboxext = null;
	540	+// }
	541	+// else
	542	+// {
	543	+// copy.skyboxname = name;
	544	+// }
	545	+// }
	546	+// }
	547	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	548	+
454	549	// refreshContents(false); // To refresh Info tab
	550	+ cameraView.repaint();
455	551	}
456	552	};
457	553	objectPanel.addChangeListener(changeListener);
..	..	@@ -877,18 +973,29 @@
877	973	boolean temp = CameraPane.SWITCH;
878	974	CameraPane.SWITCH = false;
879	975
880		- object.ExtractBigData(versiontable);
	976	+ if (Grafreed.grafreed.universe.versiontable == null)
	977	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	978	+
	979	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
881	980	// if (copy == client)
882	981
883	982	Object3D versions[] = object.versionlist;
	983	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
884	984	object.versionlist = null;
	985	+ object.versiontable = null;
	986	+
	987	+ Object3D parent = object.parent;
	988	+ object.parent = null;
885	989
886	990	//byte[] compress = Compress(copy);
887	991	Object3D compress = (Object3D)Grafreed.clone(object);
888	992
889		- object.versionlist = versions;
	993	+ object.parent = parent;
890	994
891		- object.RestoreBigData(versiontable);
	995	+ object.versionlist = versions;
	996	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	997	+
	998	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
892	999
893	1000	CameraPane.SWITCH = temp;
894	1001
..	..	@@ -1227,7 +1334,7 @@
1227	1334
1228	1335	//if (copy.pinned)
1229	1336	{
1230		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1337	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1231	1338	pinButton.setSelected(copy.pinned);
1232	1339	cGridBag t = new cGridBag();
1233	1340	t.preferredWidth = 2;
..	..	@@ -1250,14 +1357,14 @@
1250	1357
1251	1358	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1252	1359	liveCB.setToolTipText("Animate object");
	1360	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1361	+ markCB.setToolTipText("Set target transform");
1253	1362	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1254	1363	selectableCB.setToolTipText("Make object selectable");
1255	1364	// Return();
1256	1365
1257	1366	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1258	1367	hideCB.setToolTipText("Hide object");
1259		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1260		- markCB.setToolTipText("As animation target transform");
1261	1368
1262	1369	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1263	1370
..	..	@@ -1459,22 +1566,9 @@
1459	1566
1460	1567	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1461	1568	{
1462		- System.out.println("CREATE CAMERAS");
1463		- cams = new cTemplate();
1464		- cams.name = "Cameras";
1465		- copy.insertElementAt(cams, 0);
1466		- //cams.parent = copy;
1467		-
1468		- cam = new Camera(); // LA.newVector(3, 2, 1));
1469		- cams.addChild(cam);
1470		- cam = new Camera(1);
1471		- cams.addChild(cam);
1472		- cam = new Camera(2);
1473		- cams.addChild(cam);
1474		- cam = new Camera(3);
1475		- cams.addChild(cam);
1476		- cam = new Camera(4); // Light
1477		- cams.addChild(cam);
	1569	+ if (Globals.DEBUG)
	1570	+ System.out.println("CREATE CAMERAS");
	1571	+ cams = CreateCameras();
1478	1572	} else
1479	1573	{
1480	1574	cams = (cGroup) copy.get(0);
..	..	@@ -1540,6 +1634,45 @@
1540	1634	//frontView.object = copy;
1541	1635	//sideView.object = copy;
1542	1636
	1637	+ transformPanel = new cGridBag().setVertical(true);
	1638	+
	1639	+ cGridBag resetTransformPanel = new cGridBag();
	1640	+
	1641	+ resetTransformPanel.preferredHeight = 2;
	1642	+
	1643	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1644	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1645	+ resetTransform.addMouseListener(new MouseAdapter()
	1646	+ {
	1647	+ public void mouseClicked(MouseEvent e)
	1648	+ {
	1649	+ ResetTransform();
	1650	+ }
	1651	+ });
	1652	+ resetTransformPanel.add(resetTransform);
	1653	+
	1654	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1655	+ resetTransform.setToolTipText("Reset Translation only");
	1656	+ resetTransform.addMouseListener(new MouseAdapter()
	1657	+ {
	1658	+ public void mouseClicked(MouseEvent e)
	1659	+ {
	1660	+ ResetTransform(1);
	1661	+ }
	1662	+ });
	1663	+ resetTransformPanel.add(resetTransform);
	1664	+
	1665	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1666	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1667	+ resetTransform.addMouseListener(new MouseAdapter()
	1668	+ {
	1669	+ public void mouseClicked(MouseEvent e)
	1670	+ {
	1671	+ ResetTransform(2);
	1672	+ }
	1673	+ });
	1674	+ resetTransformPanel.add(resetTransform);
	1675	+
1543	1676	XYZPanel = new cGridBag().setVertical(true);
1544	1677	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1545	1678
..	..	@@ -1549,6 +1682,9 @@
1549	1682	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1550	1683	//XYZPanel.setName("XYZ");
1551	1684
	1685	+ transformPanel.add(resetTransformPanel);
	1686	+ transformPanel.add(XYZPanel);
	1687	+
1552	1688	/*
1553	1689	gridPanel = new JPanel(); //new BorderLayout());
1554	1690	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1556,12 +1692,12 @@
1556	1692	gridPanel.add(cameraView);
1557	1693	gridPanel.add(XYZPanel);
1558	1694	*/
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);
	1695	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1696	+// gridPanel.setContinuousLayout(true);
	1697	+// gridPanel.setOneTouchExpandable(true);
	1698	+// gridPanel.setDividerLocation(1.0);
	1699	+// gridPanel.setDividerSize(9);
	1700	+// gridPanel.setResizeWeight(0.85);
1565	1701
1566	1702	// aConstraints.weighty = 0;
1567	1703	//System.out.println("THIS = " + this);
..	..	@@ -1584,30 +1720,34 @@
1584	1720
1585	1721	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1586	1722	//tmp.setName("Edit");
1587		- objectPanel.add(materialPanel);
1588		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1589		- objectPanel.setToolTipTextAt(0, "Material");
1590		-
	1723	+ objectPanel.add(skyboxPanel);
	1724	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1725	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1726	+
1591	1727	objectPanel.add(toolboxPanel);
1592	1728	objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1593	1729	objectPanel.setToolTipTextAt(1, "Objects & textures");
1594	1730
1595		- objectPanel.add(skyboxPanel);
1596		- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1597		- objectPanel.setToolTipTextAt(2, "Backgrounds");
1598		-
	1731	+ objectPanel.add(materialPanel);
	1732	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1733	+ objectPanel.setToolTipTextAt(2, "Material");
	1734	+
1599	1735	// JPanel north = new JPanel(new BorderLayout());
1600	1736	// north.setName("Edit");
1601	1737	// north.add(ctrlPanel, BorderLayout.NORTH);
1602	1738	// objectPanel.add(north);
1603	1739	objectPanel.add(editPanel);
1604		- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1740	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1605	1741	objectPanel.setToolTipTextAt(3, "Edit controls");
1606	1742
1607		- objectPanel.add(XYZPanel);
	1743	+ objectPanel.add(transformPanel);
1608	1744	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1609		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1745	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1610	1746
	1747	+ patchMaterial = true;
	1748	+ cameraView.patchMaterial = this;
	1749	+ objectPanel.setSelectedIndex(2);
	1750	+
1611	1751	/*
1612	1752	aConstraints.gridx = 0;
1613	1753	aConstraints.gridwidth = 1;
..	..	@@ -1627,7 +1767,7 @@
1627	1767	scrollpane.addMouseWheelListener(this); // Default not fast enough
1628	1768
1629	1769	/JTabbedPane/ scenePanel = new cGridBag();
1630		- scenePanel.preferredWidth = 5;
	1770	+ scenePanel.preferredWidth = 6;
1631	1771
1632	1772	JTabbedPane tabbedPane = new JTabbedPane();
1633	1773	tabbedPane.add(scrollpane);
..	..	@@ -1638,17 +1778,109 @@
1638	1778
1639	1779	AddOptions(optionsPanel); //, aConstraints);
1640	1780
1641		- tabbedPane.add(optionsPanel);
1642		-
1643	1781	tabbedPane.add(FSPane = new cFileSystemPane(this));
1644	1782
	1783	+ tabbedPane.add(optionsPanel);
	1784	+
1645	1785	scenePanel.add(tabbedPane);
1646	1786
1647		- //if (Globals.ADVANCED)
1648		- tabbedPane.add(infoPanel);
1649		- tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1650		- tabbedPane.setToolTipTextAt(3, "Information");
	1787	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1788	+ creditsPanel.setName("Credits");
1651	1789
	1790	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1791	+ creditsPanel.add(ogaLabel);
	1792	+
	1793	+ cButton creditButton;
	1794	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1795	+ creditButton.setToolTipText("https://opengameart.org");
	1796	+
	1797	+ creditButton.addMouseListener(new MouseAdapter()
	1798	+ {
	1799	+ public void mouseClicked(MouseEvent e)
	1800	+ {
	1801	+ try
	1802	+ {
	1803	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1804	+ } catch (Exception e1)
	1805	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1806	+ {
	1807	+ e1.printStackTrace();
	1808	+ }
	1809	+ }
	1810	+ });
	1811	+
	1812	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1813	+ creditsPanel.add(ogaLabel);
	1814	+
	1815	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1816	+ creditButton.setToolTipText("https://3delicious.net");
	1817	+
	1818	+ creditButton.addMouseListener(new MouseAdapter()
	1819	+ {
	1820	+ public void mouseClicked(MouseEvent e)
	1821	+ {
	1822	+ try
	1823	+ {
	1824	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1825	+ } catch (Exception e1)
	1826	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1827	+ {
	1828	+ e1.printStackTrace();
	1829	+ }
	1830	+ }
	1831	+ });
	1832	+
	1833	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1834	+ creditButton.setToolTipText("https://archive3d.net");
	1835	+
	1836	+ creditButton.addMouseListener(new MouseAdapter()
	1837	+ {
	1838	+ public void mouseClicked(MouseEvent e)
	1839	+ {
	1840	+ try
	1841	+ {
	1842	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1843	+ } catch (Exception e1)
	1844	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1845	+ {
	1846	+ e1.printStackTrace();
	1847	+ }
	1848	+ }
	1849	+ });
	1850	+
	1851	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1852	+ creditButton.setToolTipText("https://turbosquid.com");
	1853	+
	1854	+ creditButton.addMouseListener(new MouseAdapter()
	1855	+ {
	1856	+ public void mouseClicked(MouseEvent e)
	1857	+ {
	1858	+ try
	1859	+ {
	1860	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1861	+ } catch (Exception e1)
	1862	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1863	+ {
	1864	+ e1.printStackTrace();
	1865	+ }
	1866	+ }
	1867	+ });
	1868	+
	1869	+ for (int i=6; --i>=0;)
	1870	+ {
	1871	+ creditsPanel.add(new cGridBag());
	1872	+ }
	1873	+
	1874	+ tabbedPane.add(creditsPanel);
	1875	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1876	+
	1877	+ if (Globals.ADVANCED)
	1878	+ {
	1879	+ objectPanel.add(infoPanel);
	1880	+ objectPanel.setIconAt(5, GetIcon("icons/info.png"));
	1881	+ objectPanel.setToolTipTextAt(4, "Information");
	1882	+ }
	1883	+
1652	1884	/*
1653	1885	cTree jTree = new cTree(null);
1654	1886	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1669,13 +1901,13 @@
1669	1901	jtp.add(tree);
1670	1902	*/
1671	1903
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");
	1904	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1905	+// bigPanel.setContinuousLayout(true);
	1906	+// bigPanel.setOneTouchExpandable(true);
	1907	+// bigPanel.setDividerLocation(0.8);
	1908	+// bigPanel.setDividerSize(15);
	1909	+// bigPanel.setResizeWeight(0.15);
	1910	+// bigPanel.setName("Scene");
1679	1911
1680	1912	//bigPanel.setLayout(new BorderLayout());
1681	1913	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1745,7 +1977,7 @@
1745	1977
1746	1978	frame.getContentPane().setLayout(new BorderLayout());
1747	1979	/**/
1748		- JTabbedPane worldPane = new JTabbedPane();
	1980	+ //JTabbedPane worldPane = new JTabbedPane();
1749	1981	//worldPane.add(bigPanel);
1750	1982	//worldPane.add(worldPanel);
1751	1983	/**/
..	..	@@ -1759,7 +1991,7 @@
1759	1991
1760	1992	cameraView.requestFocusInWindow();
1761	1993
1762		- gridPanel.setDividerLocation(1.0);
	1994	+// gridPanel.setDividerLocation(1.0);
1763	1995
1764	1996	frame.validate();
1765	1997
..	..	@@ -1794,7 +2026,7 @@
1794	2026	{
1795	2027	cGridBag presetpanel = new cGridBag().setVertical(true);
1796	2028
1797		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	2029	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1798	2030	skin.setToolTipText("Skin");
1799	2031	skin.addMouseListener(new MouseAdapter()
1800	2032	{
..	..	@@ -1805,7 +2037,15 @@
1805	2037
1806	2038	// Skin
1807	2039	colorField.setFloat(material.color);
1808		- saturationField.setFloat(material.modulation);
	2040	+ float saturation = material.modulation;
	2041	+
	2042	+ if (!cameraView.Skinshader)
	2043	+ {
	2044	+ saturation /= 1.5;
	2045	+ }
	2046	+
	2047	+ saturationField.setFloat(saturation);
	2048	+
1809	2049	subsurfaceField.setFloat(material.subsurface);
1810	2050	selfshadowField.setFloat(material.diffuseness);
1811	2051	diffusenessField.setFloat(material.factor);
..	..	@@ -1824,7 +2064,7 @@
1824	2064	});
1825	2065	presetpanel.add(skin);
1826	2066
1827		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2067	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1828	2068	lambert.setToolTipText("Diffuse");
1829	2069	lambert.addMouseListener(new MouseAdapter()
1830	2070	{
..	..	@@ -1842,7 +2082,7 @@
1842	2082	});
1843	2083	presetpanel.add(lambert);
1844	2084
1845		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2085	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1846	2086	diffuse2.setToolTipText("Diffuse2");
1847	2087	diffuse2.addMouseListener(new MouseAdapter()
1848	2088	{
..	..	@@ -1860,7 +2100,7 @@
1860	2100	});
1861	2101	presetpanel.add(diffuse2);
1862	2102
1863		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2103	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1864	2104	diffusemoon.setToolTipText("Moon");
1865	2105	diffusemoon.addMouseListener(new MouseAdapter()
1866	2106	{
..	..	@@ -1878,7 +2118,7 @@
1878	2118	});
1879	2119	presetpanel.add(diffusemoon);
1880	2120
1881		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2121	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1882	2122	diffusemoon2.setToolTipText("Moon2");
1883	2123	diffusemoon2.addMouseListener(new MouseAdapter()
1884	2124	{
..	..	@@ -1896,7 +2136,7 @@
1896	2136	});
1897	2137	presetpanel.add(diffusemoon2);
1898	2138
1899		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2139	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1900	2140	diffusemoon3.setToolTipText("Moon3");
1901	2141	diffusemoon3.addMouseListener(new MouseAdapter()
1902	2142	{
..	..	@@ -1914,7 +2154,7 @@
1914	2154	});
1915	2155	presetpanel.add(diffusemoon3);
1916	2156
1917		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2157	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1918	2158	diffusesheen.setToolTipText("Sheen");
1919	2159	diffusesheen.addMouseListener(new MouseAdapter()
1920	2160	{
..	..	@@ -1931,7 +2171,7 @@
1931	2171	});
1932	2172	presetpanel.add(diffusesheen);
1933	2173
1934		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2174	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
1935	2175	rough.setToolTipText("Rough metal");
1936	2176	rough.addMouseListener(new MouseAdapter()
1937	2177	{
..	..	@@ -1949,7 +2189,7 @@
1949	2189	});
1950	2190	presetpanel.add(rough);
1951	2191
1952		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2192	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
1953	2193	rough2.setToolTipText("Medium metal");
1954	2194	rough2.addMouseListener(new MouseAdapter()
1955	2195	{
..	..	@@ -1967,7 +2207,7 @@
1967	2207	});
1968	2208	presetpanel.add(rough2);
1969	2209
1970		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2210	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
1971	2211	shini0.setToolTipText("Shiny");
1972	2212	shini0.addMouseListener(new MouseAdapter()
1973	2213	{
..	..	@@ -1985,7 +2225,7 @@
1985	2225	});
1986	2226	presetpanel.add(shini0);
1987	2227
1988		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2228	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
1989	2229	shini1.setToolTipText("Shiny2");
1990	2230	shini1.addMouseListener(new MouseAdapter()
1991	2231	{
..	..	@@ -2003,7 +2243,7 @@
2003	2243	});
2004	2244	presetpanel.add(shini1);
2005	2245
2006		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2246	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2007	2247	shini2.setToolTipText("Shiny3");
2008	2248	shini2.addMouseListener(new MouseAdapter()
2009	2249	{
..	..	@@ -2021,7 +2261,7 @@
2021	2261	});
2022	2262	presetpanel.add(shini2);
2023	2263
2024		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2264	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2025	2265	aniso.setToolTipText("AnisoU");
2026	2266	aniso.addMouseListener(new MouseAdapter()
2027	2267	{
..	..	@@ -2039,7 +2279,7 @@
2039	2279	});
2040	2280	presetpanel.add(aniso);
2041	2281
2042		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2282	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2043	2283	aniso2.setToolTipText("AnisoV");
2044	2284	aniso2.addMouseListener(new MouseAdapter()
2045	2285	{
..	..	@@ -2057,7 +2297,7 @@
2057	2297	});
2058	2298	presetpanel.add(aniso2);
2059	2299
2060		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2300	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2061	2301	aniso3.setToolTipText("AnisoUV");
2062	2302	aniso3.addMouseListener(new MouseAdapter()
2063	2303	{
..	..	@@ -2075,7 +2315,7 @@
2075	2315	});
2076	2316	presetpanel.add(aniso3);
2077	2317
2078		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2318	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2079	2319	velvet0.setToolTipText("Velvet");
2080	2320	velvet0.addMouseListener(new MouseAdapter()
2081	2321	{
..	..	@@ -2097,7 +2337,7 @@
2097	2337	});
2098	2338	presetpanel.add(velvet0);
2099	2339
2100		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2340	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2101	2341	bump0.setToolTipText("Bump texture");
2102	2342	bump0.addMouseListener(new MouseAdapter()
2103	2343	{
..	..	@@ -2116,7 +2356,22 @@
2116	2356	});
2117	2357	presetpanel.add(bump0);
2118	2358
2119		- cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2359	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2360	+ borderShader.setToolTipText("Border fade");
	2361	+ borderShader.addMouseListener(new MouseAdapter()
	2362	+ {
	2363	+ public void mouseClicked(MouseEvent e)
	2364	+ {
	2365	+ borderfadeField.setFloat(0.4);
	2366	+ opacityField.setFloat(0.75);
	2367	+
	2368	+ materialtouched = true;
	2369	+ applySelf();
	2370	+ }
	2371	+ });
	2372	+ presetpanel.add(borderShader);
	2373	+
	2374	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2120	2375	halo.setToolTipText("Halo");
2121	2376	halo.addMouseListener(new MouseAdapter()
2122	2377	{
..	..	@@ -2133,7 +2388,7 @@
2133	2388	});
2134	2389	presetpanel.add(halo);
2135	2390
2136		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2391	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2137	2392	candle.setToolTipText("Candle");
2138	2393	candle.addMouseListener(new MouseAdapter()
2139	2394	{
..	..	@@ -2155,7 +2410,7 @@
2155	2410	});
2156	2411	presetpanel.add(candle);
2157	2412
2158		- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2413	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2159	2414	shadowShader.setToolTipText("Shadow");
2160	2415	shadowShader.addMouseListener(new MouseAdapter()
2161	2416	{
..	..	@@ -2174,6 +2429,48 @@
2174	2429	});
2175	2430	presetpanel.add(shadowShader);
2176	2431
	2432	+ cLabel para0 = GetLabel("icons/shadericons/parallax0.png", !Globals.NIMBUSLAF);
	2433	+ para0.setToolTipText("No parallax");
	2434	+ para0.addMouseListener(new MouseAdapter()
	2435	+ {
	2436	+ public void mouseClicked(MouseEvent e)
	2437	+ {
	2438	+ parallaxField.setFloat(0.125);
	2439	+
	2440	+ materialtouched = true;
	2441	+ applySelf();
	2442	+ }
	2443	+ });
	2444	+ presetpanel.add(para0);
	2445	+
	2446	+ cLabel para1 = GetLabel("icons/shadericons/parallax1.png", !Globals.NIMBUSLAF);
	2447	+ para1.setToolTipText("With parallax");
	2448	+ para1.addMouseListener(new MouseAdapter()
	2449	+ {
	2450	+ public void mouseClicked(MouseEvent e)
	2451	+ {
	2452	+ parallaxField.setFloat(0.13);
	2453	+
	2454	+ materialtouched = true;
	2455	+ applySelf();
	2456	+ }
	2457	+ });
	2458	+ presetpanel.add(para1);
	2459	+
	2460	+ cLabel para2 = GetLabel("icons/shadericons/parallax2.png", !Globals.NIMBUSLAF);
	2461	+ para2.setToolTipText("Reset parallax");
	2462	+ para2.addMouseListener(new MouseAdapter()
	2463	+ {
	2464	+ public void mouseClicked(MouseEvent e)
	2465	+ {
	2466	+ parallaxField.setFloat(0.14);
	2467	+
	2468	+ materialtouched = true;
	2469	+ applySelf();
	2470	+ }
	2471	+ });
	2472	+ presetpanel.add(para2);
	2473	+
2177	2474	cGridBag panel = new cGridBag().setVertical(true);
2178	2475
2179	2476	presetpanel.preferredWidth = 1;
..	..	@@ -2190,19 +2487,19 @@
2190	2487
2191	2488	cGridBag editBar = new cGridBag().setVertical(false);
2192	2489
2193		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2490	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2194	2491	createMaterialButton.setToolTipText("Create material");
2195	2492
2196	2493	/*
2197	2494	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2198	2495	*/
2199	2496
2200		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2497	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2201	2498	clearMaterialButton.setToolTipText("Clear material");
2202	2499
2203	2500	if (Globals.ADVANCED)
2204	2501	{
2205		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2502	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2206	2503	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2207	2504	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2208	2505	}
..	..	@@ -2223,9 +2520,20 @@
2223	2520
2224	2521	cGridBag huepanel = new cGridBag();
2225	2522	cGridBag huelabel = new cGridBag();
2226		- skin = GetLabel("icons/hue.png", false);
2227		- skin.fit = true;
2228		- huelabel.add(skin);
	2523	+ cLabel hue = GetLabel("icons/hue.png", false);
	2524	+ hue.fit = true;
	2525	+
	2526	+ hue.addMouseListener(new MouseAdapter()
	2527	+ {
	2528	+ public void mousePressed(MouseEvent e)
	2529	+ {
	2530	+ int x = e.getX();
	2531	+
	2532	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2533	+ }
	2534	+ });
	2535	+
	2536	+ huelabel.add(hue);
2229	2537	huelabel.preferredWidth = 20;
2230	2538	huepanel.add(new cGridBag()); // Label
2231	2539	huepanel.add(huelabel); // Field/slider
..	..	@@ -2408,6 +2716,12 @@
2408	2716	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
2409	2717	colorSection.add(backlit);
2410	2718
	2719	+ cGridBag parallax = new cGridBag();
	2720	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2721	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2722	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.25, -0.125)); // , aConstraints);
	2723	+ colorSection.add(parallax);
	2724	+
2411	2725	//panel.add(new JSeparator());
2412	2726
2413	2727	//panel.add(globalSection);
..	..	@@ -3459,6 +3773,7 @@
3459	3773	shadowField.setFloat(mat.shadow);
3460	3774	textureField.setFloat(mat.texture);
3461	3775	opacityField.setFloat(mat.opacity);
	3776	+ parallaxField.setFloat(mat.parallax + 0.125f);
3462	3777	fakedepthField.setFloat(mat.fakedepth);
3463	3778	shadowbiasField.setFloat(mat.shadowbias);
3464	3779	bumpField.setInteger(1); // dec 2013
..	..	@@ -3501,32 +3816,8 @@
3501	3816
3502	3817	if (multiplyToggle != null)
3503	3818	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		- }
	3819	+
	3820	+ AllocProjectedVertices(object);
3530	3821
3531	3822	SetMaterial(mat, object.projectedVertices);
3532	3823	}
..	..	@@ -3836,7 +4127,7 @@
3836	4127	//System.out.println("ObjEditor " + event);
3837	4128	applySelf0(true);
3838	4129	//parent.applySelf();
3839		- objEditor.refreshContents();
	4130	+ // conflicts with requestFocus objEditor.refreshContents();
3840	4131	} else if (source == resetButton)
3841	4132	{
3842	4133	CameraPane.fullreset = true;
..	..	@@ -4016,11 +4307,18 @@
4016	4307
4017	4308	void New()
4018	4309	{
4019		- while (copy.Size() > 1)
	4310	+ while (copy.Size() > 0)
4020	4311	{
4021		- copy.remove(1);
	4312	+ copy.remove(0);
4022	4313	}
4023	4314
	4315	+ copy.selection.clear();
	4316	+
	4317	+ if (copy == Grafreed.grafreed.universe)
	4318	+ {
	4319	+ CreateCameras();
	4320	+ cameraView.SetCamera(GetCamera(copy, 0));
	4321	+ }
4024	4322	ResetModel();
4025	4323	objEditor.refreshContents();
4026	4324	}
..	..	@@ -4129,7 +4427,7 @@
4129	4427	{
4130	4428	//Save(true);
4131	4429	Replace();
4132		- SetUndoStates();
	4430	+ SetVersionStates();
4133	4431	}
4134	4432
4135	4433	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -4148,8 +4446,6 @@
4148	4446	return true;
4149	4447	}
4150	4448
4151		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4152		-
4153	4449	void DeleteVersion()
4154	4450	{
4155	4451	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4157,9 +4453,13 @@
4157	4453	copy.versionlist[i] = copy.versionlist[i+1];
4158	4454	}
4159	4455
4160		- CopyChanged();
	4456	+ if (copy.versionlist[copy.versionindex] == null)
	4457	+ copy.versionindex -= 1;
4161	4458
4162		- SetUndoStates();
	4459	+ if (copy.versionindex != -1)
	4460	+ CopyChanged();
	4461	+
	4462	+ SetVersionStates();
4163	4463	}
4164	4464
4165	4465	public boolean Save(boolean user)
..	..	@@ -4167,7 +4467,11 @@
4167	4467	System.err.println("Save");
4168	4468	Replace();
4169	4469
4170		- //cRadio tab = GetCurrentTab();
	4470	+ if (copy.versionlist == null)
	4471	+ {
	4472	+ copy.versionlist = new Object3D[100];
	4473	+ copy.versionindex = -1;
	4474	+ }
4171	4475
4172	4476	Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4173	4477
..	..	@@ -4205,7 +4509,7 @@
4205	4509	// copy.versionlist[i] = null;
4206	4510	// }
4207	4511
4208		- SetUndoStates();
	4512	+ SetVersionStates();
4209	4513
4210	4514	// test save
4211	4515	if (false)
..	..	@@ -4265,12 +4569,12 @@
4265	4569	{
4266	4570	Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4267	4571
4268		- SetUndoStates();
	4572	+ SetVersionStates();
4269	4573
4270	4574	boolean temp = CameraPane.SWITCH;
4271	4575	CameraPane.SWITCH = false;
4272	4576
4273		- copy.ExtractBigData(versiontable);
	4577	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4274	4578
4275	4579	copy.clear();
4276	4580
..	..	@@ -4282,7 +4586,7 @@
4282	4586	copy.add(obj.get(i));
4283	4587	}
4284	4588
4285		- copy.RestoreBigData(versiontable);
	4589	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4286	4590
4287	4591	CameraPane.SWITCH = temp;
4288	4592
..	..	@@ -4332,28 +4636,45 @@
4332	4636	return count;
4333	4637	}
4334	4638
4335		- void SetUndoStates()
	4639	+ public cGridBag versionSliderPane;
	4640	+
	4641	+ void SetVersionStates()
4336	4642	{
4337	4643	//if (true)
4338	4644	// return;
4339	4645
4340	4646	//cRadio tab = GetCurrentTab();
4341	4647
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;
	4648	+ if (copy.versionindex == -2)
	4649	+ {
	4650	+ saveVersionButton.setEnabled(false);
	4651	+ restoreButton.setEnabled(false);
	4652	+ replaceButton.setEnabled(false);
	4653	+ previousVersionButton.setEnabled(false);
	4654	+ nextVersionButton.setEnabled(false);
	4655	+ deleteVersionButton.setEnabled(false);
	4656	+ versionSliderPane.setVisible(false);
	4657	+ }
	4658	+ else
	4659	+ {
	4660	+ restoreButton.setEnabled(copy.versionindex != -1);
	4661	+ replaceButton.setEnabled(copy.versionindex != -1);
	4662	+
	4663	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4664	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4665	+
	4666	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4667	+ //copy.versionlist[copy.versionindex + 1] != null);
	4668	+
	4669	+ muteSlider = true;
	4670	+ versionSlider.setMinimum(0);
	4671	+ versionSlider.setMaximum(VersionCount() - 1);
	4672	+ versionSlider.setInteger(copy.versionindex);
	4673	+ versionSlider.setEnabled(copy.versionindex != -1);
	4674	+ muteSlider = false;
	4675	+
	4676	+ versionSliderPane.setVisible(true);
	4677	+ }
4357	4678	}
4358	4679
4359	4680	public boolean PreviousVersion()
..	..	@@ -4411,7 +4732,7 @@
4411	4732
4412	4733	public boolean Replace()
4413	4734	{
4414		- System.err.println("Replace");
	4735	+ //System.err.println("Replace");
4415	4736
4416	4737	//cRadio tab = GetCurrentTab();
4417	4738
..	..	@@ -4638,6 +4959,12 @@
4638	4959	// else
4639	4960	// applySelf(true);
4640	4961	// }
	4962	+
	4963	+ boolean Equal(double a, double b)
	4964	+ {
	4965	+ return Math.abs(a - b) < 0.001;
	4966	+ }
	4967	+
4641	4968	void applySelf0(boolean name)
4642	4969	{
4643	4970	if (name)
..	..	@@ -4675,6 +5002,7 @@
4675	5002	current.shadow = (float) shadowField.getFloat();
4676	5003	current.texture = (float) textureField.getFloat();
4677	5004	current.opacity = (float) opacityField.getFloat();
	5005	+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
4678	5006	current.fakedepth = (float) fakedepthField.getFloat();
4679	5007	current.shadowbias = (float) shadowbiasField.getFloat();
4680	5008
..	..	@@ -4687,29 +5015,54 @@
4687	5015	{
4688	5016	cMaterial mat = copy.material;
4689	5017
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));
	5018	+ if (!Equal(colorField.getFloat(), mat.color))
	5019	+ colorField.SetToolTipValue((mat.color));
	5020	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	5021	+ saturationField.SetToolTipValue((mat.modulation));
	5022	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	5023	+ metalnessField.SetToolTipValue((mat.metalness));
	5024	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	5025	+ diffuseField.SetToolTipValue((mat.diffuse));
	5026	+ if (!Equal(specularField.getFloat(), mat.specular))
	5027	+ specularField.SetToolTipValue((mat.specular));
	5028	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	5029	+ shininessField.SetToolTipValue((mat.shininess));
	5030	+ if (!Equal(shiftField.getFloat(), mat.shift))
	5031	+ shiftField.SetToolTipValue((mat.shift));
	5032	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	5033	+ ambientField.SetToolTipValue((mat.ambient));
	5034	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	5035	+ lightareaField.SetToolTipValue((mat.lightarea));
	5036	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	5037	+ diffusenessField.SetToolTipValue((mat.factor));
	5038	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	5039	+ velvetField.SetToolTipValue((mat.velvet));
	5040	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	5041	+ sheenField.SetToolTipValue((mat.sheen));
	5042	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	5043	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	5044	+ if (!Equal(backlitField.getFloat(), mat.bump))
	5045	+ backlitField.SetToolTipValue((mat.bump));
	5046	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5047	+ anisoField.SetToolTipValue((mat.aniso));
	5048	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5049	+ anisoVField.SetToolTipValue((mat.anisoV));
	5050	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5051	+ cameraField.SetToolTipValue((mat.cameralight));
	5052	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5053	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5054	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5055	+ shadowField.SetToolTipValue((mat.shadow));
	5056	+ if (!Equal(textureField.getFloat(), mat.texture))
	5057	+ textureField.SetToolTipValue((mat.texture));
	5058	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5059	+ opacityField.SetToolTipValue((mat.opacity));
	5060	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5061	+ parallaxField.SetToolTipValue((mat.parallax));
	5062	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5063	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5064	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5065	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4713	5066	}
4714	5067
4715	5068	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4744,11 +5097,13 @@
4744	5097
4745	5098	public void stateChanged(ChangeEvent e)
4746	5099	{
4747		- // assert(false);
	5100	+ // assert(false);
4748	5101	if (e.getSource() == versionSlider)
4749	5102	{
4750	5103	if (muteSlider)
4751	5104	return;
	5105	+
	5106	+ Replace();
4752	5107
4753	5108	int version = versionSlider.getInteger();
4754	5109
..	..	@@ -5111,7 +5466,9 @@
5111	5466	}
5112	5467
5113	5468	if (previousVersionButton != null && copy.versionlist != null)
5114		- SetUndoStates();
	5469	+ SetVersionStates();
	5470	+
	5471	+ cameraView.requestFocusInWindow();
5115	5472	}
5116	5473
5117	5474	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5143,7 +5500,7 @@
5143	5500	// group = (Composite) group.get(0);
5144	5501	// }
5145	5502
5146		- System.out.println("makeSomething of " + thing);
	5503	+ //System.out.println("makeSomething of " + thing);
5147	5504
5148	5505	/*
5149	5506	if (deselect && jList != null)
..	..	@@ -5497,6 +5854,7 @@
5497	5854
5498	5855	copy.versionlist = readobj.versionlist;
5499	5856	copy.versionindex = readobj.versionindex;
	5857	+ copy.versiontable = readobj.versiontable;
5500	5858
5501	5859	if (copy.versionlist == null)
5502	5860	{
..	..	@@ -5504,7 +5862,7 @@
5504	5862	copy.versionlist = new Object3D[100];
5505	5863	copy.versionindex = -1;
5506	5864
5507		- Save(true);
	5865	+ //Save(true);
5508	5866	}
5509	5867
5510	5868	//? SetUndoStates();
..	..	@@ -5596,6 +5954,8 @@
5596	5954
5597	5955	void save()
5598	5956	{
	5957	+ Replace();
	5958	+
5599	5959	if (lastname == null)
5600	5960	{
5601	5961	return;
..	..	@@ -5850,6 +6210,7 @@
5850	6210	boolean materialFlushed;
5851	6211	Object3D latestObject;
5852	6212
	6213	+ cGridBag transformPanel;
5853	6214	cGridBag XYZPanel;
5854	6215
5855	6216	JSplitPane gridPanel;
..	..	@@ -5954,6 +6315,8 @@
5954	6315	cNumberSlider textureField;
5955	6316	JLabel opacityLabel;
5956	6317	cNumberSlider opacityField;
	6318	+ JLabel parallaxLabel;
	6319	+ cNumberSlider parallaxField;
5957	6320	JLabel fakedepthLabel;
5958	6321	cNumberSlider fakedepthField;
5959	6322	JLabel shadowbiasLabel;