~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -34,6 +34,7 @@
34	34	iSendInfo
35	35	//KeyListener
36	36	{
	37	+ public cToggleButton pinButton;
37	38	boolean timeline;
38	39	boolean wasFullScreen;
39	40
..	..	@@ -41,6 +42,50 @@
41	42	JFrame frame;
42	43
43	44	static ObjEditor theFrame;
	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	+ }
44	89
45	90	public cGridBag GetSeparator()
46	91	{
..	..	@@ -53,7 +98,10 @@
53	98	cButton GetButton(String name, boolean border)
54	99	{
55	100	ImageIcon icon = GetIcon(name);
56		- 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);
57	105	}
58	106
59	107	cLabel GetLabel(String name, boolean border)
..	..	@@ -74,11 +122,19 @@
74	122	return new cCheckBox(icon, border);
75	123	}
76	124
77		- 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)
78	128	{
	129	+ javax.swing.ImageIcon iconCache = icons.get(name);
	130	+ if (iconCache != null)
	131	+ {
	132	+ return iconCache;
	133	+ }
	134	+
79	135	try
80	136	{
81		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	137	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
82	138
83	139	// if (image.getWidth() > 48 && image.getHeight() > 48)
84	140	// {
..	..	@@ -93,10 +149,14 @@
93	149	// }
94	150
95	151	javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	152	+
	153	+ icons.put(name, icon);
	154	+
96	155	return icon;
97	156	}
98	157	catch (Exception e)
99	158	{
	159	+ //icons.put(name, null);
100	160	return null;
101	161	}
102	162	}
..	..	@@ -296,11 +356,13 @@
296	356	client = inClient;
297	357	copy = client;
298	358
299		- if (copy.versionlist == null)
300		- {
301		- copy.versionlist = new Object3D[100];
302		- copy.versionindex = -1;
303		- }
	359	+// if (copy.versionlist == null)
	360	+// {
	361	+// copy.versionlist = new Object3D[100];
	362	+// copy.versionindex = -1;
	363	+//
	364	+// callee.Save(true);
	365	+// }
304	366
305	367	// "this" is not called: SetupUI2(objEditor);
306	368	}
..	..	@@ -319,6 +381,8 @@
319	381	{
320	382	copy.versionlist = new Object3D[100];
321	383	copy.versionindex = -1;
	384	+
	385	+// Save(true);
322	386	}
323	387
324	388	SetupUI2(callee.GetEditor());
..	..	@@ -342,7 +406,8 @@
342	406	//parent = p;
343	407
344	408	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
345		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	409	+ if (Globals.DEBUG)
	410	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
346	411	//gd.setFullScreenWindow(this);
347	412	//setResizable(false);
348	413	//if (!isDisplayable())
..	..	@@ -353,11 +418,13 @@
353	418	copy = localCopy;
354	419	copy.editWindow = this;
355	420
356		- if (copy.versionlist == null)
357		- {
358		-// copy.versions = new byte[100][];
	421	+// if (copy.versionlist == null)
	422	+// {
	423	+// copy.versionlist = new Object3D[100];
359	424	// copy.versionindex = -1;
360		- }
	425	+//
	426	+// Save(true);
	427	+// }
361	428
362	429	SetupMenu();
363	430
..	..	@@ -377,6 +444,9 @@
377	444
378	445	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
379	446
	447	+ // This is to refresh the UI of the material panel.
	448	+ boolean patchMaterial;
	449	+
380	450	void SetupMenu()
381	451	{
382	452	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -390,8 +460,11 @@
390	460	importOBJItem.addActionListener(this);
391	461	import3DSItem = menu.add(new MenuItem("3DS file..."));
392	462	import3DSItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
393	465	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
394	466	importVRMLX3DItem.addActionListener(this);
	467	+ }
395	468	menu.add("-");
396	469	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
397	470	importGFDItem.addActionListener(this);
..	..	@@ -426,6 +499,8 @@
426	499
427	500	ChangeListener changeListener = new ChangeListener()
428	501	{
	502	+ //String name;
	503	+
429	504	public void stateChanged(ChangeEvent changeEvent)
430	505	{
431	506	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -444,7 +519,37 @@
444	519	// EditSelection(false);
445	520	// }
446	521
447		- 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();
448	553	}
449	554	};
450	555	objectPanel.addChangeListener(changeListener);
..	..	@@ -466,6 +571,8 @@
466	571
467	572	toolboxPanel = new cGridBag().setVertical(true);
468	573	//toolboxPanel.setName("Toolbox");
	574	+
	575	+ skyboxPanel = new cGridBag().setVertical(true);
469	576
470	577	materialPanel = new cGridBag().setVertical(false);
471	578	//materialPanel.setName("Material");
..	..	@@ -751,6 +858,7 @@
751	858	boolean maximized;
752	859
753	860	cButton fullscreenLayout;
	861	+ cButton expandedLayout;
754	862
755	863	void Minimize()
756	864	{
..	..	@@ -790,10 +898,12 @@
790	898	cButton minButton;
791	899	cButton maxButton;
792	900	cButton fullButton;
	901	+ cButton collapseButton;
	902	+ cButton maximize3DButton;
793	903
794	904	void ToggleFullScreen()
795	905	{
796		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	906	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797	907
798	908	cameraView.ToggleFullScreen();
799	909
..	..	@@ -814,13 +924,13 @@
814	924	// X frame.getContentPane().remove(/"Center",/bigThree);
815	925	// X framePanel.add(bigThree);
816	926	// X frame.getContentPane().add(/"Center",/framePanel);
817		- framePanel.setDividerLocation(46);
	927	+// framePanel.setDividerLocation(46); // icons are 24x24
818	928
819	929	//frame.setVisible(true);
820		- radio.layout = keepButton;
	930	+// radio.layout = keepButton;
821	931	//theFrame = null;
822	932	keepButton = null;
823		- radio.layout.doClick();
	933	+// radio.layout.doClick();
824	934
825	935	} else
826	936	{
..	..	@@ -841,10 +951,10 @@
841	951	// X frame.getContentPane().remove(/"Center",/framePanel);
842	952	// X framePanel.remove(bigThree);
843	953	// X frame.getContentPane().add(/"Center",/bigThree);
844		- framePanel.setDividerLocation(0);
	954	+// framePanel.setDividerLocation(0);
845	955
846		- radio.layout = fullscreenLayout;
847		- radio.layout.doClick();
	956	+// radio.layout = fullscreenLayout;
	957	+// radio.layout.doClick();
848	958	//frame.setVisible(true);
849	959	}
850	960	frame.validate();
..	..	@@ -852,23 +962,42 @@
852	962	cameraView.requestFocusInWindow();
853	963	}
854	964
855		- 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)
856	974	{
857	975	boolean temp = CameraPane.SWITCH;
858	976	CameraPane.SWITCH = false;
859	977
860		- 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);
861	982	// if (copy == client)
862	983
863		- Object3D versions[] = copy.versionlist;
864		- 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;
865	991
866	992	//byte[] compress = Compress(copy);
867		- Object3D compress = (Object3D)Grafreed.clone(copy);
	993	+ Object3D compress = (Object3D)Grafreed.clone(object);
868	994
869		- copy.versionlist = versions;
	995	+ object.parent = parent;
870	996
871		- copy.RestoreBigData(versiontable);
	997	+ object.versionlist = versions;
	998	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	999	+
	1000	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
872	1001
873	1002	CameraPane.SWITCH = temp;
874	1003
..	..	@@ -1205,6 +1334,18 @@
1205	1334
1206	1335	namePanel = new cGridBag();
1207	1336
	1337	+ //if (copy.pinned)
	1338	+ {
	1339	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1340	+ pinButton.setSelected(copy.pinned);
	1341	+ cGridBag t = new cGridBag();
	1342	+ t.preferredWidth = 2;
	1343	+ t.add(pinButton);
	1344	+ namePanel.add(t);
	1345	+
	1346	+ pinButton.addItemListener(this);
	1347	+ }
	1348	+
1208	1349	nameField = AddText(namePanel, copy.GetName());
1209	1350	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1210	1351	oe.ctrlPanel.add(namePanel);
..	..	@@ -1218,14 +1359,14 @@
1218	1359
1219	1360	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1220	1361	liveCB.setToolTipText("Animate object");
	1362	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1363	+ markCB.setToolTipText("Set target transform");
1221	1364	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1222	1365	selectableCB.setToolTipText("Make object selectable");
1223	1366	// Return();
1224	1367
1225	1368	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1226	1369	hideCB.setToolTipText("Hide object");
1227		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1228		- markCB.setToolTipText("As animation target transform");
1229	1370
1230	1371	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1231	1372
..	..	@@ -1427,22 +1568,9 @@
1427	1568
1428	1569	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1429	1570	{
1430		- System.out.println("CREATE CAMERAS");
1431		- cams = new cTemplate();
1432		- cams.name = "Cameras";
1433		- copy.insertElementAt(cams, 0);
1434		- //cams.parent = copy;
1435		-
1436		- cam = new Camera(); // LA.newVector(3, 2, 1));
1437		- cams.addChild(cam);
1438		- cam = new Camera(1);
1439		- cams.addChild(cam);
1440		- cam = new Camera(2);
1441		- cams.addChild(cam);
1442		- cam = new Camera(3);
1443		- cams.addChild(cam);
1444		- cam = new Camera(4); // Light
1445		- cams.addChild(cam);
	1571	+ if (Globals.DEBUG)
	1572	+ System.out.println("CREATE CAMERAS");
	1573	+ cams = CreateCameras();
1446	1574	} else
1447	1575	{
1448	1576	cams = (cGroup) copy.get(0);
..	..	@@ -1508,6 +1636,45 @@
1508	1636	//frontView.object = copy;
1509	1637	//sideView.object = copy;
1510	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	+
1511	1678	XYZPanel = new cGridBag().setVertical(true);
1512	1679	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1513	1680
..	..	@@ -1517,6 +1684,9 @@
1517	1684	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1518	1685	//XYZPanel.setName("XYZ");
1519	1686
	1687	+ transformPanel.add(resetTransformPanel);
	1688	+ transformPanel.add(XYZPanel);
	1689	+
1520	1690	/*
1521	1691	gridPanel = new JPanel(); //new BorderLayout());
1522	1692	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1524,12 +1694,12 @@
1524	1694	gridPanel.add(cameraView);
1525	1695	gridPanel.add(XYZPanel);
1526	1696	*/
1527		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1528		- gridPanel.setContinuousLayout(true);
1529		- gridPanel.setOneTouchExpandable(true);
1530		- gridPanel.setDividerLocation(1.0);
1531		- gridPanel.setDividerSize(9);
1532		- 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);
1533	1703
1534	1704	// aConstraints.weighty = 0;
1535	1705	//System.out.println("THIS = " + this);
..	..	@@ -1552,31 +1722,34 @@
1552	1722
1553	1723	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1554	1724	//tmp.setName("Edit");
	1725	+ objectPanel.add(skyboxPanel);
	1726	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1727	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1728	+
	1729	+ objectPanel.add(toolboxPanel);
	1730	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1731	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1732	+
1555	1733	objectPanel.add(materialPanel);
1556		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1557		- objectPanel.setToolTipTextAt(0, "Material");
	1734	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1735	+ objectPanel.setToolTipTextAt(2, "Material");
1558	1736
1559	1737	// JPanel north = new JPanel(new BorderLayout());
1560	1738	// north.setName("Edit");
1561	1739	// north.add(ctrlPanel, BorderLayout.NORTH);
1562	1740	// objectPanel.add(north);
1563	1741	objectPanel.add(editPanel);
1564		- objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1565		- objectPanel.setToolTipTextAt(1, "Edit controls");
	1742	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
	1743	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1566	1744
1567		- //if (Globals.ADVANCED)
1568		- objectPanel.add(infoPanel);
1569		- objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1570		- objectPanel.setToolTipTextAt(2, "Information");
	1745	+ objectPanel.add(transformPanel);
	1746	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1747	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1571	1748
1572		- objectPanel.add(XYZPanel);
1573		- objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1574		- objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
1575		-
1576		- objectPanel.add(toolboxPanel);
1577		- objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1578		- objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1579		-
	1749	+ patchMaterial = true;
	1750	+ cameraView.patchMaterial = this;
	1751	+ objectPanel.setSelectedIndex(2);
	1752	+
1580	1753	/*
1581	1754	aConstraints.gridx = 0;
1582	1755	aConstraints.gridwidth = 1;
..	..	@@ -1596,7 +1769,7 @@
1596	1769	scrollpane.addMouseWheelListener(this); // Default not fast enough
1597	1770
1598	1771	/JTabbedPane/ scenePanel = new cGridBag();
1599		- scenePanel.preferredWidth = 5;
	1772	+ scenePanel.preferredWidth = 6;
1600	1773
1601	1774	JTabbedPane tabbedPane = new JTabbedPane();
1602	1775	tabbedPane.add(scrollpane);
..	..	@@ -1607,11 +1780,108 @@
1607	1780
1608	1781	AddOptions(optionsPanel); //, aConstraints);
1609	1782
1610		- tabbedPane.add(optionsPanel);
1611		-
1612	1783	tabbedPane.add(FSPane = new cFileSystemPane(this));
1613	1784
	1785	+ tabbedPane.add(optionsPanel);
	1786	+
1614	1787	scenePanel.add(tabbedPane);
	1788	+
	1789	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1790	+ creditsPanel.setName("Credits");
	1791	+
	1792	+ cLabel ogaLabel = new cLabel(" 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	+ }
1615	1885
1616	1886	/*
1617	1887	cTree jTree = new cTree(null);
..	..	@@ -1633,13 +1903,13 @@
1633	1903	jtp.add(tree);
1634	1904	*/
1635	1905
1636		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1637		- bigPanel.setContinuousLayout(true);
1638		- bigPanel.setOneTouchExpandable(true);
1639		- bigPanel.setDividerLocation(0.8);
1640		- bigPanel.setDividerSize(15);
1641		- bigPanel.setResizeWeight(0.15);
1642		- 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");
1643	1913
1644	1914	//bigPanel.setLayout(new BorderLayout());
1645	1915	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1683,6 +1953,23 @@
1683	1953	// aConstraints.gridheight = 1;
1684	1954
1685	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	+
1686	1973	framePanel.setContinuousLayout(false);
1687	1974	framePanel.setOneTouchExpandable(false);
1688	1975	//.setDividerLocation(0.8);
..	..	@@ -1692,7 +1979,7 @@
1692	1979
1693	1980	frame.getContentPane().setLayout(new BorderLayout());
1694	1981	/**/
1695		- JTabbedPane worldPane = new JTabbedPane();
	1982	+ //JTabbedPane worldPane = new JTabbedPane();
1696	1983	//worldPane.add(bigPanel);
1697	1984	//worldPane.add(worldPanel);
1698	1985	/**/
..	..	@@ -1706,7 +1993,7 @@
1706	1993
1707	1994	cameraView.requestFocusInWindow();
1708	1995
1709		- gridPanel.setDividerLocation(1.0);
	1996	+// gridPanel.setDividerLocation(1.0);
1710	1997
1711	1998	frame.validate();
1712	1999
..	..	@@ -1740,7 +2027,9 @@
1740	2027	void SetupMaterial(cGridBag materialpanel)
1741	2028	{
1742	2029	cGridBag presetpanel = new cGridBag().setVertical(true);
1743		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	2030	+
	2031	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	2032	+ skin.setToolTipText("Skin");
1744	2033	skin.addMouseListener(new MouseAdapter()
1745	2034	{
1746	2035	public void mouseClicked(MouseEvent e)
..	..	@@ -1750,7 +2039,15 @@
1750	2039
1751	2040	// Skin
1752	2041	colorField.setFloat(material.color);
1753		- 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	+
1754	2051	subsurfaceField.setFloat(material.subsurface);
1755	2052	selfshadowField.setFloat(material.diffuseness);
1756	2053	diffusenessField.setFloat(material.factor);
..	..	@@ -1769,8 +2066,116 @@
1769	2066	});
1770	2067	presetpanel.add(skin);
1771	2068
1772		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
1773		- rough2.addMouseListener(new MouseAdapter()
	2069	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2070	+ lambert.setToolTipText("Diffuse");
	2071	+ lambert.addMouseListener(new MouseAdapter()
	2072	+ {
	2073	+ public void mouseClicked(MouseEvent e)
	2074	+ {
	2075	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2076	+ cMaterial material = object.material;
	2077	+
	2078	+ diffusenessField.setFloat(material.factor);
	2079	+ selfshadowField.setFloat(material.diffuseness);
	2080	+
	2081	+ materialtouched = true;
	2082	+ applySelf();
	2083	+ }
	2084	+ });
	2085	+ presetpanel.add(lambert);
	2086	+
	2087	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2088	+ diffuse2.setToolTipText("Diffuse2");
	2089	+ diffuse2.addMouseListener(new MouseAdapter()
	2090	+ {
	2091	+ public void mouseClicked(MouseEvent e)
	2092	+ {
	2093	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2094	+ cMaterial material = object.material;
	2095	+
	2096	+ diffusenessField.setFloat(material.factor);
	2097	+ selfshadowField.setFloat(material.diffuseness);
	2098	+
	2099	+ materialtouched = true;
	2100	+ applySelf();
	2101	+ }
	2102	+ });
	2103	+ presetpanel.add(diffuse2);
	2104	+
	2105	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2106	+ diffusemoon.setToolTipText("Moon");
	2107	+ diffusemoon.addMouseListener(new MouseAdapter()
	2108	+ {
	2109	+ public void mouseClicked(MouseEvent e)
	2110	+ {
	2111	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2112	+ cMaterial material = object.material;
	2113	+
	2114	+ diffusenessField.setFloat(material.factor);
	2115	+ selfshadowField.setFloat(material.diffuseness);
	2116	+
	2117	+ materialtouched = true;
	2118	+ applySelf();
	2119	+ }
	2120	+ });
	2121	+ presetpanel.add(diffusemoon);
	2122	+
	2123	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2124	+ diffusemoon2.setToolTipText("Moon2");
	2125	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2126	+ {
	2127	+ public void mouseClicked(MouseEvent e)
	2128	+ {
	2129	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2130	+ cMaterial material = object.material;
	2131	+
	2132	+ diffusenessField.setFloat(material.factor);
	2133	+ selfshadowField.setFloat(material.diffuseness);
	2134	+
	2135	+ materialtouched = true;
	2136	+ applySelf();
	2137	+ }
	2138	+ });
	2139	+ presetpanel.add(diffusemoon2);
	2140	+
	2141	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2142	+ diffusemoon3.setToolTipText("Moon3");
	2143	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2144	+ {
	2145	+ public void mouseClicked(MouseEvent e)
	2146	+ {
	2147	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2148	+ cMaterial material = object.material;
	2149	+
	2150	+ diffusenessField.setFloat(material.factor);
	2151	+ selfshadowField.setFloat(material.diffuseness);
	2152	+
	2153	+ materialtouched = true;
	2154	+ applySelf();
	2155	+ }
	2156	+ });
	2157	+ presetpanel.add(diffusemoon3);
	2158	+
	2159	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2160	+ diffusesheen.setToolTipText("Sheen");
	2161	+ diffusesheen.addMouseListener(new MouseAdapter()
	2162	+ {
	2163	+ public void mouseClicked(MouseEvent e)
	2164	+ {
	2165	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2166	+ cMaterial material = object.material;
	2167	+
	2168	+ sheenField.setFloat(material.sheen);
	2169	+
	2170	+ materialtouched = true;
	2171	+ applySelf();
	2172	+ }
	2173	+ });
	2174	+ presetpanel.add(diffusesheen);
	2175	+
	2176	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2177	+ rough.setToolTipText("Rough metal");
	2178	+ rough.addMouseListener(new MouseAdapter()
1774	2179	{
1775	2180	public void mouseClicked(MouseEvent e)
1776	2181	{
..	..	@@ -1784,31 +2189,254 @@
1784	2189	applySelf();
1785	2190	}
1786	2191	});
	2192	+ presetpanel.add(rough);
	2193	+
	2194	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2195	+ rough2.setToolTipText("Medium metal");
	2196	+ rough2.addMouseListener(new MouseAdapter()
	2197	+ {
	2198	+ public void mouseClicked(MouseEvent e)
	2199	+ {
	2200	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2201	+ cMaterial material = object.material;
	2202	+
	2203	+ shininessField.setFloat(material.shininess);
	2204	+ lightareaField.setFloat(material.lightarea);
	2205	+
	2206	+ materialtouched = true;
	2207	+ applySelf();
	2208	+ }
	2209	+ });
1787	2210	presetpanel.add(rough2);
1788	2211
1789		- presetpanel.add(GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF));
1790		- presetpanel.add(GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF));
1791		- presetpanel.add(GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF));
1792		- presetpanel.add(GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF));
1793		- presetpanel.add(GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF));
1794		- presetpanel.add(GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF));
1795		- presetpanel.add(GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF));
1796		- presetpanel.add(GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF));
1797		- presetpanel.add(GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF));
1798		- presetpanel.add(GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF));
1799		- presetpanel.add(GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF));
1800		- presetpanel.add(GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF));
1801		- presetpanel.add(GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF));
1802		- presetpanel.add(GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF));
1803		- presetpanel.add(GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF));
1804		- presetpanel.add(GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF));
	2212	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2213	+ shini0.setToolTipText("Shiny");
	2214	+ shini0.addMouseListener(new MouseAdapter()
	2215	+ {
	2216	+ public void mouseClicked(MouseEvent e)
	2217	+ {
	2218	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2219	+ cMaterial material = object.material;
	2220	+
	2221	+ shininessField.setFloat(material.shininess);
	2222	+ lightareaField.setFloat(material.lightarea);
	2223	+
	2224	+ materialtouched = true;
	2225	+ applySelf();
	2226	+ }
	2227	+ });
	2228	+ presetpanel.add(shini0);
	2229	+
	2230	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2231	+ shini1.setToolTipText("Shiny2");
	2232	+ shini1.addMouseListener(new MouseAdapter()
	2233	+ {
	2234	+ public void mouseClicked(MouseEvent e)
	2235	+ {
	2236	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2237	+ cMaterial material = object.material;
	2238	+
	2239	+ shininessField.setFloat(material.shininess);
	2240	+ lightareaField.setFloat(material.lightarea);
	2241	+
	2242	+ materialtouched = true;
	2243	+ applySelf();
	2244	+ }
	2245	+ });
	2246	+ presetpanel.add(shini1);
	2247	+
	2248	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2249	+ shini2.setToolTipText("Shiny3");
	2250	+ shini2.addMouseListener(new MouseAdapter()
	2251	+ {
	2252	+ public void mouseClicked(MouseEvent e)
	2253	+ {
	2254	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2255	+ cMaterial material = object.material;
	2256	+
	2257	+ shininessField.setFloat(material.shininess);
	2258	+ lightareaField.setFloat(material.lightarea);
	2259	+
	2260	+ materialtouched = true;
	2261	+ applySelf();
	2262	+ }
	2263	+ });
	2264	+ presetpanel.add(shini2);
	2265	+
	2266	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2267	+ aniso.setToolTipText("AnisoU");
	2268	+ aniso.addMouseListener(new MouseAdapter()
	2269	+ {
	2270	+ public void mouseClicked(MouseEvent e)
	2271	+ {
	2272	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2273	+ cMaterial material = object.material;
	2274	+
	2275	+ anisoField.setFloat(material.aniso);
	2276	+ anisoVField.setFloat(material.anisoV);
	2277	+
	2278	+ materialtouched = true;
	2279	+ applySelf();
	2280	+ }
	2281	+ });
	2282	+ presetpanel.add(aniso);
	2283	+
	2284	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2285	+ aniso2.setToolTipText("AnisoV");
	2286	+ aniso2.addMouseListener(new MouseAdapter()
	2287	+ {
	2288	+ public void mouseClicked(MouseEvent e)
	2289	+ {
	2290	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2291	+ cMaterial material = object.material;
	2292	+
	2293	+ anisoField.setFloat(material.aniso);
	2294	+ anisoVField.setFloat(material.anisoV);
	2295	+
	2296	+ materialtouched = true;
	2297	+ applySelf();
	2298	+ }
	2299	+ });
	2300	+ presetpanel.add(aniso2);
	2301	+
	2302	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2303	+ aniso3.setToolTipText("AnisoUV");
	2304	+ aniso3.addMouseListener(new MouseAdapter()
	2305	+ {
	2306	+ public void mouseClicked(MouseEvent e)
	2307	+ {
	2308	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2309	+ cMaterial material = object.material;
	2310	+
	2311	+ anisoField.setFloat(material.aniso);
	2312	+ anisoVField.setFloat(material.anisoV);
	2313	+
	2314	+ materialtouched = true;
	2315	+ applySelf();
	2316	+ }
	2317	+ });
	2318	+ presetpanel.add(aniso3);
	2319	+
	2320	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2321	+ velvet0.setToolTipText("Velvet");
	2322	+ velvet0.addMouseListener(new MouseAdapter()
	2323	+ {
	2324	+ public void mouseClicked(MouseEvent e)
	2325	+ {
	2326	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2327	+ cMaterial material = object.material;
	2328	+
	2329	+ diffusenessField.setFloat(material.factor);
	2330	+ selfshadowField.setFloat(material.diffuseness);
	2331	+ sheenField.setFloat(material.sheen);
	2332	+ shininessField.setFloat(material.shininess);
	2333	+ velvetField.setFloat(material.velvet);
	2334	+ shiftField.setFloat(material.shift);
	2335	+
	2336	+ materialtouched = true;
	2337	+ applySelf();
	2338	+ }
	2339	+ });
	2340	+ presetpanel.add(velvet0);
	2341	+
	2342	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2343	+ bump0.setToolTipText("Bump texture");
	2344	+ bump0.addMouseListener(new MouseAdapter()
	2345	+ {
	2346	+ public void mouseClicked(MouseEvent e)
	2347	+ {
	2348	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2349	+ cMaterial material = object.material;
	2350	+
	2351	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2352	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2353	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2354	+
	2355	+ materialtouched = true;
	2356	+ applySelf();
	2357	+ }
	2358	+ });
	2359	+ presetpanel.add(bump0);
	2360	+
	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);
	2377	+ halo.setToolTipText("Halo");
	2378	+ halo.addMouseListener(new MouseAdapter()
	2379	+ {
	2380	+ public void mouseClicked(MouseEvent e)
	2381	+ {
	2382	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2383	+ cMaterial material = object.material;
	2384	+
	2385	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2386	+
	2387	+ materialtouched = true;
	2388	+ applySelf();
	2389	+ }
	2390	+ });
	2391	+ presetpanel.add(halo);
	2392	+
	2393	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2394	+ candle.setToolTipText("Candle");
	2395	+ candle.addMouseListener(new MouseAdapter()
	2396	+ {
	2397	+ public void mouseClicked(MouseEvent e)
	2398	+ {
	2399	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2400	+ cMaterial material = object.material;
	2401	+
	2402	+ subsurfaceField.setFloat(material.subsurface);
	2403	+ shadowbiasField.setFloat(material.shadowbias);
	2404	+ ambientField.setFloat(material.ambient);
	2405	+ specularField.setFloat(material.specular);
	2406	+ lightareaField.setFloat(material.lightarea);
	2407	+ shininessField.setFloat(material.shininess);
	2408	+
	2409	+ materialtouched = true;
	2410	+ applySelf();
	2411	+ }
	2412	+ });
	2413	+ presetpanel.add(candle);
	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);
1805	2433
1806	2434	cGridBag panel = new cGridBag().setVertical(true);
1807	2435
1808	2436	presetpanel.preferredWidth = 1;
1809	2437
1810		- materialpanel.add(panel);
1811	2438	materialpanel.add(presetpanel);
	2439	+ materialpanel.add(panel);
1812	2440
1813	2441	panel.preferredWidth = 8;
1814	2442
..	..	@@ -1819,19 +2447,19 @@
1819	2447
1820	2448	cGridBag editBar = new cGridBag().setVertical(false);
1821	2449
1822		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2450	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
1823	2451	createMaterialButton.setToolTipText("Create material");
1824	2452
1825	2453	/*
1826	2454	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1827	2455	*/
1828	2456
1829		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2457	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
1830	2458	clearMaterialButton.setToolTipText("Clear material");
1831	2459
1832	2460	if (Globals.ADVANCED)
1833	2461	{
1834		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2462	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
1835	2463	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1836	2464	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1837	2465	}
..	..	@@ -1852,9 +2480,20 @@
1852	2480
1853	2481	cGridBag huepanel = new cGridBag();
1854	2482	cGridBag huelabel = new cGridBag();
1855		- skin = GetLabel("icons/hue.png", false);
1856		- skin.fit = true;
1857		- 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);
1858	2497	huelabel.preferredWidth = 20;
1859	2498	huepanel.add(new cGridBag()); // Label
1860	2499	huepanel.add(huelabel); // Field/slider
..	..	@@ -3130,32 +3769,8 @@
3130	3769
3131	3770	if (multiplyToggle != null)
3132	3771	multiplyToggle.setSelected(mat.multiply);
3133		-
3134		- assert (object.projectedVertices != null);
3135		-
3136		- if (object.projectedVertices.length <= 2)
3137		- {
3138		- // Side effect...
3139		- Object3D.cVector2[] keep = object.projectedVertices;
3140		- object.projectedVertices = new Object3D.cVector2[3];
3141		- for (int i = 0; i < 3; i++)
3142		- {
3143		- if (i < keep.length)
3144		- {
3145		- object.projectedVertices[i] = keep[i];
3146		- } else
3147		- {
3148		- object.projectedVertices[i] = new Object3D.cVector2();
3149		- }
3150		- /*
3151		- if(keep.length == 0)
3152		- object.projectedVertices[0] = new Object3D.cVector2();
3153		- else
3154		- object.projectedVertices[0] = keep[0];
3155		- object.projectedVertices[1] = new Object3D.cVector2();
3156		- */
3157		- }
3158		- }
	3772	+
	3773	+ AllocProjectedVertices(object);
3159	3774
3160	3775	SetMaterial(mat, object.projectedVertices);
3161	3776	}
..	..	@@ -3275,6 +3890,17 @@
3275	3890	public void itemStateChanged(ItemEvent event)
3276	3891	{
3277	3892	// System.out.println("Propagate = " + propagate);
	3893	+ if (event.getSource() == pinButton)
	3894	+ {
	3895	+ copy.pinned ^= true;
	3896	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3897	+ {
	3898	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3899	+ copy.CloseUI();
	3900	+ //copy.editWindow.refreshContents();
	3901	+ }
	3902	+ }
	3903	+ else
3278	3904	if (event.getSource() == propagateToggle)
3279	3905	{
3280	3906	propagate ^= true;
..	..	@@ -3454,7 +4080,7 @@
3454	4080	//System.out.println("ObjEditor " + event);
3455	4081	applySelf0(true);
3456	4082	//parent.applySelf();
3457		- objEditor.refreshContents();
	4083	+ // conflicts with requestFocus objEditor.refreshContents();
3458	4084	} else if (source == resetButton)
3459	4085	{
3460	4086	CameraPane.fullreset = true;
..	..	@@ -3634,11 +4260,18 @@
3634	4260
3635	4261	void New()
3636	4262	{
3637		- while (copy.Size() > 1)
	4263	+ while (copy.Size() > 0)
3638	4264	{
3639		- copy.remove(1);
	4265	+ copy.remove(0);
3640	4266	}
3641	4267
	4268	+ copy.selection.clear();
	4269	+
	4270	+ if (copy == Grafreed.grafreed.universe)
	4271	+ {
	4272	+ CreateCameras();
	4273	+ cameraView.SetCamera(GetCamera(copy, 0));
	4274	+ }
3642	4275	ResetModel();
3643	4276	objEditor.refreshContents();
3644	4277	}
..	..	@@ -3747,7 +4380,7 @@
3747	4380	{
3748	4381	//Save(true);
3749	4382	Replace();
3750		- SetUndoStates();
	4383	+ SetVersionStates();
3751	4384	}
3752	4385
3753	4386	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3766,8 +4399,6 @@
3766	4399	return true;
3767	4400	}
3768	4401
3769		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3770		-
3771	4402	void DeleteVersion()
3772	4403	{
3773	4404	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -3775,19 +4406,23 @@
3775	4406	copy.versionlist[i] = copy.versionlist[i+1];
3776	4407	}
3777	4408
3778		- CopyChanged();
	4409	+ if (copy.versionlist[copy.versionindex] == null)
	4410	+ copy.versionindex -= 1;
3779	4411
3780		- SetUndoStates();
	4412	+ if (copy.versionindex != -1)
	4413	+ CopyChanged();
	4414	+
	4415	+ SetVersionStates();
3781	4416	}
3782	4417
3783	4418	public boolean Save(boolean user)
3784	4419	{
3785	4420	System.err.println("Save");
3786		- //Replace();
	4421	+ Replace();
3787	4422
3788		- cRadio tab = GetCurrentTab();
	4423	+ //cRadio tab = GetCurrentTab();
3789	4424
3790		- Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
	4425	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3791	4426
3792	4427	boolean thesame = false;
3793	4428
..	..	@@ -3823,7 +4458,7 @@
3823	4458	// copy.versionlist[i] = null;
3824	4459	// }
3825	4460
3826		- SetUndoStates();
	4461	+ SetVersionStates();
3827	4462
3828	4463	// test save
3829	4464	if (false)
..	..	@@ -3881,14 +4516,14 @@
3881	4516
3882	4517	void CopyChanged()
3883	4518	{
3884		- Object3D obj = copy.versionlist[copy.versionindex];
	4519	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
3885	4520
3886		- SetUndoStates();
	4521	+ SetVersionStates();
3887	4522
3888	4523	boolean temp = CameraPane.SWITCH;
3889	4524	CameraPane.SWITCH = false;
3890	4525
3891		- copy.ExtractBigData(versiontable);
	4526	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3892	4527
3893	4528	copy.clear();
3894	4529
..	..	@@ -3900,7 +4535,7 @@
3900	4535	copy.add(obj.get(i));
3901	4536	}
3902	4537
3903		- copy.RestoreBigData(versiontable);
	4538	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3904	4539
3905	4540	CameraPane.SWITCH = temp;
3906	4541
..	..	@@ -3950,23 +4585,45 @@
3950	4585	return count;
3951	4586	}
3952	4587
3953		- void SetUndoStates()
	4588	+ public cGridBag versionSliderPane;
	4589	+
	4590	+ void SetVersionStates()
3954	4591	{
3955		- cRadio tab = GetCurrentTab();
	4592	+ //if (true)
	4593	+ // return;
	4594	+
	4595	+ //cRadio tab = GetCurrentTab();
3956	4596
3957		- restoreButton.setEnabled(true); // copy.versionindex != -1);
3958		- replaceButton.setEnabled(true); // copy.versionindex != -1);
3959		-
3960		- previousVersionButton.setEnabled(copy.versionindex > 0);
3961		- nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
3962		-
3963		- deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
3964		- copy.versionlist[copy.versionindex + 1] != null);
3965		-
3966		- muteSlider = true;
3967		- versionSlider.setMaximum(VersionCount() - 1);
3968		- versionSlider.setInteger(copy.versionindex);
3969		- 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	+ }
3970	4627	}
3971	4628
3972	4629	public boolean PreviousVersion()
..	..	@@ -3976,7 +4633,7 @@
3976	4633
3977	4634	System.err.println("Undo");
3978	4635
3979		- cRadio tab = GetCurrentTab();
	4636	+ //cRadio tab = GetCurrentTab();
3980	4637
3981	4638	if (copy.versionindex == 0)
3982	4639	{
..	..	@@ -4008,7 +4665,7 @@
4008	4665	{
4009	4666	System.err.println("Restore");
4010	4667
4011		- cRadio tab = GetCurrentTab();
	4668	+ //cRadio tab = GetCurrentTab();
4012	4669
4013	4670	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4014	4671	{
..	..	@@ -4024,9 +4681,9 @@
4024	4681
4025	4682	public boolean Replace()
4026	4683	{
4027		- System.err.println("Replace");
	4684	+ //System.err.println("Replace");
4028	4685
4029		- cRadio tab = GetCurrentTab();
	4686	+ //cRadio tab = GetCurrentTab();
4030	4687
4031	4688	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4032	4689	{
..	..	@@ -4034,7 +4691,7 @@
4034	4691	return false;
4035	4692	}
4036	4693
4037		- copy.versionlist[copy.versionindex] = CompressCopy();
	4694	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
4038	4695
4039	4696	return true;
4040	4697	}
..	..	@@ -4044,7 +4701,7 @@
4044	4701	// Option?
4045	4702	Replace();
4046	4703
4047		- cRadio tab = GetCurrentTab();
	4704	+ //cRadio tab = GetCurrentTab();
4048	4705
4049	4706	if (copy.versionlist[copy.versionindex + 1] == null)
4050	4707	{
..	..	@@ -4251,6 +4908,12 @@
4251	4908	// else
4252	4909	// applySelf(true);
4253	4910	// }
	4911	+
	4912	+ boolean Equal(double a, double b)
	4913	+ {
	4914	+ return Math.abs(a - b) < 0.001;
	4915	+ }
	4916	+
4254	4917	void applySelf0(boolean name)
4255	4918	{
4256	4919	if (name)
..	..	@@ -4300,29 +4963,52 @@
4300	4963	{
4301	4964	cMaterial mat = copy.material;
4302	4965
4303		- colorField.SetToolTipValue((mat.color));
4304		- saturationField.SetToolTipValue((mat.modulation));
4305		- metalnessField.SetToolTipValue((mat.metalness));
4306		- diffuseField.SetToolTipValue((mat.diffuse));
4307		- specularField.SetToolTipValue((mat.specular));
4308		- shininessField.SetToolTipValue((mat.shininess));
4309		- shiftField.SetToolTipValue((mat.shift));
4310		- ambientField.SetToolTipValue((mat.ambient));
4311		- lightareaField.SetToolTipValue((mat.lightarea));
4312		- diffusenessField.SetToolTipValue((mat.factor));
4313		- velvetField.SetToolTipValue((mat.velvet));
4314		- sheenField.SetToolTipValue((mat.sheen));
4315		- subsurfaceField.SetToolTipValue((mat.subsurface));
4316		- backlitField.SetToolTipValue((mat.bump));
4317		- anisoField.SetToolTipValue((mat.aniso));
4318		- anisoVField.SetToolTipValue((mat.anisoV));
4319		- cameraField.SetToolTipValue((mat.cameralight));
4320		- selfshadowField.SetToolTipValue((mat.diffuseness));
4321		- shadowField.SetToolTipValue((mat.shadow));
4322		- textureField.SetToolTipValue((mat.texture));
4323		- opacityField.SetToolTipValue((mat.opacity));
4324		- fakedepthField.SetToolTipValue((mat.fakedepth));
4325		- 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));
4326	5012	}
4327	5013
4328	5014	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4357,15 +5043,17 @@
4357	5043
4358	5044	public void stateChanged(ChangeEvent e)
4359	5045	{
4360		- // assert(false);
	5046	+ // assert(false);
4361	5047	if (e.getSource() == versionSlider)
4362	5048	{
4363	5049	if (muteSlider)
4364	5050	return;
4365	5051
	5052	+ Replace();
	5053	+
4366	5054	int version = versionSlider.getInteger();
4367	5055
4368		- if (copy.versionlist[version] != null)
	5056	+ if (version != -1 && copy.versionlist[version] != null)
4369	5057	{
4370	5058	copy.versionindex = version;
4371	5059	CopyChanged();
..	..	@@ -4409,7 +5097,7 @@
4409	5097	//System.out.println("stateChanged = " + this);
4410	5098	materialtouched = true;
4411	5099
4412		- if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5100	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
4413	5101	{
4414	5102	saturationField.setFloat(1);
4415	5103	}
..	..	@@ -4724,7 +5412,9 @@
4724	5412	}
4725	5413
4726	5414	if (previousVersionButton != null && copy.versionlist != null)
4727		- SetUndoStates();
	5415	+ SetVersionStates();
	5416	+
	5417	+ cameraView.requestFocusInWindow();
4728	5418	}
4729	5419
4730	5420	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4756,7 +5446,7 @@
4756	5446	// group = (Composite) group.get(0);
4757	5447	// }
4758	5448
4759		- System.out.println("makeSomething of " + thing);
	5449	+ //System.out.println("makeSomething of " + thing);
4760	5450
4761	5451	/*
4762	5452	if (deselect && jList != null)
..	..	@@ -5110,11 +5800,15 @@
5110	5800
5111	5801	copy.versionlist = readobj.versionlist;
5112	5802	copy.versionindex = readobj.versionindex;
	5803	+ copy.versiontable = readobj.versiontable;
5113	5804
5114	5805	if (copy.versionlist == null)
5115	5806	{
	5807	+ // Backward compatibility
5116	5808	copy.versionlist = new Object3D[100];
5117	5809	copy.versionindex = -1;
	5810	+
	5811	+ //Save(true);
5118	5812	}
5119	5813
5120	5814	//? SetUndoStates();
..	..	@@ -5206,6 +5900,8 @@
5206	5900
5207	5901	void save()
5208	5902	{
	5903	+ Replace();
	5904	+
5209	5905	if (lastname == null)
5210	5906	{
5211	5907	return;
..	..	@@ -5448,6 +6144,7 @@
5448	6144	ButtonGroup buttonGroup;
5449	6145
5450	6146	cGridBag toolboxPanel;
	6147	+ cGridBag skyboxPanel;
5451	6148	cGridBag materialPanel;
5452	6149	cGridBag ctrlPanel;
5453	6150
..	..	@@ -5459,6 +6156,7 @@
5459	6156	boolean materialFlushed;
5460	6157	Object3D latestObject;
5461	6158
	6159	+ cGridBag transformPanel;
5462	6160	cGridBag XYZPanel;
5463	6161
5464	6162	JSplitPane gridPanel;
..	..	@@ -5552,6 +6250,7 @@
5552	6250	cNumberSlider anisoField;
5553	6251	JLabel anisoVLabel;
5554	6252	cNumberSlider anisoVField;
	6253	+
5555	6254	JLabel cameraLabel;
5556	6255	cNumberSlider cameraField;
5557	6256	JLabel selfshadowLabel;
..	..	@@ -5566,6 +6265,7 @@
5566	6265	cNumberSlider fakedepthField;
5567	6266	JLabel shadowbiasLabel;
5568	6267	cNumberSlider shadowbiasField;
	6268	+
5569	6269	JLabel bumpLabel;
5570	6270	cNumberSlider bumpField;
5571	6271	JLabel noiseLabel;