~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.versions == null)
300		- {
301		- copy.versions = new byte[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	}
..	..	@@ -315,10 +383,12 @@
315	383	client = inClient;
316	384	copy = client;
317	385
318		- if (copy.versions == null)
	386	+ if (copy.versionlist == null)
319	387	{
320		- copy.versions = new byte[100][];
	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.versions == 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);
..	..	@@ -467,7 +578,9 @@
467	578	toolboxPanel = new cGridBag().setVertical(true);
468	579	//toolboxPanel.setName("Toolbox");
469	580
470		- materialPanel = new cGridBag().setVertical(true);
	581	+ skyboxPanel = new cGridBag().setVertical(true);
	582	+
	583	+ materialPanel = new cGridBag().setVertical(false);
471	584	//materialPanel.setName("Material");
472	585
473	586	/JTextPane/
..	..	@@ -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,31 +957,53 @@
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();
	967	+
	968	+ cameraView.requestFocusInWindow();
851	969	}
852	970
853		- private byte[] CompressCopy()
	971	+ void CollapseToolbar()
	972	+ {
	973	+ framePanel.setDividerLocation(0);
	974	+ //frame.validate();
	975	+
	976	+ cameraView.requestFocusInWindow();
	977	+ }
	978	+
	979	+ private Object3D Duplicate(Object3D object)
854	980	{
855	981	boolean temp = CameraPane.SWITCH;
856	982	CameraPane.SWITCH = false;
857	983
858		- 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);
859	988	// if (copy == client)
860	989
861		- byte[] versions[] = copy.versions;
862		- copy.versions = 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;
863	994
864		- byte[] compress = Compress(copy);
	995	+ Object3D parent = object.parent;
	996	+ object.parent = null;
865	997
866		- copy.versions = versions;
	998	+ //byte[] compress = Compress(copy);
	999	+ Object3D compress = (Object3D)Grafreed.clone(object);
867	1000
868		- copy.RestoreBigData(versiontable);
	1001	+ object.parent = parent;
	1002	+
	1003	+ object.versionlist = versions;
	1004	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	1005	+
	1006	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
869	1007
870	1008	CameraPane.SWITCH = temp;
871	1009
..	..	@@ -993,6 +1131,7 @@
993	1131	{
994	1132	SetupMaterial(materialPanel);
995	1133	}
	1134	+
996	1135	//SetupName();
997	1136	//SetupViews();
998	1137	}
..	..	@@ -1201,6 +1340,18 @@
1201	1340
1202	1341	namePanel = new cGridBag();
1203	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	+
1204	1355	nameField = AddText(namePanel, copy.GetName());
1205	1356	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1206	1357	oe.ctrlPanel.add(namePanel);
..	..	@@ -1214,14 +1365,14 @@
1214	1365
1215	1366	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1216	1367	liveCB.setToolTipText("Animate object");
	1368	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1369	+ markCB.setToolTipText("Set target transform");
1217	1370	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1218	1371	selectableCB.setToolTipText("Make object selectable");
1219	1372	// Return();
1220	1373
1221	1374	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1222	1375	hideCB.setToolTipText("Hide object");
1223		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1224		- markCB.setToolTipText("As animation target transform");
1225	1376
1226	1377	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1227	1378
..	..	@@ -1423,22 +1574,9 @@
1423	1574
1424	1575	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1425	1576	{
1426		- System.out.println("CREATE CAMERAS");
1427		- cams = new cTemplate();
1428		- cams.name = "Cameras";
1429		- copy.insertElementAt(cams, 0);
1430		- //cams.parent = copy;
1431		-
1432		- cam = new Camera(); // LA.newVector(3, 2, 1));
1433		- cams.addChild(cam);
1434		- cam = new Camera(1);
1435		- cams.addChild(cam);
1436		- cam = new Camera(2);
1437		- cams.addChild(cam);
1438		- cam = new Camera(3);
1439		- cams.addChild(cam);
1440		- cam = new Camera(4); // Light
1441		- cams.addChild(cam);
	1577	+ if (Globals.DEBUG)
	1578	+ System.out.println("CREATE CAMERAS");
	1579	+ cams = CreateCameras();
1442	1580	} else
1443	1581	{
1444	1582	cams = (cGroup) copy.get(0);
..	..	@@ -1504,6 +1642,45 @@
1504	1642	//frontView.object = copy;
1505	1643	//sideView.object = copy;
1506	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	+
1507	1684	XYZPanel = new cGridBag().setVertical(true);
1508	1685	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1509	1686
..	..	@@ -1513,6 +1690,9 @@
1513	1690	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1514	1691	//XYZPanel.setName("XYZ");
1515	1692
	1693	+ transformPanel.add(resetTransformPanel);
	1694	+ transformPanel.add(XYZPanel);
	1695	+
1516	1696	/*
1517	1697	gridPanel = new JPanel(); //new BorderLayout());
1518	1698	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1520,12 +1700,12 @@
1520	1700	gridPanel.add(cameraView);
1521	1701	gridPanel.add(XYZPanel);
1522	1702	*/
1523		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1524		- gridPanel.setContinuousLayout(true);
1525		- gridPanel.setOneTouchExpandable(true);
1526		- gridPanel.setDividerLocation(1.0);
1527		- gridPanel.setDividerSize(9);
1528		- 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);
1529	1709
1530	1710	// aConstraints.weighty = 0;
1531	1711	//System.out.println("THIS = " + this);
..	..	@@ -1548,31 +1728,34 @@
1548	1728
1549	1729	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1550	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	+
1551	1739	objectPanel.add(materialPanel);
1552		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1553		- objectPanel.setToolTipTextAt(0, "Material panel");
	1740	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1741	+ objectPanel.setToolTipTextAt(2, "Material");
1554	1742
1555	1743	// JPanel north = new JPanel(new BorderLayout());
1556	1744	// north.setName("Edit");
1557	1745	// north.add(ctrlPanel, BorderLayout.NORTH);
1558	1746	// objectPanel.add(north);
1559	1747	objectPanel.add(editPanel);
1560		- objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1561		- objectPanel.setToolTipTextAt(1, "Edit panel");
	1748	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
	1749	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1562	1750
1563		- //if (Globals.ADVANCED)
1564		- objectPanel.add(infoPanel);
1565		- objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1566		- objectPanel.setToolTipTextAt(2, "Info panel");
	1751	+ objectPanel.add(transformPanel);
	1752	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1753	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1567	1754
1568		- objectPanel.add(XYZPanel);
1569		- objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1570		- objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
1571		-
1572		- objectPanel.add(toolboxPanel);
1573		- objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1574		- objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
1575		-
	1755	+ patchMaterial = true;
	1756	+ cameraView.patchMaterial = this;
	1757	+ objectPanel.setSelectedIndex(2);
	1758	+
1576	1759	/*
1577	1760	aConstraints.gridx = 0;
1578	1761	aConstraints.gridwidth = 1;
..	..	@@ -1592,7 +1775,7 @@
1592	1775	scrollpane.addMouseWheelListener(this); // Default not fast enough
1593	1776
1594	1777	/JTabbedPane/ scenePanel = new cGridBag();
1595		- scenePanel.preferredWidth = 5;
	1778	+ scenePanel.preferredWidth = 6;
1596	1779
1597	1780	JTabbedPane tabbedPane = new JTabbedPane();
1598	1781	tabbedPane.add(scrollpane);
..	..	@@ -1603,11 +1786,108 @@
1603	1786
1604	1787	AddOptions(optionsPanel); //, aConstraints);
1605	1788
1606		- tabbedPane.add(optionsPanel);
1607		-
1608	1789	tabbedPane.add(FSPane = new cFileSystemPane(this));
1609	1790
	1791	+ tabbedPane.add(optionsPanel);
	1792	+
1610	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	+ }
1611	1891
1612	1892	/*
1613	1893	cTree jTree = new cTree(null);
..	..	@@ -1629,13 +1909,13 @@
1629	1909	jtp.add(tree);
1630	1910	*/
1631	1911
1632		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1633		- bigPanel.setContinuousLayout(true);
1634		- bigPanel.setOneTouchExpandable(true);
1635		- bigPanel.setDividerLocation(0.8);
1636		- bigPanel.setDividerSize(15);
1637		- bigPanel.setResizeWeight(0.15);
1638		- 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");
1639	1919
1640	1920	//bigPanel.setLayout(new BorderLayout());
1641	1921	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1679,6 +1959,23 @@
1679	1959	// aConstraints.gridheight = 1;
1680	1960
1681	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	+
1682	1979	framePanel.setContinuousLayout(false);
1683	1980	framePanel.setOneTouchExpandable(false);
1684	1981	//.setDividerLocation(0.8);
..	..	@@ -1688,7 +1985,7 @@
1688	1985
1689	1986	frame.getContentPane().setLayout(new BorderLayout());
1690	1987	/**/
1691		- JTabbedPane worldPane = new JTabbedPane();
	1988	+ //JTabbedPane worldPane = new JTabbedPane();
1692	1989	//worldPane.add(bigPanel);
1693	1990	//worldPane.add(worldPanel);
1694	1991	/**/
..	..	@@ -1702,7 +1999,7 @@
1702	1999
1703	2000	cameraView.requestFocusInWindow();
1704	2001
1705		- gridPanel.setDividerLocation(1.0);
	2002	+// gridPanel.setDividerLocation(1.0);
1706	2003
1707	2004	frame.validate();
1708	2005
..	..	@@ -1733,28 +2030,442 @@
1733	2030	ctrlPanel.removeAll();
1734	2031	}
1735	2032
1736		- void SetupMaterial(cGridBag panel)
	2033	+ void SetupMaterial(cGridBag materialpanel)
1737	2034	{
1738		- /*
	2035	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	2036	+
	2037	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	2038	+ skin.setToolTipText("Skin");
	2039	+ skin.addMouseListener(new MouseAdapter()
	2040	+ {
	2041	+ public void mouseClicked(MouseEvent e)
	2042	+ {
	2043	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	2044	+ cMaterial material = object.material;
	2045	+
	2046	+ // Skin
	2047	+ colorField.setFloat(material.color);
	2048	+ float saturation = material.modulation;
	2049	+
	2050	+ if (!cameraView.Skinshader)
	2051	+ {
	2052	+ saturation /= 1.5;
	2053	+ }
	2054	+
	2055	+ saturationField.setFloat(saturation);
	2056	+
	2057	+ subsurfaceField.setFloat(material.subsurface);
	2058	+ selfshadowField.setFloat(material.diffuseness);
	2059	+ diffusenessField.setFloat(material.factor);
	2060	+ shininessField.setFloat(material.shininess);
	2061	+ shadowbiasField.setFloat(material.shadowbias);
	2062	+ diffuseField.setFloat(material.diffuse);
	2063	+ specularField.setFloat(material.specular);
	2064	+
	2065	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2066	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2067	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2068	+
	2069	+ materialtouched = true;
	2070	+ applySelf();
	2071	+ }
	2072	+ });
	2073	+ presetpanel.add(skin);
	2074	+
	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()
	2185	+ {
	2186	+ public void mouseClicked(MouseEvent e)
	2187	+ {
	2188	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2189	+ cMaterial material = object.material;
	2190	+
	2191	+ shininessField.setFloat(material.shininess);
	2192	+ velvetField.setFloat(material.velvet);
	2193	+
	2194	+ materialtouched = true;
	2195	+ applySelf();
	2196	+ }
	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	+ });
	2216	+ presetpanel.add(rough2);
	2217	+
	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);
	2439	+
	2440	+ cGridBag panel = new cGridBag().setVertical(true);
	2441	+
	2442	+ presetpanel.preferredWidth = 1;
	2443	+
	2444	+ materialpanel.add(presetpanel);
	2445	+ materialpanel.add(panel);
	2446	+
	2447	+ panel.preferredWidth = 8;
	2448	+
	2449	+ /*
1739	2450	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1740	2451	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1741		- */
	2452	+ */
1742	2453
1743	2454	cGridBag editBar = new cGridBag().setVertical(false);
1744	2455
1745		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2456	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
1746	2457	createMaterialButton.setToolTipText("Create material");
1747	2458
1748	2459	/*
1749	2460	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1750	2461	*/
1751	2462
1752		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2463	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
1753	2464	clearMaterialButton.setToolTipText("Clear material");
1754	2465
1755	2466	if (Globals.ADVANCED)
1756	2467	{
1757		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2468	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
1758	2469	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1759	2470	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1760	2471	}
..	..	@@ -1775,7 +2486,20 @@
1775	2486
1776	2487	cGridBag huepanel = new cGridBag();
1777	2488	cGridBag huelabel = new cGridBag();
1778		- huelabel.add(GetLabel("icons/hue.png", false));
	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);
1779	2503	huelabel.preferredWidth = 20;
1780	2504	huepanel.add(new cGridBag()); // Label
1781	2505	huepanel.add(huelabel); // Field/slider
..	..	@@ -1796,7 +2520,7 @@
1796	2520	cGridBag modulation = new cGridBag();
1797	2521	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1798	2522	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1799		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2523	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1800	2524	colorSection.add(modulation);
1801	2525
1802	2526	cGridBag opacity = new cGridBag();
..	..	@@ -1958,6 +2682,12 @@
1958	2682	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1959	2683	colorSection.add(backlit);
1960	2684
	2685	+ cGridBag parallax = new cGridBag();
	2686	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2687	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2688	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.5, -0.25)); // , aConstraints);
	2689	+ colorSection.add(parallax);
	2690	+
1961	2691	//panel.add(new JSeparator());
1962	2692
1963	2693	//panel.add(globalSection);
..	..	@@ -2989,7 +3719,7 @@
2989	3719
2990	3720	freezematerial = true;
2991	3721	colorField.setFloat(mat.color);
2992		- modulationField.setFloat(mat.modulation);
	3722	+ saturationField.setFloat(mat.modulation);
2993	3723	metalnessField.setFloat(mat.metalness);
2994	3724	diffuseField.setFloat(mat.diffuse);
2995	3725	specularField.setFloat(mat.specular);
..	..	@@ -3009,6 +3739,7 @@
3009	3739	shadowField.setFloat(mat.shadow);
3010	3740	textureField.setFloat(mat.texture);
3011	3741	opacityField.setFloat(mat.opacity);
	3742	+ parallaxField.setFloat(mat.parallax + 0.25f);
3012	3743	fakedepthField.setFloat(mat.fakedepth);
3013	3744	shadowbiasField.setFloat(mat.shadowbias);
3014	3745	bumpField.setInteger(1); // dec 2013
..	..	@@ -3051,32 +3782,8 @@
3051	3782
3052	3783	if (multiplyToggle != null)
3053	3784	multiplyToggle.setSelected(mat.multiply);
3054		-
3055		- assert (object.projectedVertices != null);
3056		-
3057		- if (object.projectedVertices.length <= 2)
3058		- {
3059		- // Side effect...
3060		- Object3D.cVector2[] keep = object.projectedVertices;
3061		- object.projectedVertices = new Object3D.cVector2[3];
3062		- for (int i = 0; i < 3; i++)
3063		- {
3064		- if (i < keep.length)
3065		- {
3066		- object.projectedVertices[i] = keep[i];
3067		- } else
3068		- {
3069		- object.projectedVertices[i] = new Object3D.cVector2();
3070		- }
3071		- /*
3072		- if(keep.length == 0)
3073		- object.projectedVertices[0] = new Object3D.cVector2();
3074		- else
3075		- object.projectedVertices[0] = keep[0];
3076		- object.projectedVertices[1] = new Object3D.cVector2();
3077		- */
3078		- }
3079		- }
	3785	+
	3786	+ AllocProjectedVertices(object);
3080	3787
3081	3788	SetMaterial(mat, object.projectedVertices);
3082	3789	}
..	..	@@ -3196,6 +3903,17 @@
3196	3903	public void itemStateChanged(ItemEvent event)
3197	3904	{
3198	3905	// System.out.println("Propagate = " + propagate);
	3906	+ if (event.getSource() == pinButton)
	3907	+ {
	3908	+ copy.pinned ^= true;
	3909	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3910	+ {
	3911	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3912	+ copy.CloseUI();
	3913	+ //copy.editWindow.refreshContents();
	3914	+ }
	3915	+ }
	3916	+ else
3199	3917	if (event.getSource() == propagateToggle)
3200	3918	{
3201	3919	propagate ^= true;
..	..	@@ -3300,6 +4018,7 @@
3300	4018	} else if (event.getSource() == liveCB)
3301	4019	{
3302	4020	copy.live ^= true;
	4021	+ objEditor.refreshContents(true); // To show item colors
3303	4022	return;
3304	4023	} else if (event.getSource() == selectableCB)
3305	4024	{
..	..	@@ -3309,7 +4028,7 @@
3309	4028	{
3310	4029	copy.hide ^= true;
3311	4030	copy.Touch(); // display list issue
3312		- objEditor.refreshContents();
	4031	+ objEditor.refreshContents(true); // To show item colors
3313	4032	return;
3314	4033	} else if (event.getSource() == link2masterCB)
3315	4034	{
..	..	@@ -3374,7 +4093,7 @@
3374	4093	//System.out.println("ObjEditor " + event);
3375	4094	applySelf0(true);
3376	4095	//parent.applySelf();
3377		- objEditor.refreshContents();
	4096	+ // conflicts with requestFocus objEditor.refreshContents();
3378	4097	} else if (source == resetButton)
3379	4098	{
3380	4099	CameraPane.fullreset = true;
..	..	@@ -3554,17 +4273,25 @@
3554	4273
3555	4274	void New()
3556	4275	{
3557		- while (copy.Size() > 1)
	4276	+ while (copy.Size() > 0)
3558	4277	{
3559		- copy.remove(1);
	4278	+ copy.remove(0);
3560	4279	}
3561	4280
	4281	+ copy.selection.clear();
	4282	+
	4283	+ if (copy == Grafreed.grafreed.universe)
	4284	+ {
	4285	+ CreateCameras();
	4286	+ cameraView.SetCamera(GetCamera(copy, 0));
	4287	+ }
3562	4288	ResetModel();
3563	4289	objEditor.refreshContents();
3564	4290	}
3565	4291
3566	4292	static public byte[] Compress(Object3D o)
3567	4293	{
	4294	+ // Slower to actually compress.
3568	4295	try
3569	4296	{
3570	4297	ByteArrayOutputStream baos = new ByteArrayOutputStream();
..	..	@@ -3666,6 +4393,7 @@
3666	4393	{
3667	4394	//Save(true);
3668	4395	Replace();
	4396	+ SetVersionStates();
3669	4397	}
3670	4398
3671	4399	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3684,31 +4412,50 @@
3684	4412	return true;
3685	4413	}
3686	4414
3687		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4415	+ void DeleteVersion()
	4416	+ {
	4417	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4418	+ {
	4419	+ copy.versionlist[i] = copy.versionlist[i+1];
	4420	+ }
	4421	+
	4422	+ if (copy.versionlist[copy.versionindex] == null)
	4423	+ copy.versionindex -= 1;
	4424	+
	4425	+ if (copy.versionindex != -1)
	4426	+ CopyChanged();
	4427	+
	4428	+ SetVersionStates();
	4429	+ }
3688	4430
3689	4431	public boolean Save(boolean user)
3690	4432	{
3691	4433	System.err.println("Save");
	4434	+ Replace();
3692	4435
3693		- cRadio tab = GetCurrentTab();
	4436	+ //cRadio tab = GetCurrentTab();
3694	4437
3695		- byte[] compress = CompressCopy(); // Saved version. No need for "Replace".
	4438	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3696	4439
3697	4440	boolean thesame = false;
3698	4441
3699		- // Quick heuristic using length. Works only when stream is compressed.
3700		- if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3701		- {
3702		- thesame = true;
3703		- }
	4442	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4443	+// {
	4444	+// thesame = true;
	4445	+// }
3704	4446
3705	4447	//EditorFrame.m_MainFrame.requestFocusInWindow();
3706	4448	if (!thesame)
3707	4449	{
	4450	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4451	+ {
	4452	+ copy.versionlist[i] = copy.versionlist[i-1];
	4453	+ }
	4454	+
3708	4455	//tab.user[tab.versionindex] = user;
3709	4456	//boolean increment = true; // tab.graphs[tab.versionindex] == null;
3710	4457
3711		- copy.versions[++copy.versionindex] = compress;
	4458	+ copy.versionlist[++copy.versionindex] = compress;
3712	4459
3713	4460	// if (increment)
3714	4461	// tab.versionindex++;
..	..	@@ -3718,13 +4465,13 @@
3718	4465
3719	4466	//assert(hashtable.isEmpty());
3720	4467
3721		- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3722		- {
3723		- //tab.user[i] = false;
3724		- copy.versions[i] = null;
3725		- }
	4468	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4469	+// {
	4470	+// //tab.user[i] = false;
	4471	+// copy.versionlist[i] = null;
	4472	+// }
3726	4473
3727		- SetUndoStates();
	4474	+ SetVersionStates();
3728	4475
3729	4476	// test save
3730	4477	if (false)
..	..	@@ -3747,15 +4494,49 @@
3747	4494
3748	4495	return !thesame;
3749	4496	}
3750		-
3751		- void CopyChanged(Object3D obj)
	4497	+
	4498	+ boolean flashIt = true;
	4499	+
	4500	+ void RefreshSelection()
3752	4501	{
3753		- SetUndoStates();
	4502	+ Object3D selection = new Object3D();
	4503	+
	4504	+ for (int i = 0; i < copy.selection.size(); i++)
	4505	+ {
	4506	+ Object3D elem = copy.selection.elementAt(i);
	4507	+
	4508	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4509	+
	4510	+ if (obj == null)
	4511	+ {
	4512	+ copy.selection.remove(i--);
	4513	+ }
	4514	+ else
	4515	+ {
	4516	+ selection.add(obj);
	4517	+ copy.selection.setElementAt(obj, i);
	4518	+ }
	4519	+ }
	4520	+
	4521	+ flashIt = false;
	4522	+ GetTree().clearSelection();
	4523	+ for (int i = 0; i < selection.size(); i++)
	4524	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4525	+ flashIt = true;
	4526	+
	4527	+ //refreshContents(false);
	4528	+ }
	4529	+
	4530	+ void CopyChanged()
	4531	+ {
	4532	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4533	+
	4534	+ SetVersionStates();
3754	4535
3755	4536	boolean temp = CameraPane.SWITCH;
3756	4537	CameraPane.SWITCH = false;
3757	4538
3758		- copy.ExtractBigData(versiontable);
	4539	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3759	4540
3760	4541	copy.clear();
3761	4542
..	..	@@ -3767,10 +4548,11 @@
3767	4548	copy.add(obj.get(i));
3768	4549	}
3769	4550
3770		- copy.RestoreBigData(versiontable);
	4551	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3771	4552
3772	4553	CameraPane.SWITCH = temp;
3773	4554
	4555	+ RefreshSelection();
3774	4556	//assert(hashtable.isEmpty());
3775	4557
3776	4558	copy.Touch();
..	..	@@ -3791,13 +4573,15 @@
3791	4573	}
3792	4574	}
3793	4575
3794		- refreshContents();
	4576	+ refreshContents(true);
3795	4577	}
3796	4578
3797		- cButton undoButton;
	4579	+ cButton previousVersionButton;
3798	4580	cButton restoreButton;
3799	4581	cButton replaceButton;
3800		- cButton redoButton;
	4582	+ cButton nextVersionButton;
	4583	+ cButton saveVersionButton;
	4584	+ cButton deleteVersionButton;
3801	4585
3802	4586	boolean muteSlider;
3803	4587
..	..	@@ -3805,39 +4589,64 @@
3805	4589	{
3806	4590	int count = 0;
3807	4591
3808		- for (int i = copy.versions.length; --i >= 0;)
	4592	+ for (int i = copy.versionlist.length; --i >= 0;)
3809	4593	{
3810		- if (copy.versions[i] != null)
	4594	+ if (copy.versionlist[i] != null)
3811	4595	count++;
3812	4596	}
3813	4597
3814	4598	return count;
3815	4599	}
3816	4600
3817		- void SetUndoStates()
	4601	+ public cGridBag versionSliderPane;
	4602	+
	4603	+ void SetVersionStates()
3818	4604	{
3819		- cRadio tab = GetCurrentTab();
	4605	+ //if (true)
	4606	+ // return;
	4607	+
	4608	+ //cRadio tab = GetCurrentTab();
3820	4609
3821		- restoreButton.setEnabled(copy.versionindex != -1);
3822		- replaceButton.setEnabled(copy.versionindex != -1);
3823		-
3824		- undoButton.setEnabled(copy.versionindex > 0);
3825		- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
3826		-
3827		- muteSlider = true;
3828		- versionSlider.setMaximum(VersionCount() - 1);
3829		- versionSlider.setInteger(copy.versionindex);
3830		- muteSlider = false;
	4610	+ if (copy.versionlist == null)
	4611	+ {
	4612	+ saveVersionButton.setEnabled(false);
	4613	+ restoreButton.setEnabled(false);
	4614	+ replaceButton.setEnabled(false);
	4615	+ previousVersionButton.setEnabled(false);
	4616	+ nextVersionButton.setEnabled(false);
	4617	+ deleteVersionButton.setEnabled(false);
	4618	+ versionSliderPane.setVisible(false);
	4619	+ }
	4620	+ else
	4621	+ {
	4622	+ restoreButton.setEnabled(copy.versionindex != -1);
	4623	+ replaceButton.setEnabled(copy.versionindex != -1);
	4624	+
	4625	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4626	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4627	+
	4628	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4629	+ //copy.versionlist[copy.versionindex + 1] != null);
	4630	+
	4631	+ muteSlider = true;
	4632	+ versionSlider.setMinimum(0);
	4633	+ versionSlider.setMaximum(VersionCount() - 1);
	4634	+ versionSlider.setInteger(copy.versionindex);
	4635	+ versionSlider.setEnabled(copy.versionindex != -1);
	4636	+ muteSlider = false;
	4637	+
	4638	+ versionSliderPane.setVisible(true);
	4639	+ }
3831	4640	}
3832	4641
3833		- public boolean Undo()
	4642	+ public boolean PreviousVersion()
3834	4643	{
3835	4644	// Option?
3836	4645	Replace();
3837	4646
3838	4647	System.err.println("Undo");
3839	4648
3840		- cRadio tab = GetCurrentTab();
	4649	+ //cRadio tab = GetCurrentTab();
3841	4650
3842	4651	if (copy.versionindex == 0)
3843	4652	{
..	..	@@ -3860,7 +4669,7 @@
3860	4669
3861	4670	copy.versionindex -= 1;
3862	4671
3863		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4672	+ CopyChanged();
3864	4673
3865	4674	return true;
3866	4675	}
..	..	@@ -3869,44 +4678,45 @@
3869	4678	{
3870	4679	System.err.println("Restore");
3871	4680
3872		- cRadio tab = GetCurrentTab();
	4681	+ //cRadio tab = GetCurrentTab();
3873	4682
3874		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4683	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3875	4684	{
3876	4685	java.awt.Toolkit.getDefaultToolkit().beep();
3877	4686	return false;
3878	4687	}
3879	4688
3880		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4689	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4690	+ CopyChanged();
3881	4691
3882	4692	return true;
3883	4693	}
3884	4694
3885	4695	public boolean Replace()
3886	4696	{
3887		- System.err.println("Replace");
	4697	+ //System.err.println("Replace");
3888	4698
3889		- cRadio tab = GetCurrentTab();
	4699	+ //cRadio tab = GetCurrentTab();
3890	4700
3891		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4701	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3892	4702	{
3893	4703	// No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3894	4704	return false;
3895	4705	}
3896	4706
3897		- copy.versions[copy.versionindex] = CompressCopy();
	4707	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
3898	4708
3899	4709	return true;
3900	4710	}
3901	4711
3902		- public void Redo()
	4712	+ public void NextVersion()
3903	4713	{
3904	4714	// Option?
3905	4715	Replace();
3906	4716
3907		- cRadio tab = GetCurrentTab();
	4717	+ //cRadio tab = GetCurrentTab();
3908	4718
3909		- if (copy.versions[copy.versionindex + 1] == null)
	4719	+ if (copy.versionlist[copy.versionindex + 1] == null)
3910	4720	{
3911	4721	java.awt.Toolkit.getDefaultToolkit().beep();
3912	4722	return;
..	..	@@ -3914,7 +4724,7 @@
3914	4724
3915	4725	copy.versionindex += 1;
3916	4726
3917		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4727	+ CopyChanged();
3918	4728
3919	4729	//if (!tab.user[tab.versionindex])
3920	4730	// tab.graphs[tab.versionindex] = null;
..	..	@@ -4111,6 +4921,12 @@
4111	4921	// else
4112	4922	// applySelf(true);
4113	4923	// }
	4924	+
	4925	+ boolean Equal(double a, double b)
	4926	+ {
	4927	+ return Math.abs(a - b) < 0.001;
	4928	+ }
	4929	+
4114	4930	void applySelf0(boolean name)
4115	4931	{
4116	4932	if (name)
..	..	@@ -4128,7 +4944,7 @@
4128	4944	//copy.material = new cMaterial(copy.GetMaterial());
4129	4945
4130	4946	current.color = (float) colorField.getFloat();
4131		- current.modulation = (float) modulationField.getFloat();
	4947	+ current.modulation = (float) saturationField.getFloat();
4132	4948	current.metalness = (float) metalnessField.getFloat();
4133	4949	current.diffuse = (float) diffuseField.getFloat();
4134	4950	current.specular = (float) specularField.getFloat();
..	..	@@ -4148,6 +4964,7 @@
4148	4964	current.shadow = (float) shadowField.getFloat();
4149	4965	current.texture = (float) textureField.getFloat();
4150	4966	current.opacity = (float) opacityField.getFloat();
	4967	+ current.parallax = (float) parallaxField.getFloat() - 0.25f;
4151	4968	current.fakedepth = (float) fakedepthField.getFloat();
4152	4969	current.shadowbias = (float) shadowbiasField.getFloat();
4153	4970
..	..	@@ -4160,29 +4977,54 @@
4160	4977	{
4161	4978	cMaterial mat = copy.material;
4162	4979
4163		- colorField.SetToolTipValue((mat.color));
4164		- modulationField.SetToolTipValue((mat.modulation));
4165		- metalnessField.SetToolTipValue((mat.metalness));
4166		- diffuseField.SetToolTipValue((mat.diffuse));
4167		- specularField.SetToolTipValue((mat.specular));
4168		- shininessField.SetToolTipValue((mat.shininess));
4169		- shiftField.SetToolTipValue((mat.shift));
4170		- ambientField.SetToolTipValue((mat.ambient));
4171		- lightareaField.SetToolTipValue((mat.lightarea));
4172		- diffusenessField.SetToolTipValue((mat.factor));
4173		- velvetField.SetToolTipValue((mat.velvet));
4174		- sheenField.SetToolTipValue((mat.sheen));
4175		- subsurfaceField.SetToolTipValue((mat.subsurface));
4176		- backlitField.SetToolTipValue((mat.bump));
4177		- anisoField.SetToolTipValue((mat.aniso));
4178		- anisoVField.SetToolTipValue((mat.anisoV));
4179		- cameraField.SetToolTipValue((mat.cameralight));
4180		- selfshadowField.SetToolTipValue((mat.diffuseness));
4181		- shadowField.SetToolTipValue((mat.shadow));
4182		- textureField.SetToolTipValue((mat.texture));
4183		- opacityField.SetToolTipValue((mat.opacity));
4184		- fakedepthField.SetToolTipValue((mat.fakedepth));
4185		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	4980	+ if (!Equal(colorField.getFloat(), mat.color))
	4981	+ colorField.SetToolTipValue((mat.color));
	4982	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4983	+ saturationField.SetToolTipValue((mat.modulation));
	4984	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4985	+ metalnessField.SetToolTipValue((mat.metalness));
	4986	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4987	+ diffuseField.SetToolTipValue((mat.diffuse));
	4988	+ if (!Equal(specularField.getFloat(), mat.specular))
	4989	+ specularField.SetToolTipValue((mat.specular));
	4990	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4991	+ shininessField.SetToolTipValue((mat.shininess));
	4992	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4993	+ shiftField.SetToolTipValue((mat.shift));
	4994	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4995	+ ambientField.SetToolTipValue((mat.ambient));
	4996	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4997	+ lightareaField.SetToolTipValue((mat.lightarea));
	4998	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4999	+ diffusenessField.SetToolTipValue((mat.factor));
	5000	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	5001	+ velvetField.SetToolTipValue((mat.velvet));
	5002	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	5003	+ sheenField.SetToolTipValue((mat.sheen));
	5004	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	5005	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	5006	+ if (!Equal(backlitField.getFloat(), mat.bump))
	5007	+ backlitField.SetToolTipValue((mat.bump));
	5008	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5009	+ anisoField.SetToolTipValue((mat.aniso));
	5010	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5011	+ anisoVField.SetToolTipValue((mat.anisoV));
	5012	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5013	+ cameraField.SetToolTipValue((mat.cameralight));
	5014	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5015	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5016	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5017	+ shadowField.SetToolTipValue((mat.shadow));
	5018	+ if (!Equal(textureField.getFloat(), mat.texture))
	5019	+ textureField.SetToolTipValue((mat.texture));
	5020	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5021	+ opacityField.SetToolTipValue((mat.opacity));
	5022	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5023	+ parallaxField.SetToolTipValue((mat.parallax));
	5024	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5025	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5026	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5027	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4186	5028	}
4187	5029
4188	5030	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4217,17 +5059,20 @@
4217	5059
4218	5060	public void stateChanged(ChangeEvent e)
4219	5061	{
4220		- // assert(false);
	5062	+ // assert(false);
4221	5063	if (e.getSource() == versionSlider)
4222	5064	{
4223	5065	if (muteSlider)
4224	5066	return;
4225	5067
	5068	+ Replace();
	5069	+
4226	5070	int version = versionSlider.getInteger();
4227	5071
4228		- if (copy.versions[version] != null)
	5072	+ if (version != -1 && copy.versionlist[version] != null)
4229	5073	{
4230		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	5074	+ copy.versionindex = version;
	5075	+ CopyChanged();
4231	5076	}
4232	5077
4233	5078	return;
..	..	@@ -4267,6 +5112,12 @@
4267	5112	{
4268	5113	//System.out.println("stateChanged = " + this);
4269	5114	materialtouched = true;
	5115	+
	5116	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5117	+ {
	5118	+ saturationField.setFloat(1);
	5119	+ }
	5120	+
4270	5121	applySelf();
4271	5122	//System.out.println("this = " + this);
4272	5123	//System.out.println("PARENT = " + parent);
..	..	@@ -4566,6 +5417,7 @@
4566	5417	{
4567	5418	if (GetTree() != null)
4568	5419	{
	5420	+ GetTree().revalidate();
4569	5421	GetTree().repaint();
4570	5422	}
4571	5423
..	..	@@ -4574,6 +5426,11 @@
4574	5426	ctrlPanel.validate(); // ? new
4575	5427	ctrlPanel.repaint();
4576	5428	}
	5429	+
	5430	+ if (previousVersionButton != null && copy.versionlist != null)
	5431	+ SetVersionStates();
	5432	+
	5433	+ cameraView.requestFocusInWindow();
4577	5434	}
4578	5435
4579	5436	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4605,7 +5462,7 @@
4605	5462	// group = (Composite) group.get(0);
4606	5463	// }
4607	5464
4608		- System.out.println("makeSomething of " + thing);
	5465	+ //System.out.println("makeSomething of " + thing);
4609	5466
4610	5467	/*
4611	5468	if (deselect && jList != null)
..	..	@@ -4957,13 +5814,17 @@
4957	5814	c.addChild(csg);
4958	5815	}
4959	5816
4960		- copy.versions = readobj.versions;
	5817	+ copy.versionlist = readobj.versionlist;
4961	5818	copy.versionindex = readobj.versionindex;
	5819	+ copy.versiontable = readobj.versiontable;
4962	5820
4963		- if (copy.versions == null)
	5821	+ if (copy.versionlist == null)
4964	5822	{
4965		- copy.versions = new byte[100][];
	5823	+ // Backward compatibility
	5824	+ copy.versionlist = new Object3D[100];
4966	5825	copy.versionindex = -1;
	5826	+
	5827	+ //Save(true);
4967	5828	}
4968	5829
4969	5830	//? SetUndoStates();
..	..	@@ -4978,7 +5839,7 @@
4978	5839	{
4979	5840	if (Grafreed.standAlone)
4980	5841	{
4981		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5842	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4982	5843	browser.show();
4983	5844	String filename = browser.getFile();
4984	5845	if (filename != null && filename.length() > 0)
..	..	@@ -5055,6 +5916,8 @@
5055	5916
5056	5917	void save()
5057	5918	{
	5919	+ Replace();
	5920	+
5058	5921	if (lastname == null)
5059	5922	{
5060	5923	return;
..	..	@@ -5297,6 +6160,7 @@
5297	6160	ButtonGroup buttonGroup;
5298	6161
5299	6162	cGridBag toolboxPanel;
	6163	+ cGridBag skyboxPanel;
5300	6164	cGridBag materialPanel;
5301	6165	cGridBag ctrlPanel;
5302	6166
..	..	@@ -5308,6 +6172,7 @@
5308	6172	boolean materialFlushed;
5309	6173	Object3D latestObject;
5310	6174
	6175	+ cGridBag transformPanel;
5311	6176	cGridBag XYZPanel;
5312	6177
5313	6178	JSplitPane gridPanel;
..	..	@@ -5370,7 +6235,7 @@
5370	6235	JLabel colorLabel;
5371	6236	cNumberSlider colorField;
5372	6237	JLabel modulationLabel;
5373		- cNumberSlider modulationField;
	6238	+ cNumberSlider saturationField;
5374	6239	JLabel metalnessLabel;
5375	6240	cNumberSlider metalnessField;
5376	6241	JLabel diffuseLabel;
..	..	@@ -5401,6 +6266,7 @@
5401	6266	cNumberSlider anisoField;
5402	6267	JLabel anisoVLabel;
5403	6268	cNumberSlider anisoVField;
	6269	+
5404	6270	JLabel cameraLabel;
5405	6271	cNumberSlider cameraField;
5406	6272	JLabel selfshadowLabel;
..	..	@@ -5411,10 +6277,13 @@
5411	6277	cNumberSlider textureField;
5412	6278	JLabel opacityLabel;
5413	6279	cNumberSlider opacityField;
	6280	+ JLabel parallaxLabel;
	6281	+ cNumberSlider parallaxField;
5414	6282	JLabel fakedepthLabel;
5415	6283	cNumberSlider fakedepthField;
5416	6284	JLabel shadowbiasLabel;
5417	6285	cNumberSlider shadowbiasField;
	6286	+
5418	6287	JLabel bumpLabel;
5419	6288	cNumberSlider bumpField;
5420	6289	JLabel noiseLabel;