~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -43,6 +43,50 @@
43	43
44	44	static ObjEditor theFrame;
45	45
	46	+ public void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
	75	+ public Composite CreateCameras()
	76	+ {
	77	+ Composite cams = new cTemplate();
	78	+ cams.name = "Cameras";
	79	+ copy.insertElementAt(cams, 0);
	80	+
	81	+ cams.addChild(new Camera());
	82	+ cams.addChild(new Camera(1));
	83	+ cams.addChild(new Camera(2));
	84	+ cams.addChild(new Camera(3));
	85	+ cams.addChild(new Camera(4));
	86	+
	87	+ return cams;
	88	+ }
	89	+
46	90	public cGridBag GetSeparator()
47	91	{
48	92	cGridBag separator = new cGridBag();
..	..	@@ -54,7 +98,10 @@
54	98	cButton GetButton(String name, boolean border)
55	99	{
56	100	ImageIcon icon = GetIcon(name);
57		- return new cButton(icon, border);
	101	+ if (icon != null \|\| name.contains("/"))
	102	+ return new cButton(icon, border);
	103	+ else
	104	+ return new cButton(name, border);
58	105	}
59	106
60	107	cLabel GetLabel(String name, boolean border)
..	..	@@ -75,11 +122,19 @@
75	122	return new cCheckBox(icon, border);
76	123	}
77	124
78		- ImageIcon GetIcon(String name)
	125	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	126	+
	127	+ static ImageIcon GetIcon(String name)
79	128	{
	129	+ javax.swing.ImageIcon iconCache = icons.get(name);
	130	+ if (iconCache != null)
	131	+ {
	132	+ return iconCache;
	133	+ }
	134	+
80	135	try
81	136	{
82		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	137	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
83	138
84	139	// if (image.getWidth() > 48 && image.getHeight() > 48)
85	140	// {
..	..	@@ -94,10 +149,14 @@
94	149	// }
95	150
96	151	javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	152	+
	153	+ icons.put(name, icon);
	154	+
97	155	return icon;
98	156	}
99	157	catch (Exception e)
100	158	{
	159	+ //icons.put(name, null);
101	160	return null;
102	161	}
103	162	}
..	..	@@ -297,11 +356,13 @@
297	356	client = inClient;
298	357	copy = client;
299	358
300		- if (copy.versionlist == null)
301		- {
302		- copy.versionlist = new Object3D[100];
303		- copy.versionindex = -1;
304		- }
	359	+// if (copy.versionlist == null)
	360	+// {
	361	+// copy.versionlist = new Object3D[100];
	362	+// copy.versionindex = -1;
	363	+//
	364	+// callee.Save(true);
	365	+// }
305	366
306	367	// "this" is not called: SetupUI2(objEditor);
307	368	}
..	..	@@ -320,6 +381,8 @@
320	381	{
321	382	copy.versionlist = new Object3D[100];
322	383	copy.versionindex = -1;
	384	+
	385	+// Save(true);
323	386	}
324	387
325	388	SetupUI2(callee.GetEditor());
..	..	@@ -343,7 +406,8 @@
343	406	//parent = p;
344	407
345	408	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
346		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	409	+ if (Globals.DEBUG)
	410	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
347	411	//gd.setFullScreenWindow(this);
348	412	//setResizable(false);
349	413	//if (!isDisplayable())
..	..	@@ -354,11 +418,13 @@
354	418	copy = localCopy;
355	419	copy.editWindow = this;
356	420
357		- if (copy.versionlist == null)
358		- {
359		-// copy.versions = new byte[100][];
	421	+// if (copy.versionlist == null)
	422	+// {
	423	+// copy.versionlist = new Object3D[100];
360	424	// copy.versionindex = -1;
361		- }
	425	+//
	426	+// Save(true);
	427	+// }
362	428
363	429	SetupMenu();
364	430
..	..	@@ -378,6 +444,9 @@
378	444
379	445	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
380	446
	447	+ // This is to refresh the UI of the material panel.
	448	+ boolean patchMaterial;
	449	+
381	450	void SetupMenu()
382	451	{
383	452	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -391,8 +460,11 @@
391	460	importOBJItem.addActionListener(this);
392	461	import3DSItem = menu.add(new MenuItem("3DS file..."));
393	462	import3DSItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
394	465	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
395	466	importVRMLX3DItem.addActionListener(this);
	467	+ }
396	468	menu.add("-");
397	469	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
398	470	importGFDItem.addActionListener(this);
..	..	@@ -427,6 +499,8 @@
427	499
428	500	ChangeListener changeListener = new ChangeListener()
429	501	{
	502	+ //String name;
	503	+
430	504	public void stateChanged(ChangeEvent changeEvent)
431	505	{
432	506	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -445,7 +519,37 @@
445	519	// EditSelection(false);
446	520	// }
447	521
448		- refreshContents(false); // To refresh Info tab
	522	+// if (objectPanel.getSelectedIndex() == 4)
	523	+// {
	524	+// name = copy.skyboxname;
	525	+//
	526	+// if (name == null)
	527	+// {
	528	+// name = "";
	529	+// }
	530	+//
	531	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	532	+// copy.skyboxext = "jpg";
	533	+// }
	534	+// else
	535	+// {
	536	+// if (name != null)
	537	+// {
	538	+// if (name.equals(""))
	539	+// {
	540	+// copy.skyboxname = null;
	541	+// copy.skyboxext = null;
	542	+// }
	543	+// else
	544	+// {
	545	+// copy.skyboxname = name;
	546	+// }
	547	+// }
	548	+// }
	549	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	550	+
	551	+// refreshContents(false); // To refresh Info tab
	552	+ cameraView.repaint();
449	553	}
450	554	};
451	555	objectPanel.addChangeListener(changeListener);
..	..	@@ -754,6 +858,7 @@
754	858	boolean maximized;
755	859
756	860	cButton fullscreenLayout;
	861	+ cButton expandedLayout;
757	862
758	863	void Minimize()
759	864	{
..	..	@@ -793,10 +898,12 @@
793	898	cButton minButton;
794	899	cButton maxButton;
795	900	cButton fullButton;
	901	+ cButton collapseButton;
	902	+ cButton maximize3DButton;
796	903
797	904	void ToggleFullScreen()
798	905	{
799		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	906	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
800	907
801	908	cameraView.ToggleFullScreen();
802	909
..	..	@@ -817,13 +924,13 @@
817	924	// X frame.getContentPane().remove(/"Center",/bigThree);
818	925	// X framePanel.add(bigThree);
819	926	// X frame.getContentPane().add(/"Center",/framePanel);
820		- framePanel.setDividerLocation(46);
	927	+// framePanel.setDividerLocation(46); // icons are 24x24
821	928
822	929	//frame.setVisible(true);
823		- radio.layout = keepButton;
	930	+// radio.layout = keepButton;
824	931	//theFrame = null;
825	932	keepButton = null;
826		- radio.layout.doClick();
	933	+// radio.layout.doClick();
827	934
828	935	} else
829	936	{
..	..	@@ -844,10 +951,10 @@
844	951	// X frame.getContentPane().remove(/"Center",/framePanel);
845	952	// X framePanel.remove(bigThree);
846	953	// X frame.getContentPane().add(/"Center",/bigThree);
847		- framePanel.setDividerLocation(0);
	954	+// framePanel.setDividerLocation(0);
848	955
849		- radio.layout = fullscreenLayout;
850		- radio.layout.doClick();
	956	+// radio.layout = fullscreenLayout;
	957	+// radio.layout.doClick();
851	958	//frame.setVisible(true);
852	959	}
853	960	frame.validate();
..	..	@@ -855,23 +962,42 @@
855	962	cameraView.requestFocusInWindow();
856	963	}
857	964
858		- private Object3D CompressCopy()
	965	+ void CollapseToolbar()
	966	+ {
	967	+ framePanel.setDividerLocation(0);
	968	+ //frame.validate();
	969	+
	970	+ cameraView.requestFocusInWindow();
	971	+ }
	972	+
	973	+ private Object3D Duplicate(Object3D object)
859	974	{
860	975	boolean temp = CameraPane.SWITCH;
861	976	CameraPane.SWITCH = false;
862	977
863		- copy.ExtractBigData(versiontable);
	978	+ if (Grafreed.grafreed.universe.versiontable == null)
	979	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	980	+
	981	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
864	982	// if (copy == client)
865	983
866		- Object3D versions[] = copy.versionlist;
867		- copy.versionlist = null;
	984	+ Object3D versions[] = object.versionlist;
	985	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	986	+ object.versionlist = null;
	987	+ object.versiontable = null;
	988	+
	989	+ Object3D parent = object.parent;
	990	+ object.parent = null;
868	991
869	992	//byte[] compress = Compress(copy);
870		- Object3D compress = (Object3D)Grafreed.clone(copy);
	993	+ Object3D compress = (Object3D)Grafreed.clone(object);
871	994
872		- copy.versionlist = versions;
	995	+ object.parent = parent;
873	996
874		- copy.RestoreBigData(versiontable);
	997	+ object.versionlist = versions;
	998	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	999	+
	1000	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
875	1001
876	1002	CameraPane.SWITCH = temp;
877	1003
..	..	@@ -1210,7 +1336,7 @@
1210	1336
1211	1337	//if (copy.pinned)
1212	1338	{
1213		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1339	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1214	1340	pinButton.setSelected(copy.pinned);
1215	1341	cGridBag t = new cGridBag();
1216	1342	t.preferredWidth = 2;
..	..	@@ -1233,14 +1359,14 @@
1233	1359
1234	1360	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1235	1361	liveCB.setToolTipText("Animate object");
	1362	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1363	+ markCB.setToolTipText("Set target transform");
1236	1364	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1237	1365	selectableCB.setToolTipText("Make object selectable");
1238	1366	// Return();
1239	1367
1240	1368	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1241	1369	hideCB.setToolTipText("Hide object");
1242		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1243		- markCB.setToolTipText("As animation target transform");
1244	1370
1245	1371	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1246	1372
..	..	@@ -1442,22 +1568,9 @@
1442	1568
1443	1569	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1444	1570	{
1445		- System.out.println("CREATE CAMERAS");
1446		- cams = new cTemplate();
1447		- cams.name = "Cameras";
1448		- copy.insertElementAt(cams, 0);
1449		- //cams.parent = copy;
1450		-
1451		- cam = new Camera(); // LA.newVector(3, 2, 1));
1452		- cams.addChild(cam);
1453		- cam = new Camera(1);
1454		- cams.addChild(cam);
1455		- cam = new Camera(2);
1456		- cams.addChild(cam);
1457		- cam = new Camera(3);
1458		- cams.addChild(cam);
1459		- cam = new Camera(4); // Light
1460		- cams.addChild(cam);
	1571	+ if (Globals.DEBUG)
	1572	+ System.out.println("CREATE CAMERAS");
	1573	+ cams = CreateCameras();
1461	1574	} else
1462	1575	{
1463	1576	cams = (cGroup) copy.get(0);
..	..	@@ -1523,6 +1636,45 @@
1523	1636	//frontView.object = copy;
1524	1637	//sideView.object = copy;
1525	1638
	1639	+ transformPanel = new cGridBag().setVertical(true);
	1640	+
	1641	+ cGridBag resetTransformPanel = new cGridBag();
	1642	+
	1643	+ resetTransformPanel.preferredHeight = 2;
	1644	+
	1645	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1646	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1647	+ resetTransform.addMouseListener(new MouseAdapter()
	1648	+ {
	1649	+ public void mouseClicked(MouseEvent e)
	1650	+ {
	1651	+ ResetTransform();
	1652	+ }
	1653	+ });
	1654	+ resetTransformPanel.add(resetTransform);
	1655	+
	1656	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1657	+ resetTransform.setToolTipText("Reset Translation only");
	1658	+ resetTransform.addMouseListener(new MouseAdapter()
	1659	+ {
	1660	+ public void mouseClicked(MouseEvent e)
	1661	+ {
	1662	+ ResetTransform(1);
	1663	+ }
	1664	+ });
	1665	+ resetTransformPanel.add(resetTransform);
	1666	+
	1667	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1668	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1669	+ resetTransform.addMouseListener(new MouseAdapter()
	1670	+ {
	1671	+ public void mouseClicked(MouseEvent e)
	1672	+ {
	1673	+ ResetTransform(2);
	1674	+ }
	1675	+ });
	1676	+ resetTransformPanel.add(resetTransform);
	1677	+
1526	1678	XYZPanel = new cGridBag().setVertical(true);
1527	1679	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1528	1680
..	..	@@ -1532,6 +1684,9 @@
1532	1684	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1533	1685	//XYZPanel.setName("XYZ");
1534	1686
	1687	+ transformPanel.add(resetTransformPanel);
	1688	+ transformPanel.add(XYZPanel);
	1689	+
1535	1690	/*
1536	1691	gridPanel = new JPanel(); //new BorderLayout());
1537	1692	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1539,12 +1694,12 @@
1539	1694	gridPanel.add(cameraView);
1540	1695	gridPanel.add(XYZPanel);
1541	1696	*/
1542		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1543		- gridPanel.setContinuousLayout(true);
1544		- gridPanel.setOneTouchExpandable(true);
1545		- gridPanel.setDividerLocation(1.0);
1546		- gridPanel.setDividerSize(9);
1547		- gridPanel.setResizeWeight(0.85);
	1697	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1698	+// gridPanel.setContinuousLayout(true);
	1699	+// gridPanel.setOneTouchExpandable(true);
	1700	+// gridPanel.setDividerLocation(1.0);
	1701	+// gridPanel.setDividerSize(9);
	1702	+// gridPanel.setResizeWeight(0.85);
1548	1703
1549	1704	// aConstraints.weighty = 0;
1550	1705	//System.out.println("THIS = " + this);
..	..	@@ -1567,30 +1722,34 @@
1567	1722
1568	1723	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1569	1724	//tmp.setName("Edit");
1570		- objectPanel.add(materialPanel);
1571		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1572		- objectPanel.setToolTipTextAt(0, "Material");
1573		-
	1725	+ objectPanel.add(skyboxPanel);
	1726	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1727	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1728	+
1574	1729	objectPanel.add(toolboxPanel);
1575	1730	objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1576	1731	objectPanel.setToolTipTextAt(1, "Objects & textures");
1577	1732
1578		- objectPanel.add(skyboxPanel);
1579		- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1580		- objectPanel.setToolTipTextAt(2, "Backgrounds");
1581		-
	1733	+ objectPanel.add(materialPanel);
	1734	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1735	+ objectPanel.setToolTipTextAt(2, "Material");
	1736	+
1582	1737	// JPanel north = new JPanel(new BorderLayout());
1583	1738	// north.setName("Edit");
1584	1739	// north.add(ctrlPanel, BorderLayout.NORTH);
1585	1740	// objectPanel.add(north);
1586	1741	objectPanel.add(editPanel);
1587		- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1742	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1588	1743	objectPanel.setToolTipTextAt(3, "Edit controls");
1589	1744
1590		- objectPanel.add(XYZPanel);
	1745	+ objectPanel.add(transformPanel);
1591	1746	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1592		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1747	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1593	1748
	1749	+ patchMaterial = true;
	1750	+ cameraView.patchMaterial = this;
	1751	+ objectPanel.setSelectedIndex(2);
	1752	+
1594	1753	/*
1595	1754	aConstraints.gridx = 0;
1596	1755	aConstraints.gridwidth = 1;
..	..	@@ -1610,7 +1769,7 @@
1610	1769	scrollpane.addMouseWheelListener(this); // Default not fast enough
1611	1770
1612	1771	/JTabbedPane/ scenePanel = new cGridBag();
1613		- scenePanel.preferredWidth = 5;
	1772	+ scenePanel.preferredWidth = 6;
1614	1773
1615	1774	JTabbedPane tabbedPane = new JTabbedPane();
1616	1775	tabbedPane.add(scrollpane);
..	..	@@ -1621,17 +1780,109 @@
1621	1780
1622	1781	AddOptions(optionsPanel); //, aConstraints);
1623	1782
1624		- tabbedPane.add(optionsPanel);
1625		-
1626	1783	tabbedPane.add(FSPane = new cFileSystemPane(this));
1627	1784
	1785	+ tabbedPane.add(optionsPanel);
	1786	+
1628	1787	scenePanel.add(tabbedPane);
1629	1788
1630		- //if (Globals.ADVANCED)
1631		- tabbedPane.add(infoPanel);
1632		- tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1633		- tabbedPane.setToolTipTextAt(3, "Information");
	1789	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1790	+ creditsPanel.setName("Credits");
1634	1791
	1792	+ cLabel ogaLabel = new cLabel(" Most Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1793	+ creditsPanel.add(ogaLabel);
	1794	+
	1795	+ cButton creditButton;
	1796	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1797	+ creditButton.setToolTipText("https://opengameart.org");
	1798	+
	1799	+ creditButton.addMouseListener(new MouseAdapter()
	1800	+ {
	1801	+ public void mouseClicked(MouseEvent e)
	1802	+ {
	1803	+ try
	1804	+ {
	1805	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1806	+ } catch (Exception e1)
	1807	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1808	+ {
	1809	+ e1.printStackTrace();
	1810	+ }
	1811	+ }
	1812	+ });
	1813	+
	1814	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1815	+ creditsPanel.add(ogaLabel);
	1816	+
	1817	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1818	+ creditButton.setToolTipText("https://3delicious.net");
	1819	+
	1820	+ creditButton.addMouseListener(new MouseAdapter()
	1821	+ {
	1822	+ public void mouseClicked(MouseEvent e)
	1823	+ {
	1824	+ try
	1825	+ {
	1826	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1827	+ } catch (Exception e1)
	1828	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1829	+ {
	1830	+ e1.printStackTrace();
	1831	+ }
	1832	+ }
	1833	+ });
	1834	+
	1835	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1836	+ creditButton.setToolTipText("https://archive3d.net");
	1837	+
	1838	+ creditButton.addMouseListener(new MouseAdapter()
	1839	+ {
	1840	+ public void mouseClicked(MouseEvent e)
	1841	+ {
	1842	+ try
	1843	+ {
	1844	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1845	+ } catch (Exception e1)
	1846	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1847	+ {
	1848	+ e1.printStackTrace();
	1849	+ }
	1850	+ }
	1851	+ });
	1852	+
	1853	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1854	+ creditButton.setToolTipText("https://turbosquid.com");
	1855	+
	1856	+ creditButton.addMouseListener(new MouseAdapter()
	1857	+ {
	1858	+ public void mouseClicked(MouseEvent e)
	1859	+ {
	1860	+ try
	1861	+ {
	1862	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1863	+ } catch (Exception e1)
	1864	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1865	+ {
	1866	+ e1.printStackTrace();
	1867	+ }
	1868	+ }
	1869	+ });
	1870	+
	1871	+ for (int i=6; --i>=0;)
	1872	+ {
	1873	+ creditsPanel.add(new cGridBag());
	1874	+ }
	1875	+
	1876	+ tabbedPane.add(creditsPanel);
	1877	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1878	+
	1879	+ if (Globals.ADVANCED)
	1880	+ {
	1881	+ tabbedPane.add(infoPanel);
	1882	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1883	+ tabbedPane.setToolTipTextAt(4, "Information");
	1884	+ }
	1885	+
1635	1886	/*
1636	1887	cTree jTree = new cTree(null);
1637	1888	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1652,13 +1903,13 @@
1652	1903	jtp.add(tree);
1653	1904	*/
1654	1905
1655		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1656		- bigPanel.setContinuousLayout(true);
1657		- bigPanel.setOneTouchExpandable(true);
1658		- bigPanel.setDividerLocation(0.8);
1659		- bigPanel.setDividerSize(15);
1660		- bigPanel.setResizeWeight(0.15);
1661		- bigPanel.setName("Scene");
	1906	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1907	+// bigPanel.setContinuousLayout(true);
	1908	+// bigPanel.setOneTouchExpandable(true);
	1909	+// bigPanel.setDividerLocation(0.8);
	1910	+// bigPanel.setDividerSize(15);
	1911	+// bigPanel.setResizeWeight(0.15);
	1912	+// bigPanel.setName("Scene");
1662	1913
1663	1914	//bigPanel.setLayout(new BorderLayout());
1664	1915	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1702,6 +1953,23 @@
1702	1953	// aConstraints.gridheight = 1;
1703	1954
1704	1955	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1956	+
	1957	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1958	+ new java.beans.PropertyChangeListener()
	1959	+ {
	1960	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1961	+ {
	1962	+ if ((Integer)pce.getOldValue() == 1)
	1963	+ {
	1964	+ if (radio.layout != expandedLayout)
	1965	+ {
	1966	+ radio.layout = expandedLayout;
	1967	+ radio.layout.doClick();
	1968	+ }
	1969	+ }
	1970	+ }
	1971	+ });
	1972	+
1705	1973	framePanel.setContinuousLayout(false);
1706	1974	framePanel.setOneTouchExpandable(false);
1707	1975	//.setDividerLocation(0.8);
..	..	@@ -1711,7 +1979,7 @@
1711	1979
1712	1980	frame.getContentPane().setLayout(new BorderLayout());
1713	1981	/**/
1714		- JTabbedPane worldPane = new JTabbedPane();
	1982	+ //JTabbedPane worldPane = new JTabbedPane();
1715	1983	//worldPane.add(bigPanel);
1716	1984	//worldPane.add(worldPanel);
1717	1985	/**/
..	..	@@ -1725,7 +1993,7 @@
1725	1993
1726	1994	cameraView.requestFocusInWindow();
1727	1995
1728		- gridPanel.setDividerLocation(1.0);
	1996	+// gridPanel.setDividerLocation(1.0);
1729	1997
1730	1998	frame.validate();
1731	1999
..	..	@@ -1760,7 +2028,7 @@
1760	2028	{
1761	2029	cGridBag presetpanel = new cGridBag().setVertical(true);
1762	2030
1763		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	2031	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1764	2032	skin.setToolTipText("Skin");
1765	2033	skin.addMouseListener(new MouseAdapter()
1766	2034	{
..	..	@@ -1771,7 +2039,15 @@
1771	2039
1772	2040	// Skin
1773	2041	colorField.setFloat(material.color);
1774		- saturationField.setFloat(material.modulation);
	2042	+ float saturation = material.modulation;
	2043	+
	2044	+ if (!cameraView.Skinshader)
	2045	+ {
	2046	+ saturation /= 1.5;
	2047	+ }
	2048	+
	2049	+ saturationField.setFloat(saturation);
	2050	+
1775	2051	subsurfaceField.setFloat(material.subsurface);
1776	2052	selfshadowField.setFloat(material.diffuseness);
1777	2053	diffusenessField.setFloat(material.factor);
..	..	@@ -1790,7 +2066,7 @@
1790	2066	});
1791	2067	presetpanel.add(skin);
1792	2068
1793		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2069	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1794	2070	lambert.setToolTipText("Diffuse");
1795	2071	lambert.addMouseListener(new MouseAdapter()
1796	2072	{
..	..	@@ -1808,7 +2084,7 @@
1808	2084	});
1809	2085	presetpanel.add(lambert);
1810	2086
1811		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2087	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1812	2088	diffuse2.setToolTipText("Diffuse2");
1813	2089	diffuse2.addMouseListener(new MouseAdapter()
1814	2090	{
..	..	@@ -1826,7 +2102,7 @@
1826	2102	});
1827	2103	presetpanel.add(diffuse2);
1828	2104
1829		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2105	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1830	2106	diffusemoon.setToolTipText("Moon");
1831	2107	diffusemoon.addMouseListener(new MouseAdapter()
1832	2108	{
..	..	@@ -1844,7 +2120,7 @@
1844	2120	});
1845	2121	presetpanel.add(diffusemoon);
1846	2122
1847		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2123	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1848	2124	diffusemoon2.setToolTipText("Moon2");
1849	2125	diffusemoon2.addMouseListener(new MouseAdapter()
1850	2126	{
..	..	@@ -1862,7 +2138,7 @@
1862	2138	});
1863	2139	presetpanel.add(diffusemoon2);
1864	2140
1865		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2141	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1866	2142	diffusemoon3.setToolTipText("Moon3");
1867	2143	diffusemoon3.addMouseListener(new MouseAdapter()
1868	2144	{
..	..	@@ -1880,7 +2156,7 @@
1880	2156	});
1881	2157	presetpanel.add(diffusemoon3);
1882	2158
1883		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2159	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1884	2160	diffusesheen.setToolTipText("Sheen");
1885	2161	diffusesheen.addMouseListener(new MouseAdapter()
1886	2162	{
..	..	@@ -1897,7 +2173,7 @@
1897	2173	});
1898	2174	presetpanel.add(diffusesheen);
1899	2175
1900		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2176	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
1901	2177	rough.setToolTipText("Rough metal");
1902	2178	rough.addMouseListener(new MouseAdapter()
1903	2179	{
..	..	@@ -1915,7 +2191,7 @@
1915	2191	});
1916	2192	presetpanel.add(rough);
1917	2193
1918		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2194	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
1919	2195	rough2.setToolTipText("Medium metal");
1920	2196	rough2.addMouseListener(new MouseAdapter()
1921	2197	{
..	..	@@ -1933,7 +2209,7 @@
1933	2209	});
1934	2210	presetpanel.add(rough2);
1935	2211
1936		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2212	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
1937	2213	shini0.setToolTipText("Shiny");
1938	2214	shini0.addMouseListener(new MouseAdapter()
1939	2215	{
..	..	@@ -1951,7 +2227,7 @@
1951	2227	});
1952	2228	presetpanel.add(shini0);
1953	2229
1954		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2230	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
1955	2231	shini1.setToolTipText("Shiny2");
1956	2232	shini1.addMouseListener(new MouseAdapter()
1957	2233	{
..	..	@@ -1969,7 +2245,7 @@
1969	2245	});
1970	2246	presetpanel.add(shini1);
1971	2247
1972		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2248	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
1973	2249	shini2.setToolTipText("Shiny3");
1974	2250	shini2.addMouseListener(new MouseAdapter()
1975	2251	{
..	..	@@ -1987,7 +2263,7 @@
1987	2263	});
1988	2264	presetpanel.add(shini2);
1989	2265
1990		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2266	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
1991	2267	aniso.setToolTipText("AnisoU");
1992	2268	aniso.addMouseListener(new MouseAdapter()
1993	2269	{
..	..	@@ -2005,7 +2281,7 @@
2005	2281	});
2006	2282	presetpanel.add(aniso);
2007	2283
2008		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2284	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2009	2285	aniso2.setToolTipText("AnisoV");
2010	2286	aniso2.addMouseListener(new MouseAdapter()
2011	2287	{
..	..	@@ -2023,7 +2299,7 @@
2023	2299	});
2024	2300	presetpanel.add(aniso2);
2025	2301
2026		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2302	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2027	2303	aniso3.setToolTipText("AnisoUV");
2028	2304	aniso3.addMouseListener(new MouseAdapter()
2029	2305	{
..	..	@@ -2041,7 +2317,7 @@
2041	2317	});
2042	2318	presetpanel.add(aniso3);
2043	2319
2044		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2320	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2045	2321	velvet0.setToolTipText("Velvet");
2046	2322	velvet0.addMouseListener(new MouseAdapter()
2047	2323	{
..	..	@@ -2063,7 +2339,7 @@
2063	2339	});
2064	2340	presetpanel.add(velvet0);
2065	2341
2066		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2342	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2067	2343	bump0.setToolTipText("Bump texture");
2068	2344	bump0.addMouseListener(new MouseAdapter()
2069	2345	{
..	..	@@ -2082,7 +2358,22 @@
2082	2358	});
2083	2359	presetpanel.add(bump0);
2084	2360
2085		- cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2361	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2362	+ borderShader.setToolTipText("Border fade");
	2363	+ borderShader.addMouseListener(new MouseAdapter()
	2364	+ {
	2365	+ public void mouseClicked(MouseEvent e)
	2366	+ {
	2367	+ borderfadeField.setFloat(0.5);
	2368	+ opacityField.setFloat(0.75);
	2369	+
	2370	+ materialtouched = true;
	2371	+ applySelf();
	2372	+ }
	2373	+ });
	2374	+ presetpanel.add(borderShader);
	2375	+
	2376	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2086	2377	halo.setToolTipText("Halo");
2087	2378	halo.addMouseListener(new MouseAdapter()
2088	2379	{
..	..	@@ -2099,7 +2390,7 @@
2099	2390	});
2100	2391	presetpanel.add(halo);
2101	2392
2102		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2393	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2103	2394	candle.setToolTipText("Candle");
2104	2395	candle.addMouseListener(new MouseAdapter()
2105	2396	{
..	..	@@ -2121,6 +2412,25 @@
2121	2412	});
2122	2413	presetpanel.add(candle);
2123	2414
	2415	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2416	+ shadowShader.setToolTipText("Shadow");
	2417	+ shadowShader.addMouseListener(new MouseAdapter()
	2418	+ {
	2419	+ public void mouseClicked(MouseEvent e)
	2420	+ {
	2421	+ diffuseField.setFloat(0.001);
	2422	+ ambientField.setFloat(0.001);
	2423	+ cameraField.setFloat(0.001);
	2424	+ specularField.setFloat(0.001);
	2425	+ fakedepthField.setFloat(0.001);
	2426	+ opacityField.setFloat(0.6);
	2427	+
	2428	+ materialtouched = true;
	2429	+ applySelf();
	2430	+ }
	2431	+ });
	2432	+ presetpanel.add(shadowShader);
	2433	+
2124	2434	cGridBag panel = new cGridBag().setVertical(true);
2125	2435
2126	2436	presetpanel.preferredWidth = 1;
..	..	@@ -2137,19 +2447,19 @@
2137	2447
2138	2448	cGridBag editBar = new cGridBag().setVertical(false);
2139	2449
2140		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2450	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2141	2451	createMaterialButton.setToolTipText("Create material");
2142	2452
2143	2453	/*
2144	2454	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2145	2455	*/
2146	2456
2147		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2457	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2148	2458	clearMaterialButton.setToolTipText("Clear material");
2149	2459
2150	2460	if (Globals.ADVANCED)
2151	2461	{
2152		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2462	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2153	2463	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2154	2464	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2155	2465	}
..	..	@@ -2170,9 +2480,20 @@
2170	2480
2171	2481	cGridBag huepanel = new cGridBag();
2172	2482	cGridBag huelabel = new cGridBag();
2173		- skin = GetLabel("icons/hue.png", false);
2174		- skin.fit = true;
2175		- huelabel.add(skin);
	2483	+ cLabel hue = GetLabel("icons/hue.png", false);
	2484	+ hue.fit = true;
	2485	+
	2486	+ hue.addMouseListener(new MouseAdapter()
	2487	+ {
	2488	+ public void mousePressed(MouseEvent e)
	2489	+ {
	2490	+ int x = e.getX();
	2491	+
	2492	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2493	+ }
	2494	+ });
	2495	+
	2496	+ huelabel.add(hue);
2176	2497	huelabel.preferredWidth = 20;
2177	2498	huepanel.add(new cGridBag()); // Label
2178	2499	huepanel.add(huelabel); // Field/slider
..	..	@@ -3448,32 +3769,8 @@
3448	3769
3449	3770	if (multiplyToggle != null)
3450	3771	multiplyToggle.setSelected(mat.multiply);
3451		-
3452		- assert (object.projectedVertices != null);
3453		-
3454		- if (object.projectedVertices.length <= 2)
3455		- {
3456		- // Side effect...
3457		- Object3D.cVector2[] keep = object.projectedVertices;
3458		- object.projectedVertices = new Object3D.cVector2[3];
3459		- for (int i = 0; i < 3; i++)
3460		- {
3461		- if (i < keep.length)
3462		- {
3463		- object.projectedVertices[i] = keep[i];
3464		- } else
3465		- {
3466		- object.projectedVertices[i] = new Object3D.cVector2();
3467		- }
3468		- /*
3469		- if(keep.length == 0)
3470		- object.projectedVertices[0] = new Object3D.cVector2();
3471		- else
3472		- object.projectedVertices[0] = keep[0];
3473		- object.projectedVertices[1] = new Object3D.cVector2();
3474		- */
3475		- }
3476		- }
	3772	+
	3773	+ AllocProjectedVertices(object);
3477	3774
3478	3775	SetMaterial(mat, object.projectedVertices);
3479	3776	}
..	..	@@ -3783,7 +4080,7 @@
3783	4080	//System.out.println("ObjEditor " + event);
3784	4081	applySelf0(true);
3785	4082	//parent.applySelf();
3786		- objEditor.refreshContents();
	4083	+ // conflicts with requestFocus objEditor.refreshContents();
3787	4084	} else if (source == resetButton)
3788	4085	{
3789	4086	CameraPane.fullreset = true;
..	..	@@ -3963,11 +4260,18 @@
3963	4260
3964	4261	void New()
3965	4262	{
3966		- while (copy.Size() > 1)
	4263	+ while (copy.Size() > 0)
3967	4264	{
3968		- copy.remove(1);
	4265	+ copy.remove(0);
3969	4266	}
3970	4267
	4268	+ copy.selection.clear();
	4269	+
	4270	+ if (copy == Grafreed.grafreed.universe)
	4271	+ {
	4272	+ CreateCameras();
	4273	+ cameraView.SetCamera(GetCamera(copy, 0));
	4274	+ }
3971	4275	ResetModel();
3972	4276	objEditor.refreshContents();
3973	4277	}
..	..	@@ -4076,7 +4380,7 @@
4076	4380	{
4077	4381	//Save(true);
4078	4382	Replace();
4079		- SetUndoStates();
	4383	+ SetVersionStates();
4080	4384	}
4081	4385
4082	4386	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -4095,8 +4399,6 @@
4095	4399	return true;
4096	4400	}
4097	4401
4098		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4099		-
4100	4402	void DeleteVersion()
4101	4403	{
4102	4404	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4104,19 +4406,23 @@
4104	4406	copy.versionlist[i] = copy.versionlist[i+1];
4105	4407	}
4106	4408
4107		- CopyChanged();
	4409	+ if (copy.versionlist[copy.versionindex] == null)
	4410	+ copy.versionindex -= 1;
4108	4411
4109		- SetUndoStates();
	4412	+ if (copy.versionindex != -1)
	4413	+ CopyChanged();
	4414	+
	4415	+ SetVersionStates();
4110	4416	}
4111	4417
4112	4418	public boolean Save(boolean user)
4113	4419	{
4114	4420	System.err.println("Save");
4115		- //Replace();
	4421	+ Replace();
4116	4422
4117		- cRadio tab = GetCurrentTab();
	4423	+ //cRadio tab = GetCurrentTab();
4118	4424
4119		- Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
	4425	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4120	4426
4121	4427	boolean thesame = false;
4122	4428
..	..	@@ -4152,7 +4458,7 @@
4152	4458	// copy.versionlist[i] = null;
4153	4459	// }
4154	4460
4155		- SetUndoStates();
	4461	+ SetVersionStates();
4156	4462
4157	4463	// test save
4158	4464	if (false)
..	..	@@ -4210,14 +4516,14 @@
4210	4516
4211	4517	void CopyChanged()
4212	4518	{
4213		- Object3D obj = copy.versionlist[copy.versionindex];
	4519	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4214	4520
4215		- SetUndoStates();
	4521	+ SetVersionStates();
4216	4522
4217	4523	boolean temp = CameraPane.SWITCH;
4218	4524	CameraPane.SWITCH = false;
4219	4525
4220		- copy.ExtractBigData(versiontable);
	4526	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4221	4527
4222	4528	copy.clear();
4223	4529
..	..	@@ -4229,7 +4535,7 @@
4229	4535	copy.add(obj.get(i));
4230	4536	}
4231	4537
4232		- copy.RestoreBigData(versiontable);
	4538	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4233	4539
4234	4540	CameraPane.SWITCH = temp;
4235	4541
..	..	@@ -4279,23 +4585,45 @@
4279	4585	return count;
4280	4586	}
4281	4587
4282		- void SetUndoStates()
	4588	+ public cGridBag versionSliderPane;
	4589	+
	4590	+ void SetVersionStates()
4283	4591	{
4284		- cRadio tab = GetCurrentTab();
	4592	+ //if (true)
	4593	+ // return;
	4594	+
	4595	+ //cRadio tab = GetCurrentTab();
4285	4596
4286		- restoreButton.setEnabled(true); // copy.versionindex != -1);
4287		- replaceButton.setEnabled(true); // copy.versionindex != -1);
4288		-
4289		- previousVersionButton.setEnabled(copy.versionindex > 0);
4290		- nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4291		-
4292		- deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4293		- copy.versionlist[copy.versionindex + 1] != null);
4294		-
4295		- muteSlider = true;
4296		- versionSlider.setMaximum(VersionCount() - 1);
4297		- versionSlider.setInteger(copy.versionindex);
4298		- muteSlider = false;
	4597	+ if (copy.versionlist == null)
	4598	+ {
	4599	+ saveVersionButton.setEnabled(false);
	4600	+ restoreButton.setEnabled(false);
	4601	+ replaceButton.setEnabled(false);
	4602	+ previousVersionButton.setEnabled(false);
	4603	+ nextVersionButton.setEnabled(false);
	4604	+ deleteVersionButton.setEnabled(false);
	4605	+ versionSliderPane.setVisible(false);
	4606	+ }
	4607	+ else
	4608	+ {
	4609	+ restoreButton.setEnabled(copy.versionindex != -1);
	4610	+ replaceButton.setEnabled(copy.versionindex != -1);
	4611	+
	4612	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4613	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4614	+
	4615	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4616	+ //copy.versionlist[copy.versionindex + 1] != null);
	4617	+
	4618	+ muteSlider = true;
	4619	+ versionSlider.setMinimum(0);
	4620	+ versionSlider.setMaximum(VersionCount() - 1);
	4621	+ versionSlider.setInteger(copy.versionindex);
	4622	+ versionSlider.setEnabled(copy.versionindex != -1);
	4623	+ muteSlider = false;
	4624	+
	4625	+ versionSliderPane.setVisible(true);
	4626	+ }
4299	4627	}
4300	4628
4301	4629	public boolean PreviousVersion()
..	..	@@ -4305,7 +4633,7 @@
4305	4633
4306	4634	System.err.println("Undo");
4307	4635
4308		- cRadio tab = GetCurrentTab();
	4636	+ //cRadio tab = GetCurrentTab();
4309	4637
4310	4638	if (copy.versionindex == 0)
4311	4639	{
..	..	@@ -4337,7 +4665,7 @@
4337	4665	{
4338	4666	System.err.println("Restore");
4339	4667
4340		- cRadio tab = GetCurrentTab();
	4668	+ //cRadio tab = GetCurrentTab();
4341	4669
4342	4670	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4343	4671	{
..	..	@@ -4353,9 +4681,9 @@
4353	4681
4354	4682	public boolean Replace()
4355	4683	{
4356		- System.err.println("Replace");
	4684	+ //System.err.println("Replace");
4357	4685
4358		- cRadio tab = GetCurrentTab();
	4686	+ //cRadio tab = GetCurrentTab();
4359	4687
4360	4688	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4361	4689	{
..	..	@@ -4363,7 +4691,7 @@
4363	4691	return false;
4364	4692	}
4365	4693
4366		- copy.versionlist[copy.versionindex] = CompressCopy();
	4694	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
4367	4695
4368	4696	return true;
4369	4697	}
..	..	@@ -4373,7 +4701,7 @@
4373	4701	// Option?
4374	4702	Replace();
4375	4703
4376		- cRadio tab = GetCurrentTab();
	4704	+ //cRadio tab = GetCurrentTab();
4377	4705
4378	4706	if (copy.versionlist[copy.versionindex + 1] == null)
4379	4707	{
..	..	@@ -4580,6 +4908,12 @@
4580	4908	// else
4581	4909	// applySelf(true);
4582	4910	// }
	4911	+
	4912	+ boolean Equal(double a, double b)
	4913	+ {
	4914	+ return Math.abs(a - b) < 0.001;
	4915	+ }
	4916	+
4583	4917	void applySelf0(boolean name)
4584	4918	{
4585	4919	if (name)
..	..	@@ -4629,29 +4963,52 @@
4629	4963	{
4630	4964	cMaterial mat = copy.material;
4631	4965
4632		- colorField.SetToolTipValue((mat.color));
4633		- saturationField.SetToolTipValue((mat.modulation));
4634		- metalnessField.SetToolTipValue((mat.metalness));
4635		- diffuseField.SetToolTipValue((mat.diffuse));
4636		- specularField.SetToolTipValue((mat.specular));
4637		- shininessField.SetToolTipValue((mat.shininess));
4638		- shiftField.SetToolTipValue((mat.shift));
4639		- ambientField.SetToolTipValue((mat.ambient));
4640		- lightareaField.SetToolTipValue((mat.lightarea));
4641		- diffusenessField.SetToolTipValue((mat.factor));
4642		- velvetField.SetToolTipValue((mat.velvet));
4643		- sheenField.SetToolTipValue((mat.sheen));
4644		- subsurfaceField.SetToolTipValue((mat.subsurface));
4645		- backlitField.SetToolTipValue((mat.bump));
4646		- anisoField.SetToolTipValue((mat.aniso));
4647		- anisoVField.SetToolTipValue((mat.anisoV));
4648		- cameraField.SetToolTipValue((mat.cameralight));
4649		- selfshadowField.SetToolTipValue((mat.diffuseness));
4650		- shadowField.SetToolTipValue((mat.shadow));
4651		- textureField.SetToolTipValue((mat.texture));
4652		- opacityField.SetToolTipValue((mat.opacity));
4653		- fakedepthField.SetToolTipValue((mat.fakedepth));
4654		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	4966	+ if (!Equal(colorField.getFloat(), mat.color))
	4967	+ colorField.SetToolTipValue((mat.color));
	4968	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4969	+ saturationField.SetToolTipValue((mat.modulation));
	4970	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4971	+ metalnessField.SetToolTipValue((mat.metalness));
	4972	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4973	+ diffuseField.SetToolTipValue((mat.diffuse));
	4974	+ if (!Equal(specularField.getFloat(), mat.specular))
	4975	+ specularField.SetToolTipValue((mat.specular));
	4976	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4977	+ shininessField.SetToolTipValue((mat.shininess));
	4978	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4979	+ shiftField.SetToolTipValue((mat.shift));
	4980	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4981	+ ambientField.SetToolTipValue((mat.ambient));
	4982	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4983	+ lightareaField.SetToolTipValue((mat.lightarea));
	4984	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4985	+ diffusenessField.SetToolTipValue((mat.factor));
	4986	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4987	+ velvetField.SetToolTipValue((mat.velvet));
	4988	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4989	+ sheenField.SetToolTipValue((mat.sheen));
	4990	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4991	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4992	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4993	+ backlitField.SetToolTipValue((mat.bump));
	4994	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4995	+ anisoField.SetToolTipValue((mat.aniso));
	4996	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4997	+ anisoVField.SetToolTipValue((mat.anisoV));
	4998	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4999	+ cameraField.SetToolTipValue((mat.cameralight));
	5000	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5001	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5002	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5003	+ shadowField.SetToolTipValue((mat.shadow));
	5004	+ if (!Equal(textureField.getFloat(), mat.texture))
	5005	+ textureField.SetToolTipValue((mat.texture));
	5006	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5007	+ opacityField.SetToolTipValue((mat.opacity));
	5008	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5009	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5010	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5011	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4655	5012	}
4656	5013
4657	5014	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4686,15 +5043,17 @@
4686	5043
4687	5044	public void stateChanged(ChangeEvent e)
4688	5045	{
4689		- // assert(false);
	5046	+ // assert(false);
4690	5047	if (e.getSource() == versionSlider)
4691	5048	{
4692	5049	if (muteSlider)
4693	5050	return;
4694	5051
	5052	+ Replace();
	5053	+
4695	5054	int version = versionSlider.getInteger();
4696	5055
4697		- if (copy.versionlist[version] != null)
	5056	+ if (version != -1 && copy.versionlist[version] != null)
4698	5057	{
4699	5058	copy.versionindex = version;
4700	5059	CopyChanged();
..	..	@@ -4738,7 +5097,7 @@
4738	5097	//System.out.println("stateChanged = " + this);
4739	5098	materialtouched = true;
4740	5099
4741		- if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5100	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
4742	5101	{
4743	5102	saturationField.setFloat(1);
4744	5103	}
..	..	@@ -5053,7 +5412,9 @@
5053	5412	}
5054	5413
5055	5414	if (previousVersionButton != null && copy.versionlist != null)
5056		- SetUndoStates();
	5415	+ SetVersionStates();
	5416	+
	5417	+ cameraView.requestFocusInWindow();
5057	5418	}
5058	5419
5059	5420	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5085,7 +5446,7 @@
5085	5446	// group = (Composite) group.get(0);
5086	5447	// }
5087	5448
5088		- System.out.println("makeSomething of " + thing);
	5449	+ //System.out.println("makeSomething of " + thing);
5089	5450
5090	5451	/*
5091	5452	if (deselect && jList != null)
..	..	@@ -5439,11 +5800,15 @@
5439	5800
5440	5801	copy.versionlist = readobj.versionlist;
5441	5802	copy.versionindex = readobj.versionindex;
	5803	+ copy.versiontable = readobj.versiontable;
5442	5804
5443	5805	if (copy.versionlist == null)
5444	5806	{
	5807	+ // Backward compatibility
5445	5808	copy.versionlist = new Object3D[100];
5446	5809	copy.versionindex = -1;
	5810	+
	5811	+ //Save(true);
5447	5812	}
5448	5813
5449	5814	//? SetUndoStates();
..	..	@@ -5535,6 +5900,8 @@
5535	5900
5536	5901	void save()
5537	5902	{
	5903	+ Replace();
	5904	+
5538	5905	if (lastname == null)
5539	5906	{
5540	5907	return;
..	..	@@ -5789,6 +6156,7 @@
5789	6156	boolean materialFlushed;
5790	6157	Object3D latestObject;
5791	6158
	6159	+ cGridBag transformPanel;
5792	6160	cGridBag XYZPanel;
5793	6161
5794	6162	JSplitPane gridPanel;
..	..	@@ -5882,6 +6250,7 @@
5882	6250	cNumberSlider anisoField;
5883	6251	JLabel anisoVLabel;
5884	6252	cNumberSlider anisoVField;
	6253	+
5885	6254	JLabel cameraLabel;
5886	6255	cNumberSlider cameraField;
5887	6256	JLabel selfshadowLabel;
..	..	@@ -5896,6 +6265,7 @@
5896	6265	cNumberSlider fakedepthField;
5897	6266	JLabel shadowbiasLabel;
5898	6267	cNumberSlider shadowbiasField;
	6268	+
5899	6269	JLabel bumpLabel;
5900	6270	cNumberSlider bumpField;
5901	6271	JLabel noiseLabel;