~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	}
..	..	@@ -320,6 +387,8 @@
320	387	{
321	388	copy.versionlist = new Object3D[100];
322	389	copy.versionindex = -1;
	390	+
	391	+// Save(true);
323	392	}
324	393
325	394	SetupUI2(callee.GetEditor());
..	..	@@ -343,7 +412,8 @@
343	412	//parent = p;
344	413
345	414	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
346		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	415	+ if (Globals.DEBUG)
	416	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
347	417	//gd.setFullScreenWindow(this);
348	418	//setResizable(false);
349	419	//if (!isDisplayable())
..	..	@@ -354,11 +424,13 @@
354	424	copy = localCopy;
355	425	copy.editWindow = this;
356	426
357		- if (copy.versionlist == null)
358		- {
359		-// copy.versions = new byte[100][];
	427	+// if (copy.versionlist == null)
	428	+// {
	429	+// copy.versionlist = new Object3D[100];
360	430	// copy.versionindex = -1;
361		- }
	431	+//
	432	+// Save(true);
	433	+// }
362	434
363	435	SetupMenu();
364	436
..	..	@@ -378,6 +450,9 @@
378	450
379	451	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
380	452
	453	+ // This is to refresh the UI of the material panel.
	454	+ boolean patchMaterial;
	455	+
381	456	void SetupMenu()
382	457	{
383	458	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -391,8 +466,11 @@
391	466	importOBJItem.addActionListener(this);
392	467	import3DSItem = menu.add(new MenuItem("3DS file..."));
393	468	import3DSItem.addActionListener(this);
	469	+ if (Globals.ADVANCED)
	470	+ {
394	471	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
395	472	importVRMLX3DItem.addActionListener(this);
	473	+ }
396	474	menu.add("-");
397	475	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
398	476	importGFDItem.addActionListener(this);
..	..	@@ -427,6 +505,8 @@
427	505
428	506	ChangeListener changeListener = new ChangeListener()
429	507	{
	508	+ //String name;
	509	+
430	510	public void stateChanged(ChangeEvent changeEvent)
431	511	{
432	512	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -445,7 +525,37 @@
445	525	// EditSelection(false);
446	526	// }
447	527
448		- refreshContents(false); // To refresh Info tab
	528	+// if (objectPanel.getSelectedIndex() == 4)
	529	+// {
	530	+// name = copy.skyboxname;
	531	+//
	532	+// if (name == null)
	533	+// {
	534	+// name = "";
	535	+// }
	536	+//
	537	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	538	+// copy.skyboxext = "jpg";
	539	+// }
	540	+// else
	541	+// {
	542	+// if (name != null)
	543	+// {
	544	+// if (name.equals(""))
	545	+// {
	546	+// copy.skyboxname = null;
	547	+// copy.skyboxext = null;
	548	+// }
	549	+// else
	550	+// {
	551	+// copy.skyboxname = name;
	552	+// }
	553	+// }
	554	+// }
	555	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	556	+
	557	+// refreshContents(false); // To refresh Info tab
	558	+ cameraView.repaint();
449	559	}
450	560	};
451	561	objectPanel.addChangeListener(changeListener);
..	..	@@ -871,18 +981,29 @@
871	981	boolean temp = CameraPane.SWITCH;
872	982	CameraPane.SWITCH = false;
873	983
874		- object.ExtractBigData(versiontable);
	984	+ if (Grafreed.grafreed.universe.versiontable == null)
	985	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	986	+
	987	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
875	988	// if (copy == client)
876	989
877	990	Object3D versions[] = object.versionlist;
	991	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
878	992	object.versionlist = null;
	993	+ object.versiontable = null;
	994	+
	995	+ Object3D parent = object.parent;
	996	+ object.parent = null;
879	997
880	998	//byte[] compress = Compress(copy);
881	999	Object3D compress = (Object3D)Grafreed.clone(object);
882	1000
883		- object.versionlist = versions;
	1001	+ object.parent = parent;
884	1002
885		- object.RestoreBigData(versiontable);
	1003	+ object.versionlist = versions;
	1004	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	1005	+
	1006	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
886	1007
887	1008	CameraPane.SWITCH = temp;
888	1009
..	..	@@ -1221,7 +1342,7 @@
1221	1342
1222	1343	//if (copy.pinned)
1223	1344	{
1224		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1345	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1225	1346	pinButton.setSelected(copy.pinned);
1226	1347	cGridBag t = new cGridBag();
1227	1348	t.preferredWidth = 2;
..	..	@@ -1244,14 +1365,14 @@
1244	1365
1245	1366	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1246	1367	liveCB.setToolTipText("Animate object");
	1368	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1369	+ markCB.setToolTipText("Set target transform");
1247	1370	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1248	1371	selectableCB.setToolTipText("Make object selectable");
1249	1372	// Return();
1250	1373
1251	1374	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1252	1375	hideCB.setToolTipText("Hide object");
1253		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1254		- markCB.setToolTipText("As animation target transform");
1255	1376
1256	1377	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1257	1378
..	..	@@ -1453,22 +1574,9 @@
1453	1574
1454	1575	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1455	1576	{
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);
	1577	+ if (Globals.DEBUG)
	1578	+ System.out.println("CREATE CAMERAS");
	1579	+ cams = CreateCameras();
1472	1580	} else
1473	1581	{
1474	1582	cams = (cGroup) copy.get(0);
..	..	@@ -1534,6 +1642,45 @@
1534	1642	//frontView.object = copy;
1535	1643	//sideView.object = copy;
1536	1644
	1645	+ transformPanel = new cGridBag().setVertical(true);
	1646	+
	1647	+ cGridBag resetTransformPanel = new cGridBag();
	1648	+
	1649	+ resetTransformPanel.preferredHeight = 2;
	1650	+
	1651	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1652	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1653	+ resetTransform.addMouseListener(new MouseAdapter()
	1654	+ {
	1655	+ public void mouseClicked(MouseEvent e)
	1656	+ {
	1657	+ ResetTransform();
	1658	+ }
	1659	+ });
	1660	+ resetTransformPanel.add(resetTransform);
	1661	+
	1662	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1663	+ resetTransform.setToolTipText("Reset Translation only");
	1664	+ resetTransform.addMouseListener(new MouseAdapter()
	1665	+ {
	1666	+ public void mouseClicked(MouseEvent e)
	1667	+ {
	1668	+ ResetTransform(1);
	1669	+ }
	1670	+ });
	1671	+ resetTransformPanel.add(resetTransform);
	1672	+
	1673	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1674	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1675	+ resetTransform.addMouseListener(new MouseAdapter()
	1676	+ {
	1677	+ public void mouseClicked(MouseEvent e)
	1678	+ {
	1679	+ ResetTransform(2);
	1680	+ }
	1681	+ });
	1682	+ resetTransformPanel.add(resetTransform);
	1683	+
1537	1684	XYZPanel = new cGridBag().setVertical(true);
1538	1685	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1539	1686
..	..	@@ -1543,6 +1690,9 @@
1543	1690	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1544	1691	//XYZPanel.setName("XYZ");
1545	1692
	1693	+ transformPanel.add(resetTransformPanel);
	1694	+ transformPanel.add(XYZPanel);
	1695	+
1546	1696	/*
1547	1697	gridPanel = new JPanel(); //new BorderLayout());
1548	1698	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1550,12 +1700,12 @@
1550	1700	gridPanel.add(cameraView);
1551	1701	gridPanel.add(XYZPanel);
1552	1702	*/
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);
	1703	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1704	+// gridPanel.setContinuousLayout(true);
	1705	+// gridPanel.setOneTouchExpandable(true);
	1706	+// gridPanel.setDividerLocation(1.0);
	1707	+// gridPanel.setDividerSize(9);
	1708	+// gridPanel.setResizeWeight(0.85);
1559	1709
1560	1710	// aConstraints.weighty = 0;
1561	1711	//System.out.println("THIS = " + this);
..	..	@@ -1578,30 +1728,34 @@
1578	1728
1579	1729	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1580	1730	//tmp.setName("Edit");
1581		- objectPanel.add(materialPanel);
1582		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1583		- objectPanel.setToolTipTextAt(0, "Material");
1584		-
	1731	+ objectPanel.add(skyboxPanel);
	1732	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1733	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1734	+
1585	1735	objectPanel.add(toolboxPanel);
1586	1736	objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1587	1737	objectPanel.setToolTipTextAt(1, "Objects & textures");
1588	1738
1589		- objectPanel.add(skyboxPanel);
1590		- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1591		- objectPanel.setToolTipTextAt(2, "Backgrounds");
1592		-
	1739	+ objectPanel.add(materialPanel);
	1740	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1741	+ objectPanel.setToolTipTextAt(2, "Material");
	1742	+
1593	1743	// JPanel north = new JPanel(new BorderLayout());
1594	1744	// north.setName("Edit");
1595	1745	// north.add(ctrlPanel, BorderLayout.NORTH);
1596	1746	// objectPanel.add(north);
1597	1747	objectPanel.add(editPanel);
1598		- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1748	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1599	1749	objectPanel.setToolTipTextAt(3, "Edit controls");
1600	1750
1601		- objectPanel.add(XYZPanel);
	1751	+ objectPanel.add(transformPanel);
1602	1752	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1603		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1753	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1604	1754
	1755	+ patchMaterial = true;
	1756	+ cameraView.patchMaterial = this;
	1757	+ objectPanel.setSelectedIndex(2);
	1758	+
1605	1759	/*
1606	1760	aConstraints.gridx = 0;
1607	1761	aConstraints.gridwidth = 1;
..	..	@@ -1621,7 +1775,7 @@
1621	1775	scrollpane.addMouseWheelListener(this); // Default not fast enough
1622	1776
1623	1777	/JTabbedPane/ scenePanel = new cGridBag();
1624		- scenePanel.preferredWidth = 5;
	1778	+ scenePanel.preferredWidth = 6;
1625	1779
1626	1780	JTabbedPane tabbedPane = new JTabbedPane();
1627	1781	tabbedPane.add(scrollpane);
..	..	@@ -1632,17 +1786,109 @@
1632	1786
1633	1787	AddOptions(optionsPanel); //, aConstraints);
1634	1788
1635		- tabbedPane.add(optionsPanel);
1636		-
1637	1789	tabbedPane.add(FSPane = new cFileSystemPane(this));
1638	1790
	1791	+ tabbedPane.add(optionsPanel);
	1792	+
1639	1793	scenePanel.add(tabbedPane);
1640	1794
1641		- //if (Globals.ADVANCED)
1642		- tabbedPane.add(infoPanel);
1643		- tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1644		- tabbedPane.setToolTipTextAt(3, "Information");
	1795	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1796	+ creditsPanel.setName("Credits");
1645	1797
	1798	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1799	+ creditsPanel.add(ogaLabel);
	1800	+
	1801	+ cButton creditButton;
	1802	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1803	+ creditButton.setToolTipText("https://opengameart.org");
	1804	+
	1805	+ creditButton.addMouseListener(new MouseAdapter()
	1806	+ {
	1807	+ public void mouseClicked(MouseEvent e)
	1808	+ {
	1809	+ try
	1810	+ {
	1811	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1812	+ } catch (Exception e1)
	1813	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1814	+ {
	1815	+ e1.printStackTrace();
	1816	+ }
	1817	+ }
	1818	+ });
	1819	+
	1820	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1821	+ creditsPanel.add(ogaLabel);
	1822	+
	1823	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1824	+ creditButton.setToolTipText("https://3delicious.net");
	1825	+
	1826	+ creditButton.addMouseListener(new MouseAdapter()
	1827	+ {
	1828	+ public void mouseClicked(MouseEvent e)
	1829	+ {
	1830	+ try
	1831	+ {
	1832	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1833	+ } catch (Exception e1)
	1834	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1835	+ {
	1836	+ e1.printStackTrace();
	1837	+ }
	1838	+ }
	1839	+ });
	1840	+
	1841	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1842	+ creditButton.setToolTipText("https://archive3d.net");
	1843	+
	1844	+ creditButton.addMouseListener(new MouseAdapter()
	1845	+ {
	1846	+ public void mouseClicked(MouseEvent e)
	1847	+ {
	1848	+ try
	1849	+ {
	1850	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1851	+ } catch (Exception e1)
	1852	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1853	+ {
	1854	+ e1.printStackTrace();
	1855	+ }
	1856	+ }
	1857	+ });
	1858	+
	1859	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1860	+ creditButton.setToolTipText("https://turbosquid.com");
	1861	+
	1862	+ creditButton.addMouseListener(new MouseAdapter()
	1863	+ {
	1864	+ public void mouseClicked(MouseEvent e)
	1865	+ {
	1866	+ try
	1867	+ {
	1868	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1869	+ } catch (Exception e1)
	1870	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1871	+ {
	1872	+ e1.printStackTrace();
	1873	+ }
	1874	+ }
	1875	+ });
	1876	+
	1877	+ for (int i=6; --i>=0;)
	1878	+ {
	1879	+ creditsPanel.add(new cGridBag());
	1880	+ }
	1881	+
	1882	+ tabbedPane.add(creditsPanel);
	1883	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1884	+
	1885	+ if (Globals.ADVANCED)
	1886	+ {
	1887	+ tabbedPane.add(infoPanel);
	1888	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1889	+ tabbedPane.setToolTipTextAt(4, "Information");
	1890	+ }
	1891	+
1646	1892	/*
1647	1893	cTree jTree = new cTree(null);
1648	1894	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1663,13 +1909,13 @@
1663	1909	jtp.add(tree);
1664	1910	*/
1665	1911
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");
	1912	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1913	+// bigPanel.setContinuousLayout(true);
	1914	+// bigPanel.setOneTouchExpandable(true);
	1915	+// bigPanel.setDividerLocation(0.8);
	1916	+// bigPanel.setDividerSize(15);
	1917	+// bigPanel.setResizeWeight(0.15);
	1918	+// bigPanel.setName("Scene");
1673	1919
1674	1920	//bigPanel.setLayout(new BorderLayout());
1675	1921	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1739,7 +1985,7 @@
1739	1985
1740	1986	frame.getContentPane().setLayout(new BorderLayout());
1741	1987	/**/
1742		- JTabbedPane worldPane = new JTabbedPane();
	1988	+ //JTabbedPane worldPane = new JTabbedPane();
1743	1989	//worldPane.add(bigPanel);
1744	1990	//worldPane.add(worldPanel);
1745	1991	/**/
..	..	@@ -1753,7 +1999,7 @@
1753	1999
1754	2000	cameraView.requestFocusInWindow();
1755	2001
1756		- gridPanel.setDividerLocation(1.0);
	2002	+// gridPanel.setDividerLocation(1.0);
1757	2003
1758	2004	frame.validate();
1759	2005
..	..	@@ -1788,7 +2034,7 @@
1788	2034	{
1789	2035	cGridBag presetpanel = new cGridBag().setVertical(true);
1790	2036
1791		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	2037	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1792	2038	skin.setToolTipText("Skin");
1793	2039	skin.addMouseListener(new MouseAdapter()
1794	2040	{
..	..	@@ -1799,7 +2045,15 @@
1799	2045
1800	2046	// Skin
1801	2047	colorField.setFloat(material.color);
1802		- saturationField.setFloat(material.modulation);
	2048	+ float saturation = material.modulation;
	2049	+
	2050	+ if (!cameraView.Skinshader)
	2051	+ {
	2052	+ saturation /= 1.5;
	2053	+ }
	2054	+
	2055	+ saturationField.setFloat(saturation);
	2056	+
1803	2057	subsurfaceField.setFloat(material.subsurface);
1804	2058	selfshadowField.setFloat(material.diffuseness);
1805	2059	diffusenessField.setFloat(material.factor);
..	..	@@ -1818,7 +2072,7 @@
1818	2072	});
1819	2073	presetpanel.add(skin);
1820	2074
1821		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2075	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1822	2076	lambert.setToolTipText("Diffuse");
1823	2077	lambert.addMouseListener(new MouseAdapter()
1824	2078	{
..	..	@@ -1836,7 +2090,7 @@
1836	2090	});
1837	2091	presetpanel.add(lambert);
1838	2092
1839		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2093	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1840	2094	diffuse2.setToolTipText("Diffuse2");
1841	2095	diffuse2.addMouseListener(new MouseAdapter()
1842	2096	{
..	..	@@ -1854,7 +2108,7 @@
1854	2108	});
1855	2109	presetpanel.add(diffuse2);
1856	2110
1857		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2111	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1858	2112	diffusemoon.setToolTipText("Moon");
1859	2113	diffusemoon.addMouseListener(new MouseAdapter()
1860	2114	{
..	..	@@ -1872,7 +2126,7 @@
1872	2126	});
1873	2127	presetpanel.add(diffusemoon);
1874	2128
1875		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2129	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1876	2130	diffusemoon2.setToolTipText("Moon2");
1877	2131	diffusemoon2.addMouseListener(new MouseAdapter()
1878	2132	{
..	..	@@ -1890,7 +2144,7 @@
1890	2144	});
1891	2145	presetpanel.add(diffusemoon2);
1892	2146
1893		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2147	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1894	2148	diffusemoon3.setToolTipText("Moon3");
1895	2149	diffusemoon3.addMouseListener(new MouseAdapter()
1896	2150	{
..	..	@@ -1908,7 +2162,7 @@
1908	2162	});
1909	2163	presetpanel.add(diffusemoon3);
1910	2164
1911		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2165	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1912	2166	diffusesheen.setToolTipText("Sheen");
1913	2167	diffusesheen.addMouseListener(new MouseAdapter()
1914	2168	{
..	..	@@ -1925,7 +2179,7 @@
1925	2179	});
1926	2180	presetpanel.add(diffusesheen);
1927	2181
1928		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2182	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
1929	2183	rough.setToolTipText("Rough metal");
1930	2184	rough.addMouseListener(new MouseAdapter()
1931	2185	{
..	..	@@ -1943,7 +2197,7 @@
1943	2197	});
1944	2198	presetpanel.add(rough);
1945	2199
1946		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2200	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
1947	2201	rough2.setToolTipText("Medium metal");
1948	2202	rough2.addMouseListener(new MouseAdapter()
1949	2203	{
..	..	@@ -1961,7 +2215,7 @@
1961	2215	});
1962	2216	presetpanel.add(rough2);
1963	2217
1964		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2218	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
1965	2219	shini0.setToolTipText("Shiny");
1966	2220	shini0.addMouseListener(new MouseAdapter()
1967	2221	{
..	..	@@ -1979,7 +2233,7 @@
1979	2233	});
1980	2234	presetpanel.add(shini0);
1981	2235
1982		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2236	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
1983	2237	shini1.setToolTipText("Shiny2");
1984	2238	shini1.addMouseListener(new MouseAdapter()
1985	2239	{
..	..	@@ -1997,7 +2251,7 @@
1997	2251	});
1998	2252	presetpanel.add(shini1);
1999	2253
2000		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2254	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2001	2255	shini2.setToolTipText("Shiny3");
2002	2256	shini2.addMouseListener(new MouseAdapter()
2003	2257	{
..	..	@@ -2015,7 +2269,7 @@
2015	2269	});
2016	2270	presetpanel.add(shini2);
2017	2271
2018		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2272	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2019	2273	aniso.setToolTipText("AnisoU");
2020	2274	aniso.addMouseListener(new MouseAdapter()
2021	2275	{
..	..	@@ -2033,7 +2287,7 @@
2033	2287	});
2034	2288	presetpanel.add(aniso);
2035	2289
2036		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2290	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2037	2291	aniso2.setToolTipText("AnisoV");
2038	2292	aniso2.addMouseListener(new MouseAdapter()
2039	2293	{
..	..	@@ -2051,7 +2305,7 @@
2051	2305	});
2052	2306	presetpanel.add(aniso2);
2053	2307
2054		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2308	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2055	2309	aniso3.setToolTipText("AnisoUV");
2056	2310	aniso3.addMouseListener(new MouseAdapter()
2057	2311	{
..	..	@@ -2069,7 +2323,7 @@
2069	2323	});
2070	2324	presetpanel.add(aniso3);
2071	2325
2072		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2326	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2073	2327	velvet0.setToolTipText("Velvet");
2074	2328	velvet0.addMouseListener(new MouseAdapter()
2075	2329	{
..	..	@@ -2091,7 +2345,7 @@
2091	2345	});
2092	2346	presetpanel.add(velvet0);
2093	2347
2094		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2348	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2095	2349	bump0.setToolTipText("Bump texture");
2096	2350	bump0.addMouseListener(new MouseAdapter()
2097	2351	{
..	..	@@ -2110,7 +2364,22 @@
2110	2364	});
2111	2365	presetpanel.add(bump0);
2112	2366
2113		- cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2367	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2368	+ borderShader.setToolTipText("Border fade");
	2369	+ borderShader.addMouseListener(new MouseAdapter()
	2370	+ {
	2371	+ public void mouseClicked(MouseEvent e)
	2372	+ {
	2373	+ borderfadeField.setFloat(0.4);
	2374	+ opacityField.setFloat(0.75);
	2375	+
	2376	+ materialtouched = true;
	2377	+ applySelf();
	2378	+ }
	2379	+ });
	2380	+ presetpanel.add(borderShader);
	2381	+
	2382	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2114	2383	halo.setToolTipText("Halo");
2115	2384	halo.addMouseListener(new MouseAdapter()
2116	2385	{
..	..	@@ -2127,7 +2396,7 @@
2127	2396	});
2128	2397	presetpanel.add(halo);
2129	2398
2130		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2399	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2131	2400	candle.setToolTipText("Candle");
2132	2401	candle.addMouseListener(new MouseAdapter()
2133	2402	{
..	..	@@ -2149,7 +2418,7 @@
2149	2418	});
2150	2419	presetpanel.add(candle);
2151	2420
2152		- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2421	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2153	2422	shadowShader.setToolTipText("Shadow");
2154	2423	shadowShader.addMouseListener(new MouseAdapter()
2155	2424	{
..	..	@@ -2168,6 +2437,48 @@
2168	2437	});
2169	2438	presetpanel.add(shadowShader);
2170	2439
	2440	+ cLabel para0 = GetLabel("icons/shadericons/parallax0.png", !Globals.NIMBUSLAF);
	2441	+ para0.setToolTipText("No parallax");
	2442	+ para0.addMouseListener(new MouseAdapter()
	2443	+ {
	2444	+ public void mouseClicked(MouseEvent e)
	2445	+ {
	2446	+ parallaxField.setFloat(0.125);
	2447	+
	2448	+ materialtouched = true;
	2449	+ applySelf();
	2450	+ }
	2451	+ });
	2452	+ presetpanel.add(para0);
	2453	+
	2454	+ cLabel para1 = GetLabel("icons/shadericons/parallax1.png", !Globals.NIMBUSLAF);
	2455	+ para1.setToolTipText("With parallax");
	2456	+ para1.addMouseListener(new MouseAdapter()
	2457	+ {
	2458	+ public void mouseClicked(MouseEvent e)
	2459	+ {
	2460	+ parallaxField.setFloat(0.13);
	2461	+
	2462	+ materialtouched = true;
	2463	+ applySelf();
	2464	+ }
	2465	+ });
	2466	+ presetpanel.add(para1);
	2467	+
	2468	+ cLabel para2 = GetLabel("icons/shadericons/parallax2.png", !Globals.NIMBUSLAF);
	2469	+ para2.setToolTipText("Reset parallax");
	2470	+ para2.addMouseListener(new MouseAdapter()
	2471	+ {
	2472	+ public void mouseClicked(MouseEvent e)
	2473	+ {
	2474	+ parallaxField.setFloat(0.14);
	2475	+
	2476	+ materialtouched = true;
	2477	+ applySelf();
	2478	+ }
	2479	+ });
	2480	+ presetpanel.add(para2);
	2481	+
2171	2482	cGridBag panel = new cGridBag().setVertical(true);
2172	2483
2173	2484	presetpanel.preferredWidth = 1;
..	..	@@ -2184,19 +2495,19 @@
2184	2495
2185	2496	cGridBag editBar = new cGridBag().setVertical(false);
2186	2497
2187		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2498	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2188	2499	createMaterialButton.setToolTipText("Create material");
2189	2500
2190	2501	/*
2191	2502	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2192	2503	*/
2193	2504
2194		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2505	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2195	2506	clearMaterialButton.setToolTipText("Clear material");
2196	2507
2197	2508	if (Globals.ADVANCED)
2198	2509	{
2199		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2510	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2200	2511	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2201	2512	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2202	2513	}
..	..	@@ -2217,9 +2528,20 @@
2217	2528
2218	2529	cGridBag huepanel = new cGridBag();
2219	2530	cGridBag huelabel = new cGridBag();
2220		- skin = GetLabel("icons/hue.png", false);
2221		- skin.fit = true;
2222		- huelabel.add(skin);
	2531	+ cLabel hue = GetLabel("icons/hue.png", false);
	2532	+ hue.fit = true;
	2533	+
	2534	+ hue.addMouseListener(new MouseAdapter()
	2535	+ {
	2536	+ public void mousePressed(MouseEvent e)
	2537	+ {
	2538	+ int x = e.getX();
	2539	+
	2540	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2541	+ }
	2542	+ });
	2543	+
	2544	+ huelabel.add(hue);
2223	2545	huelabel.preferredWidth = 20;
2224	2546	huepanel.add(new cGridBag()); // Label
2225	2547	huepanel.add(huelabel); // Field/slider
..	..	@@ -2402,6 +2724,12 @@
2402	2724	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
2403	2725	colorSection.add(backlit);
2404	2726
	2727	+ cGridBag parallax = new cGridBag();
	2728	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2729	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2730	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.25, -0.125)); // , aConstraints);
	2731	+ colorSection.add(parallax);
	2732	+
2405	2733	//panel.add(new JSeparator());
2406	2734
2407	2735	//panel.add(globalSection);
..	..	@@ -3453,6 +3781,7 @@
3453	3781	shadowField.setFloat(mat.shadow);
3454	3782	textureField.setFloat(mat.texture);
3455	3783	opacityField.setFloat(mat.opacity);
	3784	+ parallaxField.setFloat(mat.parallax + 0.125f);
3456	3785	fakedepthField.setFloat(mat.fakedepth);
3457	3786	shadowbiasField.setFloat(mat.shadowbias);
3458	3787	bumpField.setInteger(1); // dec 2013
..	..	@@ -3495,32 +3824,8 @@
3495	3824
3496	3825	if (multiplyToggle != null)
3497	3826	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		- }
	3827	+
	3828	+ AllocProjectedVertices(object);
3524	3829
3525	3830	SetMaterial(mat, object.projectedVertices);
3526	3831	}
..	..	@@ -3830,7 +4135,7 @@
3830	4135	//System.out.println("ObjEditor " + event);
3831	4136	applySelf0(true);
3832	4137	//parent.applySelf();
3833		- objEditor.refreshContents();
	4138	+ // conflicts with requestFocus objEditor.refreshContents();
3834	4139	} else if (source == resetButton)
3835	4140	{
3836	4141	CameraPane.fullreset = true;
..	..	@@ -4010,11 +4315,18 @@
4010	4315
4011	4316	void New()
4012	4317	{
4013		- while (copy.Size() > 1)
	4318	+ while (copy.Size() > 0)
4014	4319	{
4015		- copy.remove(1);
	4320	+ copy.remove(0);
4016	4321	}
4017	4322
	4323	+ copy.selection.clear();
	4324	+
	4325	+ if (copy == Grafreed.grafreed.universe)
	4326	+ {
	4327	+ CreateCameras();
	4328	+ cameraView.SetCamera(GetCamera(copy, 0));
	4329	+ }
4018	4330	ResetModel();
4019	4331	objEditor.refreshContents();
4020	4332	}
..	..	@@ -4123,7 +4435,7 @@
4123	4435	{
4124	4436	//Save(true);
4125	4437	Replace();
4126		- SetUndoStates();
	4438	+ SetVersionStates();
4127	4439	}
4128	4440
4129	4441	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -4142,8 +4454,6 @@
4142	4454	return true;
4143	4455	}
4144	4456
4145		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4146		-
4147	4457	void DeleteVersion()
4148	4458	{
4149	4459	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4151,9 +4461,13 @@
4151	4461	copy.versionlist[i] = copy.versionlist[i+1];
4152	4462	}
4153	4463
4154		- CopyChanged();
	4464	+ if (copy.versionlist[copy.versionindex] == null)
	4465	+ copy.versionindex -= 1;
4155	4466
4156		- SetUndoStates();
	4467	+ if (copy.versionindex != -1)
	4468	+ CopyChanged();
	4469	+
	4470	+ SetVersionStates();
4157	4471	}
4158	4472
4159	4473	public boolean Save(boolean user)
..	..	@@ -4161,7 +4475,7 @@
4161	4475	System.err.println("Save");
4162	4476	Replace();
4163	4477
4164		- cRadio tab = GetCurrentTab();
	4478	+ //cRadio tab = GetCurrentTab();
4165	4479
4166	4480	Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4167	4481
..	..	@@ -4199,7 +4513,7 @@
4199	4513	// copy.versionlist[i] = null;
4200	4514	// }
4201	4515
4202		- SetUndoStates();
	4516	+ SetVersionStates();
4203	4517
4204	4518	// test save
4205	4519	if (false)
..	..	@@ -4259,12 +4573,12 @@
4259	4573	{
4260	4574	Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4261	4575
4262		- SetUndoStates();
	4576	+ SetVersionStates();
4263	4577
4264	4578	boolean temp = CameraPane.SWITCH;
4265	4579	CameraPane.SWITCH = false;
4266	4580
4267		- copy.ExtractBigData(versiontable);
	4581	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4268	4582
4269	4583	copy.clear();
4270	4584
..	..	@@ -4276,7 +4590,7 @@
4276	4590	copy.add(obj.get(i));
4277	4591	}
4278	4592
4279		- copy.RestoreBigData(versiontable);
	4593	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4280	4594
4281	4595	CameraPane.SWITCH = temp;
4282	4596
..	..	@@ -4326,23 +4640,45 @@
4326	4640	return count;
4327	4641	}
4328	4642
4329		- void SetUndoStates()
	4643	+ public cGridBag versionSliderPane;
	4644	+
	4645	+ void SetVersionStates()
4330	4646	{
4331		- cRadio tab = GetCurrentTab();
	4647	+ //if (true)
	4648	+ // return;
	4649	+
	4650	+ //cRadio tab = GetCurrentTab();
4332	4651
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;
	4652	+ if (copy.versionlist == null)
	4653	+ {
	4654	+ saveVersionButton.setEnabled(false);
	4655	+ restoreButton.setEnabled(false);
	4656	+ replaceButton.setEnabled(false);
	4657	+ previousVersionButton.setEnabled(false);
	4658	+ nextVersionButton.setEnabled(false);
	4659	+ deleteVersionButton.setEnabled(false);
	4660	+ versionSliderPane.setVisible(false);
	4661	+ }
	4662	+ else
	4663	+ {
	4664	+ restoreButton.setEnabled(copy.versionindex != -1);
	4665	+ replaceButton.setEnabled(copy.versionindex != -1);
	4666	+
	4667	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4668	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4669	+
	4670	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4671	+ //copy.versionlist[copy.versionindex + 1] != null);
	4672	+
	4673	+ muteSlider = true;
	4674	+ versionSlider.setMinimum(0);
	4675	+ versionSlider.setMaximum(VersionCount() - 1);
	4676	+ versionSlider.setInteger(copy.versionindex);
	4677	+ versionSlider.setEnabled(copy.versionindex != -1);
	4678	+ muteSlider = false;
	4679	+
	4680	+ versionSliderPane.setVisible(true);
	4681	+ }
4346	4682	}
4347	4683
4348	4684	public boolean PreviousVersion()
..	..	@@ -4352,7 +4688,7 @@
4352	4688
4353	4689	System.err.println("Undo");
4354	4690
4355		- cRadio tab = GetCurrentTab();
	4691	+ //cRadio tab = GetCurrentTab();
4356	4692
4357	4693	if (copy.versionindex == 0)
4358	4694	{
..	..	@@ -4384,7 +4720,7 @@
4384	4720	{
4385	4721	System.err.println("Restore");
4386	4722
4387		- cRadio tab = GetCurrentTab();
	4723	+ //cRadio tab = GetCurrentTab();
4388	4724
4389	4725	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4390	4726	{
..	..	@@ -4400,9 +4736,9 @@
4400	4736
4401	4737	public boolean Replace()
4402	4738	{
4403		- System.err.println("Replace");
	4739	+ //System.err.println("Replace");
4404	4740
4405		- cRadio tab = GetCurrentTab();
	4741	+ //cRadio tab = GetCurrentTab();
4406	4742
4407	4743	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4408	4744	{
..	..	@@ -4420,7 +4756,7 @@
4420	4756	// Option?
4421	4757	Replace();
4422	4758
4423		- cRadio tab = GetCurrentTab();
	4759	+ //cRadio tab = GetCurrentTab();
4424	4760
4425	4761	if (copy.versionlist[copy.versionindex + 1] == null)
4426	4762	{
..	..	@@ -4627,6 +4963,12 @@
4627	4963	// else
4628	4964	// applySelf(true);
4629	4965	// }
	4966	+
	4967	+ boolean Equal(double a, double b)
	4968	+ {
	4969	+ return Math.abs(a - b) < 0.001;
	4970	+ }
	4971	+
4630	4972	void applySelf0(boolean name)
4631	4973	{
4632	4974	if (name)
..	..	@@ -4664,6 +5006,7 @@
4664	5006	current.shadow = (float) shadowField.getFloat();
4665	5007	current.texture = (float) textureField.getFloat();
4666	5008	current.opacity = (float) opacityField.getFloat();
	5009	+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
4667	5010	current.fakedepth = (float) fakedepthField.getFloat();
4668	5011	current.shadowbias = (float) shadowbiasField.getFloat();
4669	5012
..	..	@@ -4676,29 +5019,54 @@
4676	5019	{
4677	5020	cMaterial mat = copy.material;
4678	5021
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));
	5022	+ if (!Equal(colorField.getFloat(), mat.color))
	5023	+ colorField.SetToolTipValue((mat.color));
	5024	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	5025	+ saturationField.SetToolTipValue((mat.modulation));
	5026	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	5027	+ metalnessField.SetToolTipValue((mat.metalness));
	5028	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	5029	+ diffuseField.SetToolTipValue((mat.diffuse));
	5030	+ if (!Equal(specularField.getFloat(), mat.specular))
	5031	+ specularField.SetToolTipValue((mat.specular));
	5032	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	5033	+ shininessField.SetToolTipValue((mat.shininess));
	5034	+ if (!Equal(shiftField.getFloat(), mat.shift))
	5035	+ shiftField.SetToolTipValue((mat.shift));
	5036	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	5037	+ ambientField.SetToolTipValue((mat.ambient));
	5038	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	5039	+ lightareaField.SetToolTipValue((mat.lightarea));
	5040	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	5041	+ diffusenessField.SetToolTipValue((mat.factor));
	5042	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	5043	+ velvetField.SetToolTipValue((mat.velvet));
	5044	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	5045	+ sheenField.SetToolTipValue((mat.sheen));
	5046	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	5047	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	5048	+ if (!Equal(backlitField.getFloat(), mat.bump))
	5049	+ backlitField.SetToolTipValue((mat.bump));
	5050	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5051	+ anisoField.SetToolTipValue((mat.aniso));
	5052	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5053	+ anisoVField.SetToolTipValue((mat.anisoV));
	5054	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5055	+ cameraField.SetToolTipValue((mat.cameralight));
	5056	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5057	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5058	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5059	+ shadowField.SetToolTipValue((mat.shadow));
	5060	+ if (!Equal(textureField.getFloat(), mat.texture))
	5061	+ textureField.SetToolTipValue((mat.texture));
	5062	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5063	+ opacityField.SetToolTipValue((mat.opacity));
	5064	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5065	+ parallaxField.SetToolTipValue((mat.parallax));
	5066	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5067	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5068	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5069	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4702	5070	}
4703	5071
4704	5072	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4733,15 +5101,17 @@
4733	5101
4734	5102	public void stateChanged(ChangeEvent e)
4735	5103	{
4736		- // assert(false);
	5104	+ // assert(false);
4737	5105	if (e.getSource() == versionSlider)
4738	5106	{
4739	5107	if (muteSlider)
4740	5108	return;
4741	5109
	5110	+ Replace();
	5111	+
4742	5112	int version = versionSlider.getInteger();
4743	5113
4744		- if (copy.versionlist[version] != null)
	5114	+ if (version != -1 && copy.versionlist[version] != null)
4745	5115	{
4746	5116	copy.versionindex = version;
4747	5117	CopyChanged();
..	..	@@ -5100,7 +5470,9 @@
5100	5470	}
5101	5471
5102	5472	if (previousVersionButton != null && copy.versionlist != null)
5103		- SetUndoStates();
	5473	+ SetVersionStates();
	5474	+
	5475	+ cameraView.requestFocusInWindow();
5104	5476	}
5105	5477
5106	5478	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5132,7 +5504,7 @@
5132	5504	// group = (Composite) group.get(0);
5133	5505	// }
5134	5506
5135		- System.out.println("makeSomething of " + thing);
	5507	+ //System.out.println("makeSomething of " + thing);
5136	5508
5137	5509	/*
5138	5510	if (deselect && jList != null)
..	..	@@ -5486,11 +5858,15 @@
5486	5858
5487	5859	copy.versionlist = readobj.versionlist;
5488	5860	copy.versionindex = readobj.versionindex;
	5861	+ copy.versiontable = readobj.versiontable;
5489	5862
5490	5863	if (copy.versionlist == null)
5491	5864	{
	5865	+ // Backward compatibility
5492	5866	copy.versionlist = new Object3D[100];
5493	5867	copy.versionindex = -1;
	5868	+
	5869	+ //Save(true);
5494	5870	}
5495	5871
5496	5872	//? SetUndoStates();
..	..	@@ -5582,6 +5958,8 @@
5582	5958
5583	5959	void save()
5584	5960	{
	5961	+ Replace();
	5962	+
5585	5963	if (lastname == null)
5586	5964	{
5587	5965	return;
..	..	@@ -5836,6 +6214,7 @@
5836	6214	boolean materialFlushed;
5837	6215	Object3D latestObject;
5838	6216
	6217	+ cGridBag transformPanel;
5839	6218	cGridBag XYZPanel;
5840	6219
5841	6220	JSplitPane gridPanel;
..	..	@@ -5940,6 +6319,8 @@
5940	6319	cNumberSlider textureField;
5941	6320	JLabel opacityLabel;
5942	6321	cNumberSlider opacityField;
	6322	+ JLabel parallaxLabel;
	6323	+ cNumberSlider parallaxField;
5943	6324	JLabel fakedepthLabel;
5944	6325	cNumberSlider fakedepthField;
5945	6326	JLabel shadowbiasLabel;