~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,25 @@
41	42	JFrame frame;
42	43
43	44	static ObjEditor theFrame;
	45	+
	46	+ public cGridBag GetSeparator()
	47	+ {
	48	+ cGridBag separator = new cGridBag();
	49	+ separator.add(new JSeparator());
	50	+ separator.preferredHeight = 5;
	51	+ return separator;
	52	+ }
44	53
45	54	cButton GetButton(String name, boolean border)
46	55	{
47	56	ImageIcon icon = GetIcon(name);
48	57	return new cButton(icon, border);
	58	+ }
	59	+
	60	+ cLabel GetLabel(String name, boolean border)
	61	+ {
	62	+ //ImageIcon icon = GetIcon(name);
	63	+ return new cLabel(GetImage(name), border);
49	64	}
50	65
51	66	cToggleButton GetToggleButton(String name, boolean border)
..	..	@@ -60,26 +75,40 @@
60	75	return new cCheckBox(icon, border);
61	76	}
62	77
63		- private ImageIcon GetIcon(String name)
	78	+ ImageIcon GetIcon(String name)
64	79	{
65	80	try
66	81	{
67	82	BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
68	83
69		- if (image.getWidth() != 24 && image.getHeight() != 24)
70		- {
71		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
72		- Graphics2D g = resized.createGraphics();
73		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
74		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
75		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
76		- g.dispose();
77		-
78		- image = resized;
79		- }
	84	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	85	+// {
	86	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	87	+// Graphics2D g = resized.createGraphics();
	88	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	89	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	90	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	91	+// g.dispose();
	92	+//
	93	+// image = resized;
	94	+// }
80	95
81	96	javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
82	97	return icon;
	98	+ }
	99	+ catch (Exception e)
	100	+ {
	101	+ return null;
	102	+ }
	103	+ }
	104	+
	105	+ BufferedImage GetImage(String name)
	106	+ {
	107	+ try
	108	+ {
	109	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	110	+
	111	+ return image;
83	112	}
84	113	catch (Exception e)
85	114	{
..	..	@@ -268,9 +297,9 @@
268	297	client = inClient;
269	298	copy = client;
270	299
271		- if (copy.versions == null)
	300	+ if (copy.versionlist == null)
272	301	{
273		- copy.versions = new byte[100][];
	302	+ copy.versionlist = new Object3D[100];
274	303	copy.versionindex = -1;
275	304	}
276	305
..	..	@@ -287,9 +316,9 @@
287	316	client = inClient;
288	317	copy = client;
289	318
290		- if (copy.versions == null)
	319	+ if (copy.versionlist == null)
291	320	{
292		- copy.versions = new byte[100][];
	321	+ copy.versionlist = new Object3D[100];
293	322	copy.versionindex = -1;
294	323	}
295	324
..	..	@@ -325,10 +354,10 @@
325	354	copy = localCopy;
326	355	copy.editWindow = this;
327	356
328		- if (copy.versions == null)
	357	+ if (copy.versionlist == null)
329	358	{
330		- copy.versions = new byte[100][];
331		- copy.versionindex = -1;
	359	+// copy.versions = new byte[100][];
	360	+// copy.versionindex = -1;
332	361	}
333	362
334	363	SetupMenu();
..	..	@@ -436,10 +465,12 @@
436	465	editPanel.add(editCommandsPanel);
437	466	editPanel.add(ctrlPanel);
438	467
439		- toolboxPanel = new cGridBag().setVertical(false);
	468	+ toolboxPanel = new cGridBag().setVertical(true);
440	469	//toolboxPanel.setName("Toolbox");
441	470
442		- materialPanel = new cGridBag().setVertical(true);
	471	+ skyboxPanel = new cGridBag().setVertical(true);
	472	+
	473	+ materialPanel = new cGridBag().setVertical(false);
443	474	//materialPanel.setName("Material");
444	475
445	476	/JTextPane/
..	..	@@ -723,6 +754,7 @@
723	754	boolean maximized;
724	755
725	756	cButton fullscreenLayout;
	757	+ cButton expandedLayout;
726	758
727	759	void Minimize()
728	760	{
..	..	@@ -762,10 +794,12 @@
762	794	cButton minButton;
763	795	cButton maxButton;
764	796	cButton fullButton;
	797	+ cButton collapseButton;
	798	+ cButton maximize3DButton;
765	799
766	800	void ToggleFullScreen()
767	801	{
768		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	802	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
769	803
770	804	cameraView.ToggleFullScreen();
771	805
..	..	@@ -786,13 +820,13 @@
786	820	// X frame.getContentPane().remove(/"Center",/bigThree);
787	821	// X framePanel.add(bigThree);
788	822	// X frame.getContentPane().add(/"Center",/framePanel);
789		- framePanel.setDividerLocation(46);
	823	+// framePanel.setDividerLocation(46); // icons are 24x24
790	824
791	825	//frame.setVisible(true);
792		- radio.layout = keepButton;
	826	+// radio.layout = keepButton;
793	827	//theFrame = null;
794	828	keepButton = null;
795		- radio.layout.doClick();
	829	+// radio.layout.doClick();
796	830
797	831	} else
798	832	{
..	..	@@ -813,31 +847,42 @@
813	847	// X frame.getContentPane().remove(/"Center",/framePanel);
814	848	// X framePanel.remove(bigThree);
815	849	// X frame.getContentPane().add(/"Center",/bigThree);
816		- framePanel.setDividerLocation(0);
	850	+// framePanel.setDividerLocation(0);
817	851
818		- radio.layout = fullscreenLayout;
819		- radio.layout.doClick();
	852	+// radio.layout = fullscreenLayout;
	853	+// radio.layout.doClick();
820	854	//frame.setVisible(true);
821	855	}
822	856	frame.validate();
	857	+
	858	+ cameraView.requestFocusInWindow();
823	859	}
824	860
825		- private byte[] CompressCopy()
	861	+ void CollapseToolbar()
	862	+ {
	863	+ framePanel.setDividerLocation(0);
	864	+ //frame.validate();
	865	+
	866	+ cameraView.requestFocusInWindow();
	867	+ }
	868	+
	869	+ private Object3D Duplicate(Object3D object)
826	870	{
827	871	boolean temp = CameraPane.SWITCH;
828	872	CameraPane.SWITCH = false;
829	873
830		- copy.ExtractBigData(versiontable);
	874	+ object.ExtractBigData(versiontable);
831	875	// if (copy == client)
832	876
833		- byte[] versions[] = copy.versions;
834		- copy.versions = null;
	877	+ Object3D versions[] = object.versionlist;
	878	+ object.versionlist = null;
835	879
836		- byte[] compress = Compress(copy);
	880	+ //byte[] compress = Compress(copy);
	881	+ Object3D compress = (Object3D)Grafreed.clone(object);
837	882
838		- copy.versions = versions;
	883	+ object.versionlist = versions;
839	884
840		- copy.RestoreBigData(versiontable);
	885	+ object.RestoreBigData(versiontable);
841	886
842	887	CameraPane.SWITCH = temp;
843	888
..	..	@@ -965,6 +1010,7 @@
965	1010	{
966	1011	SetupMaterial(materialPanel);
967	1012	}
	1013	+
968	1014	//SetupName();
969	1015	//SetupViews();
970	1016	}
..	..	@@ -974,7 +1020,7 @@
974	1020	// NumberSlider vDivsField;
975	1021	// JCheckBox endcaps;
976	1022	JCheckBox liveCB;
977		- JCheckBox selectCB;
	1023	+ JCheckBox selectableCB;
978	1024	JCheckBox hideCB;
979	1025	JCheckBox link2masterCB;
980	1026	JCheckBox markCB;
..	..	@@ -1173,6 +1219,18 @@
1173	1219
1174	1220	namePanel = new cGridBag();
1175	1221
	1222	+ //if (copy.pinned)
	1223	+ {
	1224	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1225	+ pinButton.setSelected(copy.pinned);
	1226	+ cGridBag t = new cGridBag();
	1227	+ t.preferredWidth = 2;
	1228	+ t.add(pinButton);
	1229	+ namePanel.add(t);
	1230	+
	1231	+ pinButton.addItemListener(this);
	1232	+ }
	1233	+
1176	1234	nameField = AddText(namePanel, copy.GetName());
1177	1235	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1178	1236	oe.ctrlPanel.add(namePanel);
..	..	@@ -1186,13 +1244,16 @@
1186	1244
1187	1245	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1188	1246	liveCB.setToolTipText("Animate object");
1189		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1190		- selectCB.setToolTipText("Make object selectable");
	1247	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1248	+ selectableCB.setToolTipText("Make object selectable");
1191	1249	// Return();
	1250	+
1192	1251	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1193	1252	hideCB.setToolTipText("Hide object");
1194	1253	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1195	1254	markCB.setToolTipText("As animation target transform");
	1255	+
	1256	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1196	1257
1197	1258	setupPanel2 = new cGridBag().setVertical(false);
1198	1259
..	..	@@ -1519,23 +1580,28 @@
1519	1580	//tmp.setName("Edit");
1520	1581	objectPanel.add(materialPanel);
1521	1582	objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1583	+ objectPanel.setToolTipTextAt(0, "Material");
	1584	+
	1585	+ objectPanel.add(toolboxPanel);
	1586	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1587	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1588	+
	1589	+ objectPanel.add(skyboxPanel);
	1590	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1591	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1592	+
1522	1593	// JPanel north = new JPanel(new BorderLayout());
1523	1594	// north.setName("Edit");
1524	1595	// north.add(ctrlPanel, BorderLayout.NORTH);
1525	1596	// objectPanel.add(north);
1526	1597	objectPanel.add(editPanel);
1527		- objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1528		-
1529		- //if (Globals.ADVANCED)
1530		- objectPanel.add(infoPanel);
1531		- objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1598	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1599	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1532	1600
1533	1601	objectPanel.add(XYZPanel);
1534		- objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1602	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1603	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1535	1604
1536		- objectPanel.add(toolboxPanel);
1537		- objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1538		-
1539	1605	/*
1540	1606	aConstraints.gridx = 0;
1541	1607	aConstraints.gridwidth = 1;
..	..	@@ -1572,6 +1638,11 @@
1572	1638
1573	1639	scenePanel.add(tabbedPane);
1574	1640
	1641	+ //if (Globals.ADVANCED)
	1642	+ tabbedPane.add(infoPanel);
	1643	+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1644	+ tabbedPane.setToolTipTextAt(3, "Information");
	1645	+
1575	1646	/*
1576	1647	cTree jTree = new cTree(null);
1577	1648	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1642,6 +1713,23 @@
1642	1713	// aConstraints.gridheight = 1;
1643	1714
1644	1715	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1716	+
	1717	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1718	+ new java.beans.PropertyChangeListener()
	1719	+ {
	1720	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1721	+ {
	1722	+ if ((Integer)pce.getOldValue() == 1)
	1723	+ {
	1724	+ if (radio.layout != expandedLayout)
	1725	+ {
	1726	+ radio.layout = expandedLayout;
	1727	+ radio.layout.doClick();
	1728	+ }
	1729	+ }
	1730	+ }
	1731	+ });
	1732	+
1645	1733	framePanel.setContinuousLayout(false);
1646	1734	framePanel.setOneTouchExpandable(false);
1647	1735	//.setDividerLocation(0.8);
..	..	@@ -1674,7 +1762,6 @@
1674	1762	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1675	1763	frame.addWindowListener(new WindowAdapter()
1676	1764	{
1677		-
1678	1765	public void windowClosing(WindowEvent e)
1679	1766	{
1680	1767	Close();
..	..	@@ -1697,12 +1784,403 @@
1697	1784	ctrlPanel.removeAll();
1698	1785	}
1699	1786
1700		- void SetupMaterial(cGridBag panel)
	1787	+ void SetupMaterial(cGridBag materialpanel)
1701	1788	{
1702		- /*
	1789	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1790	+
	1791	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1792	+ skin.setToolTipText("Skin");
	1793	+ skin.addMouseListener(new MouseAdapter()
	1794	+ {
	1795	+ public void mouseClicked(MouseEvent e)
	1796	+ {
	1797	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1798	+ cMaterial material = object.material;
	1799	+
	1800	+ // Skin
	1801	+ colorField.setFloat(material.color);
	1802	+ saturationField.setFloat(material.modulation);
	1803	+ subsurfaceField.setFloat(material.subsurface);
	1804	+ selfshadowField.setFloat(material.diffuseness);
	1805	+ diffusenessField.setFloat(material.factor);
	1806	+ shininessField.setFloat(material.shininess);
	1807	+ shadowbiasField.setFloat(material.shadowbias);
	1808	+ diffuseField.setFloat(material.diffuse);
	1809	+ specularField.setFloat(material.specular);
	1810	+
	1811	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1812	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1813	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1814	+
	1815	+ materialtouched = true;
	1816	+ applySelf();
	1817	+ }
	1818	+ });
	1819	+ presetpanel.add(skin);
	1820	+
	1821	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1822	+ lambert.setToolTipText("Diffuse");
	1823	+ lambert.addMouseListener(new MouseAdapter()
	1824	+ {
	1825	+ public void mouseClicked(MouseEvent e)
	1826	+ {
	1827	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1828	+ cMaterial material = object.material;
	1829	+
	1830	+ diffusenessField.setFloat(material.factor);
	1831	+ selfshadowField.setFloat(material.diffuseness);
	1832	+
	1833	+ materialtouched = true;
	1834	+ applySelf();
	1835	+ }
	1836	+ });
	1837	+ presetpanel.add(lambert);
	1838	+
	1839	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1840	+ diffuse2.setToolTipText("Diffuse2");
	1841	+ diffuse2.addMouseListener(new MouseAdapter()
	1842	+ {
	1843	+ public void mouseClicked(MouseEvent e)
	1844	+ {
	1845	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1846	+ cMaterial material = object.material;
	1847	+
	1848	+ diffusenessField.setFloat(material.factor);
	1849	+ selfshadowField.setFloat(material.diffuseness);
	1850	+
	1851	+ materialtouched = true;
	1852	+ applySelf();
	1853	+ }
	1854	+ });
	1855	+ presetpanel.add(diffuse2);
	1856	+
	1857	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1858	+ diffusemoon.setToolTipText("Moon");
	1859	+ diffusemoon.addMouseListener(new MouseAdapter()
	1860	+ {
	1861	+ public void mouseClicked(MouseEvent e)
	1862	+ {
	1863	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1864	+ cMaterial material = object.material;
	1865	+
	1866	+ diffusenessField.setFloat(material.factor);
	1867	+ selfshadowField.setFloat(material.diffuseness);
	1868	+
	1869	+ materialtouched = true;
	1870	+ applySelf();
	1871	+ }
	1872	+ });
	1873	+ presetpanel.add(diffusemoon);
	1874	+
	1875	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1876	+ diffusemoon2.setToolTipText("Moon2");
	1877	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1878	+ {
	1879	+ public void mouseClicked(MouseEvent e)
	1880	+ {
	1881	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1882	+ cMaterial material = object.material;
	1883	+
	1884	+ diffusenessField.setFloat(material.factor);
	1885	+ selfshadowField.setFloat(material.diffuseness);
	1886	+
	1887	+ materialtouched = true;
	1888	+ applySelf();
	1889	+ }
	1890	+ });
	1891	+ presetpanel.add(diffusemoon2);
	1892	+
	1893	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1894	+ diffusemoon3.setToolTipText("Moon3");
	1895	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1896	+ {
	1897	+ public void mouseClicked(MouseEvent e)
	1898	+ {
	1899	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1900	+ cMaterial material = object.material;
	1901	+
	1902	+ diffusenessField.setFloat(material.factor);
	1903	+ selfshadowField.setFloat(material.diffuseness);
	1904	+
	1905	+ materialtouched = true;
	1906	+ applySelf();
	1907	+ }
	1908	+ });
	1909	+ presetpanel.add(diffusemoon3);
	1910	+
	1911	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1912	+ diffusesheen.setToolTipText("Sheen");
	1913	+ diffusesheen.addMouseListener(new MouseAdapter()
	1914	+ {
	1915	+ public void mouseClicked(MouseEvent e)
	1916	+ {
	1917	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1918	+ cMaterial material = object.material;
	1919	+
	1920	+ sheenField.setFloat(material.sheen);
	1921	+
	1922	+ materialtouched = true;
	1923	+ applySelf();
	1924	+ }
	1925	+ });
	1926	+ presetpanel.add(diffusesheen);
	1927	+
	1928	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1929	+ rough.setToolTipText("Rough metal");
	1930	+ rough.addMouseListener(new MouseAdapter()
	1931	+ {
	1932	+ public void mouseClicked(MouseEvent e)
	1933	+ {
	1934	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1935	+ cMaterial material = object.material;
	1936	+
	1937	+ shininessField.setFloat(material.shininess);
	1938	+ velvetField.setFloat(material.velvet);
	1939	+
	1940	+ materialtouched = true;
	1941	+ applySelf();
	1942	+ }
	1943	+ });
	1944	+ presetpanel.add(rough);
	1945	+
	1946	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1947	+ rough2.setToolTipText("Medium metal");
	1948	+ rough2.addMouseListener(new MouseAdapter()
	1949	+ {
	1950	+ public void mouseClicked(MouseEvent e)
	1951	+ {
	1952	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1953	+ cMaterial material = object.material;
	1954	+
	1955	+ shininessField.setFloat(material.shininess);
	1956	+ lightareaField.setFloat(material.lightarea);
	1957	+
	1958	+ materialtouched = true;
	1959	+ applySelf();
	1960	+ }
	1961	+ });
	1962	+ presetpanel.add(rough2);
	1963	+
	1964	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	1965	+ shini0.setToolTipText("Shiny");
	1966	+ shini0.addMouseListener(new MouseAdapter()
	1967	+ {
	1968	+ public void mouseClicked(MouseEvent e)
	1969	+ {
	1970	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	1971	+ cMaterial material = object.material;
	1972	+
	1973	+ shininessField.setFloat(material.shininess);
	1974	+ lightareaField.setFloat(material.lightarea);
	1975	+
	1976	+ materialtouched = true;
	1977	+ applySelf();
	1978	+ }
	1979	+ });
	1980	+ presetpanel.add(shini0);
	1981	+
	1982	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	1983	+ shini1.setToolTipText("Shiny2");
	1984	+ shini1.addMouseListener(new MouseAdapter()
	1985	+ {
	1986	+ public void mouseClicked(MouseEvent e)
	1987	+ {
	1988	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	1989	+ cMaterial material = object.material;
	1990	+
	1991	+ shininessField.setFloat(material.shininess);
	1992	+ lightareaField.setFloat(material.lightarea);
	1993	+
	1994	+ materialtouched = true;
	1995	+ applySelf();
	1996	+ }
	1997	+ });
	1998	+ presetpanel.add(shini1);
	1999	+
	2000	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2001	+ shini2.setToolTipText("Shiny3");
	2002	+ shini2.addMouseListener(new MouseAdapter()
	2003	+ {
	2004	+ public void mouseClicked(MouseEvent e)
	2005	+ {
	2006	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2007	+ cMaterial material = object.material;
	2008	+
	2009	+ shininessField.setFloat(material.shininess);
	2010	+ lightareaField.setFloat(material.lightarea);
	2011	+
	2012	+ materialtouched = true;
	2013	+ applySelf();
	2014	+ }
	2015	+ });
	2016	+ presetpanel.add(shini2);
	2017	+
	2018	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2019	+ aniso.setToolTipText("AnisoU");
	2020	+ aniso.addMouseListener(new MouseAdapter()
	2021	+ {
	2022	+ public void mouseClicked(MouseEvent e)
	2023	+ {
	2024	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2025	+ cMaterial material = object.material;
	2026	+
	2027	+ anisoField.setFloat(material.aniso);
	2028	+ anisoVField.setFloat(material.anisoV);
	2029	+
	2030	+ materialtouched = true;
	2031	+ applySelf();
	2032	+ }
	2033	+ });
	2034	+ presetpanel.add(aniso);
	2035	+
	2036	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2037	+ aniso2.setToolTipText("AnisoV");
	2038	+ aniso2.addMouseListener(new MouseAdapter()
	2039	+ {
	2040	+ public void mouseClicked(MouseEvent e)
	2041	+ {
	2042	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2043	+ cMaterial material = object.material;
	2044	+
	2045	+ anisoField.setFloat(material.aniso);
	2046	+ anisoVField.setFloat(material.anisoV);
	2047	+
	2048	+ materialtouched = true;
	2049	+ applySelf();
	2050	+ }
	2051	+ });
	2052	+ presetpanel.add(aniso2);
	2053	+
	2054	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2055	+ aniso3.setToolTipText("AnisoUV");
	2056	+ aniso3.addMouseListener(new MouseAdapter()
	2057	+ {
	2058	+ public void mouseClicked(MouseEvent e)
	2059	+ {
	2060	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2061	+ cMaterial material = object.material;
	2062	+
	2063	+ anisoField.setFloat(material.aniso);
	2064	+ anisoVField.setFloat(material.anisoV);
	2065	+
	2066	+ materialtouched = true;
	2067	+ applySelf();
	2068	+ }
	2069	+ });
	2070	+ presetpanel.add(aniso3);
	2071	+
	2072	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2073	+ velvet0.setToolTipText("Velvet");
	2074	+ velvet0.addMouseListener(new MouseAdapter()
	2075	+ {
	2076	+ public void mouseClicked(MouseEvent e)
	2077	+ {
	2078	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2079	+ cMaterial material = object.material;
	2080	+
	2081	+ diffusenessField.setFloat(material.factor);
	2082	+ selfshadowField.setFloat(material.diffuseness);
	2083	+ sheenField.setFloat(material.sheen);
	2084	+ shininessField.setFloat(material.shininess);
	2085	+ velvetField.setFloat(material.velvet);
	2086	+ shiftField.setFloat(material.shift);
	2087	+
	2088	+ materialtouched = true;
	2089	+ applySelf();
	2090	+ }
	2091	+ });
	2092	+ presetpanel.add(velvet0);
	2093	+
	2094	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2095	+ bump0.setToolTipText("Bump texture");
	2096	+ bump0.addMouseListener(new MouseAdapter()
	2097	+ {
	2098	+ public void mouseClicked(MouseEvent e)
	2099	+ {
	2100	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2101	+ cMaterial material = object.material;
	2102	+
	2103	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2104	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2105	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2106	+
	2107	+ materialtouched = true;
	2108	+ applySelf();
	2109	+ }
	2110	+ });
	2111	+ presetpanel.add(bump0);
	2112	+
	2113	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2114	+ halo.setToolTipText("Halo");
	2115	+ halo.addMouseListener(new MouseAdapter()
	2116	+ {
	2117	+ public void mouseClicked(MouseEvent e)
	2118	+ {
	2119	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2120	+ cMaterial material = object.material;
	2121	+
	2122	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2123	+
	2124	+ materialtouched = true;
	2125	+ applySelf();
	2126	+ }
	2127	+ });
	2128	+ presetpanel.add(halo);
	2129	+
	2130	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2131	+ candle.setToolTipText("Candle");
	2132	+ candle.addMouseListener(new MouseAdapter()
	2133	+ {
	2134	+ public void mouseClicked(MouseEvent e)
	2135	+ {
	2136	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2137	+ cMaterial material = object.material;
	2138	+
	2139	+ subsurfaceField.setFloat(material.subsurface);
	2140	+ shadowbiasField.setFloat(material.shadowbias);
	2141	+ ambientField.setFloat(material.ambient);
	2142	+ specularField.setFloat(material.specular);
	2143	+ lightareaField.setFloat(material.lightarea);
	2144	+ shininessField.setFloat(material.shininess);
	2145	+
	2146	+ materialtouched = true;
	2147	+ applySelf();
	2148	+ }
	2149	+ });
	2150	+ presetpanel.add(candle);
	2151	+
	2152	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2153	+ shadowShader.setToolTipText("Shadow");
	2154	+ shadowShader.addMouseListener(new MouseAdapter()
	2155	+ {
	2156	+ public void mouseClicked(MouseEvent e)
	2157	+ {
	2158	+ diffuseField.setFloat(0.001);
	2159	+ ambientField.setFloat(0.001);
	2160	+ cameraField.setFloat(0.001);
	2161	+ specularField.setFloat(0.001);
	2162	+ fakedepthField.setFloat(0.001);
	2163	+ opacityField.setFloat(0.6);
	2164	+
	2165	+ materialtouched = true;
	2166	+ applySelf();
	2167	+ }
	2168	+ });
	2169	+ presetpanel.add(shadowShader);
	2170	+
	2171	+ cGridBag panel = new cGridBag().setVertical(true);
	2172	+
	2173	+ presetpanel.preferredWidth = 1;
	2174	+
	2175	+ materialpanel.add(presetpanel);
	2176	+ materialpanel.add(panel);
	2177	+
	2178	+ panel.preferredWidth = 8;
	2179	+
	2180	+ /*
1703	2181	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1704	2182	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1705		- */
	2183	+ */
1706	2184
1707	2185	cGridBag editBar = new cGridBag().setVertical(false);
1708	2186
..	..	@@ -1736,27 +2214,50 @@
1736	2214	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1737	2215
1738	2216	cGridBag colorSection = new cGridBag().setVertical(true);
	2217	+
	2218	+ cGridBag huepanel = new cGridBag();
	2219	+ cGridBag huelabel = new cGridBag();
	2220	+ skin = GetLabel("icons/hue.png", false);
	2221	+ skin.fit = true;
	2222	+ huelabel.add(skin);
	2223	+ huelabel.preferredWidth = 20;
	2224	+ huepanel.add(new cGridBag()); // Label
	2225	+ huepanel.add(huelabel); // Field/slider
	2226	+
	2227	+ huepanel.preferredHeight = 7;
	2228	+
	2229	+ colorSection.add(huepanel);
1739	2230
1740	2231	cGridBag color = new cGridBag();
1741		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1742		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1743		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2232	+
	2233	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2234	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2235	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2236	+
1744	2237	//colorField.preferredWidth = 200;
1745	2238	colorSection.add(color);
1746	2239
1747	2240	cGridBag modulation = new cGridBag();
1748	2241	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1749	2242	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1750		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2243	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1751	2244	colorSection.add(modulation);
1752	2245
	2246	+ cGridBag opacity = new cGridBag();
	2247	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2248	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2249	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2250	+ colorSection.add(opacity);
	2251	+
	2252	+ colorSection.add(GetSeparator());
	2253	+
1753	2254	cGridBag texture = new cGridBag();
1754	2255	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1755	2256	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1756	2257	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1757	2258	colorSection.add(texture);
1758	2259
1759		- panel.add(new JSeparator());
	2260	+ panel.add(GetSeparator());
1760	2261
1761	2262	panel.add(colorSection);
1762	2263
..	..	@@ -1812,7 +2313,7 @@
1812	2313	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1813	2314	diffuseSection.add(shadowbias);
1814	2315
1815		- panel.add(new JSeparator());
	2316	+ panel.add(GetSeparator());
1816	2317
1817	2318	panel.add(diffuseSection);
1818	2319
..	..	@@ -1875,7 +2376,7 @@
1875	2376	specularSection.add(anisoV);
1876	2377
1877	2378
1878		- panel.add(new JSeparator());
	2379	+ panel.add(GetSeparator());
1879	2380
1880	2381	panel.add(specularSection);
1881	2382
..	..	@@ -1900,12 +2401,6 @@
1900	2401	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1901	2402	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1902	2403	colorSection.add(backlit);
1903		-
1904		- cGridBag opacity = new cGridBag();
1905		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1906		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1907		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1908		- colorSection.add(opacity);
1909	2404
1910	2405	//panel.add(new JSeparator());
1911	2406
..	..	@@ -1951,7 +2446,7 @@
1951	2446	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1952	2447	textureSection.add(opacityPower);
1953	2448
1954		- panel.add(new JSeparator());
	2449	+ panel.add(GetSeparator());
1955	2450
1956	2451	panel.add(textureSection);
1957	2452
..	..	@@ -2938,7 +3433,7 @@
2938	3433
2939	3434	freezematerial = true;
2940	3435	colorField.setFloat(mat.color);
2941		- modulationField.setFloat(mat.modulation);
	3436	+ saturationField.setFloat(mat.modulation);
2942	3437	metalnessField.setFloat(mat.metalness);
2943	3438	diffuseField.setFloat(mat.diffuse);
2944	3439	specularField.setFloat(mat.specular);
..	..	@@ -3145,6 +3640,17 @@
3145	3640	public void itemStateChanged(ItemEvent event)
3146	3641	{
3147	3642	// System.out.println("Propagate = " + propagate);
	3643	+ if (event.getSource() == pinButton)
	3644	+ {
	3645	+ copy.pinned ^= true;
	3646	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3647	+ {
	3648	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3649	+ copy.CloseUI();
	3650	+ //copy.editWindow.refreshContents();
	3651	+ }
	3652	+ }
	3653	+ else
3148	3654	if (event.getSource() == propagateToggle)
3149	3655	{
3150	3656	propagate ^= true;
..	..	@@ -3249,8 +3755,9 @@
3249	3755	} else if (event.getSource() == liveCB)
3250	3756	{
3251	3757	copy.live ^= true;
	3758	+ objEditor.refreshContents(true); // To show item colors
3252	3759	return;
3253		- } else if (event.getSource() == selectCB)
	3760	+ } else if (event.getSource() == selectableCB)
3254	3761	{
3255	3762	copy.dontselect ^= true;
3256	3763	return;
..	..	@@ -3258,7 +3765,7 @@
3258	3765	{
3259	3766	copy.hide ^= true;
3260	3767	copy.Touch(); // display list issue
3261		- objEditor.refreshContents();
	3768	+ objEditor.refreshContents(true); // To show item colors
3262	3769	return;
3263	3770	} else if (event.getSource() == link2masterCB)
3264	3771	{
..	..	@@ -3514,6 +4021,7 @@
3514	4021
3515	4022	static public byte[] Compress(Object3D o)
3516	4023	{
	4024	+ // Slower to actually compress.
3517	4025	try
3518	4026	{
3519	4027	ByteArrayOutputStream baos = new ByteArrayOutputStream();
..	..	@@ -3615,6 +4123,7 @@
3615	4123	{
3616	4124	//Save(true);
3617	4125	Replace();
	4126	+ SetUndoStates();
3618	4127	}
3619	4128
3620	4129	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3635,29 +4144,46 @@
3635	4144
3636	4145	java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3637	4146
	4147	+ void DeleteVersion()
	4148	+ {
	4149	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4150	+ {
	4151	+ copy.versionlist[i] = copy.versionlist[i+1];
	4152	+ }
	4153	+
	4154	+ CopyChanged();
	4155	+
	4156	+ SetUndoStates();
	4157	+ }
	4158	+
3638	4159	public boolean Save(boolean user)
3639	4160	{
3640	4161	System.err.println("Save");
	4162	+ Replace();
3641	4163
3642	4164	cRadio tab = GetCurrentTab();
3643	4165
3644		- byte[] compress = CompressCopy();
	4166	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3645	4167
3646	4168	boolean thesame = false;
3647	4169
3648		- // Quick heuristic using length. Works only when stream is compressed.
3649		- if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3650		- {
3651		- thesame = true;
3652		- }
	4170	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4171	+// {
	4172	+// thesame = true;
	4173	+// }
3653	4174
3654	4175	//EditorFrame.m_MainFrame.requestFocusInWindow();
3655	4176	if (!thesame)
3656	4177	{
	4178	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4179	+ {
	4180	+ copy.versionlist[i] = copy.versionlist[i-1];
	4181	+ }
	4182	+
3657	4183	//tab.user[tab.versionindex] = user;
3658	4184	//boolean increment = true; // tab.graphs[tab.versionindex] == null;
3659	4185
3660		- copy.versions[++copy.versionindex] = compress;
	4186	+ copy.versionlist[++copy.versionindex] = compress;
3661	4187
3662	4188	// if (increment)
3663	4189	// tab.versionindex++;
..	..	@@ -3667,11 +4193,11 @@
3667	4193
3668	4194	//assert(hashtable.isEmpty());
3669	4195
3670		- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3671		- {
3672		- //tab.user[i] = false;
3673		- copy.versions[i] = null;
3674		- }
	4196	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4197	+// {
	4198	+// //tab.user[i] = false;
	4199	+// copy.versionlist[i] = null;
	4200	+// }
3675	4201
3676	4202	SetUndoStates();
3677	4203
..	..	@@ -3696,9 +4222,43 @@
3696	4222
3697	4223	return !thesame;
3698	4224	}
3699		-
3700		- void CopyChanged(Object3D obj)
	4225	+
	4226	+ boolean flashIt = true;
	4227	+
	4228	+ void RefreshSelection()
3701	4229	{
	4230	+ Object3D selection = new Object3D();
	4231	+
	4232	+ for (int i = 0; i < copy.selection.size(); i++)
	4233	+ {
	4234	+ Object3D elem = copy.selection.elementAt(i);
	4235	+
	4236	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4237	+
	4238	+ if (obj == null)
	4239	+ {
	4240	+ copy.selection.remove(i--);
	4241	+ }
	4242	+ else
	4243	+ {
	4244	+ selection.add(obj);
	4245	+ copy.selection.setElementAt(obj, i);
	4246	+ }
	4247	+ }
	4248	+
	4249	+ flashIt = false;
	4250	+ GetTree().clearSelection();
	4251	+ for (int i = 0; i < selection.size(); i++)
	4252	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4253	+ flashIt = true;
	4254	+
	4255	+ //refreshContents(false);
	4256	+ }
	4257	+
	4258	+ void CopyChanged()
	4259	+ {
	4260	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4261	+
3702	4262	SetUndoStates();
3703	4263
3704	4264	boolean temp = CameraPane.SWITCH;
..	..	@@ -3708,6 +4268,9 @@
3708	4268
3709	4269	copy.clear();
3710	4270
	4271	+ copy.skyboxname = obj.skyboxname;
	4272	+ copy.skyboxext = obj.skyboxext;
	4273	+
3711	4274	for (int i=0; i<obj.Size(); i++)
3712	4275	{
3713	4276	copy.add(obj.get(i));
..	..	@@ -3717,6 +4280,7 @@
3717	4280
3718	4281	CameraPane.SWITCH = temp;
3719	4282
	4283	+ RefreshSelection();
3720	4284	//assert(hashtable.isEmpty());
3721	4285
3722	4286	copy.Touch();
..	..	@@ -3737,13 +4301,15 @@
3737	4301	}
3738	4302	}
3739	4303
3740		- refreshContents();
	4304	+ refreshContents(true);
3741	4305	}
3742	4306
3743		- cButton undoButton;
	4307	+ cButton previousVersionButton;
3744	4308	cButton restoreButton;
3745	4309	cButton replaceButton;
3746		- cButton redoButton;
	4310	+ cButton nextVersionButton;
	4311	+ cButton saveVersionButton;
	4312	+ cButton deleteVersionButton;
3747	4313
3748	4314	boolean muteSlider;
3749	4315
..	..	@@ -3751,9 +4317,9 @@
3751	4317	{
3752	4318	int count = 0;
3753	4319
3754		- for (int i = copy.versions.length; --i >= 0;)
	4320	+ for (int i = copy.versionlist.length; --i >= 0;)
3755	4321	{
3756		- if (copy.versions[i] != null)
	4322	+ if (copy.versionlist[i] != null)
3757	4323	count++;
3758	4324	}
3759	4325
..	..	@@ -3764,11 +4330,14 @@
3764	4330	{
3765	4331	cRadio tab = GetCurrentTab();
3766	4332
3767		- restoreButton.setEnabled(copy.versionindex != -1);
3768		- replaceButton.setEnabled(copy.versionindex != -1);
	4333	+ restoreButton.setEnabled(true); // copy.versionindex != -1);
	4334	+ replaceButton.setEnabled(true); // copy.versionindex != -1);
3769	4335
3770		- undoButton.setEnabled(copy.versionindex > 0);
3771		- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	4336	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4337	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4338	+
	4339	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4340	+ copy.versionlist[copy.versionindex + 1] != null);
3772	4341
3773	4342	muteSlider = true;
3774	4343	versionSlider.setMaximum(VersionCount() - 1);
..	..	@@ -3776,7 +4345,7 @@
3776	4345	muteSlider = false;
3777	4346	}
3778	4347
3779		- public boolean Undo()
	4348	+ public boolean PreviousVersion()
3780	4349	{
3781	4350	// Option?
3782	4351	Replace();
..	..	@@ -3806,7 +4375,7 @@
3806	4375
3807	4376	copy.versionindex -= 1;
3808	4377
3809		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4378	+ CopyChanged();
3810	4379
3811	4380	return true;
3812	4381	}
..	..	@@ -3817,13 +4386,14 @@
3817	4386
3818	4387	cRadio tab = GetCurrentTab();
3819	4388
3820		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4389	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3821	4390	{
3822	4391	java.awt.Toolkit.getDefaultToolkit().beep();
3823	4392	return false;
3824	4393	}
3825	4394
3826		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4395	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4396	+ CopyChanged();
3827	4397
3828	4398	return true;
3829	4399	}
..	..	@@ -3834,25 +4404,25 @@
3834	4404
3835	4405	cRadio tab = GetCurrentTab();
3836	4406
3837		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4407	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3838	4408	{
3839	4409	// No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3840	4410	return false;
3841	4411	}
3842	4412
3843		- copy.versions[copy.versionindex] = CompressCopy();
	4413	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
3844	4414
3845	4415	return true;
3846	4416	}
3847	4417
3848		- public void Redo()
	4418	+ public void NextVersion()
3849	4419	{
3850	4420	// Option?
3851	4421	Replace();
3852	4422
3853	4423	cRadio tab = GetCurrentTab();
3854	4424
3855		- if (copy.versions[copy.versionindex + 1] == null)
	4425	+ if (copy.versionlist[copy.versionindex + 1] == null)
3856	4426	{
3857	4427	java.awt.Toolkit.getDefaultToolkit().beep();
3858	4428	return;
..	..	@@ -3860,7 +4430,7 @@
3860	4430
3861	4431	copy.versionindex += 1;
3862	4432
3863		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4433	+ CopyChanged();
3864	4434
3865	4435	//if (!tab.user[tab.versionindex])
3866	4436	// tab.graphs[tab.versionindex] = null;
..	..	@@ -4074,7 +4644,7 @@
4074	4644	//copy.material = new cMaterial(copy.GetMaterial());
4075	4645
4076	4646	current.color = (float) colorField.getFloat();
4077		- current.modulation = (float) modulationField.getFloat();
	4647	+ current.modulation = (float) saturationField.getFloat();
4078	4648	current.metalness = (float) metalnessField.getFloat();
4079	4649	current.diffuse = (float) diffuseField.getFloat();
4080	4650	current.specular = (float) specularField.getFloat();
..	..	@@ -4107,7 +4677,7 @@
4107	4677	cMaterial mat = copy.material;
4108	4678
4109	4679	colorField.SetToolTipValue((mat.color));
4110		- modulationField.SetToolTipValue((mat.modulation));
	4680	+ saturationField.SetToolTipValue((mat.modulation));
4111	4681	metalnessField.SetToolTipValue((mat.metalness));
4112	4682	diffuseField.SetToolTipValue((mat.diffuse));
4113	4683	specularField.SetToolTipValue((mat.specular));
..	..	@@ -4171,9 +4741,10 @@
4171	4741
4172	4742	int version = versionSlider.getInteger();
4173	4743
4174		- if (copy.versions[version] != null)
	4744	+ if (copy.versionlist[version] != null)
4175	4745	{
4176		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4746	+ copy.versionindex = version;
	4747	+ CopyChanged();
4177	4748	}
4178	4749
4179	4750	return;
..	..	@@ -4213,6 +4784,12 @@
4213	4784	{
4214	4785	//System.out.println("stateChanged = " + this);
4215	4786	materialtouched = true;
	4787	+
	4788	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4789	+ {
	4790	+ saturationField.setFloat(1);
	4791	+ }
	4792	+
4216	4793	applySelf();
4217	4794	//System.out.println("this = " + this);
4218	4795	//System.out.println("PARENT = " + parent);
..	..	@@ -4512,6 +5089,7 @@
4512	5089	{
4513	5090	if (GetTree() != null)
4514	5091	{
	5092	+ GetTree().revalidate();
4515	5093	GetTree().repaint();
4516	5094	}
4517	5095
..	..	@@ -4520,6 +5098,9 @@
4520	5098	ctrlPanel.validate(); // ? new
4521	5099	ctrlPanel.repaint();
4522	5100	}
	5101	+
	5102	+ if (previousVersionButton != null && copy.versionlist != null)
	5103	+ SetUndoStates();
4523	5104	}
4524	5105
4525	5106	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4768,7 +5349,9 @@
4768	5349	readobj.ResetDisplayList();
4769	5350	} catch (Exception e)
4770	5351	{
4771		- //e.printStackTrace();
	5352	+ if (!e.toString().contains("GZIP"))
	5353	+ e.printStackTrace();
	5354	+
4772	5355	try
4773	5356	{
4774	5357	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4848,6 +5431,8 @@
4848	5431	{
4849	5432	//readobj.deepCopySelf(copy);
4850	5433	copy.clear(); // june 2014
	5434	+ copy.skyboxname = readobj.skyboxname;
	5435	+ copy.skyboxext = readobj.skyboxext;
4851	5436	for (int i = 0; i < readobj.size(); i++)
4852	5437	{
4853	5438	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4888,6 +5473,7 @@
4888	5473	}
4889	5474	} catch (ClassCastException e)
4890	5475	{
	5476	+ e.printStackTrace();
4891	5477	assert (false);
4892	5478	Composite c = (Composite) copy;
4893	5479	c.children.clear();
..	..	@@ -4898,12 +5484,12 @@
4898	5484	c.addChild(csg);
4899	5485	}
4900	5486
4901		- copy.versions = readobj.versions;
	5487	+ copy.versionlist = readobj.versionlist;
4902	5488	copy.versionindex = readobj.versionindex;
4903	5489
4904		- if (copy.versions == null)
	5490	+ if (copy.versionlist == null)
4905	5491	{
4906		- copy.versions = new byte[100][];
	5492	+ copy.versionlist = new Object3D[100];
4907	5493	copy.versionindex = -1;
4908	5494	}
4909	5495
..	..	@@ -4919,7 +5505,7 @@
4919	5505	{
4920	5506	if (Grafreed.standAlone)
4921	5507	{
4922		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5508	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4923	5509	browser.show();
4924	5510	String filename = browser.getFile();
4925	5511	if (filename != null && filename.length() > 0)
..	..	@@ -5018,6 +5604,7 @@
5018	5604	//ps.print(buffer.toString());
5019	5605	} catch (IOException e)
5020	5606	{
	5607	+ e.printStackTrace();
5021	5608	}
5022	5609	}
5023	5610
..	..	@@ -5237,6 +5824,7 @@
5237	5824	ButtonGroup buttonGroup;
5238	5825
5239	5826	cGridBag toolboxPanel;
	5827	+ cGridBag skyboxPanel;
5240	5828	cGridBag materialPanel;
5241	5829	cGridBag ctrlPanel;
5242	5830
..	..	@@ -5310,7 +5898,7 @@
5310	5898	JLabel colorLabel;
5311	5899	cNumberSlider colorField;
5312	5900	JLabel modulationLabel;
5313		- cNumberSlider modulationField;
	5901	+ cNumberSlider saturationField;
5314	5902	JLabel metalnessLabel;
5315	5903	cNumberSlider metalnessField;
5316	5904	JLabel diffuseLabel;
..	..	@@ -5341,6 +5929,7 @@
5341	5929	cNumberSlider anisoField;
5342	5930	JLabel anisoVLabel;
5343	5931	cNumberSlider anisoVField;
	5932	+
5344	5933	JLabel cameraLabel;
5345	5934	cNumberSlider cameraField;
5346	5935	JLabel selfshadowLabel;
..	..	@@ -5355,6 +5944,7 @@
5355	5944	cNumberSlider fakedepthField;
5356	5945	JLabel shadowbiasLabel;
5357	5946	cNumberSlider shadowbiasField;
	5947	+
5358	5948	JLabel bumpLabel;
5359	5949	cNumberSlider bumpField;
5360	5950	JLabel noiseLabel;