~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,64 +42,90 @@
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		- try
48		- {
49		- ImageIcon icon = GetIcon(name);
50		- return new cButton(icon, border);
51		- }
52		- catch (Exception e)
53		- {
54		- return new cButton(name, border);
55		- }
	56	+ ImageIcon icon = GetIcon(name);
	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);
56	64	}
57	65
58	66	cToggleButton GetToggleButton(String name, boolean border)
59	67	{
60		- try
61		- {
62		- ImageIcon icon = GetIcon(name);
63		- return new cToggleButton(icon, border);
64		- }
65		- catch (Exception e)
66		- {
67		- return new cToggleButton(name, border);
68		- }
	68	+ ImageIcon icon = GetIcon(name);
	69	+ return new cToggleButton(icon, border);
69	70	}
70	71
71	72	cCheckBox GetCheckBox(String name, boolean border)
72	73	{
	74	+ ImageIcon icon = GetIcon(name);
	75	+ return new cCheckBox(icon, border);
	76	+ }
	77	+
	78	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	79	+
	80	+ ImageIcon GetIcon(String name)
	81	+ {
	82	+ javax.swing.ImageIcon iconCache = icons.get(name);
	83	+ if (iconCache != null)
	84	+ {
	85	+ return iconCache;
	86	+ }
	87	+
73	88	try
74	89	{
75		- ImageIcon icon = GetIcon(name);
76		- return new cCheckBox(icon, border);
	90	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	91	+
	92	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	93	+// {
	94	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	95	+// Graphics2D g = resized.createGraphics();
	96	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	97	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	98	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	99	+// g.dispose();
	100	+//
	101	+// image = resized;
	102	+// }
	103	+
	104	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	105	+
	106	+ icons.put(name, icon);
	107	+
	108	+ return icon;
77	109	}
78	110	catch (Exception e)
79	111	{
80		- return new cCheckBox(name, border);
	112	+ //icons.put(name, null);
	113	+ return null;
81	114	}
82	115	}
83		-
84		- private ImageIcon GetIcon(String name) throws IOException
	116	+
	117	+ BufferedImage GetImage(String name)
85	118	{
86		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87		-
88		- if (image.getWidth() != 24 && image.getHeight() != 24)
	119	+ try
89	120	{
90		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
91		- Graphics2D g = resized.createGraphics();
92		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
93		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
94		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
95		- g.dispose();
96		-
97		- image = resized;
	121	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	122	+
	123	+ return image;
98	124	}
99		-
100		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101		- return icon;
	125	+ catch (Exception e)
	126	+ {
	127	+ return null;
	128	+ }
102	129	}
103	130
104	131	// SCRIPT
..	..	@@ -282,11 +309,13 @@
282	309	client = inClient;
283	310	copy = client;
284	311
285		- if (copy.versions == null)
286		- {
287		- copy.versions = new byte[100][];
288		- copy.versionindex = -1;
289		- }
	312	+// if (copy.versionlist == null)
	313	+// {
	314	+// copy.versionlist = new Object3D[100];
	315	+// copy.versionindex = -1;
	316	+//
	317	+// callee.Save(true);
	318	+// }
290	319
291	320	// "this" is not called: SetupUI2(objEditor);
292	321	}
..	..	@@ -301,10 +330,12 @@
301	330	client = inClient;
302	331	copy = client;
303	332
304		- if (copy.versions == null)
	333	+ if (copy.versionlist == null)
305	334	{
306		- copy.versions = new byte[100][];
	335	+ copy.versionlist = new Object3D[100];
307	336	copy.versionindex = -1;
	337	+
	338	+// Save(true);
308	339	}
309	340
310	341	SetupUI2(callee.GetEditor());
..	..	@@ -339,11 +370,13 @@
339	370	copy = localCopy;
340	371	copy.editWindow = this;
341	372
342		- if (copy.versions == null)
343		- {
344		- copy.versions = new byte[100][];
345		- copy.versionindex = -1;
346		- }
	373	+// if (copy.versionlist == null)
	374	+// {
	375	+// copy.versionlist = new Object3D[100];
	376	+// copy.versionindex = -1;
	377	+//
	378	+// Save(true);
	379	+// }
347	380
348	381	SetupMenu();
349	382
..	..	@@ -412,6 +445,8 @@
412	445
413	446	ChangeListener changeListener = new ChangeListener()
414	447	{
	448	+ //String name;
	449	+
415	450	public void stateChanged(ChangeEvent changeEvent)
416	451	{
417	452	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -430,18 +465,49 @@
430	465	// EditSelection(false);
431	466	// }
432	467
433		- refreshContents(false); // To refresh Info tab
	468	+// if (objectPanel.getSelectedIndex() == 4)
	469	+// {
	470	+// name = copy.skyboxname;
	471	+//
	472	+// if (name == null)
	473	+// {
	474	+// name = "";
	475	+// }
	476	+//
	477	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	478	+// copy.skyboxext = "jpg";
	479	+// }
	480	+// else
	481	+// {
	482	+// if (name != null)
	483	+// {
	484	+// if (name.equals(""))
	485	+// {
	486	+// copy.skyboxname = null;
	487	+// copy.skyboxext = null;
	488	+// }
	489	+// else
	490	+// {
	491	+// copy.skyboxname = name;
	492	+// }
	493	+// }
	494	+// }
	495	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	496	+
	497	+// refreshContents(false); // To refresh Info tab
	498	+ cameraView.repaint();
434	499	}
435	500	};
436	501	objectPanel.addChangeListener(changeListener);
437	502
438	503	toolbarPanel = new JPanel();
439	504	toolbarPanel.setName("Toolbar");
	505	+
440	506	treePanel = new cGridBag();
441	507	treePanel.setName("Tree");
442	508
443	509	editPanel = new cGridBag().setVertical(true);
444		- editPanel.setName("Edit");
	510	+ //editPanel.setName("Edit");
445	511
446	512	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
447	513
..	..	@@ -449,11 +515,13 @@
449	515	editPanel.add(editCommandsPanel);
450	516	editPanel.add(ctrlPanel);
451	517
452		- toolboxPanel = new cGridBag().setVertical(false);
453		- toolboxPanel.setName("Toolbox");
	518	+ toolboxPanel = new cGridBag().setVertical(true);
	519	+ //toolboxPanel.setName("Toolbox");
454	520
455		- materialPanel = new cGridBag().setVertical(true);
456		- materialPanel.setName("Material");
	521	+ skyboxPanel = new cGridBag().setVertical(true);
	522	+
	523	+ materialPanel = new cGridBag().setVertical(false);
	524	+ //materialPanel.setName("Material");
457	525
458	526	/JTextPane/
459	527	infoarea = createTextPane();
..	..	@@ -461,6 +529,7 @@
461	529
462	530	infoarea.setEditable(true);
463	531	SetText();
	532	+
464	533	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
465	534	// infoarea.setOpaque(false);
466	535	// //infoarea.setForeground(textcolor);
..	..	@@ -468,7 +537,7 @@
468	537	// TEXTAREA infoarea.setWrapStyleWord(true);
469	538	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
470	539	infoPanel.setPreferredSize(new Dimension(1, 1));
471		- infoPanel.setName("Info");
	540	+ //infoPanel.setName("Info");
472	541	//infoPanel.setLayout(new BorderLayout());
473	542	//infoPanel.add(createTextPane());
474	543
..	..	@@ -735,6 +804,7 @@
735	804	boolean maximized;
736	805
737	806	cButton fullscreenLayout;
	807	+ cButton expandedLayout;
738	808
739	809	void Minimize()
740	810	{
..	..	@@ -774,10 +844,12 @@
774	844	cButton minButton;
775	845	cButton maxButton;
776	846	cButton fullButton;
	847	+ cButton collapseButton;
	848	+ cButton maximize3DButton;
777	849
778	850	void ToggleFullScreen()
779	851	{
780		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	852	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
781	853
782	854	cameraView.ToggleFullScreen();
783	855
..	..	@@ -798,13 +870,13 @@
798	870	// X frame.getContentPane().remove(/"Center",/bigThree);
799	871	// X framePanel.add(bigThree);
800	872	// X frame.getContentPane().add(/"Center",/framePanel);
801		- framePanel.setDividerLocation(46);
	873	+// framePanel.setDividerLocation(46); // icons are 24x24
802	874
803	875	//frame.setVisible(true);
804		- radio.layout = keepButton;
	876	+// radio.layout = keepButton;
805	877	//theFrame = null;
806	878	keepButton = null;
807		- radio.layout.doClick();
	879	+// radio.layout.doClick();
808	880
809	881	} else
810	882	{
..	..	@@ -825,31 +897,42 @@
825	897	// X frame.getContentPane().remove(/"Center",/framePanel);
826	898	// X framePanel.remove(bigThree);
827	899	// X frame.getContentPane().add(/"Center",/bigThree);
828		- framePanel.setDividerLocation(0);
	900	+// framePanel.setDividerLocation(0);
829	901
830		- radio.layout = fullscreenLayout;
831		- radio.layout.doClick();
	902	+// radio.layout = fullscreenLayout;
	903	+// radio.layout.doClick();
832	904	//frame.setVisible(true);
833	905	}
834	906	frame.validate();
	907	+
	908	+ cameraView.requestFocusInWindow();
835	909	}
836	910
837		- private byte[] CompressCopy()
	911	+ void CollapseToolbar()
	912	+ {
	913	+ framePanel.setDividerLocation(0);
	914	+ //frame.validate();
	915	+
	916	+ cameraView.requestFocusInWindow();
	917	+ }
	918	+
	919	+ private Object3D Duplicate(Object3D object)
838	920	{
839	921	boolean temp = CameraPane.SWITCH;
840	922	CameraPane.SWITCH = false;
841	923
842		- copy.ExtractBigData(versiontable);
	924	+ object.ExtractBigData(versiontable);
843	925	// if (copy == client)
844	926
845		- byte[] versions[] = copy.versions;
846		- copy.versions = null;
	927	+ Object3D versions[] = object.versionlist;
	928	+ object.versionlist = null;
847	929
848		- byte[] compress = Compress(copy);
	930	+ //byte[] compress = Compress(copy);
	931	+ Object3D compress = (Object3D)Grafreed.clone(object);
849	932
850		- copy.versions = versions;
	933	+ object.versionlist = versions;
851	934
852		- copy.RestoreBigData(versiontable);
	935	+ object.RestoreBigData(versiontable);
853	936
854	937	CameraPane.SWITCH = temp;
855	938
..	..	@@ -977,6 +1060,7 @@
977	1060	{
978	1061	SetupMaterial(materialPanel);
979	1062	}
	1063	+
980	1064	//SetupName();
981	1065	//SetupViews();
982	1066	}
..	..	@@ -986,7 +1070,7 @@
986	1070	// NumberSlider vDivsField;
987	1071	// JCheckBox endcaps;
988	1072	JCheckBox liveCB;
989		- JCheckBox selectCB;
	1073	+ JCheckBox selectableCB;
990	1074	JCheckBox hideCB;
991	1075	JCheckBox link2masterCB;
992	1076	JCheckBox markCB;
..	..	@@ -1185,6 +1269,18 @@
1185	1269
1186	1270	namePanel = new cGridBag();
1187	1271
	1272	+ //if (copy.pinned)
	1273	+ {
	1274	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1275	+ pinButton.setSelected(copy.pinned);
	1276	+ cGridBag t = new cGridBag();
	1277	+ t.preferredWidth = 2;
	1278	+ t.add(pinButton);
	1279	+ namePanel.add(t);
	1280	+
	1281	+ pinButton.addItemListener(this);
	1282	+ }
	1283	+
1188	1284	nameField = AddText(namePanel, copy.GetName());
1189	1285	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1190	1286	oe.ctrlPanel.add(namePanel);
..	..	@@ -1198,13 +1294,16 @@
1198	1294
1199	1295	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1200	1296	liveCB.setToolTipText("Animate object");
1201		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1202		- selectCB.setToolTipText("Make object selectable");
	1297	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1298	+ selectableCB.setToolTipText("Make object selectable");
1203	1299	// Return();
	1300	+
1204	1301	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1205	1302	hideCB.setToolTipText("Hide object");
1206	1303	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1207	1304	markCB.setToolTipText("As animation target transform");
	1305	+
	1306	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1208	1307
1209	1308	setupPanel2 = new cGridBag().setVertical(false);
1210	1309
..	..	@@ -1492,6 +1591,7 @@
1492	1591	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1493	1592	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1494	1593	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1594	+ //XYZPanel.setName("XYZ");
1495	1595
1496	1596	/*
1497	1597	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1529,17 +1629,29 @@
1529	1629	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1530	1630	//tmp.setName("Edit");
1531	1631	objectPanel.add(materialPanel);
	1632	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1633	+ objectPanel.setToolTipTextAt(0, "Material");
	1634	+
	1635	+ objectPanel.add(toolboxPanel);
	1636	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1637	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1638	+
	1639	+ objectPanel.add(skyboxPanel);
	1640	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1641	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1642	+
1532	1643	// JPanel north = new JPanel(new BorderLayout());
1533	1644	// north.setName("Edit");
1534	1645	// north.add(ctrlPanel, BorderLayout.NORTH);
1535	1646	// objectPanel.add(north);
1536	1647	objectPanel.add(editPanel);
	1648	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1649	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1537	1650
1538		- //if (Globals.ADVANCED)
1539		- objectPanel.add(infoPanel);
	1651	+ objectPanel.add(XYZPanel);
	1652	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1653	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1540	1654
1541		- objectPanel.add(toolboxPanel);
1542		-
1543	1655	/*
1544	1656	aConstraints.gridx = 0;
1545	1657	aConstraints.gridwidth = 1;
..	..	@@ -1559,7 +1671,7 @@
1559	1671	scrollpane.addMouseWheelListener(this); // Default not fast enough
1560	1672
1561	1673	/JTabbedPane/ scenePanel = new cGridBag();
1562		- scenePanel.preferredWidth = 6;
	1674	+ scenePanel.preferredWidth = 5;
1563	1675
1564	1676	JTabbedPane tabbedPane = new JTabbedPane();
1565	1677	tabbedPane.add(scrollpane);
..	..	@@ -1576,6 +1688,11 @@
1576	1688
1577	1689	scenePanel.add(tabbedPane);
1578	1690
	1691	+ //if (Globals.ADVANCED)
	1692	+// tabbedPane.add(infoPanel);
	1693	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1694	+// tabbedPane.setToolTipTextAt(3, "Information");
	1695	+
1579	1696	/*
1580	1697	cTree jTree = new cTree(null);
1581	1698	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1637,7 +1754,7 @@
1637	1754	bigThree = new cGridBag();
1638	1755	bigThree.addComponent(scenePanel);
1639	1756	bigThree.addComponent(centralPanel);
1640		- bigThree.addComponent(XYZPanel);
	1757	+ //bigThree.addComponent(XYZPanel);
1641	1758
1642	1759	// // SIDE EFFECT!!!
1643	1760	// aConstraints.gridx = 0;
..	..	@@ -1646,6 +1763,23 @@
1646	1763	// aConstraints.gridheight = 1;
1647	1764
1648	1765	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1766	+
	1767	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1768	+ new java.beans.PropertyChangeListener()
	1769	+ {
	1770	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1771	+ {
	1772	+ if ((Integer)pce.getOldValue() == 1)
	1773	+ {
	1774	+ if (radio.layout != expandedLayout)
	1775	+ {
	1776	+ radio.layout = expandedLayout;
	1777	+ radio.layout.doClick();
	1778	+ }
	1779	+ }
	1780	+ }
	1781	+ });
	1782	+
1649	1783	framePanel.setContinuousLayout(false);
1650	1784	framePanel.setOneTouchExpandable(false);
1651	1785	//.setDividerLocation(0.8);
..	..	@@ -1678,7 +1812,6 @@
1678	1812	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1679	1813	frame.addWindowListener(new WindowAdapter()
1680	1814	{
1681		-
1682	1815	public void windowClosing(WindowEvent e)
1683	1816	{
1684	1817	Close();
..	..	@@ -1701,12 +1834,403 @@
1701	1834	ctrlPanel.removeAll();
1702	1835	}
1703	1836
1704		- void SetupMaterial(cGridBag panel)
	1837	+ void SetupMaterial(cGridBag materialpanel)
1705	1838	{
1706		- /*
	1839	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1840	+
	1841	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1842	+ skin.setToolTipText("Skin");
	1843	+ skin.addMouseListener(new MouseAdapter()
	1844	+ {
	1845	+ public void mouseClicked(MouseEvent e)
	1846	+ {
	1847	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1848	+ cMaterial material = object.material;
	1849	+
	1850	+ // Skin
	1851	+ colorField.setFloat(material.color);
	1852	+ saturationField.setFloat(material.modulation);
	1853	+ subsurfaceField.setFloat(material.subsurface);
	1854	+ selfshadowField.setFloat(material.diffuseness);
	1855	+ diffusenessField.setFloat(material.factor);
	1856	+ shininessField.setFloat(material.shininess);
	1857	+ shadowbiasField.setFloat(material.shadowbias);
	1858	+ diffuseField.setFloat(material.diffuse);
	1859	+ specularField.setFloat(material.specular);
	1860	+
	1861	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1862	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1863	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1864	+
	1865	+ materialtouched = true;
	1866	+ applySelf();
	1867	+ }
	1868	+ });
	1869	+ presetpanel.add(skin);
	1870	+
	1871	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1872	+ lambert.setToolTipText("Diffuse");
	1873	+ lambert.addMouseListener(new MouseAdapter()
	1874	+ {
	1875	+ public void mouseClicked(MouseEvent e)
	1876	+ {
	1877	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1878	+ cMaterial material = object.material;
	1879	+
	1880	+ diffusenessField.setFloat(material.factor);
	1881	+ selfshadowField.setFloat(material.diffuseness);
	1882	+
	1883	+ materialtouched = true;
	1884	+ applySelf();
	1885	+ }
	1886	+ });
	1887	+ presetpanel.add(lambert);
	1888	+
	1889	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1890	+ diffuse2.setToolTipText("Diffuse2");
	1891	+ diffuse2.addMouseListener(new MouseAdapter()
	1892	+ {
	1893	+ public void mouseClicked(MouseEvent e)
	1894	+ {
	1895	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1896	+ cMaterial material = object.material;
	1897	+
	1898	+ diffusenessField.setFloat(material.factor);
	1899	+ selfshadowField.setFloat(material.diffuseness);
	1900	+
	1901	+ materialtouched = true;
	1902	+ applySelf();
	1903	+ }
	1904	+ });
	1905	+ presetpanel.add(diffuse2);
	1906	+
	1907	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1908	+ diffusemoon.setToolTipText("Moon");
	1909	+ diffusemoon.addMouseListener(new MouseAdapter()
	1910	+ {
	1911	+ public void mouseClicked(MouseEvent e)
	1912	+ {
	1913	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1914	+ cMaterial material = object.material;
	1915	+
	1916	+ diffusenessField.setFloat(material.factor);
	1917	+ selfshadowField.setFloat(material.diffuseness);
	1918	+
	1919	+ materialtouched = true;
	1920	+ applySelf();
	1921	+ }
	1922	+ });
	1923	+ presetpanel.add(diffusemoon);
	1924	+
	1925	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1926	+ diffusemoon2.setToolTipText("Moon2");
	1927	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1928	+ {
	1929	+ public void mouseClicked(MouseEvent e)
	1930	+ {
	1931	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1932	+ cMaterial material = object.material;
	1933	+
	1934	+ diffusenessField.setFloat(material.factor);
	1935	+ selfshadowField.setFloat(material.diffuseness);
	1936	+
	1937	+ materialtouched = true;
	1938	+ applySelf();
	1939	+ }
	1940	+ });
	1941	+ presetpanel.add(diffusemoon2);
	1942	+
	1943	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1944	+ diffusemoon3.setToolTipText("Moon3");
	1945	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1946	+ {
	1947	+ public void mouseClicked(MouseEvent e)
	1948	+ {
	1949	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1950	+ cMaterial material = object.material;
	1951	+
	1952	+ diffusenessField.setFloat(material.factor);
	1953	+ selfshadowField.setFloat(material.diffuseness);
	1954	+
	1955	+ materialtouched = true;
	1956	+ applySelf();
	1957	+ }
	1958	+ });
	1959	+ presetpanel.add(diffusemoon3);
	1960	+
	1961	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1962	+ diffusesheen.setToolTipText("Sheen");
	1963	+ diffusesheen.addMouseListener(new MouseAdapter()
	1964	+ {
	1965	+ public void mouseClicked(MouseEvent e)
	1966	+ {
	1967	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1968	+ cMaterial material = object.material;
	1969	+
	1970	+ sheenField.setFloat(material.sheen);
	1971	+
	1972	+ materialtouched = true;
	1973	+ applySelf();
	1974	+ }
	1975	+ });
	1976	+ presetpanel.add(diffusesheen);
	1977	+
	1978	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1979	+ rough.setToolTipText("Rough metal");
	1980	+ rough.addMouseListener(new MouseAdapter()
	1981	+ {
	1982	+ public void mouseClicked(MouseEvent e)
	1983	+ {
	1984	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1985	+ cMaterial material = object.material;
	1986	+
	1987	+ shininessField.setFloat(material.shininess);
	1988	+ velvetField.setFloat(material.velvet);
	1989	+
	1990	+ materialtouched = true;
	1991	+ applySelf();
	1992	+ }
	1993	+ });
	1994	+ presetpanel.add(rough);
	1995	+
	1996	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1997	+ rough2.setToolTipText("Medium metal");
	1998	+ rough2.addMouseListener(new MouseAdapter()
	1999	+ {
	2000	+ public void mouseClicked(MouseEvent e)
	2001	+ {
	2002	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2003	+ cMaterial material = object.material;
	2004	+
	2005	+ shininessField.setFloat(material.shininess);
	2006	+ lightareaField.setFloat(material.lightarea);
	2007	+
	2008	+ materialtouched = true;
	2009	+ applySelf();
	2010	+ }
	2011	+ });
	2012	+ presetpanel.add(rough2);
	2013	+
	2014	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2015	+ shini0.setToolTipText("Shiny");
	2016	+ shini0.addMouseListener(new MouseAdapter()
	2017	+ {
	2018	+ public void mouseClicked(MouseEvent e)
	2019	+ {
	2020	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2021	+ cMaterial material = object.material;
	2022	+
	2023	+ shininessField.setFloat(material.shininess);
	2024	+ lightareaField.setFloat(material.lightarea);
	2025	+
	2026	+ materialtouched = true;
	2027	+ applySelf();
	2028	+ }
	2029	+ });
	2030	+ presetpanel.add(shini0);
	2031	+
	2032	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2033	+ shini1.setToolTipText("Shiny2");
	2034	+ shini1.addMouseListener(new MouseAdapter()
	2035	+ {
	2036	+ public void mouseClicked(MouseEvent e)
	2037	+ {
	2038	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2039	+ cMaterial material = object.material;
	2040	+
	2041	+ shininessField.setFloat(material.shininess);
	2042	+ lightareaField.setFloat(material.lightarea);
	2043	+
	2044	+ materialtouched = true;
	2045	+ applySelf();
	2046	+ }
	2047	+ });
	2048	+ presetpanel.add(shini1);
	2049	+
	2050	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2051	+ shini2.setToolTipText("Shiny3");
	2052	+ shini2.addMouseListener(new MouseAdapter()
	2053	+ {
	2054	+ public void mouseClicked(MouseEvent e)
	2055	+ {
	2056	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2057	+ cMaterial material = object.material;
	2058	+
	2059	+ shininessField.setFloat(material.shininess);
	2060	+ lightareaField.setFloat(material.lightarea);
	2061	+
	2062	+ materialtouched = true;
	2063	+ applySelf();
	2064	+ }
	2065	+ });
	2066	+ presetpanel.add(shini2);
	2067	+
	2068	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2069	+ aniso.setToolTipText("AnisoU");
	2070	+ aniso.addMouseListener(new MouseAdapter()
	2071	+ {
	2072	+ public void mouseClicked(MouseEvent e)
	2073	+ {
	2074	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2075	+ cMaterial material = object.material;
	2076	+
	2077	+ anisoField.setFloat(material.aniso);
	2078	+ anisoVField.setFloat(material.anisoV);
	2079	+
	2080	+ materialtouched = true;
	2081	+ applySelf();
	2082	+ }
	2083	+ });
	2084	+ presetpanel.add(aniso);
	2085	+
	2086	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2087	+ aniso2.setToolTipText("AnisoV");
	2088	+ aniso2.addMouseListener(new MouseAdapter()
	2089	+ {
	2090	+ public void mouseClicked(MouseEvent e)
	2091	+ {
	2092	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2093	+ cMaterial material = object.material;
	2094	+
	2095	+ anisoField.setFloat(material.aniso);
	2096	+ anisoVField.setFloat(material.anisoV);
	2097	+
	2098	+ materialtouched = true;
	2099	+ applySelf();
	2100	+ }
	2101	+ });
	2102	+ presetpanel.add(aniso2);
	2103	+
	2104	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2105	+ aniso3.setToolTipText("AnisoUV");
	2106	+ aniso3.addMouseListener(new MouseAdapter()
	2107	+ {
	2108	+ public void mouseClicked(MouseEvent e)
	2109	+ {
	2110	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2111	+ cMaterial material = object.material;
	2112	+
	2113	+ anisoField.setFloat(material.aniso);
	2114	+ anisoVField.setFloat(material.anisoV);
	2115	+
	2116	+ materialtouched = true;
	2117	+ applySelf();
	2118	+ }
	2119	+ });
	2120	+ presetpanel.add(aniso3);
	2121	+
	2122	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2123	+ velvet0.setToolTipText("Velvet");
	2124	+ velvet0.addMouseListener(new MouseAdapter()
	2125	+ {
	2126	+ public void mouseClicked(MouseEvent e)
	2127	+ {
	2128	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2129	+ cMaterial material = object.material;
	2130	+
	2131	+ diffusenessField.setFloat(material.factor);
	2132	+ selfshadowField.setFloat(material.diffuseness);
	2133	+ sheenField.setFloat(material.sheen);
	2134	+ shininessField.setFloat(material.shininess);
	2135	+ velvetField.setFloat(material.velvet);
	2136	+ shiftField.setFloat(material.shift);
	2137	+
	2138	+ materialtouched = true;
	2139	+ applySelf();
	2140	+ }
	2141	+ });
	2142	+ presetpanel.add(velvet0);
	2143	+
	2144	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2145	+ bump0.setToolTipText("Bump texture");
	2146	+ bump0.addMouseListener(new MouseAdapter()
	2147	+ {
	2148	+ public void mouseClicked(MouseEvent e)
	2149	+ {
	2150	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2151	+ cMaterial material = object.material;
	2152	+
	2153	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2154	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2155	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2156	+
	2157	+ materialtouched = true;
	2158	+ applySelf();
	2159	+ }
	2160	+ });
	2161	+ presetpanel.add(bump0);
	2162	+
	2163	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2164	+ halo.setToolTipText("Halo");
	2165	+ halo.addMouseListener(new MouseAdapter()
	2166	+ {
	2167	+ public void mouseClicked(MouseEvent e)
	2168	+ {
	2169	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2170	+ cMaterial material = object.material;
	2171	+
	2172	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2173	+
	2174	+ materialtouched = true;
	2175	+ applySelf();
	2176	+ }
	2177	+ });
	2178	+ presetpanel.add(halo);
	2179	+
	2180	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2181	+ candle.setToolTipText("Candle");
	2182	+ candle.addMouseListener(new MouseAdapter()
	2183	+ {
	2184	+ public void mouseClicked(MouseEvent e)
	2185	+ {
	2186	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2187	+ cMaterial material = object.material;
	2188	+
	2189	+ subsurfaceField.setFloat(material.subsurface);
	2190	+ shadowbiasField.setFloat(material.shadowbias);
	2191	+ ambientField.setFloat(material.ambient);
	2192	+ specularField.setFloat(material.specular);
	2193	+ lightareaField.setFloat(material.lightarea);
	2194	+ shininessField.setFloat(material.shininess);
	2195	+
	2196	+ materialtouched = true;
	2197	+ applySelf();
	2198	+ }
	2199	+ });
	2200	+ presetpanel.add(candle);
	2201	+
	2202	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2203	+ shadowShader.setToolTipText("Shadow");
	2204	+ shadowShader.addMouseListener(new MouseAdapter()
	2205	+ {
	2206	+ public void mouseClicked(MouseEvent e)
	2207	+ {
	2208	+ diffuseField.setFloat(0.001);
	2209	+ ambientField.setFloat(0.001);
	2210	+ cameraField.setFloat(0.001);
	2211	+ specularField.setFloat(0.001);
	2212	+ fakedepthField.setFloat(0.001);
	2213	+ opacityField.setFloat(0.6);
	2214	+
	2215	+ materialtouched = true;
	2216	+ applySelf();
	2217	+ }
	2218	+ });
	2219	+ presetpanel.add(shadowShader);
	2220	+
	2221	+ cGridBag panel = new cGridBag().setVertical(true);
	2222	+
	2223	+ presetpanel.preferredWidth = 1;
	2224	+
	2225	+ materialpanel.add(presetpanel);
	2226	+ materialpanel.add(panel);
	2227	+
	2228	+ panel.preferredWidth = 8;
	2229	+
	2230	+ /*
1707	2231	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1708	2232	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1709		- */
	2233	+ */
1710	2234
1711	2235	cGridBag editBar = new cGridBag().setVertical(false);
1712	2236
..	..	@@ -1740,27 +2264,50 @@
1740	2264	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1741	2265
1742	2266	cGridBag colorSection = new cGridBag().setVertical(true);
	2267	+
	2268	+ cGridBag huepanel = new cGridBag();
	2269	+ cGridBag huelabel = new cGridBag();
	2270	+ skin = GetLabel("icons/hue.png", false);
	2271	+ skin.fit = true;
	2272	+ huelabel.add(skin);
	2273	+ huelabel.preferredWidth = 20;
	2274	+ huepanel.add(new cGridBag()); // Label
	2275	+ huepanel.add(huelabel); // Field/slider
	2276	+
	2277	+ huepanel.preferredHeight = 7;
	2278	+
	2279	+ colorSection.add(huepanel);
1743	2280
1744	2281	cGridBag color = new cGridBag();
1745		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1746		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1747		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2282	+
	2283	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2284	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2285	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2286	+
1748	2287	//colorField.preferredWidth = 200;
1749	2288	colorSection.add(color);
1750	2289
1751	2290	cGridBag modulation = new cGridBag();
1752	2291	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1753	2292	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1754		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2293	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1755	2294	colorSection.add(modulation);
1756	2295
	2296	+ cGridBag opacity = new cGridBag();
	2297	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2298	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2299	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2300	+ colorSection.add(opacity);
	2301	+
	2302	+ colorSection.add(GetSeparator());
	2303	+
1757	2304	cGridBag texture = new cGridBag();
1758	2305	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1759	2306	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1760	2307	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1761	2308	colorSection.add(texture);
1762	2309
1763		- panel.add(new JSeparator());
	2310	+ panel.add(GetSeparator());
1764	2311
1765	2312	panel.add(colorSection);
1766	2313
..	..	@@ -1816,7 +2363,7 @@
1816	2363	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1817	2364	diffuseSection.add(shadowbias);
1818	2365
1819		- panel.add(new JSeparator());
	2366	+ panel.add(GetSeparator());
1820	2367
1821	2368	panel.add(diffuseSection);
1822	2369
..	..	@@ -1879,7 +2426,7 @@
1879	2426	specularSection.add(anisoV);
1880	2427
1881	2428
1882		- panel.add(new JSeparator());
	2429	+ panel.add(GetSeparator());
1883	2430
1884	2431	panel.add(specularSection);
1885	2432
..	..	@@ -1904,12 +2451,6 @@
1904	2451	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1905	2452	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1906	2453	colorSection.add(backlit);
1907		-
1908		- cGridBag opacity = new cGridBag();
1909		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1910		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1911		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1912		- colorSection.add(opacity);
1913	2454
1914	2455	//panel.add(new JSeparator());
1915	2456
..	..	@@ -1955,7 +2496,7 @@
1955	2496	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1956	2497	textureSection.add(opacityPower);
1957	2498
1958		- panel.add(new JSeparator());
	2499	+ panel.add(GetSeparator());
1959	2500
1960	2501	panel.add(textureSection);
1961	2502
..	..	@@ -2942,7 +3483,7 @@
2942	3483
2943	3484	freezematerial = true;
2944	3485	colorField.setFloat(mat.color);
2945		- modulationField.setFloat(mat.modulation);
	3486	+ saturationField.setFloat(mat.modulation);
2946	3487	metalnessField.setFloat(mat.metalness);
2947	3488	diffuseField.setFloat(mat.diffuse);
2948	3489	specularField.setFloat(mat.specular);
..	..	@@ -3149,6 +3690,17 @@
3149	3690	public void itemStateChanged(ItemEvent event)
3150	3691	{
3151	3692	// System.out.println("Propagate = " + propagate);
	3693	+ if (event.getSource() == pinButton)
	3694	+ {
	3695	+ copy.pinned ^= true;
	3696	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3697	+ {
	3698	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3699	+ copy.CloseUI();
	3700	+ //copy.editWindow.refreshContents();
	3701	+ }
	3702	+ }
	3703	+ else
3152	3704	if (event.getSource() == propagateToggle)
3153	3705	{
3154	3706	propagate ^= true;
..	..	@@ -3253,8 +3805,9 @@
3253	3805	} else if (event.getSource() == liveCB)
3254	3806	{
3255	3807	copy.live ^= true;
	3808	+ objEditor.refreshContents(true); // To show item colors
3256	3809	return;
3257		- } else if (event.getSource() == selectCB)
	3810	+ } else if (event.getSource() == selectableCB)
3258	3811	{
3259	3812	copy.dontselect ^= true;
3260	3813	return;
..	..	@@ -3262,7 +3815,7 @@
3262	3815	{
3263	3816	copy.hide ^= true;
3264	3817	copy.Touch(); // display list issue
3265		- objEditor.refreshContents();
	3818	+ objEditor.refreshContents(true); // To show item colors
3266	3819	return;
3267	3820	} else if (event.getSource() == link2masterCB)
3268	3821	{
..	..	@@ -3518,6 +4071,7 @@
3518	4071
3519	4072	static public byte[] Compress(Object3D o)
3520	4073	{
	4074	+ // Slower to actually compress.
3521	4075	try
3522	4076	{
3523	4077	ByteArrayOutputStream baos = new ByteArrayOutputStream();
..	..	@@ -3619,6 +4173,7 @@
3619	4173	{
3620	4174	//Save(true);
3621	4175	Replace();
	4176	+ SetVersionStates();
3622	4177	}
3623	4178
3624	4179	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3639,29 +4194,46 @@
3639	4194
3640	4195	java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3641	4196
	4197	+ void DeleteVersion()
	4198	+ {
	4199	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4200	+ {
	4201	+ copy.versionlist[i] = copy.versionlist[i+1];
	4202	+ }
	4203	+
	4204	+ CopyChanged();
	4205	+
	4206	+ SetVersionStates();
	4207	+ }
	4208	+
3642	4209	public boolean Save(boolean user)
3643	4210	{
3644	4211	System.err.println("Save");
	4212	+ Replace();
3645	4213
3646		- cRadio tab = GetCurrentTab();
	4214	+ //cRadio tab = GetCurrentTab();
3647	4215
3648		- byte[] compress = CompressCopy();
	4216	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3649	4217
3650	4218	boolean thesame = false;
3651	4219
3652		- // Quick heuristic using length. Works only when stream is compressed.
3653		- if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3654		- {
3655		- thesame = true;
3656		- }
	4220	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4221	+// {
	4222	+// thesame = true;
	4223	+// }
3657	4224
3658	4225	//EditorFrame.m_MainFrame.requestFocusInWindow();
3659	4226	if (!thesame)
3660	4227	{
	4228	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4229	+ {
	4230	+ copy.versionlist[i] = copy.versionlist[i-1];
	4231	+ }
	4232	+
3661	4233	//tab.user[tab.versionindex] = user;
3662	4234	//boolean increment = true; // tab.graphs[tab.versionindex] == null;
3663	4235
3664		- copy.versions[++copy.versionindex] = compress;
	4236	+ copy.versionlist[++copy.versionindex] = compress;
3665	4237
3666	4238	// if (increment)
3667	4239	// tab.versionindex++;
..	..	@@ -3671,13 +4243,13 @@
3671	4243
3672	4244	//assert(hashtable.isEmpty());
3673	4245
3674		- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3675		- {
3676		- //tab.user[i] = false;
3677		- copy.versions[i] = null;
3678		- }
	4246	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4247	+// {
	4248	+// //tab.user[i] = false;
	4249	+// copy.versionlist[i] = null;
	4250	+// }
3679	4251
3680		- SetUndoStates();
	4252	+ SetVersionStates();
3681	4253
3682	4254	// test save
3683	4255	if (false)
..	..	@@ -3700,10 +4272,44 @@
3700	4272
3701	4273	return !thesame;
3702	4274	}
3703		-
3704		- void CopyChanged(Object3D obj)
	4275	+
	4276	+ boolean flashIt = true;
	4277	+
	4278	+ void RefreshSelection()
3705	4279	{
3706		- SetUndoStates();
	4280	+ Object3D selection = new Object3D();
	4281	+
	4282	+ for (int i = 0; i < copy.selection.size(); i++)
	4283	+ {
	4284	+ Object3D elem = copy.selection.elementAt(i);
	4285	+
	4286	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4287	+
	4288	+ if (obj == null)
	4289	+ {
	4290	+ copy.selection.remove(i--);
	4291	+ }
	4292	+ else
	4293	+ {
	4294	+ selection.add(obj);
	4295	+ copy.selection.setElementAt(obj, i);
	4296	+ }
	4297	+ }
	4298	+
	4299	+ flashIt = false;
	4300	+ GetTree().clearSelection();
	4301	+ for (int i = 0; i < selection.size(); i++)
	4302	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4303	+ flashIt = true;
	4304	+
	4305	+ //refreshContents(false);
	4306	+ }
	4307	+
	4308	+ void CopyChanged()
	4309	+ {
	4310	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4311	+
	4312	+ SetVersionStates();
3707	4313
3708	4314	boolean temp = CameraPane.SWITCH;
3709	4315	CameraPane.SWITCH = false;
..	..	@@ -3712,6 +4318,9 @@
3712	4318
3713	4319	copy.clear();
3714	4320
	4321	+ copy.skyboxname = obj.skyboxname;
	4322	+ copy.skyboxext = obj.skyboxext;
	4323	+
3715	4324	for (int i=0; i<obj.Size(); i++)
3716	4325	{
3717	4326	copy.add(obj.get(i));
..	..	@@ -3721,6 +4330,7 @@
3721	4330
3722	4331	CameraPane.SWITCH = temp;
3723	4332
	4333	+ RefreshSelection();
3724	4334	//assert(hashtable.isEmpty());
3725	4335
3726	4336	copy.Touch();
..	..	@@ -3741,13 +4351,15 @@
3741	4351	}
3742	4352	}
3743	4353
3744		- refreshContents();
	4354	+ refreshContents(true);
3745	4355	}
3746	4356
3747		- cButton undoButton;
	4357	+ cButton previousVersionButton;
3748	4358	cButton restoreButton;
3749	4359	cButton replaceButton;
3750		- cButton redoButton;
	4360	+ cButton nextVersionButton;
	4361	+ cButton saveVersionButton;
	4362	+ cButton deleteVersionButton;
3751	4363
3752	4364	boolean muteSlider;
3753	4365
..	..	@@ -3755,39 +4367,47 @@
3755	4367	{
3756	4368	int count = 0;
3757	4369
3758		- for (int i = copy.versions.length; --i >= 0;)
	4370	+ for (int i = copy.versionlist.length; --i >= 0;)
3759	4371	{
3760		- if (copy.versions[i] != null)
	4372	+ if (copy.versionlist[i] != null)
3761	4373	count++;
3762	4374	}
3763	4375
3764	4376	return count;
3765	4377	}
3766	4378
3767		- void SetUndoStates()
	4379	+ void SetVersionStates()
3768	4380	{
3769		- cRadio tab = GetCurrentTab();
	4381	+ //if (true)
	4382	+ // return;
	4383	+
	4384	+ //cRadio tab = GetCurrentTab();
3770	4385
3771	4386	restoreButton.setEnabled(copy.versionindex != -1);
3772	4387	replaceButton.setEnabled(copy.versionindex != -1);
3773	4388
3774		- undoButton.setEnabled(copy.versionindex > 0);
3775		- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	4389	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4390	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4391	+
	4392	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4393	+ copy.versionlist[copy.versionindex + 1] != null);
3776	4394
3777	4395	muteSlider = true;
	4396	+ versionSlider.setMinimum(0);
3778	4397	versionSlider.setMaximum(VersionCount() - 1);
3779	4398	versionSlider.setInteger(copy.versionindex);
	4399	+ versionSlider.setEnabled(copy.versionindex != -1);
3780	4400	muteSlider = false;
3781	4401	}
3782	4402
3783		- public boolean Undo()
	4403	+ public boolean PreviousVersion()
3784	4404	{
3785	4405	// Option?
3786	4406	Replace();
3787	4407
3788	4408	System.err.println("Undo");
3789	4409
3790		- cRadio tab = GetCurrentTab();
	4410	+ //cRadio tab = GetCurrentTab();
3791	4411
3792	4412	if (copy.versionindex == 0)
3793	4413	{
..	..	@@ -3810,7 +4430,7 @@
3810	4430
3811	4431	copy.versionindex -= 1;
3812	4432
3813		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4433	+ CopyChanged();
3814	4434
3815	4435	return true;
3816	4436	}
..	..	@@ -3819,15 +4439,16 @@
3819	4439	{
3820	4440	System.err.println("Restore");
3821	4441
3822		- cRadio tab = GetCurrentTab();
	4442	+ //cRadio tab = GetCurrentTab();
3823	4443
3824		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4444	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3825	4445	{
3826	4446	java.awt.Toolkit.getDefaultToolkit().beep();
3827	4447	return false;
3828	4448	}
3829	4449
3830		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4450	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4451	+ CopyChanged();
3831	4452
3832	4453	return true;
3833	4454	}
..	..	@@ -3836,27 +4457,27 @@
3836	4457	{
3837	4458	System.err.println("Replace");
3838	4459
3839		- cRadio tab = GetCurrentTab();
	4460	+ //cRadio tab = GetCurrentTab();
3840	4461
3841		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4462	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3842	4463	{
3843	4464	// No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3844	4465	return false;
3845	4466	}
3846	4467
3847		- copy.versions[copy.versionindex] = CompressCopy();
	4468	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
3848	4469
3849	4470	return true;
3850	4471	}
3851	4472
3852		- public void Redo()
	4473	+ public void NextVersion()
3853	4474	{
3854	4475	// Option?
3855	4476	Replace();
3856	4477
3857		- cRadio tab = GetCurrentTab();
	4478	+ //cRadio tab = GetCurrentTab();
3858	4479
3859		- if (copy.versions[copy.versionindex + 1] == null)
	4480	+ if (copy.versionlist[copy.versionindex + 1] == null)
3860	4481	{
3861	4482	java.awt.Toolkit.getDefaultToolkit().beep();
3862	4483	return;
..	..	@@ -3864,7 +4485,7 @@
3864	4485
3865	4486	copy.versionindex += 1;
3866	4487
3867		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4488	+ CopyChanged();
3868	4489
3869	4490	//if (!tab.user[tab.versionindex])
3870	4491	// tab.graphs[tab.versionindex] = null;
..	..	@@ -4078,7 +4699,7 @@
4078	4699	//copy.material = new cMaterial(copy.GetMaterial());
4079	4700
4080	4701	current.color = (float) colorField.getFloat();
4081		- current.modulation = (float) modulationField.getFloat();
	4702	+ current.modulation = (float) saturationField.getFloat();
4082	4703	current.metalness = (float) metalnessField.getFloat();
4083	4704	current.diffuse = (float) diffuseField.getFloat();
4084	4705	current.specular = (float) specularField.getFloat();
..	..	@@ -4111,7 +4732,7 @@
4111	4732	cMaterial mat = copy.material;
4112	4733
4113	4734	colorField.SetToolTipValue((mat.color));
4114		- modulationField.SetToolTipValue((mat.modulation));
	4735	+ saturationField.SetToolTipValue((mat.modulation));
4115	4736	metalnessField.SetToolTipValue((mat.metalness));
4116	4737	diffuseField.SetToolTipValue((mat.diffuse));
4117	4738	specularField.SetToolTipValue((mat.specular));
..	..	@@ -4173,11 +4794,14 @@
4173	4794	if (muteSlider)
4174	4795	return;
4175	4796
	4797	+ Replace();
	4798	+
4176	4799	int version = versionSlider.getInteger();
4177	4800
4178		- if (copy.versions[version] != null)
	4801	+ if (version != -1 && copy.versionlist[version] != null)
4179	4802	{
4180		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4803	+ copy.versionindex = version;
	4804	+ CopyChanged();
4181	4805	}
4182	4806
4183	4807	return;
..	..	@@ -4217,6 +4841,12 @@
4217	4841	{
4218	4842	//System.out.println("stateChanged = " + this);
4219	4843	materialtouched = true;
	4844	+
	4845	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4846	+ {
	4847	+ saturationField.setFloat(1);
	4848	+ }
	4849	+
4220	4850	applySelf();
4221	4851	//System.out.println("this = " + this);
4222	4852	//System.out.println("PARENT = " + parent);
..	..	@@ -4516,6 +5146,7 @@
4516	5146	{
4517	5147	if (GetTree() != null)
4518	5148	{
	5149	+ GetTree().revalidate();
4519	5150	GetTree().repaint();
4520	5151	}
4521	5152
..	..	@@ -4524,6 +5155,9 @@
4524	5155	ctrlPanel.validate(); // ? new
4525	5156	ctrlPanel.repaint();
4526	5157	}
	5158	+
	5159	+ if (previousVersionButton != null && copy.versionlist != null)
	5160	+ SetVersionStates();
4527	5161	}
4528	5162
4529	5163	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4772,7 +5406,9 @@
4772	5406	readobj.ResetDisplayList();
4773	5407	} catch (Exception e)
4774	5408	{
4775		- //e.printStackTrace();
	5409	+ if (!e.toString().contains("GZIP"))
	5410	+ e.printStackTrace();
	5411	+
4776	5412	try
4777	5413	{
4778	5414	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4852,6 +5488,8 @@
4852	5488	{
4853	5489	//readobj.deepCopySelf(copy);
4854	5490	copy.clear(); // june 2014
	5491	+ copy.skyboxname = readobj.skyboxname;
	5492	+ copy.skyboxext = readobj.skyboxext;
4855	5493	for (int i = 0; i < readobj.size(); i++)
4856	5494	{
4857	5495	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4892,6 +5530,7 @@
4892	5530	}
4893	5531	} catch (ClassCastException e)
4894	5532	{
	5533	+ e.printStackTrace();
4895	5534	assert (false);
4896	5535	Composite c = (Composite) copy;
4897	5536	c.children.clear();
..	..	@@ -4902,13 +5541,16 @@
4902	5541	c.addChild(csg);
4903	5542	}
4904	5543
4905		- copy.versions = readobj.versions;
	5544	+ copy.versionlist = readobj.versionlist;
4906	5545	copy.versionindex = readobj.versionindex;
4907	5546
4908		- if (copy.versions == null)
	5547	+ if (copy.versionlist == null)
4909	5548	{
4910		- copy.versions = new byte[100][];
	5549	+ // Backward compatibility
	5550	+ copy.versionlist = new Object3D[100];
4911	5551	copy.versionindex = -1;
	5552	+
	5553	+ Save(true);
4912	5554	}
4913	5555
4914	5556	//? SetUndoStates();
..	..	@@ -4923,7 +5565,7 @@
4923	5565	{
4924	5566	if (Grafreed.standAlone)
4925	5567	{
4926		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5568	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4927	5569	browser.show();
4928	5570	String filename = browser.getFile();
4929	5571	if (filename != null && filename.length() > 0)
..	..	@@ -5000,6 +5642,8 @@
5000	5642
5001	5643	void save()
5002	5644	{
	5645	+ Replace();
	5646	+
5003	5647	if (lastname == null)
5004	5648	{
5005	5649	return;
..	..	@@ -5022,6 +5666,7 @@
5022	5666	//ps.print(buffer.toString());
5023	5667	} catch (IOException e)
5024	5668	{
	5669	+ e.printStackTrace();
5025	5670	}
5026	5671	}
5027	5672
..	..	@@ -5241,6 +5886,7 @@
5241	5886	ButtonGroup buttonGroup;
5242	5887
5243	5888	cGridBag toolboxPanel;
	5889	+ cGridBag skyboxPanel;
5244	5890	cGridBag materialPanel;
5245	5891	cGridBag ctrlPanel;
5246	5892
..	..	@@ -5314,7 +5960,7 @@
5314	5960	JLabel colorLabel;
5315	5961	cNumberSlider colorField;
5316	5962	JLabel modulationLabel;
5317		- cNumberSlider modulationField;
	5963	+ cNumberSlider saturationField;
5318	5964	JLabel metalnessLabel;
5319	5965	cNumberSlider metalnessField;
5320	5966	JLabel diffuseLabel;
..	..	@@ -5345,6 +5991,7 @@
5345	5991	cNumberSlider anisoField;
5346	5992	JLabel anisoVLabel;
5347	5993	cNumberSlider anisoVField;
	5994	+
5348	5995	JLabel cameraLabel;
5349	5996	cNumberSlider cameraField;
5350	5997	JLabel selfshadowLabel;
..	..	@@ -5359,6 +6006,7 @@
5359	6006	cNumberSlider fakedepthField;
5360	6007	JLabel shadowbiasLabel;
5361	6008	cNumberSlider shadowbiasField;
	6009	+
5362	6010	JLabel bumpLabel;
5363	6011	cNumberSlider bumpField;
5364	6012	JLabel noiseLabel;