~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,12 +122,26 @@
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));
82		-
	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	+
83	145	// if (image.getWidth() > 48 && image.getHeight() > 48)
84	146	// {
85	147	// BufferedImage resized = new BufferedImage(48, 48, image.getType());
..	..	@@ -93,10 +155,14 @@
93	155	// }
94	156
95	157	javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	158	+
	159	+ icons.put(name, icon);
	160	+
96	161	return icon;
97	162	}
98	163	catch (Exception e)
99	164	{
	165	+ //icons.put(name, null);
100	166	return null;
101	167	}
102	168	}
..	..	@@ -296,11 +362,13 @@
296	362	client = inClient;
297	363	copy = client;
298	364
299		- if (copy.versionlist == null)
300		- {
301		- copy.versionlist = new Object3D[100];
302		- copy.versionindex = -1;
303		- }
	365	+// if (copy.versionlist == null)
	366	+// {
	367	+// copy.versionlist = new Object3D[100];
	368	+// copy.versionindex = -1;
	369	+//
	370	+// callee.Save(true);
	371	+// }
304	372
305	373	// "this" is not called: SetupUI2(objEditor);
306	374	}
..	..	@@ -319,6 +387,8 @@
319	387	{
320	388	copy.versionlist = new Object3D[100];
321	389	copy.versionindex = -1;
	390	+
	391	+// Save(true);
322	392	}
323	393
324	394	SetupUI2(callee.GetEditor());
..	..	@@ -342,7 +412,8 @@
342	412	//parent = p;
343	413
344	414	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
345		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	415	+ if (Globals.DEBUG)
	416	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
346	417	//gd.setFullScreenWindow(this);
347	418	//setResizable(false);
348	419	//if (!isDisplayable())
..	..	@@ -353,11 +424,13 @@
353	424	copy = localCopy;
354	425	copy.editWindow = this;
355	426
356		- if (copy.versionlist == null)
357		- {
358		-// copy.versions = new byte[100][];
	427	+// if (copy.versionlist == null)
	428	+// {
	429	+// copy.versionlist = new Object3D[100];
359	430	// copy.versionindex = -1;
360		- }
	431	+//
	432	+// Save(true);
	433	+// }
361	434
362	435	SetupMenu();
363	436
..	..	@@ -377,6 +450,9 @@
377	450
378	451	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
379	452
	453	+ // This is to refresh the UI of the material panel.
	454	+ boolean patchMaterial;
	455	+
380	456	void SetupMenu()
381	457	{
382	458	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -390,8 +466,11 @@
390	466	importOBJItem.addActionListener(this);
391	467	import3DSItem = menu.add(new MenuItem("3DS file..."));
392	468	import3DSItem.addActionListener(this);
	469	+ if (Globals.ADVANCED)
	470	+ {
393	471	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
394	472	importVRMLX3DItem.addActionListener(this);
	473	+ }
395	474	menu.add("-");
396	475	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
397	476	importGFDItem.addActionListener(this);
..	..	@@ -426,6 +505,8 @@
426	505
427	506	ChangeListener changeListener = new ChangeListener()
428	507	{
	508	+ //String name;
	509	+
429	510	public void stateChanged(ChangeEvent changeEvent)
430	511	{
431	512	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -444,7 +525,37 @@
444	525	// EditSelection(false);
445	526	// }
446	527
447		- refreshContents(false); // To refresh Info tab
	528	+// if (objectPanel.getSelectedIndex() == 4)
	529	+// {
	530	+// name = copy.skyboxname;
	531	+//
	532	+// if (name == null)
	533	+// {
	534	+// name = "";
	535	+// }
	536	+//
	537	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	538	+// copy.skyboxext = "jpg";
	539	+// }
	540	+// else
	541	+// {
	542	+// if (name != null)
	543	+// {
	544	+// if (name.equals(""))
	545	+// {
	546	+// copy.skyboxname = null;
	547	+// copy.skyboxext = null;
	548	+// }
	549	+// else
	550	+// {
	551	+// copy.skyboxname = name;
	552	+// }
	553	+// }
	554	+// }
	555	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	556	+
	557	+// refreshContents(false); // To refresh Info tab
	558	+ cameraView.repaint();
448	559	}
449	560	};
450	561	objectPanel.addChangeListener(changeListener);
..	..	@@ -466,6 +577,8 @@
466	577
467	578	toolboxPanel = new cGridBag().setVertical(true);
468	579	//toolboxPanel.setName("Toolbox");
	580	+
	581	+ skyboxPanel = new cGridBag().setVertical(true);
469	582
470	583	materialPanel = new cGridBag().setVertical(false);
471	584	//materialPanel.setName("Material");
..	..	@@ -751,6 +864,7 @@
751	864	boolean maximized;
752	865
753	866	cButton fullscreenLayout;
	867	+ cButton expandedLayout;
754	868
755	869	void Minimize()
756	870	{
..	..	@@ -790,10 +904,12 @@
790	904	cButton minButton;
791	905	cButton maxButton;
792	906	cButton fullButton;
	907	+ cButton collapseButton;
	908	+ cButton maximize3DButton;
793	909
794	910	void ToggleFullScreen()
795	911	{
796		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	912	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797	913
798	914	cameraView.ToggleFullScreen();
799	915
..	..	@@ -814,13 +930,13 @@
814	930	// X frame.getContentPane().remove(/"Center",/bigThree);
815	931	// X framePanel.add(bigThree);
816	932	// X frame.getContentPane().add(/"Center",/framePanel);
817		- framePanel.setDividerLocation(46);
	933	+// framePanel.setDividerLocation(46); // icons are 24x24
818	934
819	935	//frame.setVisible(true);
820		- radio.layout = keepButton;
	936	+// radio.layout = keepButton;
821	937	//theFrame = null;
822	938	keepButton = null;
823		- radio.layout.doClick();
	939	+// radio.layout.doClick();
824	940
825	941	} else
826	942	{
..	..	@@ -841,10 +957,10 @@
841	957	// X frame.getContentPane().remove(/"Center",/framePanel);
842	958	// X framePanel.remove(bigThree);
843	959	// X frame.getContentPane().add(/"Center",/bigThree);
844		- framePanel.setDividerLocation(0);
	960	+// framePanel.setDividerLocation(0);
845	961
846		- radio.layout = fullscreenLayout;
847		- radio.layout.doClick();
	962	+// radio.layout = fullscreenLayout;
	963	+// radio.layout.doClick();
848	964	//frame.setVisible(true);
849	965	}
850	966	frame.validate();
..	..	@@ -852,23 +968,42 @@
852	968	cameraView.requestFocusInWindow();
853	969	}
854	970
855		- private Object3D CompressCopy()
	971	+ void CollapseToolbar()
	972	+ {
	973	+ framePanel.setDividerLocation(0);
	974	+ //frame.validate();
	975	+
	976	+ cameraView.requestFocusInWindow();
	977	+ }
	978	+
	979	+ private Object3D Duplicate(Object3D object)
856	980	{
857	981	boolean temp = CameraPane.SWITCH;
858	982	CameraPane.SWITCH = false;
859	983
860		- copy.ExtractBigData(versiontable);
	984	+ if (Grafreed.grafreed.universe.versiontable == null)
	985	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	986	+
	987	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
861	988	// if (copy == client)
862	989
863		- Object3D versions[] = copy.versionlist;
864		- copy.versionlist = null;
	990	+ Object3D versions[] = object.versionlist;
	991	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	992	+ object.versionlist = null;
	993	+ object.versiontable = null;
	994	+
	995	+ Object3D parent = object.parent;
	996	+ object.parent = null;
865	997
866	998	//byte[] compress = Compress(copy);
867		- Object3D compress = (Object3D)Grafreed.clone(copy);
	999	+ Object3D compress = (Object3D)Grafreed.clone(object);
868	1000
869		- copy.versionlist = versions;
	1001	+ object.parent = parent;
870	1002
871		- copy.RestoreBigData(versiontable);
	1003	+ object.versionlist = versions;
	1004	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	1005	+
	1006	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
872	1007
873	1008	CameraPane.SWITCH = temp;
874	1009
..	..	@@ -1205,6 +1340,18 @@
1205	1340
1206	1341	namePanel = new cGridBag();
1207	1342
	1343	+ //if (copy.pinned)
	1344	+ {
	1345	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1346	+ pinButton.setSelected(copy.pinned);
	1347	+ cGridBag t = new cGridBag();
	1348	+ t.preferredWidth = 2;
	1349	+ t.add(pinButton);
	1350	+ namePanel.add(t);
	1351	+
	1352	+ pinButton.addItemListener(this);
	1353	+ }
	1354	+
1208	1355	nameField = AddText(namePanel, copy.GetName());
1209	1356	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1210	1357	oe.ctrlPanel.add(namePanel);
..	..	@@ -1218,14 +1365,14 @@
1218	1365
1219	1366	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1220	1367	liveCB.setToolTipText("Animate object");
	1368	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1369	+ markCB.setToolTipText("Set target transform");
1221	1370	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1222	1371	selectableCB.setToolTipText("Make object selectable");
1223	1372	// Return();
1224	1373
1225	1374	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1226	1375	hideCB.setToolTipText("Hide object");
1227		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1228		- markCB.setToolTipText("As animation target transform");
1229	1376
1230	1377	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1231	1378
..	..	@@ -1427,22 +1574,9 @@
1427	1574
1428	1575	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1429	1576	{
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);
	1577	+ if (Globals.DEBUG)
	1578	+ System.out.println("CREATE CAMERAS");
	1579	+ cams = CreateCameras();
1446	1580	} else
1447	1581	{
1448	1582	cams = (cGroup) copy.get(0);
..	..	@@ -1508,6 +1642,45 @@
1508	1642	//frontView.object = copy;
1509	1643	//sideView.object = copy;
1510	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	+
1511	1684	XYZPanel = new cGridBag().setVertical(true);
1512	1685	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1513	1686
..	..	@@ -1517,6 +1690,9 @@
1517	1690	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1518	1691	//XYZPanel.setName("XYZ");
1519	1692
	1693	+ transformPanel.add(resetTransformPanel);
	1694	+ transformPanel.add(XYZPanel);
	1695	+
1520	1696	/*
1521	1697	gridPanel = new JPanel(); //new BorderLayout());
1522	1698	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1524,12 +1700,12 @@
1524	1700	gridPanel.add(cameraView);
1525	1701	gridPanel.add(XYZPanel);
1526	1702	*/
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);
	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);
1533	1709
1534	1710	// aConstraints.weighty = 0;
1535	1711	//System.out.println("THIS = " + this);
..	..	@@ -1552,31 +1728,34 @@
1552	1728
1553	1729	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1554	1730	//tmp.setName("Edit");
	1731	+ objectPanel.add(skyboxPanel);
	1732	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1733	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1734	+
	1735	+ objectPanel.add(toolboxPanel);
	1736	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1737	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1738	+
1555	1739	objectPanel.add(materialPanel);
1556		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1557		- objectPanel.setToolTipTextAt(0, "Material");
	1740	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1741	+ objectPanel.setToolTipTextAt(2, "Material");
1558	1742
1559	1743	// JPanel north = new JPanel(new BorderLayout());
1560	1744	// north.setName("Edit");
1561	1745	// north.add(ctrlPanel, BorderLayout.NORTH);
1562	1746	// objectPanel.add(north);
1563	1747	objectPanel.add(editPanel);
1564		- objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1565		- objectPanel.setToolTipTextAt(1, "Edit controls");
	1748	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
	1749	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1566	1750
1567		- //if (Globals.ADVANCED)
1568		- objectPanel.add(infoPanel);
1569		- objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1570		- objectPanel.setToolTipTextAt(2, "Information");
	1751	+ objectPanel.add(transformPanel);
	1752	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1753	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1571	1754
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		-
	1755	+ patchMaterial = true;
	1756	+ cameraView.patchMaterial = this;
	1757	+ objectPanel.setSelectedIndex(2);
	1758	+
1580	1759	/*
1581	1760	aConstraints.gridx = 0;
1582	1761	aConstraints.gridwidth = 1;
..	..	@@ -1596,7 +1775,7 @@
1596	1775	scrollpane.addMouseWheelListener(this); // Default not fast enough
1597	1776
1598	1777	/JTabbedPane/ scenePanel = new cGridBag();
1599		- scenePanel.preferredWidth = 5;
	1778	+ scenePanel.preferredWidth = 6;
1600	1779
1601	1780	JTabbedPane tabbedPane = new JTabbedPane();
1602	1781	tabbedPane.add(scrollpane);
..	..	@@ -1607,11 +1786,108 @@
1607	1786
1608	1787	AddOptions(optionsPanel); //, aConstraints);
1609	1788
1610		- tabbedPane.add(optionsPanel);
1611		-
1612	1789	tabbedPane.add(FSPane = new cFileSystemPane(this));
1613	1790
	1791	+ tabbedPane.add(optionsPanel);
	1792	+
1614	1793	scenePanel.add(tabbedPane);
	1794	+
	1795	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1796	+ creditsPanel.setName("Credits");
	1797	+
	1798	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1799	+ creditsPanel.add(ogaLabel);
	1800	+
	1801	+ cButton creditButton;
	1802	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1803	+ creditButton.setToolTipText("https://opengameart.org");
	1804	+
	1805	+ creditButton.addMouseListener(new MouseAdapter()
	1806	+ {
	1807	+ public void mouseClicked(MouseEvent e)
	1808	+ {
	1809	+ try
	1810	+ {
	1811	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1812	+ } catch (Exception e1)
	1813	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1814	+ {
	1815	+ e1.printStackTrace();
	1816	+ }
	1817	+ }
	1818	+ });
	1819	+
	1820	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1821	+ creditsPanel.add(ogaLabel);
	1822	+
	1823	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1824	+ creditButton.setToolTipText("https://3delicious.net");
	1825	+
	1826	+ creditButton.addMouseListener(new MouseAdapter()
	1827	+ {
	1828	+ public void mouseClicked(MouseEvent e)
	1829	+ {
	1830	+ try
	1831	+ {
	1832	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1833	+ } catch (Exception e1)
	1834	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1835	+ {
	1836	+ e1.printStackTrace();
	1837	+ }
	1838	+ }
	1839	+ });
	1840	+
	1841	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1842	+ creditButton.setToolTipText("https://archive3d.net");
	1843	+
	1844	+ creditButton.addMouseListener(new MouseAdapter()
	1845	+ {
	1846	+ public void mouseClicked(MouseEvent e)
	1847	+ {
	1848	+ try
	1849	+ {
	1850	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1851	+ } catch (Exception e1)
	1852	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1853	+ {
	1854	+ e1.printStackTrace();
	1855	+ }
	1856	+ }
	1857	+ });
	1858	+
	1859	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1860	+ creditButton.setToolTipText("https://turbosquid.com");
	1861	+
	1862	+ creditButton.addMouseListener(new MouseAdapter()
	1863	+ {
	1864	+ public void mouseClicked(MouseEvent e)
	1865	+ {
	1866	+ try
	1867	+ {
	1868	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1869	+ } catch (Exception e1)
	1870	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1871	+ {
	1872	+ e1.printStackTrace();
	1873	+ }
	1874	+ }
	1875	+ });
	1876	+
	1877	+ for (int i=6; --i>=0;)
	1878	+ {
	1879	+ creditsPanel.add(new cGridBag());
	1880	+ }
	1881	+
	1882	+ tabbedPane.add(creditsPanel);
	1883	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1884	+
	1885	+ if (Globals.ADVANCED)
	1886	+ {
	1887	+ tabbedPane.add(infoPanel);
	1888	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1889	+ tabbedPane.setToolTipTextAt(4, "Information");
	1890	+ }
1615	1891
1616	1892	/*
1617	1893	cTree jTree = new cTree(null);
..	..	@@ -1633,13 +1909,13 @@
1633	1909	jtp.add(tree);
1634	1910	*/
1635	1911
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");
	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");
1643	1919
1644	1920	//bigPanel.setLayout(new BorderLayout());
1645	1921	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1683,6 +1959,23 @@
1683	1959	// aConstraints.gridheight = 1;
1684	1960
1685	1961	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1962	+
	1963	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1964	+ new java.beans.PropertyChangeListener()
	1965	+ {
	1966	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1967	+ {
	1968	+ if ((Integer)pce.getOldValue() == 1)
	1969	+ {
	1970	+ if (radio.layout != expandedLayout)
	1971	+ {
	1972	+ radio.layout = expandedLayout;
	1973	+ radio.layout.doClick();
	1974	+ }
	1975	+ }
	1976	+ }
	1977	+ });
	1978	+
1686	1979	framePanel.setContinuousLayout(false);
1687	1980	framePanel.setOneTouchExpandable(false);
1688	1981	//.setDividerLocation(0.8);
..	..	@@ -1692,7 +1985,7 @@
1692	1985
1693	1986	frame.getContentPane().setLayout(new BorderLayout());
1694	1987	/**/
1695		- JTabbedPane worldPane = new JTabbedPane();
	1988	+ //JTabbedPane worldPane = new JTabbedPane();
1696	1989	//worldPane.add(bigPanel);
1697	1990	//worldPane.add(worldPanel);
1698	1991	/**/
..	..	@@ -1706,7 +1999,7 @@
1706	1999
1707	2000	cameraView.requestFocusInWindow();
1708	2001
1709		- gridPanel.setDividerLocation(1.0);
	2002	+// gridPanel.setDividerLocation(1.0);
1710	2003
1711	2004	frame.validate();
1712	2005
..	..	@@ -1740,7 +2033,9 @@
1740	2033	void SetupMaterial(cGridBag materialpanel)
1741	2034	{
1742	2035	cGridBag presetpanel = new cGridBag().setVertical(true);
1743		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	2036	+
	2037	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	2038	+ skin.setToolTipText("Skin");
1744	2039	skin.addMouseListener(new MouseAdapter()
1745	2040	{
1746	2041	public void mouseClicked(MouseEvent e)
..	..	@@ -1750,7 +2045,15 @@
1750	2045
1751	2046	// Skin
1752	2047	colorField.setFloat(material.color);
1753		- 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	+
1754	2057	subsurfaceField.setFloat(material.subsurface);
1755	2058	selfshadowField.setFloat(material.diffuseness);
1756	2059	diffusenessField.setFloat(material.factor);
..	..	@@ -1769,8 +2072,116 @@
1769	2072	});
1770	2073	presetpanel.add(skin);
1771	2074
1772		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
1773		- rough2.addMouseListener(new MouseAdapter()
	2075	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2076	+ lambert.setToolTipText("Diffuse");
	2077	+ lambert.addMouseListener(new MouseAdapter()
	2078	+ {
	2079	+ public void mouseClicked(MouseEvent e)
	2080	+ {
	2081	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2082	+ cMaterial material = object.material;
	2083	+
	2084	+ diffusenessField.setFloat(material.factor);
	2085	+ selfshadowField.setFloat(material.diffuseness);
	2086	+
	2087	+ materialtouched = true;
	2088	+ applySelf();
	2089	+ }
	2090	+ });
	2091	+ presetpanel.add(lambert);
	2092	+
	2093	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2094	+ diffuse2.setToolTipText("Diffuse2");
	2095	+ diffuse2.addMouseListener(new MouseAdapter()
	2096	+ {
	2097	+ public void mouseClicked(MouseEvent e)
	2098	+ {
	2099	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2100	+ cMaterial material = object.material;
	2101	+
	2102	+ diffusenessField.setFloat(material.factor);
	2103	+ selfshadowField.setFloat(material.diffuseness);
	2104	+
	2105	+ materialtouched = true;
	2106	+ applySelf();
	2107	+ }
	2108	+ });
	2109	+ presetpanel.add(diffuse2);
	2110	+
	2111	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2112	+ diffusemoon.setToolTipText("Moon");
	2113	+ diffusemoon.addMouseListener(new MouseAdapter()
	2114	+ {
	2115	+ public void mouseClicked(MouseEvent e)
	2116	+ {
	2117	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2118	+ cMaterial material = object.material;
	2119	+
	2120	+ diffusenessField.setFloat(material.factor);
	2121	+ selfshadowField.setFloat(material.diffuseness);
	2122	+
	2123	+ materialtouched = true;
	2124	+ applySelf();
	2125	+ }
	2126	+ });
	2127	+ presetpanel.add(diffusemoon);
	2128	+
	2129	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2130	+ diffusemoon2.setToolTipText("Moon2");
	2131	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2132	+ {
	2133	+ public void mouseClicked(MouseEvent e)
	2134	+ {
	2135	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2136	+ cMaterial material = object.material;
	2137	+
	2138	+ diffusenessField.setFloat(material.factor);
	2139	+ selfshadowField.setFloat(material.diffuseness);
	2140	+
	2141	+ materialtouched = true;
	2142	+ applySelf();
	2143	+ }
	2144	+ });
	2145	+ presetpanel.add(diffusemoon2);
	2146	+
	2147	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2148	+ diffusemoon3.setToolTipText("Moon3");
	2149	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2150	+ {
	2151	+ public void mouseClicked(MouseEvent e)
	2152	+ {
	2153	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2154	+ cMaterial material = object.material;
	2155	+
	2156	+ diffusenessField.setFloat(material.factor);
	2157	+ selfshadowField.setFloat(material.diffuseness);
	2158	+
	2159	+ materialtouched = true;
	2160	+ applySelf();
	2161	+ }
	2162	+ });
	2163	+ presetpanel.add(diffusemoon3);
	2164	+
	2165	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2166	+ diffusesheen.setToolTipText("Sheen");
	2167	+ diffusesheen.addMouseListener(new MouseAdapter()
	2168	+ {
	2169	+ public void mouseClicked(MouseEvent e)
	2170	+ {
	2171	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2172	+ cMaterial material = object.material;
	2173	+
	2174	+ sheenField.setFloat(material.sheen);
	2175	+
	2176	+ materialtouched = true;
	2177	+ applySelf();
	2178	+ }
	2179	+ });
	2180	+ presetpanel.add(diffusesheen);
	2181	+
	2182	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2183	+ rough.setToolTipText("Rough metal");
	2184	+ rough.addMouseListener(new MouseAdapter()
1774	2185	{
1775	2186	public void mouseClicked(MouseEvent e)
1776	2187	{
..	..	@@ -1784,31 +2195,254 @@
1784	2195	applySelf();
1785	2196	}
1786	2197	});
	2198	+ presetpanel.add(rough);
	2199	+
	2200	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2201	+ rough2.setToolTipText("Medium metal");
	2202	+ rough2.addMouseListener(new MouseAdapter()
	2203	+ {
	2204	+ public void mouseClicked(MouseEvent e)
	2205	+ {
	2206	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2207	+ cMaterial material = object.material;
	2208	+
	2209	+ shininessField.setFloat(material.shininess);
	2210	+ lightareaField.setFloat(material.lightarea);
	2211	+
	2212	+ materialtouched = true;
	2213	+ applySelf();
	2214	+ }
	2215	+ });
1787	2216	presetpanel.add(rough2);
1788	2217
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));
	2218	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2219	+ shini0.setToolTipText("Shiny");
	2220	+ shini0.addMouseListener(new MouseAdapter()
	2221	+ {
	2222	+ public void mouseClicked(MouseEvent e)
	2223	+ {
	2224	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2225	+ cMaterial material = object.material;
	2226	+
	2227	+ shininessField.setFloat(material.shininess);
	2228	+ lightareaField.setFloat(material.lightarea);
	2229	+
	2230	+ materialtouched = true;
	2231	+ applySelf();
	2232	+ }
	2233	+ });
	2234	+ presetpanel.add(shini0);
	2235	+
	2236	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2237	+ shini1.setToolTipText("Shiny2");
	2238	+ shini1.addMouseListener(new MouseAdapter()
	2239	+ {
	2240	+ public void mouseClicked(MouseEvent e)
	2241	+ {
	2242	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2243	+ cMaterial material = object.material;
	2244	+
	2245	+ shininessField.setFloat(material.shininess);
	2246	+ lightareaField.setFloat(material.lightarea);
	2247	+
	2248	+ materialtouched = true;
	2249	+ applySelf();
	2250	+ }
	2251	+ });
	2252	+ presetpanel.add(shini1);
	2253	+
	2254	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2255	+ shini2.setToolTipText("Shiny3");
	2256	+ shini2.addMouseListener(new MouseAdapter()
	2257	+ {
	2258	+ public void mouseClicked(MouseEvent e)
	2259	+ {
	2260	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2261	+ cMaterial material = object.material;
	2262	+
	2263	+ shininessField.setFloat(material.shininess);
	2264	+ lightareaField.setFloat(material.lightarea);
	2265	+
	2266	+ materialtouched = true;
	2267	+ applySelf();
	2268	+ }
	2269	+ });
	2270	+ presetpanel.add(shini2);
	2271	+
	2272	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2273	+ aniso.setToolTipText("AnisoU");
	2274	+ aniso.addMouseListener(new MouseAdapter()
	2275	+ {
	2276	+ public void mouseClicked(MouseEvent e)
	2277	+ {
	2278	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2279	+ cMaterial material = object.material;
	2280	+
	2281	+ anisoField.setFloat(material.aniso);
	2282	+ anisoVField.setFloat(material.anisoV);
	2283	+
	2284	+ materialtouched = true;
	2285	+ applySelf();
	2286	+ }
	2287	+ });
	2288	+ presetpanel.add(aniso);
	2289	+
	2290	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2291	+ aniso2.setToolTipText("AnisoV");
	2292	+ aniso2.addMouseListener(new MouseAdapter()
	2293	+ {
	2294	+ public void mouseClicked(MouseEvent e)
	2295	+ {
	2296	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2297	+ cMaterial material = object.material;
	2298	+
	2299	+ anisoField.setFloat(material.aniso);
	2300	+ anisoVField.setFloat(material.anisoV);
	2301	+
	2302	+ materialtouched = true;
	2303	+ applySelf();
	2304	+ }
	2305	+ });
	2306	+ presetpanel.add(aniso2);
	2307	+
	2308	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2309	+ aniso3.setToolTipText("AnisoUV");
	2310	+ aniso3.addMouseListener(new MouseAdapter()
	2311	+ {
	2312	+ public void mouseClicked(MouseEvent e)
	2313	+ {
	2314	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2315	+ cMaterial material = object.material;
	2316	+
	2317	+ anisoField.setFloat(material.aniso);
	2318	+ anisoVField.setFloat(material.anisoV);
	2319	+
	2320	+ materialtouched = true;
	2321	+ applySelf();
	2322	+ }
	2323	+ });
	2324	+ presetpanel.add(aniso3);
	2325	+
	2326	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2327	+ velvet0.setToolTipText("Velvet");
	2328	+ velvet0.addMouseListener(new MouseAdapter()
	2329	+ {
	2330	+ public void mouseClicked(MouseEvent e)
	2331	+ {
	2332	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2333	+ cMaterial material = object.material;
	2334	+
	2335	+ diffusenessField.setFloat(material.factor);
	2336	+ selfshadowField.setFloat(material.diffuseness);
	2337	+ sheenField.setFloat(material.sheen);
	2338	+ shininessField.setFloat(material.shininess);
	2339	+ velvetField.setFloat(material.velvet);
	2340	+ shiftField.setFloat(material.shift);
	2341	+
	2342	+ materialtouched = true;
	2343	+ applySelf();
	2344	+ }
	2345	+ });
	2346	+ presetpanel.add(velvet0);
	2347	+
	2348	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2349	+ bump0.setToolTipText("Bump texture");
	2350	+ bump0.addMouseListener(new MouseAdapter()
	2351	+ {
	2352	+ public void mouseClicked(MouseEvent e)
	2353	+ {
	2354	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2355	+ cMaterial material = object.material;
	2356	+
	2357	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2358	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2359	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2360	+
	2361	+ materialtouched = true;
	2362	+ applySelf();
	2363	+ }
	2364	+ });
	2365	+ presetpanel.add(bump0);
	2366	+
	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.5);
	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);
	2383	+ halo.setToolTipText("Halo");
	2384	+ halo.addMouseListener(new MouseAdapter()
	2385	+ {
	2386	+ public void mouseClicked(MouseEvent e)
	2387	+ {
	2388	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2389	+ cMaterial material = object.material;
	2390	+
	2391	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2392	+
	2393	+ materialtouched = true;
	2394	+ applySelf();
	2395	+ }
	2396	+ });
	2397	+ presetpanel.add(halo);
	2398	+
	2399	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2400	+ candle.setToolTipText("Candle");
	2401	+ candle.addMouseListener(new MouseAdapter()
	2402	+ {
	2403	+ public void mouseClicked(MouseEvent e)
	2404	+ {
	2405	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2406	+ cMaterial material = object.material;
	2407	+
	2408	+ subsurfaceField.setFloat(material.subsurface);
	2409	+ shadowbiasField.setFloat(material.shadowbias);
	2410	+ ambientField.setFloat(material.ambient);
	2411	+ specularField.setFloat(material.specular);
	2412	+ lightareaField.setFloat(material.lightarea);
	2413	+ shininessField.setFloat(material.shininess);
	2414	+
	2415	+ materialtouched = true;
	2416	+ applySelf();
	2417	+ }
	2418	+ });
	2419	+ presetpanel.add(candle);
	2420	+
	2421	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2422	+ shadowShader.setToolTipText("Shadow");
	2423	+ shadowShader.addMouseListener(new MouseAdapter()
	2424	+ {
	2425	+ public void mouseClicked(MouseEvent e)
	2426	+ {
	2427	+ diffuseField.setFloat(0.001);
	2428	+ ambientField.setFloat(0.001);
	2429	+ cameraField.setFloat(0.001);
	2430	+ specularField.setFloat(0.001);
	2431	+ fakedepthField.setFloat(0.001);
	2432	+ opacityField.setFloat(0.6);
	2433	+
	2434	+ materialtouched = true;
	2435	+ applySelf();
	2436	+ }
	2437	+ });
	2438	+ presetpanel.add(shadowShader);
1805	2439
1806	2440	cGridBag panel = new cGridBag().setVertical(true);
1807	2441
1808	2442	presetpanel.preferredWidth = 1;
1809	2443
1810		- materialpanel.add(panel);
1811	2444	materialpanel.add(presetpanel);
	2445	+ materialpanel.add(panel);
1812	2446
1813	2447	panel.preferredWidth = 8;
1814	2448
..	..	@@ -1819,19 +2453,19 @@
1819	2453
1820	2454	cGridBag editBar = new cGridBag().setVertical(false);
1821	2455
1822		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2456	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
1823	2457	createMaterialButton.setToolTipText("Create material");
1824	2458
1825	2459	/*
1826	2460	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1827	2461	*/
1828	2462
1829		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2463	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
1830	2464	clearMaterialButton.setToolTipText("Clear material");
1831	2465
1832	2466	if (Globals.ADVANCED)
1833	2467	{
1834		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2468	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
1835	2469	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1836	2470	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1837	2471	}
..	..	@@ -1852,9 +2486,20 @@
1852	2486
1853	2487	cGridBag huepanel = new cGridBag();
1854	2488	cGridBag huelabel = new cGridBag();
1855		- skin = GetLabel("icons/hue.png", false);
1856		- skin.fit = true;
1857		- huelabel.add(skin);
	2489	+ cLabel hue = GetLabel("icons/hue.png", false);
	2490	+ hue.fit = true;
	2491	+
	2492	+ hue.addMouseListener(new MouseAdapter()
	2493	+ {
	2494	+ public void mousePressed(MouseEvent e)
	2495	+ {
	2496	+ int x = e.getX();
	2497	+
	2498	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2499	+ }
	2500	+ });
	2501	+
	2502	+ huelabel.add(hue);
1858	2503	huelabel.preferredWidth = 20;
1859	2504	huepanel.add(new cGridBag()); // Label
1860	2505	huepanel.add(huelabel); // Field/slider
..	..	@@ -3130,32 +3775,8 @@
3130	3775
3131	3776	if (multiplyToggle != null)
3132	3777	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		- }
	3778	+
	3779	+ AllocProjectedVertices(object);
3159	3780
3160	3781	SetMaterial(mat, object.projectedVertices);
3161	3782	}
..	..	@@ -3275,6 +3896,17 @@
3275	3896	public void itemStateChanged(ItemEvent event)
3276	3897	{
3277	3898	// System.out.println("Propagate = " + propagate);
	3899	+ if (event.getSource() == pinButton)
	3900	+ {
	3901	+ copy.pinned ^= true;
	3902	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3903	+ {
	3904	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3905	+ copy.CloseUI();
	3906	+ //copy.editWindow.refreshContents();
	3907	+ }
	3908	+ }
	3909	+ else
3278	3910	if (event.getSource() == propagateToggle)
3279	3911	{
3280	3912	propagate ^= true;
..	..	@@ -3454,7 +4086,7 @@
3454	4086	//System.out.println("ObjEditor " + event);
3455	4087	applySelf0(true);
3456	4088	//parent.applySelf();
3457		- objEditor.refreshContents();
	4089	+ // conflicts with requestFocus objEditor.refreshContents();
3458	4090	} else if (source == resetButton)
3459	4091	{
3460	4092	CameraPane.fullreset = true;
..	..	@@ -3634,11 +4266,18 @@
3634	4266
3635	4267	void New()
3636	4268	{
3637		- while (copy.Size() > 1)
	4269	+ while (copy.Size() > 0)
3638	4270	{
3639		- copy.remove(1);
	4271	+ copy.remove(0);
3640	4272	}
3641	4273
	4274	+ copy.selection.clear();
	4275	+
	4276	+ if (copy == Grafreed.grafreed.universe)
	4277	+ {
	4278	+ CreateCameras();
	4279	+ cameraView.SetCamera(GetCamera(copy, 0));
	4280	+ }
3642	4281	ResetModel();
3643	4282	objEditor.refreshContents();
3644	4283	}
..	..	@@ -3747,7 +4386,7 @@
3747	4386	{
3748	4387	//Save(true);
3749	4388	Replace();
3750		- SetUndoStates();
	4389	+ SetVersionStates();
3751	4390	}
3752	4391
3753	4392	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3766,8 +4405,6 @@
3766	4405	return true;
3767	4406	}
3768	4407
3769		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3770		-
3771	4408	void DeleteVersion()
3772	4409	{
3773	4410	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -3775,19 +4412,23 @@
3775	4412	copy.versionlist[i] = copy.versionlist[i+1];
3776	4413	}
3777	4414
3778		- CopyChanged();
	4415	+ if (copy.versionlist[copy.versionindex] == null)
	4416	+ copy.versionindex -= 1;
3779	4417
3780		- SetUndoStates();
	4418	+ if (copy.versionindex != -1)
	4419	+ CopyChanged();
	4420	+
	4421	+ SetVersionStates();
3781	4422	}
3782	4423
3783	4424	public boolean Save(boolean user)
3784	4425	{
3785	4426	System.err.println("Save");
3786		- //Replace();
	4427	+ Replace();
3787	4428
3788		- cRadio tab = GetCurrentTab();
	4429	+ //cRadio tab = GetCurrentTab();
3789	4430
3790		- Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
	4431	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3791	4432
3792	4433	boolean thesame = false;
3793	4434
..	..	@@ -3823,7 +4464,7 @@
3823	4464	// copy.versionlist[i] = null;
3824	4465	// }
3825	4466
3826		- SetUndoStates();
	4467	+ SetVersionStates();
3827	4468
3828	4469	// test save
3829	4470	if (false)
..	..	@@ -3881,14 +4522,14 @@
3881	4522
3882	4523	void CopyChanged()
3883	4524	{
3884		- Object3D obj = copy.versionlist[copy.versionindex];
	4525	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
3885	4526
3886		- SetUndoStates();
	4527	+ SetVersionStates();
3887	4528
3888	4529	boolean temp = CameraPane.SWITCH;
3889	4530	CameraPane.SWITCH = false;
3890	4531
3891		- copy.ExtractBigData(versiontable);
	4532	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3892	4533
3893	4534	copy.clear();
3894	4535
..	..	@@ -3900,7 +4541,7 @@
3900	4541	copy.add(obj.get(i));
3901	4542	}
3902	4543
3903		- copy.RestoreBigData(versiontable);
	4544	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3904	4545
3905	4546	CameraPane.SWITCH = temp;
3906	4547
..	..	@@ -3950,23 +4591,45 @@
3950	4591	return count;
3951	4592	}
3952	4593
3953		- void SetUndoStates()
	4594	+ public cGridBag versionSliderPane;
	4595	+
	4596	+ void SetVersionStates()
3954	4597	{
3955		- cRadio tab = GetCurrentTab();
	4598	+ //if (true)
	4599	+ // return;
	4600	+
	4601	+ //cRadio tab = GetCurrentTab();
3956	4602
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;
	4603	+ if (copy.versionlist == null)
	4604	+ {
	4605	+ saveVersionButton.setEnabled(false);
	4606	+ restoreButton.setEnabled(false);
	4607	+ replaceButton.setEnabled(false);
	4608	+ previousVersionButton.setEnabled(false);
	4609	+ nextVersionButton.setEnabled(false);
	4610	+ deleteVersionButton.setEnabled(false);
	4611	+ versionSliderPane.setVisible(false);
	4612	+ }
	4613	+ else
	4614	+ {
	4615	+ restoreButton.setEnabled(copy.versionindex != -1);
	4616	+ replaceButton.setEnabled(copy.versionindex != -1);
	4617	+
	4618	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4619	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4620	+
	4621	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4622	+ //copy.versionlist[copy.versionindex + 1] != null);
	4623	+
	4624	+ muteSlider = true;
	4625	+ versionSlider.setMinimum(0);
	4626	+ versionSlider.setMaximum(VersionCount() - 1);
	4627	+ versionSlider.setInteger(copy.versionindex);
	4628	+ versionSlider.setEnabled(copy.versionindex != -1);
	4629	+ muteSlider = false;
	4630	+
	4631	+ versionSliderPane.setVisible(true);
	4632	+ }
3970	4633	}
3971	4634
3972	4635	public boolean PreviousVersion()
..	..	@@ -3976,7 +4639,7 @@
3976	4639
3977	4640	System.err.println("Undo");
3978	4641
3979		- cRadio tab = GetCurrentTab();
	4642	+ //cRadio tab = GetCurrentTab();
3980	4643
3981	4644	if (copy.versionindex == 0)
3982	4645	{
..	..	@@ -4008,7 +4671,7 @@
4008	4671	{
4009	4672	System.err.println("Restore");
4010	4673
4011		- cRadio tab = GetCurrentTab();
	4674	+ //cRadio tab = GetCurrentTab();
4012	4675
4013	4676	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4014	4677	{
..	..	@@ -4024,9 +4687,9 @@
4024	4687
4025	4688	public boolean Replace()
4026	4689	{
4027		- System.err.println("Replace");
	4690	+ //System.err.println("Replace");
4028	4691
4029		- cRadio tab = GetCurrentTab();
	4692	+ //cRadio tab = GetCurrentTab();
4030	4693
4031	4694	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4032	4695	{
..	..	@@ -4034,7 +4697,7 @@
4034	4697	return false;
4035	4698	}
4036	4699
4037		- copy.versionlist[copy.versionindex] = CompressCopy();
	4700	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
4038	4701
4039	4702	return true;
4040	4703	}
..	..	@@ -4044,7 +4707,7 @@
4044	4707	// Option?
4045	4708	Replace();
4046	4709
4047		- cRadio tab = GetCurrentTab();
	4710	+ //cRadio tab = GetCurrentTab();
4048	4711
4049	4712	if (copy.versionlist[copy.versionindex + 1] == null)
4050	4713	{
..	..	@@ -4251,6 +4914,12 @@
4251	4914	// else
4252	4915	// applySelf(true);
4253	4916	// }
	4917	+
	4918	+ boolean Equal(double a, double b)
	4919	+ {
	4920	+ return Math.abs(a - b) < 0.001;
	4921	+ }
	4922	+
4254	4923	void applySelf0(boolean name)
4255	4924	{
4256	4925	if (name)
..	..	@@ -4300,29 +4969,52 @@
4300	4969	{
4301	4970	cMaterial mat = copy.material;
4302	4971
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));
	4972	+ if (!Equal(colorField.getFloat(), mat.color))
	4973	+ colorField.SetToolTipValue((mat.color));
	4974	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4975	+ saturationField.SetToolTipValue((mat.modulation));
	4976	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4977	+ metalnessField.SetToolTipValue((mat.metalness));
	4978	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4979	+ diffuseField.SetToolTipValue((mat.diffuse));
	4980	+ if (!Equal(specularField.getFloat(), mat.specular))
	4981	+ specularField.SetToolTipValue((mat.specular));
	4982	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4983	+ shininessField.SetToolTipValue((mat.shininess));
	4984	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4985	+ shiftField.SetToolTipValue((mat.shift));
	4986	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4987	+ ambientField.SetToolTipValue((mat.ambient));
	4988	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4989	+ lightareaField.SetToolTipValue((mat.lightarea));
	4990	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4991	+ diffusenessField.SetToolTipValue((mat.factor));
	4992	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4993	+ velvetField.SetToolTipValue((mat.velvet));
	4994	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4995	+ sheenField.SetToolTipValue((mat.sheen));
	4996	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4997	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4998	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4999	+ backlitField.SetToolTipValue((mat.bump));
	5000	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5001	+ anisoField.SetToolTipValue((mat.aniso));
	5002	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5003	+ anisoVField.SetToolTipValue((mat.anisoV));
	5004	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5005	+ cameraField.SetToolTipValue((mat.cameralight));
	5006	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5007	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5008	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5009	+ shadowField.SetToolTipValue((mat.shadow));
	5010	+ if (!Equal(textureField.getFloat(), mat.texture))
	5011	+ textureField.SetToolTipValue((mat.texture));
	5012	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5013	+ opacityField.SetToolTipValue((mat.opacity));
	5014	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5015	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5016	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5017	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4326	5018	}
4327	5019
4328	5020	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4357,15 +5049,17 @@
4357	5049
4358	5050	public void stateChanged(ChangeEvent e)
4359	5051	{
4360		- // assert(false);
	5052	+ // assert(false);
4361	5053	if (e.getSource() == versionSlider)
4362	5054	{
4363	5055	if (muteSlider)
4364	5056	return;
4365	5057
	5058	+ Replace();
	5059	+
4366	5060	int version = versionSlider.getInteger();
4367	5061
4368		- if (copy.versionlist[version] != null)
	5062	+ if (version != -1 && copy.versionlist[version] != null)
4369	5063	{
4370	5064	copy.versionindex = version;
4371	5065	CopyChanged();
..	..	@@ -4409,7 +5103,7 @@
4409	5103	//System.out.println("stateChanged = " + this);
4410	5104	materialtouched = true;
4411	5105
4412		- if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5106	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
4413	5107	{
4414	5108	saturationField.setFloat(1);
4415	5109	}
..	..	@@ -4724,7 +5418,9 @@
4724	5418	}
4725	5419
4726	5420	if (previousVersionButton != null && copy.versionlist != null)
4727		- SetUndoStates();
	5421	+ SetVersionStates();
	5422	+
	5423	+ cameraView.requestFocusInWindow();
4728	5424	}
4729	5425
4730	5426	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4756,7 +5452,7 @@
4756	5452	// group = (Composite) group.get(0);
4757	5453	// }
4758	5454
4759		- System.out.println("makeSomething of " + thing);
	5455	+ //System.out.println("makeSomething of " + thing);
4760	5456
4761	5457	/*
4762	5458	if (deselect && jList != null)
..	..	@@ -5110,11 +5806,15 @@
5110	5806
5111	5807	copy.versionlist = readobj.versionlist;
5112	5808	copy.versionindex = readobj.versionindex;
	5809	+ copy.versiontable = readobj.versiontable;
5113	5810
5114	5811	if (copy.versionlist == null)
5115	5812	{
	5813	+ // Backward compatibility
5116	5814	copy.versionlist = new Object3D[100];
5117	5815	copy.versionindex = -1;
	5816	+
	5817	+ //Save(true);
5118	5818	}
5119	5819
5120	5820	//? SetUndoStates();
..	..	@@ -5206,6 +5906,8 @@
5206	5906
5207	5907	void save()
5208	5908	{
	5909	+ Replace();
	5910	+
5209	5911	if (lastname == null)
5210	5912	{
5211	5913	return;
..	..	@@ -5448,6 +6150,7 @@
5448	6150	ButtonGroup buttonGroup;
5449	6151
5450	6152	cGridBag toolboxPanel;
	6153	+ cGridBag skyboxPanel;
5451	6154	cGridBag materialPanel;
5452	6155	cGridBag ctrlPanel;
5453	6156
..	..	@@ -5459,6 +6162,7 @@
5459	6162	boolean materialFlushed;
5460	6163	Object3D latestObject;
5461	6164
	6165	+ cGridBag transformPanel;
5462	6166	cGridBag XYZPanel;
5463	6167
5464	6168	JSplitPane gridPanel;
..	..	@@ -5552,6 +6256,7 @@
5552	6256	cNumberSlider anisoField;
5553	6257	JLabel anisoVLabel;
5554	6258	cNumberSlider anisoVField;
	6259	+
5555	6260	JLabel cameraLabel;
5556	6261	cNumberSlider cameraField;
5557	6262	JLabel selfshadowLabel;
..	..	@@ -5566,6 +6271,7 @@
5566	6271	cNumberSlider fakedepthField;
5567	6272	JLabel shadowbiasLabel;
5568	6273	cNumberSlider shadowbiasField;
	6274	+
5569	6275	JLabel bumpLabel;
5570	6276	cNumberSlider bumpField;
5571	6277	JLabel noiseLabel;