~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	}
..	..	@@ -297,11 +362,13 @@
297	362	client = inClient;
298	363	copy = client;
299	364
300		- if (copy.versionlist == null)
301		- {
302		- copy.versionlist = new Object3D[100];
303		- copy.versionindex = -1;
304		- }
	365	+// if (copy.versionlist == null)
	366	+// {
	367	+// copy.versionlist = new Object3D[100];
	368	+// copy.versionindex = -1;
	369	+//
	370	+// callee.Save(true);
	371	+// }
305	372
306	373	// "this" is not called: SetupUI2(objEditor);
307	374	}
..	..	@@ -316,12 +383,6 @@
316	383	client = inClient;
317	384	copy = client;
318	385
319		- if (copy.versionlist == null)
320		- {
321		- copy.versionlist = new Object3D[100];
322		- copy.versionindex = -1;
323		- }
324		-
325	386	SetupUI2(callee.GetEditor());
326	387	}
327	388
..	..	@@ -343,7 +404,8 @@
343	404	//parent = p;
344	405
345	406	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
346		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	407	+ if (Globals.DEBUG)
	408	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
347	409	//gd.setFullScreenWindow(this);
348	410	//setResizable(false);
349	411	//if (!isDisplayable())
..	..	@@ -354,11 +416,13 @@
354	416	copy = localCopy;
355	417	copy.editWindow = this;
356	418
357		- if (copy.versionlist == null)
358		- {
359		-// copy.versions = new byte[100][];
	419	+// if (copy.versionlist == null)
	420	+// {
	421	+// copy.versionlist = new Object3D[100];
360	422	// copy.versionindex = -1;
361		- }
	423	+//
	424	+// Save(true);
	425	+// }
362	426
363	427	SetupMenu();
364	428
..	..	@@ -378,6 +442,9 @@
378	442
379	443	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
380	444
	445	+ // This is to refresh the UI of the material panel.
	446	+ boolean patchMaterial;
	447	+
381	448	void SetupMenu()
382	449	{
383	450	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -391,8 +458,11 @@
391	458	importOBJItem.addActionListener(this);
392	459	import3DSItem = menu.add(new MenuItem("3DS file..."));
393	460	import3DSItem.addActionListener(this);
	461	+ if (Globals.ADVANCED)
	462	+ {
394	463	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
395	464	importVRMLX3DItem.addActionListener(this);
	465	+ }
396	466	menu.add("-");
397	467	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
398	468	importGFDItem.addActionListener(this);
..	..	@@ -427,6 +497,8 @@
427	497
428	498	ChangeListener changeListener = new ChangeListener()
429	499	{
	500	+ //String name;
	501	+
430	502	public void stateChanged(ChangeEvent changeEvent)
431	503	{
432	504	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -445,7 +517,37 @@
445	517	// EditSelection(false);
446	518	// }
447	519
448		- refreshContents(false); // To refresh Info tab
	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	+
	549	+// refreshContents(false); // To refresh Info tab
	550	+ cameraView.repaint();
449	551	}
450	552	};
451	553	objectPanel.addChangeListener(changeListener);
..	..	@@ -871,18 +973,29 @@
871	973	boolean temp = CameraPane.SWITCH;
872	974	CameraPane.SWITCH = false;
873	975
874		- 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);
875	980	// if (copy == client)
876	981
877	982	Object3D versions[] = object.versionlist;
	983	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
878	984	object.versionlist = null;
	985	+ object.versiontable = null;
	986	+
	987	+ Object3D parent = object.parent;
	988	+ object.parent = null;
879	989
880	990	//byte[] compress = Compress(copy);
881	991	Object3D compress = (Object3D)Grafreed.clone(object);
882	992
883		- object.versionlist = versions;
	993	+ object.parent = parent;
884	994
885		- object.RestoreBigData(versiontable);
	995	+ object.versionlist = versions;
	996	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	997	+
	998	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
886	999
887	1000	CameraPane.SWITCH = temp;
888	1001
..	..	@@ -1221,7 +1334,7 @@
1221	1334
1222	1335	//if (copy.pinned)
1223	1336	{
1224		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1337	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1225	1338	pinButton.setSelected(copy.pinned);
1226	1339	cGridBag t = new cGridBag();
1227	1340	t.preferredWidth = 2;
..	..	@@ -1244,14 +1357,14 @@
1244	1357
1245	1358	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1246	1359	liveCB.setToolTipText("Animate object");
	1360	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1361	+ markCB.setToolTipText("Set target transform");
1247	1362	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1248	1363	selectableCB.setToolTipText("Make object selectable");
1249	1364	// Return();
1250	1365
1251	1366	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1252	1367	hideCB.setToolTipText("Hide object");
1253		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1254		- markCB.setToolTipText("As animation target transform");
1255	1368
1256	1369	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1257	1370
..	..	@@ -1453,22 +1566,9 @@
1453	1566
1454	1567	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1455	1568	{
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);
	1569	+ if (Globals.DEBUG)
	1570	+ System.out.println("CREATE CAMERAS");
	1571	+ cams = CreateCameras();
1472	1572	} else
1473	1573	{
1474	1574	cams = (cGroup) copy.get(0);
..	..	@@ -1534,6 +1634,45 @@
1534	1634	//frontView.object = copy;
1535	1635	//sideView.object = copy;
1536	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	+
1537	1676	XYZPanel = new cGridBag().setVertical(true);
1538	1677	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1539	1678
..	..	@@ -1543,6 +1682,9 @@
1543	1682	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1544	1683	//XYZPanel.setName("XYZ");
1545	1684
	1685	+ transformPanel.add(resetTransformPanel);
	1686	+ transformPanel.add(XYZPanel);
	1687	+
1546	1688	/*
1547	1689	gridPanel = new JPanel(); //new BorderLayout());
1548	1690	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1550,12 +1692,12 @@
1550	1692	gridPanel.add(cameraView);
1551	1693	gridPanel.add(XYZPanel);
1552	1694	*/
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);
	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);
1559	1701
1560	1702	// aConstraints.weighty = 0;
1561	1703	//System.out.println("THIS = " + this);
..	..	@@ -1578,30 +1720,34 @@
1578	1720
1579	1721	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1580	1722	//tmp.setName("Edit");
1581		- objectPanel.add(materialPanel);
1582		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1583		- objectPanel.setToolTipTextAt(0, "Material");
1584		-
	1723	+ objectPanel.add(skyboxPanel);
	1724	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1725	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1726	+
1585	1727	objectPanel.add(toolboxPanel);
1586	1728	objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1587	1729	objectPanel.setToolTipTextAt(1, "Objects & textures");
1588	1730
1589		- objectPanel.add(skyboxPanel);
1590		- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1591		- objectPanel.setToolTipTextAt(2, "Backgrounds");
1592		-
	1731	+ objectPanel.add(materialPanel);
	1732	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1733	+ objectPanel.setToolTipTextAt(2, "Material");
	1734	+
1593	1735	// JPanel north = new JPanel(new BorderLayout());
1594	1736	// north.setName("Edit");
1595	1737	// north.add(ctrlPanel, BorderLayout.NORTH);
1596	1738	// objectPanel.add(north);
1597	1739	objectPanel.add(editPanel);
1598		- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1740	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1599	1741	objectPanel.setToolTipTextAt(3, "Edit controls");
1600	1742
1601		- objectPanel.add(XYZPanel);
	1743	+ objectPanel.add(transformPanel);
1602	1744	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1603		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1745	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1604	1746
	1747	+ patchMaterial = true;
	1748	+ cameraView.patchMaterial = this;
	1749	+ objectPanel.setSelectedIndex(2);
	1750	+
1605	1751	/*
1606	1752	aConstraints.gridx = 0;
1607	1753	aConstraints.gridwidth = 1;
..	..	@@ -1621,7 +1767,7 @@
1621	1767	scrollpane.addMouseWheelListener(this); // Default not fast enough
1622	1768
1623	1769	/JTabbedPane/ scenePanel = new cGridBag();
1624		- scenePanel.preferredWidth = 5;
	1770	+ scenePanel.preferredWidth = 6;
1625	1771
1626	1772	JTabbedPane tabbedPane = new JTabbedPane();
1627	1773	tabbedPane.add(scrollpane);
..	..	@@ -1632,17 +1778,109 @@
1632	1778
1633	1779	AddOptions(optionsPanel); //, aConstraints);
1634	1780
1635		- tabbedPane.add(optionsPanel);
1636		-
1637	1781	tabbedPane.add(FSPane = new cFileSystemPane(this));
1638	1782
	1783	+ tabbedPane.add(optionsPanel);
	1784	+
1639	1785	scenePanel.add(tabbedPane);
1640	1786
1641		- //if (Globals.ADVANCED)
1642		- tabbedPane.add(infoPanel);
1643		- tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1644		- tabbedPane.setToolTipTextAt(3, "Information");
	1787	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1788	+ creditsPanel.setName("Credits");
1645	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	+
1646	1884	/*
1647	1885	cTree jTree = new cTree(null);
1648	1886	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1663,13 +1901,13 @@
1663	1901	jtp.add(tree);
1664	1902	*/
1665	1903
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");
	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");
1673	1911
1674	1912	//bigPanel.setLayout(new BorderLayout());
1675	1913	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1739,7 +1977,7 @@
1739	1977
1740	1978	frame.getContentPane().setLayout(new BorderLayout());
1741	1979	/**/
1742		- JTabbedPane worldPane = new JTabbedPane();
	1980	+ //JTabbedPane worldPane = new JTabbedPane();
1743	1981	//worldPane.add(bigPanel);
1744	1982	//worldPane.add(worldPanel);
1745	1983	/**/
..	..	@@ -1753,7 +1991,7 @@
1753	1991
1754	1992	cameraView.requestFocusInWindow();
1755	1993
1756		- gridPanel.setDividerLocation(1.0);
	1994	+// gridPanel.setDividerLocation(1.0);
1757	1995
1758	1996	frame.validate();
1759	1997
..	..	@@ -1788,7 +2026,7 @@
1788	2026	{
1789	2027	cGridBag presetpanel = new cGridBag().setVertical(true);
1790	2028
1791		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	2029	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1792	2030	skin.setToolTipText("Skin");
1793	2031	skin.addMouseListener(new MouseAdapter()
1794	2032	{
..	..	@@ -1799,7 +2037,15 @@
1799	2037
1800	2038	// Skin
1801	2039	colorField.setFloat(material.color);
1802		- 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	+
1803	2049	subsurfaceField.setFloat(material.subsurface);
1804	2050	selfshadowField.setFloat(material.diffuseness);
1805	2051	diffusenessField.setFloat(material.factor);
..	..	@@ -1818,7 +2064,7 @@
1818	2064	});
1819	2065	presetpanel.add(skin);
1820	2066
1821		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2067	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1822	2068	lambert.setToolTipText("Diffuse");
1823	2069	lambert.addMouseListener(new MouseAdapter()
1824	2070	{
..	..	@@ -1836,7 +2082,7 @@
1836	2082	});
1837	2083	presetpanel.add(lambert);
1838	2084
1839		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2085	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1840	2086	diffuse2.setToolTipText("Diffuse2");
1841	2087	diffuse2.addMouseListener(new MouseAdapter()
1842	2088	{
..	..	@@ -1854,7 +2100,7 @@
1854	2100	});
1855	2101	presetpanel.add(diffuse2);
1856	2102
1857		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2103	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1858	2104	diffusemoon.setToolTipText("Moon");
1859	2105	diffusemoon.addMouseListener(new MouseAdapter()
1860	2106	{
..	..	@@ -1872,7 +2118,7 @@
1872	2118	});
1873	2119	presetpanel.add(diffusemoon);
1874	2120
1875		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2121	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1876	2122	diffusemoon2.setToolTipText("Moon2");
1877	2123	diffusemoon2.addMouseListener(new MouseAdapter()
1878	2124	{
..	..	@@ -1890,7 +2136,7 @@
1890	2136	});
1891	2137	presetpanel.add(diffusemoon2);
1892	2138
1893		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2139	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1894	2140	diffusemoon3.setToolTipText("Moon3");
1895	2141	diffusemoon3.addMouseListener(new MouseAdapter()
1896	2142	{
..	..	@@ -1908,7 +2154,7 @@
1908	2154	});
1909	2155	presetpanel.add(diffusemoon3);
1910	2156
1911		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2157	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1912	2158	diffusesheen.setToolTipText("Sheen");
1913	2159	diffusesheen.addMouseListener(new MouseAdapter()
1914	2160	{
..	..	@@ -1925,7 +2171,7 @@
1925	2171	});
1926	2172	presetpanel.add(diffusesheen);
1927	2173
1928		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2174	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
1929	2175	rough.setToolTipText("Rough metal");
1930	2176	rough.addMouseListener(new MouseAdapter()
1931	2177	{
..	..	@@ -1943,7 +2189,7 @@
1943	2189	});
1944	2190	presetpanel.add(rough);
1945	2191
1946		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2192	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
1947	2193	rough2.setToolTipText("Medium metal");
1948	2194	rough2.addMouseListener(new MouseAdapter()
1949	2195	{
..	..	@@ -1961,7 +2207,7 @@
1961	2207	});
1962	2208	presetpanel.add(rough2);
1963	2209
1964		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2210	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
1965	2211	shini0.setToolTipText("Shiny");
1966	2212	shini0.addMouseListener(new MouseAdapter()
1967	2213	{
..	..	@@ -1979,7 +2225,7 @@
1979	2225	});
1980	2226	presetpanel.add(shini0);
1981	2227
1982		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2228	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
1983	2229	shini1.setToolTipText("Shiny2");
1984	2230	shini1.addMouseListener(new MouseAdapter()
1985	2231	{
..	..	@@ -1997,7 +2243,7 @@
1997	2243	});
1998	2244	presetpanel.add(shini1);
1999	2245
2000		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2246	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2001	2247	shini2.setToolTipText("Shiny3");
2002	2248	shini2.addMouseListener(new MouseAdapter()
2003	2249	{
..	..	@@ -2015,7 +2261,7 @@
2015	2261	});
2016	2262	presetpanel.add(shini2);
2017	2263
2018		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2264	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2019	2265	aniso.setToolTipText("AnisoU");
2020	2266	aniso.addMouseListener(new MouseAdapter()
2021	2267	{
..	..	@@ -2033,7 +2279,7 @@
2033	2279	});
2034	2280	presetpanel.add(aniso);
2035	2281
2036		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2282	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2037	2283	aniso2.setToolTipText("AnisoV");
2038	2284	aniso2.addMouseListener(new MouseAdapter()
2039	2285	{
..	..	@@ -2051,7 +2297,7 @@
2051	2297	});
2052	2298	presetpanel.add(aniso2);
2053	2299
2054		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2300	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2055	2301	aniso3.setToolTipText("AnisoUV");
2056	2302	aniso3.addMouseListener(new MouseAdapter()
2057	2303	{
..	..	@@ -2069,7 +2315,7 @@
2069	2315	});
2070	2316	presetpanel.add(aniso3);
2071	2317
2072		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2318	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2073	2319	velvet0.setToolTipText("Velvet");
2074	2320	velvet0.addMouseListener(new MouseAdapter()
2075	2321	{
..	..	@@ -2091,7 +2337,7 @@
2091	2337	});
2092	2338	presetpanel.add(velvet0);
2093	2339
2094		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2340	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2095	2341	bump0.setToolTipText("Bump texture");
2096	2342	bump0.addMouseListener(new MouseAdapter()
2097	2343	{
..	..	@@ -2110,7 +2356,22 @@
2110	2356	});
2111	2357	presetpanel.add(bump0);
2112	2358
2113		- 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);
2114	2375	halo.setToolTipText("Halo");
2115	2376	halo.addMouseListener(new MouseAdapter()
2116	2377	{
..	..	@@ -2127,7 +2388,7 @@
2127	2388	});
2128	2389	presetpanel.add(halo);
2129	2390
2130		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2391	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2131	2392	candle.setToolTipText("Candle");
2132	2393	candle.addMouseListener(new MouseAdapter()
2133	2394	{
..	..	@@ -2149,7 +2410,7 @@
2149	2410	});
2150	2411	presetpanel.add(candle);
2151	2412
2152		- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2413	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2153	2414	shadowShader.setToolTipText("Shadow");
2154	2415	shadowShader.addMouseListener(new MouseAdapter()
2155	2416	{
..	..	@@ -2168,6 +2429,48 @@
2168	2429	});
2169	2430	presetpanel.add(shadowShader);
2170	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	+
2171	2474	cGridBag panel = new cGridBag().setVertical(true);
2172	2475
2173	2476	presetpanel.preferredWidth = 1;
..	..	@@ -2184,19 +2487,19 @@
2184	2487
2185	2488	cGridBag editBar = new cGridBag().setVertical(false);
2186	2489
2187		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2490	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2188	2491	createMaterialButton.setToolTipText("Create material");
2189	2492
2190	2493	/*
2191	2494	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2192	2495	*/
2193	2496
2194		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2497	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2195	2498	clearMaterialButton.setToolTipText("Clear material");
2196	2499
2197	2500	if (Globals.ADVANCED)
2198	2501	{
2199		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2502	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2200	2503	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2201	2504	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2202	2505	}
..	..	@@ -2217,9 +2520,20 @@
2217	2520
2218	2521	cGridBag huepanel = new cGridBag();
2219	2522	cGridBag huelabel = new cGridBag();
2220		- skin = GetLabel("icons/hue.png", false);
2221		- skin.fit = true;
2222		- 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);
2223	2537	huelabel.preferredWidth = 20;
2224	2538	huepanel.add(new cGridBag()); // Label
2225	2539	huepanel.add(huelabel); // Field/slider
..	..	@@ -2402,6 +2716,12 @@
2402	2716	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
2403	2717	colorSection.add(backlit);
2404	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	+
2405	2725	//panel.add(new JSeparator());
2406	2726
2407	2727	//panel.add(globalSection);
..	..	@@ -3453,6 +3773,7 @@
3453	3773	shadowField.setFloat(mat.shadow);
3454	3774	textureField.setFloat(mat.texture);
3455	3775	opacityField.setFloat(mat.opacity);
	3776	+ parallaxField.setFloat(mat.parallax + 0.125f);
3456	3777	fakedepthField.setFloat(mat.fakedepth);
3457	3778	shadowbiasField.setFloat(mat.shadowbias);
3458	3779	bumpField.setInteger(1); // dec 2013
..	..	@@ -3495,32 +3816,8 @@
3495	3816
3496	3817	if (multiplyToggle != null)
3497	3818	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		- }
	3819	+
	3820	+ AllocProjectedVertices(object);
3524	3821
3525	3822	SetMaterial(mat, object.projectedVertices);
3526	3823	}
..	..	@@ -3830,7 +4127,7 @@
3830	4127	//System.out.println("ObjEditor " + event);
3831	4128	applySelf0(true);
3832	4129	//parent.applySelf();
3833		- objEditor.refreshContents();
	4130	+ // conflicts with requestFocus objEditor.refreshContents();
3834	4131	} else if (source == resetButton)
3835	4132	{
3836	4133	CameraPane.fullreset = true;
..	..	@@ -4010,11 +4307,18 @@
4010	4307
4011	4308	void New()
4012	4309	{
4013		- while (copy.Size() > 1)
	4310	+ while (copy.Size() > 0)
4014	4311	{
4015		- copy.remove(1);
	4312	+ copy.remove(0);
4016	4313	}
4017	4314
	4315	+ copy.selection.clear();
	4316	+
	4317	+ if (copy == Grafreed.grafreed.universe)
	4318	+ {
	4319	+ CreateCameras();
	4320	+ cameraView.SetCamera(GetCamera(copy, 0));
	4321	+ }
4018	4322	ResetModel();
4019	4323	objEditor.refreshContents();
4020	4324	}
..	..	@@ -4123,7 +4427,7 @@
4123	4427	{
4124	4428	//Save(true);
4125	4429	Replace();
4126		- SetUndoStates();
	4430	+ SetVersionStates();
4127	4431	}
4128	4432
4129	4433	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -4142,8 +4446,6 @@
4142	4446	return true;
4143	4447	}
4144	4448
4145		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4146		-
4147	4449	void DeleteVersion()
4148	4450	{
4149	4451	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4151,9 +4453,13 @@
4151	4453	copy.versionlist[i] = copy.versionlist[i+1];
4152	4454	}
4153	4455
4154		- CopyChanged();
	4456	+ if (copy.versionlist[copy.versionindex] == null)
	4457	+ copy.versionindex -= 1;
4155	4458
4156		- SetUndoStates();
	4459	+ if (copy.versionindex != -1)
	4460	+ CopyChanged();
	4461	+
	4462	+ SetVersionStates();
4157	4463	}
4158	4464
4159	4465	public boolean Save(boolean user)
..	..	@@ -4161,7 +4467,11 @@
4161	4467	System.err.println("Save");
4162	4468	Replace();
4163	4469
4164		- cRadio tab = GetCurrentTab();
	4470	+ if (copy.versionlist == null)
	4471	+ {
	4472	+ copy.versionlist = new Object3D[100];
	4473	+ copy.versionindex = -1;
	4474	+ }
4165	4475
4166	4476	Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4167	4477
..	..	@@ -4199,7 +4509,7 @@
4199	4509	// copy.versionlist[i] = null;
4200	4510	// }
4201	4511
4202		- SetUndoStates();
	4512	+ SetVersionStates();
4203	4513
4204	4514	// test save
4205	4515	if (false)
..	..	@@ -4259,12 +4569,12 @@
4259	4569	{
4260	4570	Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4261	4571
4262		- SetUndoStates();
	4572	+ SetVersionStates();
4263	4573
4264	4574	boolean temp = CameraPane.SWITCH;
4265	4575	CameraPane.SWITCH = false;
4266	4576
4267		- copy.ExtractBigData(versiontable);
	4577	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4268	4578
4269	4579	copy.clear();
4270	4580
..	..	@@ -4276,7 +4586,7 @@
4276	4586	copy.add(obj.get(i));
4277	4587	}
4278	4588
4279		- copy.RestoreBigData(versiontable);
	4589	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4280	4590
4281	4591	CameraPane.SWITCH = temp;
4282	4592
..	..	@@ -4326,23 +4636,45 @@
4326	4636	return count;
4327	4637	}
4328	4638
4329		- void SetUndoStates()
	4639	+ public cGridBag versionSliderPane;
	4640	+
	4641	+ void SetVersionStates()
4330	4642	{
4331		- cRadio tab = GetCurrentTab();
	4643	+ //if (true)
	4644	+ // return;
	4645	+
	4646	+ //cRadio tab = GetCurrentTab();
4332	4647
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;
	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	+ }
4346	4678	}
4347	4679
4348	4680	public boolean PreviousVersion()
..	..	@@ -4352,7 +4684,7 @@
4352	4684
4353	4685	System.err.println("Undo");
4354	4686
4355		- cRadio tab = GetCurrentTab();
	4687	+ //cRadio tab = GetCurrentTab();
4356	4688
4357	4689	if (copy.versionindex == 0)
4358	4690	{
..	..	@@ -4384,7 +4716,7 @@
4384	4716	{
4385	4717	System.err.println("Restore");
4386	4718
4387		- cRadio tab = GetCurrentTab();
	4719	+ //cRadio tab = GetCurrentTab();
4388	4720
4389	4721	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4390	4722	{
..	..	@@ -4400,9 +4732,9 @@
4400	4732
4401	4733	public boolean Replace()
4402	4734	{
4403		- System.err.println("Replace");
	4735	+ //System.err.println("Replace");
4404	4736
4405		- cRadio tab = GetCurrentTab();
	4737	+ //cRadio tab = GetCurrentTab();
4406	4738
4407	4739	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4408	4740	{
..	..	@@ -4420,7 +4752,7 @@
4420	4752	// Option?
4421	4753	Replace();
4422	4754
4423		- cRadio tab = GetCurrentTab();
	4755	+ //cRadio tab = GetCurrentTab();
4424	4756
4425	4757	if (copy.versionlist[copy.versionindex + 1] == null)
4426	4758	{
..	..	@@ -4627,6 +4959,12 @@
4627	4959	// else
4628	4960	// applySelf(true);
4629	4961	// }
	4962	+
	4963	+ boolean Equal(double a, double b)
	4964	+ {
	4965	+ return Math.abs(a - b) < 0.001;
	4966	+ }
	4967	+
4630	4968	void applySelf0(boolean name)
4631	4969	{
4632	4970	if (name)
..	..	@@ -4664,6 +5002,7 @@
4664	5002	current.shadow = (float) shadowField.getFloat();
4665	5003	current.texture = (float) textureField.getFloat();
4666	5004	current.opacity = (float) opacityField.getFloat();
	5005	+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
4667	5006	current.fakedepth = (float) fakedepthField.getFloat();
4668	5007	current.shadowbias = (float) shadowbiasField.getFloat();
4669	5008
..	..	@@ -4676,29 +5015,54 @@
4676	5015	{
4677	5016	cMaterial mat = copy.material;
4678	5017
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));
	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));
4702	5066	}
4703	5067
4704	5068	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4733,15 +5097,17 @@
4733	5097
4734	5098	public void stateChanged(ChangeEvent e)
4735	5099	{
4736		- // assert(false);
	5100	+ // assert(false);
4737	5101	if (e.getSource() == versionSlider)
4738	5102	{
4739	5103	if (muteSlider)
4740	5104	return;
4741	5105
	5106	+ Replace();
	5107	+
4742	5108	int version = versionSlider.getInteger();
4743	5109
4744		- if (copy.versionlist[version] != null)
	5110	+ if (version != -1 && copy.versionlist[version] != null)
4745	5111	{
4746	5112	copy.versionindex = version;
4747	5113	CopyChanged();
..	..	@@ -5100,7 +5466,9 @@
5100	5466	}
5101	5467
5102	5468	if (previousVersionButton != null && copy.versionlist != null)
5103		- SetUndoStates();
	5469	+ SetVersionStates();
	5470	+
	5471	+ cameraView.requestFocusInWindow();
5104	5472	}
5105	5473
5106	5474	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5132,7 +5500,7 @@
5132	5500	// group = (Composite) group.get(0);
5133	5501	// }
5134	5502
5135		- System.out.println("makeSomething of " + thing);
	5503	+ //System.out.println("makeSomething of " + thing);
5136	5504
5137	5505	/*
5138	5506	if (deselect && jList != null)
..	..	@@ -5486,11 +5854,15 @@
5486	5854
5487	5855	copy.versionlist = readobj.versionlist;
5488	5856	copy.versionindex = readobj.versionindex;
	5857	+ copy.versiontable = readobj.versiontable;
5489	5858
5490	5859	if (copy.versionlist == null)
5491	5860	{
	5861	+ // Backward compatibility
5492	5862	copy.versionlist = new Object3D[100];
5493	5863	copy.versionindex = -1;
	5864	+
	5865	+ //Save(true);
5494	5866	}
5495	5867
5496	5868	//? SetUndoStates();
..	..	@@ -5582,6 +5954,8 @@
5582	5954
5583	5955	void save()
5584	5956	{
	5957	+ Replace();
	5958	+
5585	5959	if (lastname == null)
5586	5960	{
5587	5961	return;
..	..	@@ -5836,6 +6210,7 @@
5836	6210	boolean materialFlushed;
5837	6211	Object3D latestObject;
5838	6212
	6213	+ cGridBag transformPanel;
5839	6214	cGridBag XYZPanel;
5840	6215
5841	6216	JSplitPane gridPanel;
..	..	@@ -5940,6 +6315,8 @@
5940	6315	cNumberSlider textureField;
5941	6316	JLabel opacityLabel;
5942	6317	cNumberSlider opacityField;
	6318	+ JLabel parallaxLabel;
	6319	+ cNumberSlider parallaxField;
5943	6320	JLabel fakedepthLabel;
5944	6321	cNumberSlider fakedepthField;
5945	6322	JLabel shadowbiasLabel;