~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	}
..	..	@@ -251,6 +316,8 @@
251	316	objEditor.ctrlPanel.remove(setupPanel2);
252	317	objEditor.ctrlPanel.remove(objectCommandsPanel);
253	318	objEditor.ctrlPanel.remove(pushPanel);
	319	+ if (versionPanel != null)
	320	+ objEditor.ctrlPanel.remove(versionPanel);
254	321	//objEditor.ctrlPanel.remove(fillPanel);
255	322
256	323	//Remove(normalpushField);
..	..	@@ -297,11 +364,13 @@
297	364	client = inClient;
298	365	copy = client;
299	366
300		- if (copy.versionlist == null)
301		- {
302		- copy.versionlist = new Object3D[100];
303		- copy.versionindex = -1;
304		- }
	367	+// if (copy.versionlist == null)
	368	+// {
	369	+// copy.versionlist = new Object3D[100];
	370	+// copy.versionindex = -1;
	371	+//
	372	+// callee.Save(true);
	373	+// }
305	374
306	375	// "this" is not called: SetupUI2(objEditor);
307	376	}
..	..	@@ -316,12 +385,6 @@
316	385	client = inClient;
317	386	copy = client;
318	387
319		- if (copy.versionlist == null)
320		- {
321		- copy.versionlist = new Object3D[100];
322		- copy.versionindex = -1;
323		- }
324		-
325	388	SetupUI2(callee.GetEditor());
326	389	}
327	390
..	..	@@ -343,7 +406,8 @@
343	406	//parent = p;
344	407
345	408	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
346		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	409	+ if (Globals.DEBUG)
	410	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
347	411	//gd.setFullScreenWindow(this);
348	412	//setResizable(false);
349	413	//if (!isDisplayable())
..	..	@@ -354,11 +418,13 @@
354	418	copy = localCopy;
355	419	copy.editWindow = this;
356	420
357		- if (copy.versionlist == null)
358		- {
359		-// copy.versions = new byte[100][];
	421	+// if (copy.versionlist == null)
	422	+// {
	423	+// copy.versionlist = new Object3D[100];
360	424	// copy.versionindex = -1;
361		- }
	425	+//
	426	+// Save(true);
	427	+// }
362	428
363	429	SetupMenu();
364	430
..	..	@@ -378,6 +444,9 @@
378	444
379	445	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
380	446
	447	+ // This is to refresh the UI of the material panel.
	448	+ boolean patchMaterial;
	449	+
381	450	void SetupMenu()
382	451	{
383	452	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -391,8 +460,11 @@
391	460	importOBJItem.addActionListener(this);
392	461	import3DSItem = menu.add(new MenuItem("3DS file..."));
393	462	import3DSItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
394	465	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
395	466	importVRMLX3DItem.addActionListener(this);
	467	+ }
396	468	menu.add("-");
397	469	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
398	470	importGFDItem.addActionListener(this);
..	..	@@ -427,6 +499,8 @@
427	499
428	500	ChangeListener changeListener = new ChangeListener()
429	501	{
	502	+ //String name;
	503	+
430	504	public void stateChanged(ChangeEvent changeEvent)
431	505	{
432	506	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -445,7 +519,37 @@
445	519	// EditSelection(false);
446	520	// }
447	521
448		- refreshContents(false); // To refresh Info tab
	522	+// if (objectPanel.getSelectedIndex() == 4)
	523	+// {
	524	+// name = copy.skyboxname;
	525	+//
	526	+// if (name == null)
	527	+// {
	528	+// name = "";
	529	+// }
	530	+//
	531	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	532	+// copy.skyboxext = "jpg";
	533	+// }
	534	+// else
	535	+// {
	536	+// if (name != null)
	537	+// {
	538	+// if (name.equals(""))
	539	+// {
	540	+// copy.skyboxname = null;
	541	+// copy.skyboxext = null;
	542	+// }
	543	+// else
	544	+// {
	545	+// copy.skyboxname = name;
	546	+// }
	547	+// }
	548	+// }
	549	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	550	+
	551	+// refreshContents(false); // To refresh Info tab
	552	+ cameraView.repaint();
449	553	}
450	554	};
451	555	objectPanel.addChangeListener(changeListener);
..	..	@@ -871,18 +975,29 @@
871	975	boolean temp = CameraPane.SWITCH;
872	976	CameraPane.SWITCH = false;
873	977
874		- object.ExtractBigData(versiontable);
	978	+ if (Grafreed.grafreed.universe.versiontable == null)
	979	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	980	+
	981	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
875	982	// if (copy == client)
876	983
877	984	Object3D versions[] = object.versionlist;
	985	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
878	986	object.versionlist = null;
	987	+ object.versiontable = null;
	988	+
	989	+ Object3D parent = object.parent;
	990	+ object.parent = null;
879	991
880	992	//byte[] compress = Compress(copy);
881	993	Object3D compress = (Object3D)Grafreed.clone(object);
882	994
883		- object.versionlist = versions;
	995	+ object.parent = parent;
884	996
885		- object.RestoreBigData(versiontable);
	997	+ object.versionlist = versions;
	998	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	999	+
	1000	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
886	1001
887	1002	CameraPane.SWITCH = temp;
888	1003
..	..	@@ -1050,6 +1165,7 @@
1050	1165	cGridBag setupPanel2;
1051	1166	cGridBag objectCommandsPanel;
1052	1167	cGridBag pushPanel;
	1168	+ cGridBag versionPanel;
1053	1169	cGridBag fillPanel;
1054	1170
1055	1171	JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
..	..	@@ -1221,7 +1337,7 @@
1221	1337
1222	1338	//if (copy.pinned)
1223	1339	{
1224		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1340	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1225	1341	pinButton.setSelected(copy.pinned);
1226	1342	cGridBag t = new cGridBag();
1227	1343	t.preferredWidth = 2;
..	..	@@ -1244,14 +1360,14 @@
1244	1360
1245	1361	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1246	1362	liveCB.setToolTipText("Animate object");
	1363	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1364	+ markCB.setToolTipText("Set target transform");
1247	1365	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1248	1366	selectableCB.setToolTipText("Make object selectable");
1249	1367	// Return();
1250	1368
1251	1369	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1252	1370	hideCB.setToolTipText("Hide object");
1253		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1254		- markCB.setToolTipText("As animation target transform");
1255	1371
1256	1372	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1257	1373
..	..	@@ -1296,9 +1412,14 @@
1296	1412	oe.ctrlPanel.add(objectCommandsPanel);
1297	1413	oe.ctrlPanel.Return();
1298	1414
1299		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1415	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH * 100, 1.1); // To have the buttons
1300	1416	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1301		- //Return();
	1417	+ if (false && copy.versionlist != null && copy.versionindex != -1)
	1418	+ {
	1419	+ oe.ctrlPanel.Return();
	1420	+ versionPanel = AddSlider(oe.ctrlPanel, "Version", 0, copy.VersionCount() - 1, copy.versionindex);
	1421	+ versionField = (cNumberSlider)versionPanel.getComponent(1);
	1422	+ }
1302	1423
1303	1424	oe.ctrlPanel.Return();
1304	1425
..	..	@@ -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;
..	..	@@ -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	+ objectPanel.add(infoPanel);
	1888	+ objectPanel.setIconAt(5, GetIcon("icons/info.png"));
	1889	+ objectPanel.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	{
..	..	@@ -2160,13 +2429,55 @@
2160	2429	cameraField.setFloat(0.001);
2161	2430	specularField.setFloat(0.001);
2162	2431	fakedepthField.setFloat(0.001);
2163		- opacityField.setFloat(0.6);
	2432	+ opacityField.setFloat(0.4);
2164	2433
2165	2434	materialtouched = true;
2166	2435	applySelf();
2167	2436	}
2168	2437	});
2169	2438	presetpanel.add(shadowShader);
	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);
2170	2481
2171	2482	cGridBag panel = new cGridBag().setVertical(true);
2172	2483
..	..	@@ -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	}
..	..	@@ -3770,6 +4075,7 @@
3770	4075	} else if (event.getSource() == link2masterCB)
3771	4076	{
3772	4077	copy.link2master ^= true;
	4078	+ objEditor.refreshContents();
3773	4079	return;
3774	4080	}
3775	4081	if (event.getSource() == randomCB)
..	..	@@ -3830,7 +4136,7 @@
3830	4136	//System.out.println("ObjEditor " + event);
3831	4137	applySelf0(true);
3832	4138	//parent.applySelf();
3833		- objEditor.refreshContents();
	4139	+ // conflicts with requestFocus objEditor.refreshContents();
3834	4140	} else if (source == resetButton)
3835	4141	{
3836	4142	CameraPane.fullreset = true;
..	..	@@ -4010,11 +4316,18 @@
4010	4316
4011	4317	void New()
4012	4318	{
4013		- while (copy.Size() > 1)
	4319	+ while (copy.Size() > 0)
4014	4320	{
4015		- copy.remove(1);
	4321	+ copy.remove(0);
4016	4322	}
4017	4323
	4324	+ copy.selection.clear();
	4325	+
	4326	+ if (copy == Grafreed.grafreed.universe)
	4327	+ {
	4328	+ CreateCameras();
	4329	+ cameraView.SetCamera(GetCamera(copy, 0));
	4330	+ }
4018	4331	ResetModel();
4019	4332	objEditor.refreshContents();
4020	4333	}
..	..	@@ -4123,7 +4436,7 @@
4123	4436	{
4124	4437	//Save(true);
4125	4438	Replace();
4126		- SetUndoStates();
	4439	+ SetVersionStates();
4127	4440	}
4128	4441
4129	4442	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -4142,8 +4455,6 @@
4142	4455	return true;
4143	4456	}
4144	4457
4145		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4146		-
4147	4458	void DeleteVersion()
4148	4459	{
4149	4460	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4151,9 +4462,13 @@
4151	4462	copy.versionlist[i] = copy.versionlist[i+1];
4152	4463	}
4153	4464
4154		- CopyChanged();
	4465	+ if (copy.versionlist[copy.versionindex] == null)
	4466	+ copy.versionindex -= 1;
4155	4467
4156		- SetUndoStates();
	4468	+ if (copy.versionindex != -1)
	4469	+ CopyChanged(copy);
	4470	+
	4471	+ SetVersionStates();
4157	4472	}
4158	4473
4159	4474	public boolean Save(boolean user)
..	..	@@ -4161,7 +4476,11 @@
4161	4476	System.err.println("Save");
4162	4477	Replace();
4163	4478
4164		- cRadio tab = GetCurrentTab();
	4479	+ if (copy.versionlist == null)
	4480	+ {
	4481	+ copy.versionlist = new Object3D[100];
	4482	+ copy.versionindex = -1;
	4483	+ }
4165	4484
4166	4485	Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4167	4486
..	..	@@ -4199,7 +4518,7 @@
4199	4518	// copy.versionlist[i] = null;
4200	4519	// }
4201	4520
4202		- SetUndoStates();
	4521	+ SetVersionStates();
4203	4522
4204	4523	// test save
4205	4524	if (false)
..	..	@@ -4229,20 +4548,20 @@
4229	4548	{
4230	4549	Object3D selection = new Object3D();
4231	4550
4232		- for (int i = 0; i < copy.selection.size(); i++)
	4551	+ for (int i = 0; i < objEditor.copy.selection.size(); i++)
4233	4552	{
4234		- Object3D elem = copy.selection.elementAt(i);
	4553	+ Object3D elem = objEditor.copy.selection.elementAt(i);
4235	4554
4236		- Object3D obj = copy.GetObject(elem.GetUUID());
	4555	+ Object3D obj = objEditor.copy.GetObject(elem.GetUUID());
4237	4556
4238	4557	if (obj == null)
4239	4558	{
4240		- copy.selection.remove(i--);
	4559	+ objEditor.copy.selection.remove(i--);
4241	4560	}
4242	4561	else
4243	4562	{
4244	4563	selection.add(obj);
4245		- copy.selection.setElementAt(obj, i);
	4564	+ objEditor.copy.selection.setElementAt(obj, i);
4246	4565	}
4247	4566	}
4248	4567
..	..	@@ -4255,44 +4574,43 @@
4255	4574	//refreshContents(false);
4256	4575	}
4257	4576
4258		- void CopyChanged()
	4577	+ void CopyChanged(Object3D changed)
4259	4578	{
4260		- Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4261		-
4262		- SetUndoStates();
	4579	+ Object3D obj = (Object3D)Grafreed.clone(changed.versionlist[copy.versionindex]);
4263	4580
4264	4581	boolean temp = CameraPane.SWITCH;
4265	4582	CameraPane.SWITCH = false;
4266	4583
4267		- copy.ExtractBigData(versiontable);
	4584	+ changed.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4268	4585
4269		- copy.clear();
	4586	+ changed.clear();
4270	4587
4271		- copy.skyboxname = obj.skyboxname;
4272		- copy.skyboxext = obj.skyboxext;
	4588	+ changed.skyboxname = obj.skyboxname;
	4589	+ changed.skyboxext = obj.skyboxext;
4273	4590
4274	4591	for (int i=0; i<obj.Size(); i++)
4275	4592	{
4276		- copy.add(obj.get(i));
	4593	+ changed.add(obj.get(i));
4277	4594	}
4278	4595
4279		- copy.RestoreBigData(versiontable);
	4596	+ changed.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4280	4597
4281	4598	CameraPane.SWITCH = temp;
4282	4599
4283		- RefreshSelection();
	4600	+ if (objEditor == this)
	4601	+ RefreshSelection();
4284	4602	//assert(hashtable.isEmpty());
4285	4603
4286		- copy.Touch();
	4604	+ objEditor.copy.Touch();
4287	4605
4288	4606	ResetModel();
4289		- copy.HardTouch(); // recompile?
	4607	+ objEditor.copy.HardTouch(); // recompile?
4290	4608
4291	4609	cRadio ab;
4292		- for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4610	+ for (java.util.Enumeration e = objEditor.buttonGroup.getElements(); e.hasMoreElements();)
4293	4611	{
4294	4612	ab = (cRadio)e.nextElement();
4295		- Object3D test = copy.GetObject(ab.object.GetUUID());
	4613	+ Object3D test = objEditor.copy.GetObject(ab.object.GetUUID());
4296	4614	//ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
4297	4615	if (test != null)
4298	4616	{
..	..	@@ -4301,7 +4619,7 @@
4301	4619	}
4302	4620	}
4303	4621
4304		- refreshContents(true);
	4622	+ objEditor.refreshContents(true);
4305	4623	}
4306	4624
4307	4625	cButton previousVersionButton;
..	..	@@ -4315,34 +4633,48 @@
4315	4633
4316	4634	int VersionCount()
4317	4635	{
4318		- int count = 0;
4319		-
4320		- for (int i = copy.versionlist.length; --i >= 0;)
4321		- {
4322		- if (copy.versionlist[i] != null)
4323		- count++;
4324		- }
4325		-
4326		- return count;
	4636	+ return copy.VersionCount();
4327	4637	}
4328	4638
4329		- void SetUndoStates()
	4639	+ public cGridBag versionSliderPane;
	4640	+
	4641	+ void SetVersionStates()
4330	4642	{
4331		- cRadio tab = GetCurrentTab();
	4643	+ //if (true)
	4644	+ // return;
	4645	+
	4646	+ //cRadio tab = GetCurrentTab();
4332	4647
4333		- restoreButton.setEnabled(true); // copy.versionindex != -1);
4334		- replaceButton.setEnabled(true); // copy.versionindex != -1);
4335		-
4336		- previousVersionButton.setEnabled(copy.versionindex > 0);
4337		- nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4338		-
4339		- deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4340		- copy.versionlist[copy.versionindex + 1] != null);
4341		-
4342		- muteSlider = true;
4343		- versionSlider.setMaximum(VersionCount() - 1);
4344		- versionSlider.setInteger(copy.versionindex);
4345		- muteSlider = false;
	4648	+ if (copy.versionindex == -2)
	4649	+ {
	4650	+ saveVersionButton.setEnabled(false);
	4651	+ restoreButton.setEnabled(false);
	4652	+ replaceButton.setEnabled(false);
	4653	+ previousVersionButton.setEnabled(false);
	4654	+ nextVersionButton.setEnabled(false);
	4655	+ deleteVersionButton.setEnabled(false);
	4656	+ versionSliderPane.setVisible(false);
	4657	+ }
	4658	+ else
	4659	+ {
	4660	+ restoreButton.setEnabled(copy.versionindex != -1);
	4661	+ replaceButton.setEnabled(copy.versionindex != -1);
	4662	+
	4663	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4664	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4665	+
	4666	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4667	+ //copy.versionlist[copy.versionindex + 1] != null);
	4668	+
	4669	+ muteSlider = true;
	4670	+ versionSlider.setMinimum(0);
	4671	+ versionSlider.setMaximum(VersionCount() - 1);
	4672	+ versionSlider.setInteger(copy.versionindex);
	4673	+ versionSlider.setEnabled(copy.versionindex != -1);
	4674	+ muteSlider = false;
	4675	+
	4676	+ versionSliderPane.setVisible(true);
	4677	+ }
4346	4678	}
4347	4679
4348	4680	public boolean PreviousVersion()
..	..	@@ -4352,7 +4684,7 @@
4352	4684
4353	4685	System.err.println("Undo");
4354	4686
4355		- cRadio tab = GetCurrentTab();
	4687	+ //cRadio tab = GetCurrentTab();
4356	4688
4357	4689	if (copy.versionindex == 0)
4358	4690	{
..	..	@@ -4375,7 +4707,9 @@
4375	4707
4376	4708	copy.versionindex -= 1;
4377	4709
4378		- CopyChanged();
	4710	+ CopyChanged(copy);
	4711	+
	4712	+ SetVersionStates();
4379	4713
4380	4714	return true;
4381	4715	}
..	..	@@ -4384,7 +4718,7 @@
4384	4718	{
4385	4719	System.err.println("Restore");
4386	4720
4387		- cRadio tab = GetCurrentTab();
	4721	+ //cRadio tab = GetCurrentTab();
4388	4722
4389	4723	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4390	4724	{
..	..	@@ -4393,16 +4727,18 @@
4393	4727	}
4394	4728
4395	4729	//CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4396		- CopyChanged();
	4730	+ CopyChanged(copy);
	4731	+
	4732	+ SetVersionStates();
4397	4733
4398	4734	return true;
4399	4735	}
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	{
..	..	@@ -4430,10 +4766,12 @@
4430	4766
4431	4767	copy.versionindex += 1;
4432	4768
4433		- CopyChanged();
	4769	+ CopyChanged(copy);
4434	4770
4435	4771	//if (!tab.user[tab.versionindex])
4436	4772	// tab.graphs[tab.versionindex] = null;
	4773	+
	4774	+ SetVersionStates();
4437	4775	}
4438	4776
4439	4777	void ImportGFD()
..	..	@@ -4627,6 +4965,12 @@
4627	4965	// else
4628	4966	// applySelf(true);
4629	4967	// }
	4968	+
	4969	+ boolean Equal(double a, double b)
	4970	+ {
	4971	+ return Math.abs(a - b) < 0.001;
	4972	+ }
	4973	+
4630	4974	void applySelf0(boolean name)
4631	4975	{
4632	4976	if (name)
..	..	@@ -4664,6 +5008,7 @@
4664	5008	current.shadow = (float) shadowField.getFloat();
4665	5009	current.texture = (float) textureField.getFloat();
4666	5010	current.opacity = (float) opacityField.getFloat();
	5011	+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
4667	5012	current.fakedepth = (float) fakedepthField.getFloat();
4668	5013	current.shadowbias = (float) shadowbiasField.getFloat();
4669	5014
..	..	@@ -4676,29 +5021,54 @@
4676	5021	{
4677	5022	cMaterial mat = copy.material;
4678	5023
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));
	5024	+ if (!Equal(colorField.getFloat(), mat.color))
	5025	+ colorField.SetToolTipValue((mat.color));
	5026	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	5027	+ saturationField.SetToolTipValue((mat.modulation));
	5028	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	5029	+ metalnessField.SetToolTipValue((mat.metalness));
	5030	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	5031	+ diffuseField.SetToolTipValue((mat.diffuse));
	5032	+ if (!Equal(specularField.getFloat(), mat.specular))
	5033	+ specularField.SetToolTipValue((mat.specular));
	5034	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	5035	+ shininessField.SetToolTipValue((mat.shininess));
	5036	+ if (!Equal(shiftField.getFloat(), mat.shift))
	5037	+ shiftField.SetToolTipValue((mat.shift));
	5038	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	5039	+ ambientField.SetToolTipValue((mat.ambient));
	5040	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	5041	+ lightareaField.SetToolTipValue((mat.lightarea));
	5042	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	5043	+ diffusenessField.SetToolTipValue((mat.factor));
	5044	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	5045	+ velvetField.SetToolTipValue((mat.velvet));
	5046	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	5047	+ sheenField.SetToolTipValue((mat.sheen));
	5048	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	5049	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	5050	+ if (!Equal(backlitField.getFloat(), mat.bump))
	5051	+ backlitField.SetToolTipValue((mat.bump));
	5052	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5053	+ anisoField.SetToolTipValue((mat.aniso));
	5054	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5055	+ anisoVField.SetToolTipValue((mat.anisoV));
	5056	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5057	+ cameraField.SetToolTipValue((mat.cameralight));
	5058	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5059	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5060	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5061	+ shadowField.SetToolTipValue((mat.shadow));
	5062	+ if (!Equal(textureField.getFloat(), mat.texture))
	5063	+ textureField.SetToolTipValue((mat.texture));
	5064	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5065	+ opacityField.SetToolTipValue((mat.opacity));
	5066	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5067	+ parallaxField.SetToolTipValue((mat.parallax));
	5068	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5069	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5070	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5071	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4702	5072	}
4703	5073
4704	5074	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4730,26 +5100,43 @@
4730	5100	}
4731	5101
4732	5102	cNumberSlider versionSlider;
	5103	+ cNumberSlider versionField;
4733	5104
4734	5105	public void stateChanged(ChangeEvent e)
4735	5106	{
4736		- // assert(false);
	5107	+ // assert(false);
4737	5108	if (e.getSource() == versionSlider)
4738	5109	{
4739	5110	if (muteSlider)
4740	5111	return;
4741	5112
	5113	+ Replace();
	5114	+
4742	5115	int version = versionSlider.getInteger();
4743	5116
4744		- if (copy.versionlist[version] != null)
	5117	+ if (version != -1 && copy.versionlist[version] != null)
4745	5118	{
4746	5119	copy.versionindex = version;
4747		- CopyChanged();
	5120	+ CopyChanged(copy);
	5121	+ SetVersionStates();
4748	5122	}
4749	5123
4750	5124	return;
4751	5125	}
4752	5126
	5127	+ if (e.getSource() == versionField)
	5128	+ {
	5129	+ int version = versionField.getInteger();
	5130	+
	5131	+ if (version != -1 && copy.versionindex != version && copy.versionlist[version] != null)
	5132	+ {
	5133	+ copy.versionindex = version;
	5134	+ CopyChanged(copy);
	5135	+ }
	5136	+
	5137	+ return;
	5138	+ }
	5139	+
4753	5140	if (freezematerial)
4754	5141	{
4755	5142	return;
..	..	@@ -4839,7 +5226,7 @@
4839	5226	}
4840	5227
4841	5228	if (normalpushField != null)
4842		- copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
	5229	+ copy.NORMALPUSH = (float)normalpushField.getFloat() / 100;
4843	5230	}
4844	5231
4845	5232	void SnapObject()
..	..	@@ -5100,7 +5487,9 @@
5100	5487	}
5101	5488
5102	5489	if (previousVersionButton != null && copy.versionlist != null)
5103		- SetUndoStates();
	5490	+ SetVersionStates();
	5491	+
	5492	+ cameraView.requestFocusInWindow();
5104	5493	}
5105	5494
5106	5495	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5132,7 +5521,7 @@
5132	5521	// group = (Composite) group.get(0);
5133	5522	// }
5134	5523
5135		- System.out.println("makeSomething of " + thing);
	5524	+ //System.out.println("makeSomething of " + thing);
5136	5525
5137	5526	/*
5138	5527	if (deselect && jList != null)
..	..	@@ -5211,7 +5600,7 @@
5211	5600	void ResetModel()
5212	5601	{
5213	5602	//assert(copy instanceof Composite);
5214		- Object3D /Composite/ group = (Object3D /Composite/) copy;
	5603	+ Object3D /Composite/ group = (Object3D /Composite/) objEditor.copy;
5215	5604
5216	5605	// necessary? group.selection = new Object3D(); // java.util.Vector();
5217	5606
..	..	@@ -5222,14 +5611,14 @@
5222	5611	//group.refreshEditWindow();
5223	5612	//refreshContents();
5224	5613
5225		- if (copy.selection == null)
	5614	+ if (objEditor.copy.selection == null)
5226	5615	{
5227		- copy.selection = new Object3D();
	5616	+ objEditor.copy.selection = new Object3D();
5228	5617	}
5229	5618
5230		- for (int j = 0; j < copy.selection.size(); j++)
	5619	+ for (int j = 0; j < objEditor.copy.selection.size(); j++)
5231	5620	{
5232		- Object3D item = copy.selection.get(j);
	5621	+ Object3D item = objEditor.copy.selection.get(j);
5233	5622
5234	5623	if (item instanceof cGroup && ((cGroup) item).transientlink)
5235	5624	{
..	..	@@ -5238,15 +5627,15 @@
5238	5627
5239	5628	if (item.count <= 1) // ??? == 0)
5240	5629	{
5241		- copy.selection.remove(item);
	5630	+ objEditor.copy.selection.remove(item);
5242	5631	}
5243	5632	}
5244	5633
5245	5634	boolean first = true;
5246	5635
5247		- for (int i = copy.selection.size(); --i >= 0;)
	5636	+ for (int i = objEditor.copy.selection.size(); --i >= 0;)
5248	5637	{
5249		- Object3D item = copy.selection.get(i);
	5638	+ Object3D item = objEditor.copy.selection.get(i);
5250	5639
5251	5640	if (item instanceof cGroup && ((cGroup) item).transientlink)
5252	5641	{
..	..	@@ -5486,11 +5875,15 @@
5486	5875
5487	5876	copy.versionlist = readobj.versionlist;
5488	5877	copy.versionindex = readobj.versionindex;
	5878	+ copy.versiontable = readobj.versiontable;
5489	5879
5490	5880	if (copy.versionlist == null)
5491	5881	{
	5882	+ // Backward compatibility
5492	5883	copy.versionlist = new Object3D[100];
5493	5884	copy.versionindex = -1;
	5885	+
	5886	+ //Save(true);
5494	5887	}
5495	5888
5496	5889	//? SetUndoStates();
..	..	@@ -5582,6 +5975,8 @@
5582	5975
5583	5976	void save()
5584	5977	{
	5978	+ Replace();
	5979	+
5585	5980	if (lastname == null)
5586	5981	{
5587	5982	return;
..	..	@@ -5836,6 +6231,7 @@
5836	6231	boolean materialFlushed;
5837	6232	Object3D latestObject;
5838	6233
	6234	+ cGridBag transformPanel;
5839	6235	cGridBag XYZPanel;
5840	6236
5841	6237	JSplitPane gridPanel;
..	..	@@ -5940,6 +6336,8 @@
5940	6336	cNumberSlider textureField;
5941	6337	JLabel opacityLabel;
5942	6338	cNumberSlider opacityField;
	6339	+ JLabel parallaxLabel;
	6340	+ cNumberSlider parallaxField;
5943	6341	JLabel fakedepthLabel;
5944	6342	cNumberSlider fakedepthField;
5945	6343	JLabel shadowbiasLabel;