~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -34,6 +34,7 @@
34	34	iSendInfo
35	35	//KeyListener
36	36	{
	37	+ public cToggleButton pinButton;
37	38	boolean timeline;
38	39	boolean wasFullScreen;
39	40
..	..	@@ -41,6 +42,50 @@
41	42	JFrame frame;
42	43
43	44	static ObjEditor theFrame;
	45	+
	46	+ public void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
	75	+ public Composite CreateCameras()
	76	+ {
	77	+ Composite cams = new cTemplate();
	78	+ cams.name = "Cameras";
	79	+ copy.insertElementAt(cams, 0);
	80	+
	81	+ cams.addChild(new Camera());
	82	+ cams.addChild(new Camera(1));
	83	+ cams.addChild(new Camera(2));
	84	+ cams.addChild(new Camera(3));
	85	+ cams.addChild(new Camera(4));
	86	+
	87	+ return cams;
	88	+ }
44	89
45	90	public cGridBag GetSeparator()
46	91	{
..	..	@@ -53,7 +98,10 @@
53	98	cButton GetButton(String name, boolean border)
54	99	{
55	100	ImageIcon icon = GetIcon(name);
56		- return new cButton(icon, border);
	101	+ if (icon != null \|\| name.contains("/"))
	102	+ return new cButton(icon, border);
	103	+ else
	104	+ return new cButton(name, border);
57	105	}
58	106
59	107	cLabel GetLabel(String name, boolean border)
..	..	@@ -74,11 +122,19 @@
74	122	return new cCheckBox(icon, border);
75	123	}
76	124
77		- ImageIcon GetIcon(String name)
	125	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	126	+
	127	+ static ImageIcon GetIcon(String name)
78	128	{
	129	+ javax.swing.ImageIcon iconCache = icons.get(name);
	130	+ if (iconCache != null)
	131	+ {
	132	+ return iconCache;
	133	+ }
	134	+
79	135	try
80	136	{
81		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	137	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
82	138
83	139	// if (image.getWidth() > 48 && image.getHeight() > 48)
84	140	// {
..	..	@@ -93,10 +149,14 @@
93	149	// }
94	150
95	151	javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	152	+
	153	+ icons.put(name, icon);
	154	+
96	155	return icon;
97	156	}
98	157	catch (Exception e)
99	158	{
	159	+ //icons.put(name, null);
100	160	return null;
101	161	}
102	162	}
..	..	@@ -296,11 +356,13 @@
296	356	client = inClient;
297	357	copy = client;
298	358
299		- if (copy.versions == null)
300		- {
301		- copy.versions = new Object3D[100];
302		- copy.versionindex = -1;
303		- }
	359	+// if (copy.versionlist == null)
	360	+// {
	361	+// copy.versionlist = new Object3D[100];
	362	+// copy.versionindex = -1;
	363	+//
	364	+// callee.Save(true);
	365	+// }
304	366
305	367	// "this" is not called: SetupUI2(objEditor);
306	368	}
..	..	@@ -315,10 +377,12 @@
315	377	client = inClient;
316	378	copy = client;
317	379
318		- if (copy.versions == null)
	380	+ if (copy.versionlist == null)
319	381	{
320		- copy.versions = new Object3D[100];
	382	+ copy.versionlist = new Object3D[100];
321	383	copy.versionindex = -1;
	384	+
	385	+// Save(true);
322	386	}
323	387
324	388	SetupUI2(callee.GetEditor());
..	..	@@ -342,7 +406,8 @@
342	406	//parent = p;
343	407
344	408	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
345		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	409	+ if (Globals.DEBUG)
	410	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
346	411	//gd.setFullScreenWindow(this);
347	412	//setResizable(false);
348	413	//if (!isDisplayable())
..	..	@@ -353,11 +418,13 @@
353	418	copy = localCopy;
354	419	copy.editWindow = this;
355	420
356		- if (copy.versions == null)
357		- {
358		-// copy.versions = new byte[100][];
	421	+// if (copy.versionlist == null)
	422	+// {
	423	+// copy.versionlist = new Object3D[100];
359	424	// copy.versionindex = -1;
360		- }
	425	+//
	426	+// Save(true);
	427	+// }
361	428
362	429	SetupMenu();
363	430
..	..	@@ -377,6 +444,9 @@
377	444
378	445	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
379	446
	447	+ // This is to refresh the UI of the material panel.
	448	+ boolean patchMaterial;
	449	+
380	450	void SetupMenu()
381	451	{
382	452	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -426,6 +496,8 @@
426	496
427	497	ChangeListener changeListener = new ChangeListener()
428	498	{
	499	+ //String name;
	500	+
429	501	public void stateChanged(ChangeEvent changeEvent)
430	502	{
431	503	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -444,7 +516,37 @@
444	516	// EditSelection(false);
445	517	// }
446	518
447		- refreshContents(false); // To refresh Info tab
	519	+// if (objectPanel.getSelectedIndex() == 4)
	520	+// {
	521	+// name = copy.skyboxname;
	522	+//
	523	+// if (name == null)
	524	+// {
	525	+// name = "";
	526	+// }
	527	+//
	528	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	529	+// copy.skyboxext = "jpg";
	530	+// }
	531	+// else
	532	+// {
	533	+// if (name != null)
	534	+// {
	535	+// if (name.equals(""))
	536	+// {
	537	+// copy.skyboxname = null;
	538	+// copy.skyboxext = null;
	539	+// }
	540	+// else
	541	+// {
	542	+// copy.skyboxname = name;
	543	+// }
	544	+// }
	545	+// }
	546	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	547	+
	548	+// refreshContents(false); // To refresh Info tab
	549	+ cameraView.repaint();
448	550	}
449	551	};
450	552	objectPanel.addChangeListener(changeListener);
..	..	@@ -467,7 +569,9 @@
467	569	toolboxPanel = new cGridBag().setVertical(true);
468	570	//toolboxPanel.setName("Toolbox");
469	571
470		- materialPanel = new cGridBag().setVertical(true);
	572	+ skyboxPanel = new cGridBag().setVertical(true);
	573	+
	574	+ materialPanel = new cGridBag().setVertical(false);
471	575	//materialPanel.setName("Material");
472	576
473	577	/JTextPane/
..	..	@@ -751,6 +855,7 @@
751	855	boolean maximized;
752	856
753	857	cButton fullscreenLayout;
	858	+ cButton expandedLayout;
754	859
755	860	void Minimize()
756	861	{
..	..	@@ -790,10 +895,12 @@
790	895	cButton minButton;
791	896	cButton maxButton;
792	897	cButton fullButton;
	898	+ cButton collapseButton;
	899	+ cButton maximize3DButton;
793	900
794	901	void ToggleFullScreen()
795	902	{
796		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	903	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797	904
798	905	cameraView.ToggleFullScreen();
799	906
..	..	@@ -814,13 +921,13 @@
814	921	// X frame.getContentPane().remove(/"Center",/bigThree);
815	922	// X framePanel.add(bigThree);
816	923	// X frame.getContentPane().add(/"Center",/framePanel);
817		- framePanel.setDividerLocation(46);
	924	+// framePanel.setDividerLocation(46); // icons are 24x24
818	925
819	926	//frame.setVisible(true);
820		- radio.layout = keepButton;
	927	+// radio.layout = keepButton;
821	928	//theFrame = null;
822	929	keepButton = null;
823		- radio.layout.doClick();
	930	+// radio.layout.doClick();
824	931
825	932	} else
826	933	{
..	..	@@ -841,32 +948,53 @@
841	948	// X frame.getContentPane().remove(/"Center",/framePanel);
842	949	// X framePanel.remove(bigThree);
843	950	// X frame.getContentPane().add(/"Center",/bigThree);
844		- framePanel.setDividerLocation(0);
	951	+// framePanel.setDividerLocation(0);
845	952
846		- radio.layout = fullscreenLayout;
847		- radio.layout.doClick();
	953	+// radio.layout = fullscreenLayout;
	954	+// radio.layout.doClick();
848	955	//frame.setVisible(true);
849	956	}
850	957	frame.validate();
	958	+
	959	+ cameraView.requestFocusInWindow();
851	960	}
852	961
853		- private Object3D CompressCopy()
	962	+ void CollapseToolbar()
	963	+ {
	964	+ framePanel.setDividerLocation(0);
	965	+ //frame.validate();
	966	+
	967	+ cameraView.requestFocusInWindow();
	968	+ }
	969	+
	970	+ private Object3D Duplicate(Object3D object)
854	971	{
855	972	boolean temp = CameraPane.SWITCH;
856	973	CameraPane.SWITCH = false;
857	974
858		- copy.ExtractBigData(versiontable);
	975	+ if (Grafreed.grafreed.universe.versiontable == null)
	976	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	977	+
	978	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
859	979	// if (copy == client)
860	980
861		- Object3D versions[] = copy.versions;
862		- copy.versions = null;
	981	+ Object3D versions[] = object.versionlist;
	982	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	983	+ object.versionlist = null;
	984	+ object.versiontable = null;
	985	+
	986	+ Object3D parent = object.parent;
	987	+ object.parent = null;
863	988
864	989	//byte[] compress = Compress(copy);
865		- Object3D compress = (Object3D)Grafreed.clone(copy);
	990	+ Object3D compress = (Object3D)Grafreed.clone(object);
866	991
867		- copy.versions = versions;
	992	+ object.parent = parent;
868	993
869		- copy.RestoreBigData(versiontable);
	994	+ object.versionlist = versions;
	995	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	996	+
	997	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
870	998
871	999	CameraPane.SWITCH = temp;
872	1000
..	..	@@ -994,6 +1122,7 @@
994	1122	{
995	1123	SetupMaterial(materialPanel);
996	1124	}
	1125	+
997	1126	//SetupName();
998	1127	//SetupViews();
999	1128	}
..	..	@@ -1202,6 +1331,18 @@
1202	1331
1203	1332	namePanel = new cGridBag();
1204	1333
	1334	+ //if (copy.pinned)
	1335	+ {
	1336	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1337	+ pinButton.setSelected(copy.pinned);
	1338	+ cGridBag t = new cGridBag();
	1339	+ t.preferredWidth = 2;
	1340	+ t.add(pinButton);
	1341	+ namePanel.add(t);
	1342	+
	1343	+ pinButton.addItemListener(this);
	1344	+ }
	1345	+
1205	1346	nameField = AddText(namePanel, copy.GetName());
1206	1347	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1207	1348	oe.ctrlPanel.add(namePanel);
..	..	@@ -1215,14 +1356,14 @@
1215	1356
1216	1357	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1217	1358	liveCB.setToolTipText("Animate object");
	1359	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1360	+ markCB.setToolTipText("Set target transform");
1218	1361	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1219	1362	selectableCB.setToolTipText("Make object selectable");
1220	1363	// Return();
1221	1364
1222	1365	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1223	1366	hideCB.setToolTipText("Hide object");
1224		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1225		- markCB.setToolTipText("As animation target transform");
1226	1367
1227	1368	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1228	1369
..	..	@@ -1424,22 +1565,9 @@
1424	1565
1425	1566	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1426	1567	{
1427		- System.out.println("CREATE CAMERAS");
1428		- cams = new cTemplate();
1429		- cams.name = "Cameras";
1430		- copy.insertElementAt(cams, 0);
1431		- //cams.parent = copy;
1432		-
1433		- cam = new Camera(); // LA.newVector(3, 2, 1));
1434		- cams.addChild(cam);
1435		- cam = new Camera(1);
1436		- cams.addChild(cam);
1437		- cam = new Camera(2);
1438		- cams.addChild(cam);
1439		- cam = new Camera(3);
1440		- cams.addChild(cam);
1441		- cam = new Camera(4); // Light
1442		- cams.addChild(cam);
	1568	+ if (Globals.DEBUG)
	1569	+ System.out.println("CREATE CAMERAS");
	1570	+ cams = CreateCameras();
1443	1571	} else
1444	1572	{
1445	1573	cams = (cGroup) copy.get(0);
..	..	@@ -1505,6 +1633,45 @@
1505	1633	//frontView.object = copy;
1506	1634	//sideView.object = copy;
1507	1635
	1636	+ transformPanel = new cGridBag().setVertical(true);
	1637	+
	1638	+ cGridBag resetTransformPanel = new cGridBag();
	1639	+
	1640	+ resetTransformPanel.preferredHeight = 2;
	1641	+
	1642	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1643	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1644	+ resetTransform.addMouseListener(new MouseAdapter()
	1645	+ {
	1646	+ public void mouseClicked(MouseEvent e)
	1647	+ {
	1648	+ ResetTransform();
	1649	+ }
	1650	+ });
	1651	+ resetTransformPanel.add(resetTransform);
	1652	+
	1653	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1654	+ resetTransform.setToolTipText("Reset Translation only");
	1655	+ resetTransform.addMouseListener(new MouseAdapter()
	1656	+ {
	1657	+ public void mouseClicked(MouseEvent e)
	1658	+ {
	1659	+ ResetTransform(1);
	1660	+ }
	1661	+ });
	1662	+ resetTransformPanel.add(resetTransform);
	1663	+
	1664	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1665	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1666	+ resetTransform.addMouseListener(new MouseAdapter()
	1667	+ {
	1668	+ public void mouseClicked(MouseEvent e)
	1669	+ {
	1670	+ ResetTransform(2);
	1671	+ }
	1672	+ });
	1673	+ resetTransformPanel.add(resetTransform);
	1674	+
1508	1675	XYZPanel = new cGridBag().setVertical(true);
1509	1676	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1510	1677
..	..	@@ -1514,6 +1681,9 @@
1514	1681	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1515	1682	//XYZPanel.setName("XYZ");
1516	1683
	1684	+ transformPanel.add(resetTransformPanel);
	1685	+ transformPanel.add(XYZPanel);
	1686	+
1517	1687	/*
1518	1688	gridPanel = new JPanel(); //new BorderLayout());
1519	1689	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1521,12 +1691,12 @@
1521	1691	gridPanel.add(cameraView);
1522	1692	gridPanel.add(XYZPanel);
1523	1693	*/
1524		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1525		- gridPanel.setContinuousLayout(true);
1526		- gridPanel.setOneTouchExpandable(true);
1527		- gridPanel.setDividerLocation(1.0);
1528		- gridPanel.setDividerSize(9);
1529		- gridPanel.setResizeWeight(0.85);
	1694	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1695	+// gridPanel.setContinuousLayout(true);
	1696	+// gridPanel.setOneTouchExpandable(true);
	1697	+// gridPanel.setDividerLocation(1.0);
	1698	+// gridPanel.setDividerSize(9);
	1699	+// gridPanel.setResizeWeight(0.85);
1530	1700
1531	1701	// aConstraints.weighty = 0;
1532	1702	//System.out.println("THIS = " + this);
..	..	@@ -1549,31 +1719,34 @@
1549	1719
1550	1720	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1551	1721	//tmp.setName("Edit");
	1722	+ objectPanel.add(skyboxPanel);
	1723	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1724	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1725	+
	1726	+ objectPanel.add(toolboxPanel);
	1727	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1728	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1729	+
1552	1730	objectPanel.add(materialPanel);
1553		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1554		- objectPanel.setToolTipTextAt(0, "Material panel");
	1731	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1732	+ objectPanel.setToolTipTextAt(2, "Material");
1555	1733
1556	1734	// JPanel north = new JPanel(new BorderLayout());
1557	1735	// north.setName("Edit");
1558	1736	// north.add(ctrlPanel, BorderLayout.NORTH);
1559	1737	// objectPanel.add(north);
1560	1738	objectPanel.add(editPanel);
1561		- objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1562		- objectPanel.setToolTipTextAt(1, "Edit panel");
	1739	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
	1740	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1563	1741
1564		- //if (Globals.ADVANCED)
1565		- objectPanel.add(infoPanel);
1566		- objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1567		- objectPanel.setToolTipTextAt(2, "Info panel");
	1742	+ objectPanel.add(transformPanel);
	1743	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1744	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1568	1745
1569		- objectPanel.add(XYZPanel);
1570		- objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1571		- objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
1572		-
1573		- objectPanel.add(toolboxPanel);
1574		- objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1575		- objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
1576		-
	1746	+ patchMaterial = true;
	1747	+ cameraView.patchMaterial = this;
	1748	+ objectPanel.setSelectedIndex(2);
	1749	+
1577	1750	/*
1578	1751	aConstraints.gridx = 0;
1579	1752	aConstraints.gridwidth = 1;
..	..	@@ -1593,7 +1766,7 @@
1593	1766	scrollpane.addMouseWheelListener(this); // Default not fast enough
1594	1767
1595	1768	/JTabbedPane/ scenePanel = new cGridBag();
1596		- scenePanel.preferredWidth = 5;
	1769	+ scenePanel.preferredWidth = 6;
1597	1770
1598	1771	JTabbedPane tabbedPane = new JTabbedPane();
1599	1772	tabbedPane.add(scrollpane);
..	..	@@ -1604,11 +1777,51 @@
1604	1777
1605	1778	AddOptions(optionsPanel); //, aConstraints);
1606	1779
1607		- tabbedPane.add(optionsPanel);
1608		-
1609	1780	tabbedPane.add(FSPane = new cFileSystemPane(this));
1610	1781
	1782	+ tabbedPane.add(optionsPanel);
	1783	+
1611	1784	scenePanel.add(tabbedPane);
	1785	+
	1786	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1787	+ creditsPanel.setName("Credits");
	1788	+
	1789	+ cLabel ogaLabel = new cLabel(" Most Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1790	+ creditsPanel.add(ogaLabel);
	1791	+
	1792	+ cButton opengameartButton;
	1793	+ creditsPanel.add(opengameartButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1794	+ opengameartButton.setToolTipText("https://opengameart.org");
	1795	+
	1796	+ opengameartButton.addMouseListener(new MouseAdapter()
	1797	+ {
	1798	+ public void mouseClicked(MouseEvent e)
	1799	+ {
	1800	+ try
	1801	+ {
	1802	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1803	+ } catch (Exception e1)
	1804	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1805	+ {
	1806	+ e1.printStackTrace();
	1807	+ }
	1808	+ }
	1809	+ });
	1810	+
	1811	+ for (int i=10; --i>=0;)
	1812	+ {
	1813	+ creditsPanel.add(new cGridBag());
	1814	+ }
	1815	+
	1816	+ tabbedPane.add(creditsPanel);
	1817	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1818	+
	1819	+ if (Globals.ADVANCED)
	1820	+ {
	1821	+ tabbedPane.add(infoPanel);
	1822	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1823	+ tabbedPane.setToolTipTextAt(4, "Information");
	1824	+ }
1612	1825
1613	1826	/*
1614	1827	cTree jTree = new cTree(null);
..	..	@@ -1630,13 +1843,13 @@
1630	1843	jtp.add(tree);
1631	1844	*/
1632	1845
1633		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1634		- bigPanel.setContinuousLayout(true);
1635		- bigPanel.setOneTouchExpandable(true);
1636		- bigPanel.setDividerLocation(0.8);
1637		- bigPanel.setDividerSize(15);
1638		- bigPanel.setResizeWeight(0.15);
1639		- bigPanel.setName("Scene");
	1846	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1847	+// bigPanel.setContinuousLayout(true);
	1848	+// bigPanel.setOneTouchExpandable(true);
	1849	+// bigPanel.setDividerLocation(0.8);
	1850	+// bigPanel.setDividerSize(15);
	1851	+// bigPanel.setResizeWeight(0.15);
	1852	+// bigPanel.setName("Scene");
1640	1853
1641	1854	//bigPanel.setLayout(new BorderLayout());
1642	1855	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1680,6 +1893,23 @@
1680	1893	// aConstraints.gridheight = 1;
1681	1894
1682	1895	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1896	+
	1897	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1898	+ new java.beans.PropertyChangeListener()
	1899	+ {
	1900	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1901	+ {
	1902	+ if ((Integer)pce.getOldValue() == 1)
	1903	+ {
	1904	+ if (radio.layout != expandedLayout)
	1905	+ {
	1906	+ radio.layout = expandedLayout;
	1907	+ radio.layout.doClick();
	1908	+ }
	1909	+ }
	1910	+ }
	1911	+ });
	1912	+
1683	1913	framePanel.setContinuousLayout(false);
1684	1914	framePanel.setOneTouchExpandable(false);
1685	1915	//.setDividerLocation(0.8);
..	..	@@ -1689,7 +1919,7 @@
1689	1919
1690	1920	frame.getContentPane().setLayout(new BorderLayout());
1691	1921	/**/
1692		- JTabbedPane worldPane = new JTabbedPane();
	1922	+ //JTabbedPane worldPane = new JTabbedPane();
1693	1923	//worldPane.add(bigPanel);
1694	1924	//worldPane.add(worldPanel);
1695	1925	/**/
..	..	@@ -1703,7 +1933,7 @@
1703	1933
1704	1934	cameraView.requestFocusInWindow();
1705	1935
1706		- gridPanel.setDividerLocation(1.0);
	1936	+// gridPanel.setDividerLocation(1.0);
1707	1937
1708	1938	frame.validate();
1709	1939
..	..	@@ -1734,28 +1964,442 @@
1734	1964	ctrlPanel.removeAll();
1735	1965	}
1736	1966
1737		- void SetupMaterial(cGridBag panel)
	1967	+ void SetupMaterial(cGridBag materialpanel)
1738	1968	{
1739		- /*
	1969	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1970	+
	1971	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	1972	+ skin.setToolTipText("Skin");
	1973	+ skin.addMouseListener(new MouseAdapter()
	1974	+ {
	1975	+ public void mouseClicked(MouseEvent e)
	1976	+ {
	1977	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1978	+ cMaterial material = object.material;
	1979	+
	1980	+ // Skin
	1981	+ colorField.setFloat(material.color);
	1982	+ float saturation = material.modulation;
	1983	+
	1984	+ if (!cameraView.Skinshader)
	1985	+ {
	1986	+ saturation /= 1.5;
	1987	+ }
	1988	+
	1989	+ saturationField.setFloat(saturation);
	1990	+
	1991	+ subsurfaceField.setFloat(material.subsurface);
	1992	+ selfshadowField.setFloat(material.diffuseness);
	1993	+ diffusenessField.setFloat(material.factor);
	1994	+ shininessField.setFloat(material.shininess);
	1995	+ shadowbiasField.setFloat(material.shadowbias);
	1996	+ diffuseField.setFloat(material.diffuse);
	1997	+ specularField.setFloat(material.specular);
	1998	+
	1999	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2000	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2001	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2002	+
	2003	+ materialtouched = true;
	2004	+ applySelf();
	2005	+ }
	2006	+ });
	2007	+ presetpanel.add(skin);
	2008	+
	2009	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2010	+ lambert.setToolTipText("Diffuse");
	2011	+ lambert.addMouseListener(new MouseAdapter()
	2012	+ {
	2013	+ public void mouseClicked(MouseEvent e)
	2014	+ {
	2015	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2016	+ cMaterial material = object.material;
	2017	+
	2018	+ diffusenessField.setFloat(material.factor);
	2019	+ selfshadowField.setFloat(material.diffuseness);
	2020	+
	2021	+ materialtouched = true;
	2022	+ applySelf();
	2023	+ }
	2024	+ });
	2025	+ presetpanel.add(lambert);
	2026	+
	2027	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2028	+ diffuse2.setToolTipText("Diffuse2");
	2029	+ diffuse2.addMouseListener(new MouseAdapter()
	2030	+ {
	2031	+ public void mouseClicked(MouseEvent e)
	2032	+ {
	2033	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2034	+ cMaterial material = object.material;
	2035	+
	2036	+ diffusenessField.setFloat(material.factor);
	2037	+ selfshadowField.setFloat(material.diffuseness);
	2038	+
	2039	+ materialtouched = true;
	2040	+ applySelf();
	2041	+ }
	2042	+ });
	2043	+ presetpanel.add(diffuse2);
	2044	+
	2045	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2046	+ diffusemoon.setToolTipText("Moon");
	2047	+ diffusemoon.addMouseListener(new MouseAdapter()
	2048	+ {
	2049	+ public void mouseClicked(MouseEvent e)
	2050	+ {
	2051	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2052	+ cMaterial material = object.material;
	2053	+
	2054	+ diffusenessField.setFloat(material.factor);
	2055	+ selfshadowField.setFloat(material.diffuseness);
	2056	+
	2057	+ materialtouched = true;
	2058	+ applySelf();
	2059	+ }
	2060	+ });
	2061	+ presetpanel.add(diffusemoon);
	2062	+
	2063	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2064	+ diffusemoon2.setToolTipText("Moon2");
	2065	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2066	+ {
	2067	+ public void mouseClicked(MouseEvent e)
	2068	+ {
	2069	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2070	+ cMaterial material = object.material;
	2071	+
	2072	+ diffusenessField.setFloat(material.factor);
	2073	+ selfshadowField.setFloat(material.diffuseness);
	2074	+
	2075	+ materialtouched = true;
	2076	+ applySelf();
	2077	+ }
	2078	+ });
	2079	+ presetpanel.add(diffusemoon2);
	2080	+
	2081	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2082	+ diffusemoon3.setToolTipText("Moon3");
	2083	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2084	+ {
	2085	+ public void mouseClicked(MouseEvent e)
	2086	+ {
	2087	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2088	+ cMaterial material = object.material;
	2089	+
	2090	+ diffusenessField.setFloat(material.factor);
	2091	+ selfshadowField.setFloat(material.diffuseness);
	2092	+
	2093	+ materialtouched = true;
	2094	+ applySelf();
	2095	+ }
	2096	+ });
	2097	+ presetpanel.add(diffusemoon3);
	2098	+
	2099	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2100	+ diffusesheen.setToolTipText("Sheen");
	2101	+ diffusesheen.addMouseListener(new MouseAdapter()
	2102	+ {
	2103	+ public void mouseClicked(MouseEvent e)
	2104	+ {
	2105	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2106	+ cMaterial material = object.material;
	2107	+
	2108	+ sheenField.setFloat(material.sheen);
	2109	+
	2110	+ materialtouched = true;
	2111	+ applySelf();
	2112	+ }
	2113	+ });
	2114	+ presetpanel.add(diffusesheen);
	2115	+
	2116	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2117	+ rough.setToolTipText("Rough metal");
	2118	+ rough.addMouseListener(new MouseAdapter()
	2119	+ {
	2120	+ public void mouseClicked(MouseEvent e)
	2121	+ {
	2122	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2123	+ cMaterial material = object.material;
	2124	+
	2125	+ shininessField.setFloat(material.shininess);
	2126	+ velvetField.setFloat(material.velvet);
	2127	+
	2128	+ materialtouched = true;
	2129	+ applySelf();
	2130	+ }
	2131	+ });
	2132	+ presetpanel.add(rough);
	2133	+
	2134	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2135	+ rough2.setToolTipText("Medium metal");
	2136	+ rough2.addMouseListener(new MouseAdapter()
	2137	+ {
	2138	+ public void mouseClicked(MouseEvent e)
	2139	+ {
	2140	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2141	+ cMaterial material = object.material;
	2142	+
	2143	+ shininessField.setFloat(material.shininess);
	2144	+ lightareaField.setFloat(material.lightarea);
	2145	+
	2146	+ materialtouched = true;
	2147	+ applySelf();
	2148	+ }
	2149	+ });
	2150	+ presetpanel.add(rough2);
	2151	+
	2152	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2153	+ shini0.setToolTipText("Shiny");
	2154	+ shini0.addMouseListener(new MouseAdapter()
	2155	+ {
	2156	+ public void mouseClicked(MouseEvent e)
	2157	+ {
	2158	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2159	+ cMaterial material = object.material;
	2160	+
	2161	+ shininessField.setFloat(material.shininess);
	2162	+ lightareaField.setFloat(material.lightarea);
	2163	+
	2164	+ materialtouched = true;
	2165	+ applySelf();
	2166	+ }
	2167	+ });
	2168	+ presetpanel.add(shini0);
	2169	+
	2170	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2171	+ shini1.setToolTipText("Shiny2");
	2172	+ shini1.addMouseListener(new MouseAdapter()
	2173	+ {
	2174	+ public void mouseClicked(MouseEvent e)
	2175	+ {
	2176	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2177	+ cMaterial material = object.material;
	2178	+
	2179	+ shininessField.setFloat(material.shininess);
	2180	+ lightareaField.setFloat(material.lightarea);
	2181	+
	2182	+ materialtouched = true;
	2183	+ applySelf();
	2184	+ }
	2185	+ });
	2186	+ presetpanel.add(shini1);
	2187	+
	2188	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2189	+ shini2.setToolTipText("Shiny3");
	2190	+ shini2.addMouseListener(new MouseAdapter()
	2191	+ {
	2192	+ public void mouseClicked(MouseEvent e)
	2193	+ {
	2194	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2195	+ cMaterial material = object.material;
	2196	+
	2197	+ shininessField.setFloat(material.shininess);
	2198	+ lightareaField.setFloat(material.lightarea);
	2199	+
	2200	+ materialtouched = true;
	2201	+ applySelf();
	2202	+ }
	2203	+ });
	2204	+ presetpanel.add(shini2);
	2205	+
	2206	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2207	+ aniso.setToolTipText("AnisoU");
	2208	+ aniso.addMouseListener(new MouseAdapter()
	2209	+ {
	2210	+ public void mouseClicked(MouseEvent e)
	2211	+ {
	2212	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2213	+ cMaterial material = object.material;
	2214	+
	2215	+ anisoField.setFloat(material.aniso);
	2216	+ anisoVField.setFloat(material.anisoV);
	2217	+
	2218	+ materialtouched = true;
	2219	+ applySelf();
	2220	+ }
	2221	+ });
	2222	+ presetpanel.add(aniso);
	2223	+
	2224	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2225	+ aniso2.setToolTipText("AnisoV");
	2226	+ aniso2.addMouseListener(new MouseAdapter()
	2227	+ {
	2228	+ public void mouseClicked(MouseEvent e)
	2229	+ {
	2230	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2231	+ cMaterial material = object.material;
	2232	+
	2233	+ anisoField.setFloat(material.aniso);
	2234	+ anisoVField.setFloat(material.anisoV);
	2235	+
	2236	+ materialtouched = true;
	2237	+ applySelf();
	2238	+ }
	2239	+ });
	2240	+ presetpanel.add(aniso2);
	2241	+
	2242	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2243	+ aniso3.setToolTipText("AnisoUV");
	2244	+ aniso3.addMouseListener(new MouseAdapter()
	2245	+ {
	2246	+ public void mouseClicked(MouseEvent e)
	2247	+ {
	2248	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2249	+ cMaterial material = object.material;
	2250	+
	2251	+ anisoField.setFloat(material.aniso);
	2252	+ anisoVField.setFloat(material.anisoV);
	2253	+
	2254	+ materialtouched = true;
	2255	+ applySelf();
	2256	+ }
	2257	+ });
	2258	+ presetpanel.add(aniso3);
	2259	+
	2260	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2261	+ velvet0.setToolTipText("Velvet");
	2262	+ velvet0.addMouseListener(new MouseAdapter()
	2263	+ {
	2264	+ public void mouseClicked(MouseEvent e)
	2265	+ {
	2266	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2267	+ cMaterial material = object.material;
	2268	+
	2269	+ diffusenessField.setFloat(material.factor);
	2270	+ selfshadowField.setFloat(material.diffuseness);
	2271	+ sheenField.setFloat(material.sheen);
	2272	+ shininessField.setFloat(material.shininess);
	2273	+ velvetField.setFloat(material.velvet);
	2274	+ shiftField.setFloat(material.shift);
	2275	+
	2276	+ materialtouched = true;
	2277	+ applySelf();
	2278	+ }
	2279	+ });
	2280	+ presetpanel.add(velvet0);
	2281	+
	2282	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2283	+ bump0.setToolTipText("Bump texture");
	2284	+ bump0.addMouseListener(new MouseAdapter()
	2285	+ {
	2286	+ public void mouseClicked(MouseEvent e)
	2287	+ {
	2288	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2289	+ cMaterial material = object.material;
	2290	+
	2291	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2292	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2293	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2294	+
	2295	+ materialtouched = true;
	2296	+ applySelf();
	2297	+ }
	2298	+ });
	2299	+ presetpanel.add(bump0);
	2300	+
	2301	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2302	+ borderShader.setToolTipText("Border fade");
	2303	+ borderShader.addMouseListener(new MouseAdapter()
	2304	+ {
	2305	+ public void mouseClicked(MouseEvent e)
	2306	+ {
	2307	+ borderfadeField.setFloat(0.5);
	2308	+ opacityField.setFloat(0.75);
	2309	+
	2310	+ materialtouched = true;
	2311	+ applySelf();
	2312	+ }
	2313	+ });
	2314	+ presetpanel.add(borderShader);
	2315	+
	2316	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
	2317	+ halo.setToolTipText("Halo");
	2318	+ halo.addMouseListener(new MouseAdapter()
	2319	+ {
	2320	+ public void mouseClicked(MouseEvent e)
	2321	+ {
	2322	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2323	+ cMaterial material = object.material;
	2324	+
	2325	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2326	+
	2327	+ materialtouched = true;
	2328	+ applySelf();
	2329	+ }
	2330	+ });
	2331	+ presetpanel.add(halo);
	2332	+
	2333	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2334	+ candle.setToolTipText("Candle");
	2335	+ candle.addMouseListener(new MouseAdapter()
	2336	+ {
	2337	+ public void mouseClicked(MouseEvent e)
	2338	+ {
	2339	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2340	+ cMaterial material = object.material;
	2341	+
	2342	+ subsurfaceField.setFloat(material.subsurface);
	2343	+ shadowbiasField.setFloat(material.shadowbias);
	2344	+ ambientField.setFloat(material.ambient);
	2345	+ specularField.setFloat(material.specular);
	2346	+ lightareaField.setFloat(material.lightarea);
	2347	+ shininessField.setFloat(material.shininess);
	2348	+
	2349	+ materialtouched = true;
	2350	+ applySelf();
	2351	+ }
	2352	+ });
	2353	+ presetpanel.add(candle);
	2354	+
	2355	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2356	+ shadowShader.setToolTipText("Shadow");
	2357	+ shadowShader.addMouseListener(new MouseAdapter()
	2358	+ {
	2359	+ public void mouseClicked(MouseEvent e)
	2360	+ {
	2361	+ diffuseField.setFloat(0.001);
	2362	+ ambientField.setFloat(0.001);
	2363	+ cameraField.setFloat(0.001);
	2364	+ specularField.setFloat(0.001);
	2365	+ fakedepthField.setFloat(0.001);
	2366	+ opacityField.setFloat(0.6);
	2367	+
	2368	+ materialtouched = true;
	2369	+ applySelf();
	2370	+ }
	2371	+ });
	2372	+ presetpanel.add(shadowShader);
	2373	+
	2374	+ cGridBag panel = new cGridBag().setVertical(true);
	2375	+
	2376	+ presetpanel.preferredWidth = 1;
	2377	+
	2378	+ materialpanel.add(presetpanel);
	2379	+ materialpanel.add(panel);
	2380	+
	2381	+ panel.preferredWidth = 8;
	2382	+
	2383	+ /*
1740	2384	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1741	2385	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1742		- */
	2386	+ */
1743	2387
1744	2388	cGridBag editBar = new cGridBag().setVertical(false);
1745	2389
1746		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2390	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
1747	2391	createMaterialButton.setToolTipText("Create material");
1748	2392
1749	2393	/*
1750	2394	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1751	2395	*/
1752	2396
1753		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2397	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
1754	2398	clearMaterialButton.setToolTipText("Clear material");
1755	2399
1756	2400	if (Globals.ADVANCED)
1757	2401	{
1758		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2402	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
1759	2403	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1760	2404	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1761	2405	}
..	..	@@ -1776,7 +2420,20 @@
1776	2420
1777	2421	cGridBag huepanel = new cGridBag();
1778	2422	cGridBag huelabel = new cGridBag();
1779		- huelabel.add(GetLabel("icons/hue.png", false));
	2423	+ cLabel hue = GetLabel("icons/hue.png", false);
	2424	+ hue.fit = true;
	2425	+
	2426	+ hue.addMouseListener(new MouseAdapter()
	2427	+ {
	2428	+ public void mousePressed(MouseEvent e)
	2429	+ {
	2430	+ int x = e.getX();
	2431	+
	2432	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2433	+ }
	2434	+ });
	2435	+
	2436	+ huelabel.add(hue);
1780	2437	huelabel.preferredWidth = 20;
1781	2438	huepanel.add(new cGridBag()); // Label
1782	2439	huepanel.add(huelabel); // Field/slider
..	..	@@ -1797,7 +2454,7 @@
1797	2454	cGridBag modulation = new cGridBag();
1798	2455	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1799	2456	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1800		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2457	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1801	2458	colorSection.add(modulation);
1802	2459
1803	2460	cGridBag opacity = new cGridBag();
..	..	@@ -2990,7 +3647,7 @@
2990	3647
2991	3648	freezematerial = true;
2992	3649	colorField.setFloat(mat.color);
2993		- modulationField.setFloat(mat.modulation);
	3650	+ saturationField.setFloat(mat.modulation);
2994	3651	metalnessField.setFloat(mat.metalness);
2995	3652	diffuseField.setFloat(mat.diffuse);
2996	3653	specularField.setFloat(mat.specular);
..	..	@@ -3052,32 +3709,8 @@
3052	3709
3053	3710	if (multiplyToggle != null)
3054	3711	multiplyToggle.setSelected(mat.multiply);
3055		-
3056		- assert (object.projectedVertices != null);
3057		-
3058		- if (object.projectedVertices.length <= 2)
3059		- {
3060		- // Side effect...
3061		- Object3D.cVector2[] keep = object.projectedVertices;
3062		- object.projectedVertices = new Object3D.cVector2[3];
3063		- for (int i = 0; i < 3; i++)
3064		- {
3065		- if (i < keep.length)
3066		- {
3067		- object.projectedVertices[i] = keep[i];
3068		- } else
3069		- {
3070		- object.projectedVertices[i] = new Object3D.cVector2();
3071		- }
3072		- /*
3073		- if(keep.length == 0)
3074		- object.projectedVertices[0] = new Object3D.cVector2();
3075		- else
3076		- object.projectedVertices[0] = keep[0];
3077		- object.projectedVertices[1] = new Object3D.cVector2();
3078		- */
3079		- }
3080		- }
	3712	+
	3713	+ AllocProjectedVertices(object);
3081	3714
3082	3715	SetMaterial(mat, object.projectedVertices);
3083	3716	}
..	..	@@ -3197,6 +3830,17 @@
3197	3830	public void itemStateChanged(ItemEvent event)
3198	3831	{
3199	3832	// System.out.println("Propagate = " + propagate);
	3833	+ if (event.getSource() == pinButton)
	3834	+ {
	3835	+ copy.pinned ^= true;
	3836	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3837	+ {
	3838	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3839	+ copy.CloseUI();
	3840	+ //copy.editWindow.refreshContents();
	3841	+ }
	3842	+ }
	3843	+ else
3200	3844	if (event.getSource() == propagateToggle)
3201	3845	{
3202	3846	propagate ^= true;
..	..	@@ -3301,6 +3945,7 @@
3301	3945	} else if (event.getSource() == liveCB)
3302	3946	{
3303	3947	copy.live ^= true;
	3948	+ objEditor.refreshContents(true); // To show item colors
3304	3949	return;
3305	3950	} else if (event.getSource() == selectableCB)
3306	3951	{
..	..	@@ -3310,7 +3955,7 @@
3310	3955	{
3311	3956	copy.hide ^= true;
3312	3957	copy.Touch(); // display list issue
3313		- objEditor.refreshContents();
	3958	+ objEditor.refreshContents(true); // To show item colors
3314	3959	return;
3315	3960	} else if (event.getSource() == link2masterCB)
3316	3961	{
..	..	@@ -3375,7 +4020,7 @@
3375	4020	//System.out.println("ObjEditor " + event);
3376	4021	applySelf0(true);
3377	4022	//parent.applySelf();
3378		- objEditor.refreshContents();
	4023	+ // conflicts with requestFocus objEditor.refreshContents();
3379	4024	} else if (source == resetButton)
3380	4025	{
3381	4026	CameraPane.fullreset = true;
..	..	@@ -3555,11 +4200,18 @@
3555	4200
3556	4201	void New()
3557	4202	{
3558		- while (copy.Size() > 1)
	4203	+ while (copy.Size() > 0)
3559	4204	{
3560		- copy.remove(1);
	4205	+ copy.remove(0);
3561	4206	}
3562	4207
	4208	+ copy.selection.clear();
	4209	+
	4210	+ if (copy == Grafreed.grafreed.universe)
	4211	+ {
	4212	+ CreateCameras();
	4213	+ cameraView.SetCamera(GetCamera(copy, 0));
	4214	+ }
3563	4215	ResetModel();
3564	4216	objEditor.refreshContents();
3565	4217	}
..	..	@@ -3668,6 +4320,7 @@
3668	4320	{
3669	4321	//Save(true);
3670	4322	Replace();
	4323	+ SetVersionStates();
3671	4324	}
3672	4325
3673	4326	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3686,15 +4339,30 @@
3686	4339	return true;
3687	4340	}
3688	4341
3689		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4342	+ void DeleteVersion()
	4343	+ {
	4344	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4345	+ {
	4346	+ copy.versionlist[i] = copy.versionlist[i+1];
	4347	+ }
	4348	+
	4349	+ if (copy.versionlist[copy.versionindex] == null)
	4350	+ copy.versionindex -= 1;
	4351	+
	4352	+ if (copy.versionindex != -1)
	4353	+ CopyChanged();
	4354	+
	4355	+ SetVersionStates();
	4356	+ }
3690	4357
3691	4358	public boolean Save(boolean user)
3692	4359	{
3693	4360	System.err.println("Save");
	4361	+ Replace();
3694	4362
3695		- cRadio tab = GetCurrentTab();
	4363	+ //cRadio tab = GetCurrentTab();
3696	4364
3697		- Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
	4365	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3698	4366
3699	4367	boolean thesame = false;
3700	4368
..	..	@@ -3706,10 +4374,15 @@
3706	4374	//EditorFrame.m_MainFrame.requestFocusInWindow();
3707	4375	if (!thesame)
3708	4376	{
	4377	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4378	+ {
	4379	+ copy.versionlist[i] = copy.versionlist[i-1];
	4380	+ }
	4381	+
3709	4382	//tab.user[tab.versionindex] = user;
3710	4383	//boolean increment = true; // tab.graphs[tab.versionindex] == null;
3711	4384
3712		- copy.versions[++copy.versionindex] = compress;
	4385	+ copy.versionlist[++copy.versionindex] = compress;
3713	4386
3714	4387	// if (increment)
3715	4388	// tab.versionindex++;
..	..	@@ -3719,13 +4392,13 @@
3719	4392
3720	4393	//assert(hashtable.isEmpty());
3721	4394
3722		- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3723		- {
3724		- //tab.user[i] = false;
3725		- copy.versions[i] = null;
3726		- }
	4395	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4396	+// {
	4397	+// //tab.user[i] = false;
	4398	+// copy.versionlist[i] = null;
	4399	+// }
3727	4400
3728		- SetUndoStates();
	4401	+ SetVersionStates();
3729	4402
3730	4403	// test save
3731	4404	if (false)
..	..	@@ -3748,15 +4421,49 @@
3748	4421
3749	4422	return !thesame;
3750	4423	}
3751		-
3752		- void CopyChanged(Object3D obj)
	4424	+
	4425	+ boolean flashIt = true;
	4426	+
	4427	+ void RefreshSelection()
3753	4428	{
3754		- SetUndoStates();
	4429	+ Object3D selection = new Object3D();
	4430	+
	4431	+ for (int i = 0; i < copy.selection.size(); i++)
	4432	+ {
	4433	+ Object3D elem = copy.selection.elementAt(i);
	4434	+
	4435	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4436	+
	4437	+ if (obj == null)
	4438	+ {
	4439	+ copy.selection.remove(i--);
	4440	+ }
	4441	+ else
	4442	+ {
	4443	+ selection.add(obj);
	4444	+ copy.selection.setElementAt(obj, i);
	4445	+ }
	4446	+ }
	4447	+
	4448	+ flashIt = false;
	4449	+ GetTree().clearSelection();
	4450	+ for (int i = 0; i < selection.size(); i++)
	4451	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4452	+ flashIt = true;
	4453	+
	4454	+ //refreshContents(false);
	4455	+ }
	4456	+
	4457	+ void CopyChanged()
	4458	+ {
	4459	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4460	+
	4461	+ SetVersionStates();
3755	4462
3756	4463	boolean temp = CameraPane.SWITCH;
3757	4464	CameraPane.SWITCH = false;
3758	4465
3759		- copy.ExtractBigData(versiontable);
	4466	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3760	4467
3761	4468	copy.clear();
3762	4469
..	..	@@ -3768,10 +4475,11 @@
3768	4475	copy.add(obj.get(i));
3769	4476	}
3770	4477
3771		- copy.RestoreBigData(versiontable);
	4478	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3772	4479
3773	4480	CameraPane.SWITCH = temp;
3774	4481
	4482	+ RefreshSelection();
3775	4483	//assert(hashtable.isEmpty());
3776	4484
3777	4485	copy.Touch();
..	..	@@ -3792,13 +4500,15 @@
3792	4500	}
3793	4501	}
3794	4502
3795		- refreshContents();
	4503	+ refreshContents(true);
3796	4504	}
3797	4505
3798		- cButton undoButton;
	4506	+ cButton previousVersionButton;
3799	4507	cButton restoreButton;
3800	4508	cButton replaceButton;
3801		- cButton redoButton;
	4509	+ cButton nextVersionButton;
	4510	+ cButton saveVersionButton;
	4511	+ cButton deleteVersionButton;
3802	4512
3803	4513	boolean muteSlider;
3804	4514
..	..	@@ -3806,39 +4516,64 @@
3806	4516	{
3807	4517	int count = 0;
3808	4518
3809		- for (int i = copy.versions.length; --i >= 0;)
	4519	+ for (int i = copy.versionlist.length; --i >= 0;)
3810	4520	{
3811		- if (copy.versions[i] != null)
	4521	+ if (copy.versionlist[i] != null)
3812	4522	count++;
3813	4523	}
3814	4524
3815	4525	return count;
3816	4526	}
3817	4527
3818		- void SetUndoStates()
	4528	+ public cGridBag versionSliderPane;
	4529	+
	4530	+ void SetVersionStates()
3819	4531	{
3820		- cRadio tab = GetCurrentTab();
	4532	+ //if (true)
	4533	+ // return;
	4534	+
	4535	+ //cRadio tab = GetCurrentTab();
3821	4536
3822		- restoreButton.setEnabled(copy.versionindex != -1);
3823		- replaceButton.setEnabled(copy.versionindex != -1);
3824		-
3825		- undoButton.setEnabled(copy.versionindex > 0);
3826		- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
3827		-
3828		- muteSlider = true;
3829		- versionSlider.setMaximum(VersionCount() - 1);
3830		- versionSlider.setInteger(copy.versionindex);
3831		- muteSlider = false;
	4537	+ if (copy.versionlist == null)
	4538	+ {
	4539	+ saveVersionButton.setEnabled(false);
	4540	+ restoreButton.setEnabled(false);
	4541	+ replaceButton.setEnabled(false);
	4542	+ previousVersionButton.setEnabled(false);
	4543	+ nextVersionButton.setEnabled(false);
	4544	+ deleteVersionButton.setEnabled(false);
	4545	+ versionSliderPane.setVisible(false);
	4546	+ }
	4547	+ else
	4548	+ {
	4549	+ restoreButton.setEnabled(copy.versionindex != -1);
	4550	+ replaceButton.setEnabled(copy.versionindex != -1);
	4551	+
	4552	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4553	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4554	+
	4555	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4556	+ //copy.versionlist[copy.versionindex + 1] != null);
	4557	+
	4558	+ muteSlider = true;
	4559	+ versionSlider.setMinimum(0);
	4560	+ versionSlider.setMaximum(VersionCount() - 1);
	4561	+ versionSlider.setInteger(copy.versionindex);
	4562	+ versionSlider.setEnabled(copy.versionindex != -1);
	4563	+ muteSlider = false;
	4564	+
	4565	+ versionSliderPane.setVisible(true);
	4566	+ }
3832	4567	}
3833	4568
3834		- public boolean Undo()
	4569	+ public boolean PreviousVersion()
3835	4570	{
3836	4571	// Option?
3837	4572	Replace();
3838	4573
3839	4574	System.err.println("Undo");
3840	4575
3841		- cRadio tab = GetCurrentTab();
	4576	+ //cRadio tab = GetCurrentTab();
3842	4577
3843	4578	if (copy.versionindex == 0)
3844	4579	{
..	..	@@ -3861,7 +4596,7 @@
3861	4596
3862	4597	copy.versionindex -= 1;
3863	4598
3864		- CopyChanged((Object3D)copy.versions[copy.versionindex]);
	4599	+ CopyChanged();
3865	4600
3866	4601	return true;
3867	4602	}
..	..	@@ -3870,45 +4605,45 @@
3870	4605	{
3871	4606	System.err.println("Restore");
3872	4607
3873		- cRadio tab = GetCurrentTab();
	4608	+ //cRadio tab = GetCurrentTab();
3874	4609
3875		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4610	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3876	4611	{
3877	4612	java.awt.Toolkit.getDefaultToolkit().beep();
3878	4613	return false;
3879	4614	}
3880	4615
3881	4616	//CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3882		- CopyChanged(copy.versions[copy.versionindex]);
	4617	+ CopyChanged();
3883	4618
3884	4619	return true;
3885	4620	}
3886	4621
3887	4622	public boolean Replace()
3888	4623	{
3889		- System.err.println("Replace");
	4624	+ //System.err.println("Replace");
3890	4625
3891		- cRadio tab = GetCurrentTab();
	4626	+ //cRadio tab = GetCurrentTab();
3892	4627
3893		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4628	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3894	4629	{
3895	4630	// No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3896	4631	return false;
3897	4632	}
3898	4633
3899		- copy.versions[copy.versionindex] = CompressCopy();
	4634	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
3900	4635
3901	4636	return true;
3902	4637	}
3903	4638
3904		- public void Redo()
	4639	+ public void NextVersion()
3905	4640	{
3906	4641	// Option?
3907	4642	Replace();
3908	4643
3909		- cRadio tab = GetCurrentTab();
	4644	+ //cRadio tab = GetCurrentTab();
3910	4645
3911		- if (copy.versions[copy.versionindex + 1] == null)
	4646	+ if (copy.versionlist[copy.versionindex + 1] == null)
3912	4647	{
3913	4648	java.awt.Toolkit.getDefaultToolkit().beep();
3914	4649	return;
..	..	@@ -3916,7 +4651,7 @@
3916	4651
3917	4652	copy.versionindex += 1;
3918	4653
3919		- CopyChanged(copy.versions[copy.versionindex]);
	4654	+ CopyChanged();
3920	4655
3921	4656	//if (!tab.user[tab.versionindex])
3922	4657	// tab.graphs[tab.versionindex] = null;
..	..	@@ -4113,6 +4848,12 @@
4113	4848	// else
4114	4849	// applySelf(true);
4115	4850	// }
	4851	+
	4852	+ boolean Equal(double a, double b)
	4853	+ {
	4854	+ return Math.abs(a - b) < 0.001;
	4855	+ }
	4856	+
4116	4857	void applySelf0(boolean name)
4117	4858	{
4118	4859	if (name)
..	..	@@ -4130,7 +4871,7 @@
4130	4871	//copy.material = new cMaterial(copy.GetMaterial());
4131	4872
4132	4873	current.color = (float) colorField.getFloat();
4133		- current.modulation = (float) modulationField.getFloat();
	4874	+ current.modulation = (float) saturationField.getFloat();
4134	4875	current.metalness = (float) metalnessField.getFloat();
4135	4876	current.diffuse = (float) diffuseField.getFloat();
4136	4877	current.specular = (float) specularField.getFloat();
..	..	@@ -4162,29 +4903,52 @@
4162	4903	{
4163	4904	cMaterial mat = copy.material;
4164	4905
4165		- colorField.SetToolTipValue((mat.color));
4166		- modulationField.SetToolTipValue((mat.modulation));
4167		- metalnessField.SetToolTipValue((mat.metalness));
4168		- diffuseField.SetToolTipValue((mat.diffuse));
4169		- specularField.SetToolTipValue((mat.specular));
4170		- shininessField.SetToolTipValue((mat.shininess));
4171		- shiftField.SetToolTipValue((mat.shift));
4172		- ambientField.SetToolTipValue((mat.ambient));
4173		- lightareaField.SetToolTipValue((mat.lightarea));
4174		- diffusenessField.SetToolTipValue((mat.factor));
4175		- velvetField.SetToolTipValue((mat.velvet));
4176		- sheenField.SetToolTipValue((mat.sheen));
4177		- subsurfaceField.SetToolTipValue((mat.subsurface));
4178		- backlitField.SetToolTipValue((mat.bump));
4179		- anisoField.SetToolTipValue((mat.aniso));
4180		- anisoVField.SetToolTipValue((mat.anisoV));
4181		- cameraField.SetToolTipValue((mat.cameralight));
4182		- selfshadowField.SetToolTipValue((mat.diffuseness));
4183		- shadowField.SetToolTipValue((mat.shadow));
4184		- textureField.SetToolTipValue((mat.texture));
4185		- opacityField.SetToolTipValue((mat.opacity));
4186		- fakedepthField.SetToolTipValue((mat.fakedepth));
4187		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	4906	+ if (!Equal(colorField.getFloat(), mat.color))
	4907	+ colorField.SetToolTipValue((mat.color));
	4908	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4909	+ saturationField.SetToolTipValue((mat.modulation));
	4910	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4911	+ metalnessField.SetToolTipValue((mat.metalness));
	4912	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4913	+ diffuseField.SetToolTipValue((mat.diffuse));
	4914	+ if (!Equal(specularField.getFloat(), mat.specular))
	4915	+ specularField.SetToolTipValue((mat.specular));
	4916	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4917	+ shininessField.SetToolTipValue((mat.shininess));
	4918	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4919	+ shiftField.SetToolTipValue((mat.shift));
	4920	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4921	+ ambientField.SetToolTipValue((mat.ambient));
	4922	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4923	+ lightareaField.SetToolTipValue((mat.lightarea));
	4924	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4925	+ diffusenessField.SetToolTipValue((mat.factor));
	4926	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4927	+ velvetField.SetToolTipValue((mat.velvet));
	4928	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4929	+ sheenField.SetToolTipValue((mat.sheen));
	4930	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4931	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4932	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4933	+ backlitField.SetToolTipValue((mat.bump));
	4934	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4935	+ anisoField.SetToolTipValue((mat.aniso));
	4936	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4937	+ anisoVField.SetToolTipValue((mat.anisoV));
	4938	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4939	+ cameraField.SetToolTipValue((mat.cameralight));
	4940	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	4941	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4942	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	4943	+ shadowField.SetToolTipValue((mat.shadow));
	4944	+ if (!Equal(textureField.getFloat(), mat.texture))
	4945	+ textureField.SetToolTipValue((mat.texture));
	4946	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	4947	+ opacityField.SetToolTipValue((mat.opacity));
	4948	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	4949	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4950	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	4951	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4188	4952	}
4189	4953
4190	4954	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4219,17 +4983,20 @@
4219	4983
4220	4984	public void stateChanged(ChangeEvent e)
4221	4985	{
4222		- // assert(false);
	4986	+ // assert(false);
4223	4987	if (e.getSource() == versionSlider)
4224	4988	{
4225	4989	if (muteSlider)
4226	4990	return;
4227	4991
	4992	+ Replace();
	4993	+
4228	4994	int version = versionSlider.getInteger();
4229	4995
4230		- if (copy.versions[version] != null)
	4996	+ if (version != -1 && copy.versionlist[version] != null)
4231	4997	{
4232		- CopyChanged(copy.versions[copy.versionindex = version]);
	4998	+ copy.versionindex = version;
	4999	+ CopyChanged();
4233	5000	}
4234	5001
4235	5002	return;
..	..	@@ -4269,6 +5036,12 @@
4269	5036	{
4270	5037	//System.out.println("stateChanged = " + this);
4271	5038	materialtouched = true;
	5039	+
	5040	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5041	+ {
	5042	+ saturationField.setFloat(1);
	5043	+ }
	5044	+
4272	5045	applySelf();
4273	5046	//System.out.println("this = " + this);
4274	5047	//System.out.println("PARENT = " + parent);
..	..	@@ -4568,6 +5341,7 @@
4568	5341	{
4569	5342	if (GetTree() != null)
4570	5343	{
	5344	+ GetTree().revalidate();
4571	5345	GetTree().repaint();
4572	5346	}
4573	5347
..	..	@@ -4576,6 +5350,11 @@
4576	5350	ctrlPanel.validate(); // ? new
4577	5351	ctrlPanel.repaint();
4578	5352	}
	5353	+
	5354	+ if (previousVersionButton != null && copy.versionlist != null)
	5355	+ SetVersionStates();
	5356	+
	5357	+ cameraView.requestFocusInWindow();
4579	5358	}
4580	5359
4581	5360	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4607,7 +5386,7 @@
4607	5386	// group = (Composite) group.get(0);
4608	5387	// }
4609	5388
4610		- System.out.println("makeSomething of " + thing);
	5389	+ //System.out.println("makeSomething of " + thing);
4611	5390
4612	5391	/*
4613	5392	if (deselect && jList != null)
..	..	@@ -4959,13 +5738,17 @@
4959	5738	c.addChild(csg);
4960	5739	}
4961	5740
4962		- copy.versions = readobj.versions;
	5741	+ copy.versionlist = readobj.versionlist;
4963	5742	copy.versionindex = readobj.versionindex;
	5743	+ copy.versiontable = readobj.versiontable;
4964	5744
4965		- if (copy.versions == null)
	5745	+ if (copy.versionlist == null)
4966	5746	{
4967		- copy.versions = new Object3D[100];
	5747	+ // Backward compatibility
	5748	+ copy.versionlist = new Object3D[100];
4968	5749	copy.versionindex = -1;
	5750	+
	5751	+ //Save(true);
4969	5752	}
4970	5753
4971	5754	//? SetUndoStates();
..	..	@@ -4980,7 +5763,7 @@
4980	5763	{
4981	5764	if (Grafreed.standAlone)
4982	5765	{
4983		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5766	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4984	5767	browser.show();
4985	5768	String filename = browser.getFile();
4986	5769	if (filename != null && filename.length() > 0)
..	..	@@ -5057,6 +5840,8 @@
5057	5840
5058	5841	void save()
5059	5842	{
	5843	+ Replace();
	5844	+
5060	5845	if (lastname == null)
5061	5846	{
5062	5847	return;
..	..	@@ -5299,6 +6084,7 @@
5299	6084	ButtonGroup buttonGroup;
5300	6085
5301	6086	cGridBag toolboxPanel;
	6087	+ cGridBag skyboxPanel;
5302	6088	cGridBag materialPanel;
5303	6089	cGridBag ctrlPanel;
5304	6090
..	..	@@ -5310,6 +6096,7 @@
5310	6096	boolean materialFlushed;
5311	6097	Object3D latestObject;
5312	6098
	6099	+ cGridBag transformPanel;
5313	6100	cGridBag XYZPanel;
5314	6101
5315	6102	JSplitPane gridPanel;
..	..	@@ -5372,7 +6159,7 @@
5372	6159	JLabel colorLabel;
5373	6160	cNumberSlider colorField;
5374	6161	JLabel modulationLabel;
5375		- cNumberSlider modulationField;
	6162	+ cNumberSlider saturationField;
5376	6163	JLabel metalnessLabel;
5377	6164	cNumberSlider metalnessField;
5378	6165	JLabel diffuseLabel;
..	..	@@ -5403,6 +6190,7 @@
5403	6190	cNumberSlider anisoField;
5404	6191	JLabel anisoVLabel;
5405	6192	cNumberSlider anisoVField;
	6193	+
5406	6194	JLabel cameraLabel;
5407	6195	cNumberSlider cameraField;
5408	6196	JLabel selfshadowLabel;
..	..	@@ -5417,6 +6205,7 @@
5417	6205	cNumberSlider fakedepthField;
5418	6206	JLabel shadowbiasLabel;
5419	6207	cNumberSlider shadowbiasField;
	6208	+
5420	6209	JLabel bumpLabel;
5421	6210	cNumberSlider bumpField;
5422	6211	JLabel noiseLabel;