~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,11 +42,54 @@
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 cGridBag GetSeparator()
	76	+ {
	77	+ cGridBag separator = new cGridBag();
	78	+ separator.add(new JSeparator());
	79	+ separator.preferredHeight = 5;
	80	+ return separator;
	81	+ }
44	82
45	83	cButton GetButton(String name, boolean border)
46	84	{
47	85	ImageIcon icon = GetIcon(name);
48	86	return new cButton(icon, border);
	87	+ }
	88	+
	89	+ cLabel GetLabel(String name, boolean border)
	90	+ {
	91	+ //ImageIcon icon = GetIcon(name);
	92	+ return new cLabel(GetImage(name), border);
49	93	}
50	94
51	95	cToggleButton GetToggleButton(String name, boolean border)
..	..	@@ -60,8 +104,16 @@
60	104	return new cCheckBox(icon, border);
61	105	}
62	106
	107	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	108	+
63	109	ImageIcon GetIcon(String name)
64	110	{
	111	+ javax.swing.ImageIcon iconCache = icons.get(name);
	112	+ if (iconCache != null)
	113	+ {
	114	+ return iconCache;
	115	+ }
	116	+
65	117	try
66	118	{
67	119	BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
..	..	@@ -79,7 +131,25 @@
79	131	// }
80	132
81	133	javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	134	+
	135	+ icons.put(name, icon);
	136	+
82	137	return icon;
	138	+ }
	139	+ catch (Exception e)
	140	+ {
	141	+ //icons.put(name, null);
	142	+ return null;
	143	+ }
	144	+ }
	145	+
	146	+ BufferedImage GetImage(String name)
	147	+ {
	148	+ try
	149	+ {
	150	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	151	+
	152	+ return image;
83	153	}
84	154	catch (Exception e)
85	155	{
..	..	@@ -268,11 +338,13 @@
268	338	client = inClient;
269	339	copy = client;
270	340
271		- if (copy.versions == null)
272		- {
273		- copy.versions = new byte[100][];
274		- copy.versionindex = -1;
275		- }
	341	+// if (copy.versionlist == null)
	342	+// {
	343	+// copy.versionlist = new Object3D[100];
	344	+// copy.versionindex = -1;
	345	+//
	346	+// callee.Save(true);
	347	+// }
276	348
277	349	// "this" is not called: SetupUI2(objEditor);
278	350	}
..	..	@@ -287,10 +359,12 @@
287	359	client = inClient;
288	360	copy = client;
289	361
290		- if (copy.versions == null)
	362	+ if (copy.versionlist == null)
291	363	{
292		- copy.versions = new byte[100][];
	364	+ copy.versionlist = new Object3D[100];
293	365	copy.versionindex = -1;
	366	+
	367	+// Save(true);
294	368	}
295	369
296	370	SetupUI2(callee.GetEditor());
..	..	@@ -314,7 +388,8 @@
314	388	//parent = p;
315	389
316	390	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
317		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	391	+ if (Globals.DEBUG)
	392	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
318	393	//gd.setFullScreenWindow(this);
319	394	//setResizable(false);
320	395	//if (!isDisplayable())
..	..	@@ -325,11 +400,13 @@
325	400	copy = localCopy;
326	401	copy.editWindow = this;
327	402
328		- if (copy.versions == null)
329		- {
330		-// copy.versions = new byte[100][];
	403	+// if (copy.versionlist == null)
	404	+// {
	405	+// copy.versionlist = new Object3D[100];
331	406	// copy.versionindex = -1;
332		- }
	407	+//
	408	+// Save(true);
	409	+// }
333	410
334	411	SetupMenu();
335	412
..	..	@@ -398,6 +475,8 @@
398	475
399	476	ChangeListener changeListener = new ChangeListener()
400	477	{
	478	+ //String name;
	479	+
401	480	public void stateChanged(ChangeEvent changeEvent)
402	481	{
403	482	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -416,7 +495,37 @@
416	495	// EditSelection(false);
417	496	// }
418	497
419		- refreshContents(false); // To refresh Info tab
	498	+// if (objectPanel.getSelectedIndex() == 4)
	499	+// {
	500	+// name = copy.skyboxname;
	501	+//
	502	+// if (name == null)
	503	+// {
	504	+// name = "";
	505	+// }
	506	+//
	507	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	508	+// copy.skyboxext = "jpg";
	509	+// }
	510	+// else
	511	+// {
	512	+// if (name != null)
	513	+// {
	514	+// if (name.equals(""))
	515	+// {
	516	+// copy.skyboxname = null;
	517	+// copy.skyboxext = null;
	518	+// }
	519	+// else
	520	+// {
	521	+// copy.skyboxname = name;
	522	+// }
	523	+// }
	524	+// }
	525	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	526	+
	527	+// refreshContents(false); // To refresh Info tab
	528	+ cameraView.repaint();
420	529	}
421	530	};
422	531	objectPanel.addChangeListener(changeListener);
..	..	@@ -439,7 +548,9 @@
439	548	toolboxPanel = new cGridBag().setVertical(true);
440	549	//toolboxPanel.setName("Toolbox");
441	550
442		- materialPanel = new cGridBag().setVertical(true);
	551	+ skyboxPanel = new cGridBag().setVertical(true);
	552	+
	553	+ materialPanel = new cGridBag().setVertical(false);
443	554	//materialPanel.setName("Material");
444	555
445	556	/JTextPane/
..	..	@@ -723,6 +834,7 @@
723	834	boolean maximized;
724	835
725	836	cButton fullscreenLayout;
	837	+ cButton expandedLayout;
726	838
727	839	void Minimize()
728	840	{
..	..	@@ -762,10 +874,12 @@
762	874	cButton minButton;
763	875	cButton maxButton;
764	876	cButton fullButton;
	877	+ cButton collapseButton;
	878	+ cButton maximize3DButton;
765	879
766	880	void ToggleFullScreen()
767	881	{
768		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	882	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
769	883
770	884	cameraView.ToggleFullScreen();
771	885
..	..	@@ -786,13 +900,13 @@
786	900	// X frame.getContentPane().remove(/"Center",/bigThree);
787	901	// X framePanel.add(bigThree);
788	902	// X frame.getContentPane().add(/"Center",/framePanel);
789		- framePanel.setDividerLocation(46);
	903	+// framePanel.setDividerLocation(46); // icons are 24x24
790	904
791	905	//frame.setVisible(true);
792		- radio.layout = keepButton;
	906	+// radio.layout = keepButton;
793	907	//theFrame = null;
794	908	keepButton = null;
795		- radio.layout.doClick();
	909	+// radio.layout.doClick();
796	910
797	911	} else
798	912	{
..	..	@@ -813,31 +927,42 @@
813	927	// X frame.getContentPane().remove(/"Center",/framePanel);
814	928	// X framePanel.remove(bigThree);
815	929	// X frame.getContentPane().add(/"Center",/bigThree);
816		- framePanel.setDividerLocation(0);
	930	+// framePanel.setDividerLocation(0);
817	931
818		- radio.layout = fullscreenLayout;
819		- radio.layout.doClick();
	932	+// radio.layout = fullscreenLayout;
	933	+// radio.layout.doClick();
820	934	//frame.setVisible(true);
821	935	}
822	936	frame.validate();
	937	+
	938	+ cameraView.requestFocusInWindow();
823	939	}
824	940
825		- private byte[] CompressCopy()
	941	+ void CollapseToolbar()
	942	+ {
	943	+ framePanel.setDividerLocation(0);
	944	+ //frame.validate();
	945	+
	946	+ cameraView.requestFocusInWindow();
	947	+ }
	948	+
	949	+ private Object3D Duplicate(Object3D object)
826	950	{
827	951	boolean temp = CameraPane.SWITCH;
828	952	CameraPane.SWITCH = false;
829	953
830		- copy.ExtractBigData(versiontable);
	954	+ object.ExtractBigData(versiontable);
831	955	// if (copy == client)
832	956
833		- byte[] versions[] = copy.versions;
834		- copy.versions = null;
	957	+ Object3D versions[] = object.versionlist;
	958	+ object.versionlist = null;
835	959
836		- byte[] compress = Compress(copy);
	960	+ //byte[] compress = Compress(copy);
	961	+ Object3D compress = (Object3D)Grafreed.clone(object);
837	962
838		- copy.versions = versions;
	963	+ object.versionlist = versions;
839	964
840		- copy.RestoreBigData(versiontable);
	965	+ object.RestoreBigData(versiontable);
841	966
842	967	CameraPane.SWITCH = temp;
843	968
..	..	@@ -965,6 +1090,7 @@
965	1090	{
966	1091	SetupMaterial(materialPanel);
967	1092	}
	1093	+
968	1094	//SetupName();
969	1095	//SetupViews();
970	1096	}
..	..	@@ -1173,6 +1299,18 @@
1173	1299
1174	1300	namePanel = new cGridBag();
1175	1301
	1302	+ //if (copy.pinned)
	1303	+ {
	1304	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1305	+ pinButton.setSelected(copy.pinned);
	1306	+ cGridBag t = new cGridBag();
	1307	+ t.preferredWidth = 2;
	1308	+ t.add(pinButton);
	1309	+ namePanel.add(t);
	1310	+
	1311	+ pinButton.addItemListener(this);
	1312	+ }
	1313	+
1176	1314	nameField = AddText(namePanel, copy.GetName());
1177	1315	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1178	1316	oe.ctrlPanel.add(namePanel);
..	..	@@ -1186,14 +1324,14 @@
1186	1324
1187	1325	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1188	1326	liveCB.setToolTipText("Animate object");
	1327	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1328	+ markCB.setToolTipText("Set target transform");
1189	1329	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1190	1330	selectableCB.setToolTipText("Make object selectable");
1191	1331	// Return();
1192	1332
1193	1333	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1194	1334	hideCB.setToolTipText("Hide object");
1195		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1196		- markCB.setToolTipText("As animation target transform");
1197	1335
1198	1336	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1199	1337
..	..	@@ -1395,6 +1533,7 @@
1395	1533
1396	1534	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1397	1535	{
	1536	+ if (Globals.DEBUG)
1398	1537	System.out.println("CREATE CAMERAS");
1399	1538	cams = new cTemplate();
1400	1539	cams.name = "Cameras";
..	..	@@ -1522,23 +1661,28 @@
1522	1661	//tmp.setName("Edit");
1523	1662	objectPanel.add(materialPanel);
1524	1663	objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1664	+ objectPanel.setToolTipTextAt(0, "Material");
	1665	+
	1666	+ objectPanel.add(toolboxPanel);
	1667	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1668	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1669	+
	1670	+ objectPanel.add(skyboxPanel);
	1671	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1672	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1673	+
1525	1674	// JPanel north = new JPanel(new BorderLayout());
1526	1675	// north.setName("Edit");
1527	1676	// north.add(ctrlPanel, BorderLayout.NORTH);
1528	1677	// objectPanel.add(north);
1529	1678	objectPanel.add(editPanel);
1530		- objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1531		-
1532		- //if (Globals.ADVANCED)
1533		- objectPanel.add(infoPanel);
1534		- objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1679	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1680	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1535	1681
1536	1682	objectPanel.add(XYZPanel);
1537		- objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1683	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1684	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1538	1685
1539		- objectPanel.add(toolboxPanel);
1540		- objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1541		-
1542	1686	/*
1543	1687	aConstraints.gridx = 0;
1544	1688	aConstraints.gridwidth = 1;
..	..	@@ -1575,6 +1719,11 @@
1575	1719
1576	1720	scenePanel.add(tabbedPane);
1577	1721
	1722	+ //if (Globals.ADVANCED)
	1723	+// tabbedPane.add(infoPanel);
	1724	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1725	+// tabbedPane.setToolTipTextAt(3, "Information");
	1726	+
1578	1727	/*
1579	1728	cTree jTree = new cTree(null);
1580	1729	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1634,8 +1783,8 @@
1634	1783	/**/
1635	1784
1636	1785	bigThree = new cGridBag();
1637		- bigThree.addComponent(centralPanel);
1638	1786	bigThree.addComponent(scenePanel);
	1787	+ bigThree.addComponent(centralPanel);
1639	1788	//bigThree.addComponent(XYZPanel);
1640	1789
1641	1790	// // SIDE EFFECT!!!
..	..	@@ -1645,6 +1794,23 @@
1645	1794	// aConstraints.gridheight = 1;
1646	1795
1647	1796	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1797	+
	1798	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1799	+ new java.beans.PropertyChangeListener()
	1800	+ {
	1801	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1802	+ {
	1803	+ if ((Integer)pce.getOldValue() == 1)
	1804	+ {
	1805	+ if (radio.layout != expandedLayout)
	1806	+ {
	1807	+ radio.layout = expandedLayout;
	1808	+ radio.layout.doClick();
	1809	+ }
	1810	+ }
	1811	+ }
	1812	+ });
	1813	+
1648	1814	framePanel.setContinuousLayout(false);
1649	1815	framePanel.setOneTouchExpandable(false);
1650	1816	//.setDividerLocation(0.8);
..	..	@@ -1654,7 +1820,7 @@
1654	1820
1655	1821	frame.getContentPane().setLayout(new BorderLayout());
1656	1822	/**/
1657		- JTabbedPane worldPane = new JTabbedPane();
	1823	+ //JTabbedPane worldPane = new JTabbedPane();
1658	1824	//worldPane.add(bigPanel);
1659	1825	//worldPane.add(worldPanel);
1660	1826	/**/
..	..	@@ -1677,7 +1843,6 @@
1677	1843	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1678	1844	frame.addWindowListener(new WindowAdapter()
1679	1845	{
1680		-
1681	1846	public void windowClosing(WindowEvent e)
1682	1847	{
1683	1848	Close();
..	..	@@ -1700,12 +1865,418 @@
1700	1865	ctrlPanel.removeAll();
1701	1866	}
1702	1867
1703		- void SetupMaterial(cGridBag panel)
	1868	+ void SetupMaterial(cGridBag materialpanel)
1704	1869	{
1705		- /*
	1870	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1871	+
	1872	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1873	+ skin.setToolTipText("Skin");
	1874	+ skin.addMouseListener(new MouseAdapter()
	1875	+ {
	1876	+ public void mouseClicked(MouseEvent e)
	1877	+ {
	1878	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1879	+ cMaterial material = object.material;
	1880	+
	1881	+ // Skin
	1882	+ colorField.setFloat(material.color);
	1883	+ saturationField.setFloat(material.modulation);
	1884	+ subsurfaceField.setFloat(material.subsurface);
	1885	+ selfshadowField.setFloat(material.diffuseness);
	1886	+ diffusenessField.setFloat(material.factor);
	1887	+ shininessField.setFloat(material.shininess);
	1888	+ shadowbiasField.setFloat(material.shadowbias);
	1889	+ diffuseField.setFloat(material.diffuse);
	1890	+ specularField.setFloat(material.specular);
	1891	+
	1892	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1893	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1894	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1895	+
	1896	+ materialtouched = true;
	1897	+ applySelf();
	1898	+ }
	1899	+ });
	1900	+ presetpanel.add(skin);
	1901	+
	1902	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1903	+ lambert.setToolTipText("Diffuse");
	1904	+ lambert.addMouseListener(new MouseAdapter()
	1905	+ {
	1906	+ public void mouseClicked(MouseEvent e)
	1907	+ {
	1908	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1909	+ cMaterial material = object.material;
	1910	+
	1911	+ diffusenessField.setFloat(material.factor);
	1912	+ selfshadowField.setFloat(material.diffuseness);
	1913	+
	1914	+ materialtouched = true;
	1915	+ applySelf();
	1916	+ }
	1917	+ });
	1918	+ presetpanel.add(lambert);
	1919	+
	1920	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1921	+ diffuse2.setToolTipText("Diffuse2");
	1922	+ diffuse2.addMouseListener(new MouseAdapter()
	1923	+ {
	1924	+ public void mouseClicked(MouseEvent e)
	1925	+ {
	1926	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1927	+ cMaterial material = object.material;
	1928	+
	1929	+ diffusenessField.setFloat(material.factor);
	1930	+ selfshadowField.setFloat(material.diffuseness);
	1931	+
	1932	+ materialtouched = true;
	1933	+ applySelf();
	1934	+ }
	1935	+ });
	1936	+ presetpanel.add(diffuse2);
	1937	+
	1938	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1939	+ diffusemoon.setToolTipText("Moon");
	1940	+ diffusemoon.addMouseListener(new MouseAdapter()
	1941	+ {
	1942	+ public void mouseClicked(MouseEvent e)
	1943	+ {
	1944	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1945	+ cMaterial material = object.material;
	1946	+
	1947	+ diffusenessField.setFloat(material.factor);
	1948	+ selfshadowField.setFloat(material.diffuseness);
	1949	+
	1950	+ materialtouched = true;
	1951	+ applySelf();
	1952	+ }
	1953	+ });
	1954	+ presetpanel.add(diffusemoon);
	1955	+
	1956	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1957	+ diffusemoon2.setToolTipText("Moon2");
	1958	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1959	+ {
	1960	+ public void mouseClicked(MouseEvent e)
	1961	+ {
	1962	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1963	+ cMaterial material = object.material;
	1964	+
	1965	+ diffusenessField.setFloat(material.factor);
	1966	+ selfshadowField.setFloat(material.diffuseness);
	1967	+
	1968	+ materialtouched = true;
	1969	+ applySelf();
	1970	+ }
	1971	+ });
	1972	+ presetpanel.add(diffusemoon2);
	1973	+
	1974	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1975	+ diffusemoon3.setToolTipText("Moon3");
	1976	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1977	+ {
	1978	+ public void mouseClicked(MouseEvent e)
	1979	+ {
	1980	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1981	+ cMaterial material = object.material;
	1982	+
	1983	+ diffusenessField.setFloat(material.factor);
	1984	+ selfshadowField.setFloat(material.diffuseness);
	1985	+
	1986	+ materialtouched = true;
	1987	+ applySelf();
	1988	+ }
	1989	+ });
	1990	+ presetpanel.add(diffusemoon3);
	1991	+
	1992	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1993	+ diffusesheen.setToolTipText("Sheen");
	1994	+ diffusesheen.addMouseListener(new MouseAdapter()
	1995	+ {
	1996	+ public void mouseClicked(MouseEvent e)
	1997	+ {
	1998	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1999	+ cMaterial material = object.material;
	2000	+
	2001	+ sheenField.setFloat(material.sheen);
	2002	+
	2003	+ materialtouched = true;
	2004	+ applySelf();
	2005	+ }
	2006	+ });
	2007	+ presetpanel.add(diffusesheen);
	2008	+
	2009	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2010	+ rough.setToolTipText("Rough metal");
	2011	+ rough.addMouseListener(new MouseAdapter()
	2012	+ {
	2013	+ public void mouseClicked(MouseEvent e)
	2014	+ {
	2015	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2016	+ cMaterial material = object.material;
	2017	+
	2018	+ shininessField.setFloat(material.shininess);
	2019	+ velvetField.setFloat(material.velvet);
	2020	+
	2021	+ materialtouched = true;
	2022	+ applySelf();
	2023	+ }
	2024	+ });
	2025	+ presetpanel.add(rough);
	2026	+
	2027	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2028	+ rough2.setToolTipText("Medium metal");
	2029	+ rough2.addMouseListener(new MouseAdapter()
	2030	+ {
	2031	+ public void mouseClicked(MouseEvent e)
	2032	+ {
	2033	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2034	+ cMaterial material = object.material;
	2035	+
	2036	+ shininessField.setFloat(material.shininess);
	2037	+ lightareaField.setFloat(material.lightarea);
	2038	+
	2039	+ materialtouched = true;
	2040	+ applySelf();
	2041	+ }
	2042	+ });
	2043	+ presetpanel.add(rough2);
	2044	+
	2045	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2046	+ shini0.setToolTipText("Shiny");
	2047	+ shini0.addMouseListener(new MouseAdapter()
	2048	+ {
	2049	+ public void mouseClicked(MouseEvent e)
	2050	+ {
	2051	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2052	+ cMaterial material = object.material;
	2053	+
	2054	+ shininessField.setFloat(material.shininess);
	2055	+ lightareaField.setFloat(material.lightarea);
	2056	+
	2057	+ materialtouched = true;
	2058	+ applySelf();
	2059	+ }
	2060	+ });
	2061	+ presetpanel.add(shini0);
	2062	+
	2063	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2064	+ shini1.setToolTipText("Shiny2");
	2065	+ shini1.addMouseListener(new MouseAdapter()
	2066	+ {
	2067	+ public void mouseClicked(MouseEvent e)
	2068	+ {
	2069	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2070	+ cMaterial material = object.material;
	2071	+
	2072	+ shininessField.setFloat(material.shininess);
	2073	+ lightareaField.setFloat(material.lightarea);
	2074	+
	2075	+ materialtouched = true;
	2076	+ applySelf();
	2077	+ }
	2078	+ });
	2079	+ presetpanel.add(shini1);
	2080	+
	2081	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2082	+ shini2.setToolTipText("Shiny3");
	2083	+ shini2.addMouseListener(new MouseAdapter()
	2084	+ {
	2085	+ public void mouseClicked(MouseEvent e)
	2086	+ {
	2087	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2088	+ cMaterial material = object.material;
	2089	+
	2090	+ shininessField.setFloat(material.shininess);
	2091	+ lightareaField.setFloat(material.lightarea);
	2092	+
	2093	+ materialtouched = true;
	2094	+ applySelf();
	2095	+ }
	2096	+ });
	2097	+ presetpanel.add(shini2);
	2098	+
	2099	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2100	+ aniso.setToolTipText("AnisoU");
	2101	+ aniso.addMouseListener(new MouseAdapter()
	2102	+ {
	2103	+ public void mouseClicked(MouseEvent e)
	2104	+ {
	2105	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2106	+ cMaterial material = object.material;
	2107	+
	2108	+ anisoField.setFloat(material.aniso);
	2109	+ anisoVField.setFloat(material.anisoV);
	2110	+
	2111	+ materialtouched = true;
	2112	+ applySelf();
	2113	+ }
	2114	+ });
	2115	+ presetpanel.add(aniso);
	2116	+
	2117	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2118	+ aniso2.setToolTipText("AnisoV");
	2119	+ aniso2.addMouseListener(new MouseAdapter()
	2120	+ {
	2121	+ public void mouseClicked(MouseEvent e)
	2122	+ {
	2123	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2124	+ cMaterial material = object.material;
	2125	+
	2126	+ anisoField.setFloat(material.aniso);
	2127	+ anisoVField.setFloat(material.anisoV);
	2128	+
	2129	+ materialtouched = true;
	2130	+ applySelf();
	2131	+ }
	2132	+ });
	2133	+ presetpanel.add(aniso2);
	2134	+
	2135	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2136	+ aniso3.setToolTipText("AnisoUV");
	2137	+ aniso3.addMouseListener(new MouseAdapter()
	2138	+ {
	2139	+ public void mouseClicked(MouseEvent e)
	2140	+ {
	2141	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2142	+ cMaterial material = object.material;
	2143	+
	2144	+ anisoField.setFloat(material.aniso);
	2145	+ anisoVField.setFloat(material.anisoV);
	2146	+
	2147	+ materialtouched = true;
	2148	+ applySelf();
	2149	+ }
	2150	+ });
	2151	+ presetpanel.add(aniso3);
	2152	+
	2153	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2154	+ velvet0.setToolTipText("Velvet");
	2155	+ velvet0.addMouseListener(new MouseAdapter()
	2156	+ {
	2157	+ public void mouseClicked(MouseEvent e)
	2158	+ {
	2159	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2160	+ cMaterial material = object.material;
	2161	+
	2162	+ diffusenessField.setFloat(material.factor);
	2163	+ selfshadowField.setFloat(material.diffuseness);
	2164	+ sheenField.setFloat(material.sheen);
	2165	+ shininessField.setFloat(material.shininess);
	2166	+ velvetField.setFloat(material.velvet);
	2167	+ shiftField.setFloat(material.shift);
	2168	+
	2169	+ materialtouched = true;
	2170	+ applySelf();
	2171	+ }
	2172	+ });
	2173	+ presetpanel.add(velvet0);
	2174	+
	2175	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2176	+ bump0.setToolTipText("Bump texture");
	2177	+ bump0.addMouseListener(new MouseAdapter()
	2178	+ {
	2179	+ public void mouseClicked(MouseEvent e)
	2180	+ {
	2181	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2182	+ cMaterial material = object.material;
	2183	+
	2184	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2185	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2186	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2187	+
	2188	+ materialtouched = true;
	2189	+ applySelf();
	2190	+ }
	2191	+ });
	2192	+ presetpanel.add(bump0);
	2193	+
	2194	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2195	+ borderShader.setToolTipText("Border fade");
	2196	+ borderShader.addMouseListener(new MouseAdapter()
	2197	+ {
	2198	+ public void mouseClicked(MouseEvent e)
	2199	+ {
	2200	+ borderfadeField.setFloat(0.5);
	2201	+ opacityField.setFloat(0.75);
	2202	+
	2203	+ materialtouched = true;
	2204	+ applySelf();
	2205	+ }
	2206	+ });
	2207	+ presetpanel.add(borderShader);
	2208	+
	2209	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2210	+ halo.setToolTipText("Halo");
	2211	+ halo.addMouseListener(new MouseAdapter()
	2212	+ {
	2213	+ public void mouseClicked(MouseEvent e)
	2214	+ {
	2215	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2216	+ cMaterial material = object.material;
	2217	+
	2218	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2219	+
	2220	+ materialtouched = true;
	2221	+ applySelf();
	2222	+ }
	2223	+ });
	2224	+ presetpanel.add(halo);
	2225	+
	2226	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2227	+ candle.setToolTipText("Candle");
	2228	+ candle.addMouseListener(new MouseAdapter()
	2229	+ {
	2230	+ public void mouseClicked(MouseEvent e)
	2231	+ {
	2232	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2233	+ cMaterial material = object.material;
	2234	+
	2235	+ subsurfaceField.setFloat(material.subsurface);
	2236	+ shadowbiasField.setFloat(material.shadowbias);
	2237	+ ambientField.setFloat(material.ambient);
	2238	+ specularField.setFloat(material.specular);
	2239	+ lightareaField.setFloat(material.lightarea);
	2240	+ shininessField.setFloat(material.shininess);
	2241	+
	2242	+ materialtouched = true;
	2243	+ applySelf();
	2244	+ }
	2245	+ });
	2246	+ presetpanel.add(candle);
	2247	+
	2248	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2249	+ shadowShader.setToolTipText("Shadow");
	2250	+ shadowShader.addMouseListener(new MouseAdapter()
	2251	+ {
	2252	+ public void mouseClicked(MouseEvent e)
	2253	+ {
	2254	+ diffuseField.setFloat(0.001);
	2255	+ ambientField.setFloat(0.001);
	2256	+ cameraField.setFloat(0.001);
	2257	+ specularField.setFloat(0.001);
	2258	+ fakedepthField.setFloat(0.001);
	2259	+ opacityField.setFloat(0.6);
	2260	+
	2261	+ materialtouched = true;
	2262	+ applySelf();
	2263	+ }
	2264	+ });
	2265	+ presetpanel.add(shadowShader);
	2266	+
	2267	+ cGridBag panel = new cGridBag().setVertical(true);
	2268	+
	2269	+ presetpanel.preferredWidth = 1;
	2270	+
	2271	+ materialpanel.add(presetpanel);
	2272	+ materialpanel.add(panel);
	2273	+
	2274	+ panel.preferredWidth = 8;
	2275	+
	2276	+ /*
1706	2277	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1707	2278	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1708		- */
	2279	+ */
1709	2280
1710	2281	cGridBag editBar = new cGridBag().setVertical(false);
1711	2282
..	..	@@ -1739,27 +2310,61 @@
1739	2310	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1740	2311
1741	2312	cGridBag colorSection = new cGridBag().setVertical(true);
	2313	+
	2314	+ cGridBag huepanel = new cGridBag();
	2315	+ cGridBag huelabel = new cGridBag();
	2316	+ cLabel hue = GetLabel("icons/hue.png", false);
	2317	+ hue.fit = true;
	2318	+
	2319	+ hue.addMouseListener(new MouseAdapter()
	2320	+ {
	2321	+ public void mousePressed(MouseEvent e)
	2322	+ {
	2323	+ int x = e.getX();
	2324	+
	2325	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2326	+ }
	2327	+ });
	2328	+
	2329	+ huelabel.add(hue);
	2330	+ huelabel.preferredWidth = 20;
	2331	+ huepanel.add(new cGridBag()); // Label
	2332	+ huepanel.add(huelabel); // Field/slider
	2333	+
	2334	+ huepanel.preferredHeight = 7;
	2335	+
	2336	+ colorSection.add(huepanel);
1742	2337
1743	2338	cGridBag color = new cGridBag();
1744		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1745		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1746		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2339	+
	2340	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2341	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2342	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2343	+
1747	2344	//colorField.preferredWidth = 200;
1748	2345	colorSection.add(color);
1749	2346
1750	2347	cGridBag modulation = new cGridBag();
1751	2348	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1752	2349	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1753		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2350	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1754	2351	colorSection.add(modulation);
1755	2352
	2353	+ cGridBag opacity = new cGridBag();
	2354	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2355	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2356	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2357	+ colorSection.add(opacity);
	2358	+
	2359	+ colorSection.add(GetSeparator());
	2360	+
1756	2361	cGridBag texture = new cGridBag();
1757	2362	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1758	2363	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1759	2364	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1760	2365	colorSection.add(texture);
1761	2366
1762		- panel.add(new JSeparator());
	2367	+ panel.add(GetSeparator());
1763	2368
1764	2369	panel.add(colorSection);
1765	2370
..	..	@@ -1815,7 +2420,7 @@
1815	2420	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1816	2421	diffuseSection.add(shadowbias);
1817	2422
1818		- panel.add(new JSeparator());
	2423	+ panel.add(GetSeparator());
1819	2424
1820	2425	panel.add(diffuseSection);
1821	2426
..	..	@@ -1878,7 +2483,7 @@
1878	2483	specularSection.add(anisoV);
1879	2484
1880	2485
1881		- panel.add(new JSeparator());
	2486	+ panel.add(GetSeparator());
1882	2487
1883	2488	panel.add(specularSection);
1884	2489
..	..	@@ -1903,12 +2508,6 @@
1903	2508	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1904	2509	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1905	2510	colorSection.add(backlit);
1906		-
1907		- cGridBag opacity = new cGridBag();
1908		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1909		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1910		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1911		- colorSection.add(opacity);
1912	2511
1913	2512	//panel.add(new JSeparator());
1914	2513
..	..	@@ -1954,7 +2553,7 @@
1954	2553	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1955	2554	textureSection.add(opacityPower);
1956	2555
1957		- panel.add(new JSeparator());
	2556	+ panel.add(GetSeparator());
1958	2557
1959	2558	panel.add(textureSection);
1960	2559
..	..	@@ -2941,7 +3540,7 @@
2941	3540
2942	3541	freezematerial = true;
2943	3542	colorField.setFloat(mat.color);
2944		- modulationField.setFloat(mat.modulation);
	3543	+ saturationField.setFloat(mat.modulation);
2945	3544	metalnessField.setFloat(mat.metalness);
2946	3545	diffuseField.setFloat(mat.diffuse);
2947	3546	specularField.setFloat(mat.specular);
..	..	@@ -3003,32 +3602,8 @@
3003	3602
3004	3603	if (multiplyToggle != null)
3005	3604	multiplyToggle.setSelected(mat.multiply);
3006		-
3007		- assert (object.projectedVertices != null);
3008		-
3009		- if (object.projectedVertices.length <= 2)
3010		- {
3011		- // Side effect...
3012		- Object3D.cVector2[] keep = object.projectedVertices;
3013		- object.projectedVertices = new Object3D.cVector2[3];
3014		- for (int i = 0; i < 3; i++)
3015		- {
3016		- if (i < keep.length)
3017		- {
3018		- object.projectedVertices[i] = keep[i];
3019		- } else
3020		- {
3021		- object.projectedVertices[i] = new Object3D.cVector2();
3022		- }
3023		- /*
3024		- if(keep.length == 0)
3025		- object.projectedVertices[0] = new Object3D.cVector2();
3026		- else
3027		- object.projectedVertices[0] = keep[0];
3028		- object.projectedVertices[1] = new Object3D.cVector2();
3029		- */
3030		- }
3031		- }
	3605	+
	3606	+ AllocProjectedVertices(object);
3032	3607
3033	3608	SetMaterial(mat, object.projectedVertices);
3034	3609	}
..	..	@@ -3148,6 +3723,17 @@
3148	3723	public void itemStateChanged(ItemEvent event)
3149	3724	{
3150	3725	// System.out.println("Propagate = " + propagate);
	3726	+ if (event.getSource() == pinButton)
	3727	+ {
	3728	+ copy.pinned ^= true;
	3729	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3730	+ {
	3731	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3732	+ copy.CloseUI();
	3733	+ //copy.editWindow.refreshContents();
	3734	+ }
	3735	+ }
	3736	+ else
3151	3737	if (event.getSource() == propagateToggle)
3152	3738	{
3153	3739	propagate ^= true;
..	..	@@ -3252,6 +3838,7 @@
3252	3838	} else if (event.getSource() == liveCB)
3253	3839	{
3254	3840	copy.live ^= true;
	3841	+ objEditor.refreshContents(true); // To show item colors
3255	3842	return;
3256	3843	} else if (event.getSource() == selectableCB)
3257	3844	{
..	..	@@ -3261,7 +3848,7 @@
3261	3848	{
3262	3849	copy.hide ^= true;
3263	3850	copy.Touch(); // display list issue
3264		- objEditor.refreshContents();
	3851	+ objEditor.refreshContents(true); // To show item colors
3265	3852	return;
3266	3853	} else if (event.getSource() == link2masterCB)
3267	3854	{
..	..	@@ -3517,6 +4104,7 @@
3517	4104
3518	4105	static public byte[] Compress(Object3D o)
3519	4106	{
	4107	+ // Slower to actually compress.
3520	4108	try
3521	4109	{
3522	4110	ByteArrayOutputStream baos = new ByteArrayOutputStream();
..	..	@@ -3618,6 +4206,7 @@
3618	4206	{
3619	4207	//Save(true);
3620	4208	Replace();
	4209	+ SetVersionStates();
3621	4210	}
3622	4211
3623	4212	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3638,29 +4227,46 @@
3638	4227
3639	4228	java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3640	4229
	4230	+ void DeleteVersion()
	4231	+ {
	4232	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4233	+ {
	4234	+ copy.versionlist[i] = copy.versionlist[i+1];
	4235	+ }
	4236	+
	4237	+ CopyChanged();
	4238	+
	4239	+ SetVersionStates();
	4240	+ }
	4241	+
3641	4242	public boolean Save(boolean user)
3642	4243	{
3643	4244	System.err.println("Save");
	4245	+ Replace();
3644	4246
3645		- cRadio tab = GetCurrentTab();
	4247	+ //cRadio tab = GetCurrentTab();
3646	4248
3647		- byte[] compress = CompressCopy();
	4249	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3648	4250
3649	4251	boolean thesame = false;
3650	4252
3651		- // Quick heuristic using length. Works only when stream is compressed.
3652		- if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3653		- {
3654		- thesame = true;
3655		- }
	4253	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4254	+// {
	4255	+// thesame = true;
	4256	+// }
3656	4257
3657	4258	//EditorFrame.m_MainFrame.requestFocusInWindow();
3658	4259	if (!thesame)
3659	4260	{
	4261	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4262	+ {
	4263	+ copy.versionlist[i] = copy.versionlist[i-1];
	4264	+ }
	4265	+
3660	4266	//tab.user[tab.versionindex] = user;
3661	4267	//boolean increment = true; // tab.graphs[tab.versionindex] == null;
3662	4268
3663		- copy.versions[++copy.versionindex] = compress;
	4269	+ copy.versionlist[++copy.versionindex] = compress;
3664	4270
3665	4271	// if (increment)
3666	4272	// tab.versionindex++;
..	..	@@ -3670,13 +4276,13 @@
3670	4276
3671	4277	//assert(hashtable.isEmpty());
3672	4278
3673		- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3674		- {
3675		- //tab.user[i] = false;
3676		- copy.versions[i] = null;
3677		- }
	4279	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4280	+// {
	4281	+// //tab.user[i] = false;
	4282	+// copy.versionlist[i] = null;
	4283	+// }
3678	4284
3679		- SetUndoStates();
	4285	+ SetVersionStates();
3680	4286
3681	4287	// test save
3682	4288	if (false)
..	..	@@ -3699,10 +4305,44 @@
3699	4305
3700	4306	return !thesame;
3701	4307	}
3702		-
3703		- void CopyChanged(Object3D obj)
	4308	+
	4309	+ boolean flashIt = true;
	4310	+
	4311	+ void RefreshSelection()
3704	4312	{
3705		- SetUndoStates();
	4313	+ Object3D selection = new Object3D();
	4314	+
	4315	+ for (int i = 0; i < copy.selection.size(); i++)
	4316	+ {
	4317	+ Object3D elem = copy.selection.elementAt(i);
	4318	+
	4319	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4320	+
	4321	+ if (obj == null)
	4322	+ {
	4323	+ copy.selection.remove(i--);
	4324	+ }
	4325	+ else
	4326	+ {
	4327	+ selection.add(obj);
	4328	+ copy.selection.setElementAt(obj, i);
	4329	+ }
	4330	+ }
	4331	+
	4332	+ flashIt = false;
	4333	+ GetTree().clearSelection();
	4334	+ for (int i = 0; i < selection.size(); i++)
	4335	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4336	+ flashIt = true;
	4337	+
	4338	+ //refreshContents(false);
	4339	+ }
	4340	+
	4341	+ void CopyChanged()
	4342	+ {
	4343	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4344	+
	4345	+ SetVersionStates();
3706	4346
3707	4347	boolean temp = CameraPane.SWITCH;
3708	4348	CameraPane.SWITCH = false;
..	..	@@ -3711,6 +4351,9 @@
3711	4351
3712	4352	copy.clear();
3713	4353
	4354	+ copy.skyboxname = obj.skyboxname;
	4355	+ copy.skyboxext = obj.skyboxext;
	4356	+
3714	4357	for (int i=0; i<obj.Size(); i++)
3715	4358	{
3716	4359	copy.add(obj.get(i));
..	..	@@ -3720,6 +4363,7 @@
3720	4363
3721	4364	CameraPane.SWITCH = temp;
3722	4365
	4366	+ RefreshSelection();
3723	4367	//assert(hashtable.isEmpty());
3724	4368
3725	4369	copy.Touch();
..	..	@@ -3740,13 +4384,15 @@
3740	4384	}
3741	4385	}
3742	4386
3743		- refreshContents();
	4387	+ refreshContents(true);
3744	4388	}
3745	4389
3746		- cButton undoButton;
	4390	+ cButton previousVersionButton;
3747	4391	cButton restoreButton;
3748	4392	cButton replaceButton;
3749		- cButton redoButton;
	4393	+ cButton nextVersionButton;
	4394	+ cButton saveVersionButton;
	4395	+ cButton deleteVersionButton;
3750	4396
3751	4397	boolean muteSlider;
3752	4398
..	..	@@ -3754,39 +4400,47 @@
3754	4400	{
3755	4401	int count = 0;
3756	4402
3757		- for (int i = copy.versions.length; --i >= 0;)
	4403	+ for (int i = copy.versionlist.length; --i >= 0;)
3758	4404	{
3759		- if (copy.versions[i] != null)
	4405	+ if (copy.versionlist[i] != null)
3760	4406	count++;
3761	4407	}
3762	4408
3763	4409	return count;
3764	4410	}
3765	4411
3766		- void SetUndoStates()
	4412	+ void SetVersionStates()
3767	4413	{
3768		- cRadio tab = GetCurrentTab();
	4414	+ //if (true)
	4415	+ // return;
	4416	+
	4417	+ //cRadio tab = GetCurrentTab();
3769	4418
3770	4419	restoreButton.setEnabled(copy.versionindex != -1);
3771	4420	replaceButton.setEnabled(copy.versionindex != -1);
3772	4421
3773		- undoButton.setEnabled(copy.versionindex > 0);
3774		- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	4422	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4423	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4424	+
	4425	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4426	+ copy.versionlist[copy.versionindex + 1] != null);
3775	4427
3776	4428	muteSlider = true;
	4429	+ versionSlider.setMinimum(0);
3777	4430	versionSlider.setMaximum(VersionCount() - 1);
3778	4431	versionSlider.setInteger(copy.versionindex);
	4432	+ versionSlider.setEnabled(copy.versionindex != -1);
3779	4433	muteSlider = false;
3780	4434	}
3781	4435
3782		- public boolean Undo()
	4436	+ public boolean PreviousVersion()
3783	4437	{
3784	4438	// Option?
3785	4439	Replace();
3786	4440
3787	4441	System.err.println("Undo");
3788	4442
3789		- cRadio tab = GetCurrentTab();
	4443	+ //cRadio tab = GetCurrentTab();
3790	4444
3791	4445	if (copy.versionindex == 0)
3792	4446	{
..	..	@@ -3809,7 +4463,7 @@
3809	4463
3810	4464	copy.versionindex -= 1;
3811	4465
3812		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4466	+ CopyChanged();
3813	4467
3814	4468	return true;
3815	4469	}
..	..	@@ -3818,15 +4472,16 @@
3818	4472	{
3819	4473	System.err.println("Restore");
3820	4474
3821		- cRadio tab = GetCurrentTab();
	4475	+ //cRadio tab = GetCurrentTab();
3822	4476
3823		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4477	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3824	4478	{
3825	4479	java.awt.Toolkit.getDefaultToolkit().beep();
3826	4480	return false;
3827	4481	}
3828	4482
3829		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4483	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4484	+ CopyChanged();
3830	4485
3831	4486	return true;
3832	4487	}
..	..	@@ -3835,27 +4490,27 @@
3835	4490	{
3836	4491	System.err.println("Replace");
3837	4492
3838		- cRadio tab = GetCurrentTab();
	4493	+ //cRadio tab = GetCurrentTab();
3839	4494
3840		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4495	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3841	4496	{
3842	4497	// No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3843	4498	return false;
3844	4499	}
3845	4500
3846		- copy.versions[copy.versionindex] = CompressCopy();
	4501	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
3847	4502
3848	4503	return true;
3849	4504	}
3850	4505
3851		- public void Redo()
	4506	+ public void NextVersion()
3852	4507	{
3853	4508	// Option?
3854	4509	Replace();
3855	4510
3856		- cRadio tab = GetCurrentTab();
	4511	+ //cRadio tab = GetCurrentTab();
3857	4512
3858		- if (copy.versions[copy.versionindex + 1] == null)
	4513	+ if (copy.versionlist[copy.versionindex + 1] == null)
3859	4514	{
3860	4515	java.awt.Toolkit.getDefaultToolkit().beep();
3861	4516	return;
..	..	@@ -3863,7 +4518,7 @@
3863	4518
3864	4519	copy.versionindex += 1;
3865	4520
3866		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4521	+ CopyChanged();
3867	4522
3868	4523	//if (!tab.user[tab.versionindex])
3869	4524	// tab.graphs[tab.versionindex] = null;
..	..	@@ -4077,7 +4732,7 @@
4077	4732	//copy.material = new cMaterial(copy.GetMaterial());
4078	4733
4079	4734	current.color = (float) colorField.getFloat();
4080		- current.modulation = (float) modulationField.getFloat();
	4735	+ current.modulation = (float) saturationField.getFloat();
4081	4736	current.metalness = (float) metalnessField.getFloat();
4082	4737	current.diffuse = (float) diffuseField.getFloat();
4083	4738	current.specular = (float) specularField.getFloat();
..	..	@@ -4110,7 +4765,7 @@
4110	4765	cMaterial mat = copy.material;
4111	4766
4112	4767	colorField.SetToolTipValue((mat.color));
4113		- modulationField.SetToolTipValue((mat.modulation));
	4768	+ saturationField.SetToolTipValue((mat.modulation));
4114	4769	metalnessField.SetToolTipValue((mat.metalness));
4115	4770	diffuseField.SetToolTipValue((mat.diffuse));
4116	4771	specularField.SetToolTipValue((mat.specular));
..	..	@@ -4172,11 +4827,14 @@
4172	4827	if (muteSlider)
4173	4828	return;
4174	4829
	4830	+ Replace();
	4831	+
4175	4832	int version = versionSlider.getInteger();
4176	4833
4177		- if (copy.versions[version] != null)
	4834	+ if (version != -1 && copy.versionlist[version] != null)
4178	4835	{
4179		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4836	+ copy.versionindex = version;
	4837	+ CopyChanged();
4180	4838	}
4181	4839
4182	4840	return;
..	..	@@ -4216,6 +4874,12 @@
4216	4874	{
4217	4875	//System.out.println("stateChanged = " + this);
4218	4876	materialtouched = true;
	4877	+
	4878	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4879	+ {
	4880	+ saturationField.setFloat(1);
	4881	+ }
	4882	+
4219	4883	applySelf();
4220	4884	//System.out.println("this = " + this);
4221	4885	//System.out.println("PARENT = " + parent);
..	..	@@ -4515,6 +5179,7 @@
4515	5179	{
4516	5180	if (GetTree() != null)
4517	5181	{
	5182	+ GetTree().revalidate();
4518	5183	GetTree().repaint();
4519	5184	}
4520	5185
..	..	@@ -4523,6 +5188,11 @@
4523	5188	ctrlPanel.validate(); // ? new
4524	5189	ctrlPanel.repaint();
4525	5190	}
	5191	+
	5192	+ if (previousVersionButton != null && copy.versionlist != null)
	5193	+ SetVersionStates();
	5194	+
	5195	+ cameraView.requestFocusInWindow();
4526	5196	}
4527	5197
4528	5198	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4554,7 +5224,7 @@
4554	5224	// group = (Composite) group.get(0);
4555	5225	// }
4556	5226
4557		- System.out.println("makeSomething of " + thing);
	5227	+ //System.out.println("makeSomething of " + thing);
4558	5228
4559	5229	/*
4560	5230	if (deselect && jList != null)
..	..	@@ -4853,6 +5523,8 @@
4853	5523	{
4854	5524	//readobj.deepCopySelf(copy);
4855	5525	copy.clear(); // june 2014
	5526	+ copy.skyboxname = readobj.skyboxname;
	5527	+ copy.skyboxext = readobj.skyboxext;
4856	5528	for (int i = 0; i < readobj.size(); i++)
4857	5529	{
4858	5530	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4904,13 +5576,16 @@
4904	5576	c.addChild(csg);
4905	5577	}
4906	5578
4907		- copy.versions = readobj.versions;
	5579	+ copy.versionlist = readobj.versionlist;
4908	5580	copy.versionindex = readobj.versionindex;
4909	5581
4910		- if (copy.versions == null)
	5582	+ if (copy.versionlist == null)
4911	5583	{
4912		- copy.versions = new byte[100][];
	5584	+ // Backward compatibility
	5585	+ copy.versionlist = new Object3D[100];
4913	5586	copy.versionindex = -1;
	5587	+
	5588	+ //Save(true);
4914	5589	}
4915	5590
4916	5591	//? SetUndoStates();
..	..	@@ -4925,7 +5600,7 @@
4925	5600	{
4926	5601	if (Grafreed.standAlone)
4927	5602	{
4928		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5603	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4929	5604	browser.show();
4930	5605	String filename = browser.getFile();
4931	5606	if (filename != null && filename.length() > 0)
..	..	@@ -5002,6 +5677,8 @@
5002	5677
5003	5678	void save()
5004	5679	{
	5680	+ Replace();
	5681	+
5005	5682	if (lastname == null)
5006	5683	{
5007	5684	return;
..	..	@@ -5244,6 +5921,7 @@
5244	5921	ButtonGroup buttonGroup;
5245	5922
5246	5923	cGridBag toolboxPanel;
	5924	+ cGridBag skyboxPanel;
5247	5925	cGridBag materialPanel;
5248	5926	cGridBag ctrlPanel;
5249	5927
..	..	@@ -5317,7 +5995,7 @@
5317	5995	JLabel colorLabel;
5318	5996	cNumberSlider colorField;
5319	5997	JLabel modulationLabel;
5320		- cNumberSlider modulationField;
	5998	+ cNumberSlider saturationField;
5321	5999	JLabel metalnessLabel;
5322	6000	cNumberSlider metalnessField;
5323	6001	JLabel diffuseLabel;
..	..	@@ -5348,6 +6026,7 @@
5348	6026	cNumberSlider anisoField;
5349	6027	JLabel anisoVLabel;
5350	6028	cNumberSlider anisoVField;
	6029	+
5351	6030	JLabel cameraLabel;
5352	6031	cNumberSlider cameraField;
5353	6032	JLabel selfshadowLabel;
..	..	@@ -5362,6 +6041,7 @@
5362	6041	cNumberSlider fakedepthField;
5363	6042	JLabel shadowbiasLabel;
5364	6043	cNumberSlider shadowbiasField;
	6044	+
5365	6045	JLabel bumpLabel;
5366	6046	cNumberSlider bumpField;
5367	6047	JLabel noiseLabel;