~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,78 @@
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	+ ImageIcon GetIcon(String name)
	79	+ {
73	80	try
74	81	{
75		- ImageIcon icon = GetIcon(name);
76		- return new cCheckBox(icon, border);
	82	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	83	+
	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	+// }
	95	+
	96	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	97	+ return icon;
77	98	}
78	99	catch (Exception e)
79	100	{
80		- return new cCheckBox(name, border);
	101	+ return null;
81	102	}
82	103	}
83		-
84		- private ImageIcon GetIcon(String name) throws IOException
	104	+
	105	+ BufferedImage GetImage(String name)
85	106	{
86		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87		-
88		- if (image.getWidth() != 24 && image.getHeight() != 24)
	107	+ try
89	108	{
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;
	109	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	110	+
	111	+ return image;
98	112	}
99		-
100		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101		- return icon;
	113	+ catch (Exception e)
	114	+ {
	115	+ return null;
	116	+ }
102	117	}
103	118
104	119	// SCRIPT
..	..	@@ -282,11 +297,13 @@
282	297	client = inClient;
283	298	copy = client;
284	299
285		- if (copy.versions == null)
286		- {
287		- copy.versions = new byte[100][];
288		- copy.versionindex = -1;
289		- }
	300	+// if (copy.versionlist == null)
	301	+// {
	302	+// copy.versionlist = new Object3D[100];
	303	+// copy.versionindex = -1;
	304	+//
	305	+// callee.Save(true);
	306	+// }
290	307
291	308	// "this" is not called: SetupUI2(objEditor);
292	309	}
..	..	@@ -301,10 +318,12 @@
301	318	client = inClient;
302	319	copy = client;
303	320
304		- if (copy.versions == null)
	321	+ if (copy.versionlist == null)
305	322	{
306		- copy.versions = new byte[100][];
	323	+ copy.versionlist = new Object3D[100];
307	324	copy.versionindex = -1;
	325	+
	326	+// Save(true);
308	327	}
309	328
310	329	SetupUI2(callee.GetEditor());
..	..	@@ -339,11 +358,13 @@
339	358	copy = localCopy;
340	359	copy.editWindow = this;
341	360
342		- if (copy.versions == null)
343		- {
344		- copy.versions = new byte[100][];
345		- copy.versionindex = -1;
346		- }
	361	+// if (copy.versionlist == null)
	362	+// {
	363	+// copy.versionlist = new Object3D[100];
	364	+// copy.versionindex = -1;
	365	+//
	366	+// Save(true);
	367	+// }
347	368
348	369	SetupMenu();
349	370
..	..	@@ -412,6 +433,8 @@
412	433
413	434	ChangeListener changeListener = new ChangeListener()
414	435	{
	436	+ String name;
	437	+
415	438	public void stateChanged(ChangeEvent changeEvent)
416	439	{
417	440	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -430,18 +453,48 @@
430	453	// EditSelection(false);
431	454	// }
432	455
433		- refreshContents(false); // To refresh Info tab
	456	+ if (objectPanel.getSelectedIndex() == 4)
	457	+ {
	458	+ name = copy.skyboxname;
	459	+
	460	+ if (name == null)
	461	+ {
	462	+ name = "";
	463	+ }
	464	+
	465	+ copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	466	+ copy.skyboxext = "jpg";
	467	+ }
	468	+ else
	469	+ {
	470	+ if (name != null)
	471	+ {
	472	+ if (name.equals(""))
	473	+ {
	474	+ copy.skyboxname = null;
	475	+ copy.skyboxext = null;
	476	+ }
	477	+ else
	478	+ {
	479	+ copy.skyboxname = name;
	480	+ }
	481	+ }
	482	+ }
	483	+
	484	+// refreshContents(false); // To refresh Info tab
	485	+ cameraView.repaint();
434	486	}
435	487	};
436	488	objectPanel.addChangeListener(changeListener);
437	489
438	490	toolbarPanel = new JPanel();
439	491	toolbarPanel.setName("Toolbar");
	492	+
440	493	treePanel = new cGridBag();
441	494	treePanel.setName("Tree");
442	495
443	496	editPanel = new cGridBag().setVertical(true);
444		- editPanel.setName("Edit");
	497	+ //editPanel.setName("Edit");
445	498
446	499	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
447	500
..	..	@@ -449,11 +502,13 @@
449	502	editPanel.add(editCommandsPanel);
450	503	editPanel.add(ctrlPanel);
451	504
452		- toolboxPanel = new cGridBag().setVertical(false);
453		- toolboxPanel.setName("Toolbox");
	505	+ toolboxPanel = new cGridBag().setVertical(true);
	506	+ //toolboxPanel.setName("Toolbox");
454	507
455		- materialPanel = new cGridBag().setVertical(true);
456		- materialPanel.setName("Material");
	508	+ skyboxPanel = new cGridBag().setVertical(true);
	509	+
	510	+ materialPanel = new cGridBag().setVertical(false);
	511	+ //materialPanel.setName("Material");
457	512
458	513	/JTextPane/
459	514	infoarea = createTextPane();
..	..	@@ -461,6 +516,7 @@
461	516
462	517	infoarea.setEditable(true);
463	518	SetText();
	519	+
464	520	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
465	521	// infoarea.setOpaque(false);
466	522	// //infoarea.setForeground(textcolor);
..	..	@@ -468,7 +524,7 @@
468	524	// TEXTAREA infoarea.setWrapStyleWord(true);
469	525	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
470	526	infoPanel.setPreferredSize(new Dimension(1, 1));
471		- infoPanel.setName("Info");
	527	+ //infoPanel.setName("Info");
472	528	//infoPanel.setLayout(new BorderLayout());
473	529	//infoPanel.add(createTextPane());
474	530
..	..	@@ -735,6 +791,7 @@
735	791	boolean maximized;
736	792
737	793	cButton fullscreenLayout;
	794	+ cButton expandedLayout;
738	795
739	796	void Minimize()
740	797	{
..	..	@@ -774,10 +831,12 @@
774	831	cButton minButton;
775	832	cButton maxButton;
776	833	cButton fullButton;
	834	+ cButton collapseButton;
	835	+ cButton maximize3DButton;
777	836
778	837	void ToggleFullScreen()
779	838	{
780		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	839	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
781	840
782	841	cameraView.ToggleFullScreen();
783	842
..	..	@@ -798,13 +857,13 @@
798	857	// X frame.getContentPane().remove(/"Center",/bigThree);
799	858	// X framePanel.add(bigThree);
800	859	// X frame.getContentPane().add(/"Center",/framePanel);
801		- framePanel.setDividerLocation(46);
	860	+// framePanel.setDividerLocation(46); // icons are 24x24
802	861
803	862	//frame.setVisible(true);
804		- radio.layout = keepButton;
	863	+// radio.layout = keepButton;
805	864	//theFrame = null;
806	865	keepButton = null;
807		- radio.layout.doClick();
	866	+// radio.layout.doClick();
808	867
809	868	} else
810	869	{
..	..	@@ -825,31 +884,42 @@
825	884	// X frame.getContentPane().remove(/"Center",/framePanel);
826	885	// X framePanel.remove(bigThree);
827	886	// X frame.getContentPane().add(/"Center",/bigThree);
828		- framePanel.setDividerLocation(0);
	887	+// framePanel.setDividerLocation(0);
829	888
830		- radio.layout = fullscreenLayout;
831		- radio.layout.doClick();
	889	+// radio.layout = fullscreenLayout;
	890	+// radio.layout.doClick();
832	891	//frame.setVisible(true);
833	892	}
834	893	frame.validate();
	894	+
	895	+ cameraView.requestFocusInWindow();
835	896	}
836	897
837		- private byte[] CompressCopy()
	898	+ void CollapseToolbar()
	899	+ {
	900	+ framePanel.setDividerLocation(0);
	901	+ //frame.validate();
	902	+
	903	+ cameraView.requestFocusInWindow();
	904	+ }
	905	+
	906	+ private Object3D Duplicate(Object3D object)
838	907	{
839	908	boolean temp = CameraPane.SWITCH;
840	909	CameraPane.SWITCH = false;
841	910
842		- copy.ExtractBigData(versiontable);
	911	+ object.ExtractBigData(versiontable);
843	912	// if (copy == client)
844	913
845		- byte[] versions[] = copy.versions;
846		- copy.versions = null;
	914	+ Object3D versions[] = object.versionlist;
	915	+ object.versionlist = null;
847	916
848		- byte[] compress = Compress(copy);
	917	+ //byte[] compress = Compress(copy);
	918	+ Object3D compress = (Object3D)Grafreed.clone(object);
849	919
850		- copy.versions = versions;
	920	+ object.versionlist = versions;
851	921
852		- copy.RestoreBigData(versiontable);
	922	+ object.RestoreBigData(versiontable);
853	923
854	924	CameraPane.SWITCH = temp;
855	925
..	..	@@ -977,6 +1047,7 @@
977	1047	{
978	1048	SetupMaterial(materialPanel);
979	1049	}
	1050	+
980	1051	//SetupName();
981	1052	//SetupViews();
982	1053	}
..	..	@@ -986,7 +1057,7 @@
986	1057	// NumberSlider vDivsField;
987	1058	// JCheckBox endcaps;
988	1059	JCheckBox liveCB;
989		- JCheckBox selectCB;
	1060	+ JCheckBox selectableCB;
990	1061	JCheckBox hideCB;
991	1062	JCheckBox link2masterCB;
992	1063	JCheckBox markCB;
..	..	@@ -1185,6 +1256,18 @@
1185	1256
1186	1257	namePanel = new cGridBag();
1187	1258
	1259	+ //if (copy.pinned)
	1260	+ {
	1261	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1262	+ pinButton.setSelected(copy.pinned);
	1263	+ cGridBag t = new cGridBag();
	1264	+ t.preferredWidth = 2;
	1265	+ t.add(pinButton);
	1266	+ namePanel.add(t);
	1267	+
	1268	+ pinButton.addItemListener(this);
	1269	+ }
	1270	+
1188	1271	nameField = AddText(namePanel, copy.GetName());
1189	1272	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1190	1273	oe.ctrlPanel.add(namePanel);
..	..	@@ -1198,13 +1281,16 @@
1198	1281
1199	1282	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1200	1283	liveCB.setToolTipText("Animate object");
1201		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1202		- selectCB.setToolTipText("Make object selectable");
	1284	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1285	+ selectableCB.setToolTipText("Make object selectable");
1203	1286	// Return();
	1287	+
1204	1288	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1205	1289	hideCB.setToolTipText("Hide object");
1206	1290	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1207	1291	markCB.setToolTipText("As animation target transform");
	1292	+
	1293	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1208	1294
1209	1295	setupPanel2 = new cGridBag().setVertical(false);
1210	1296
..	..	@@ -1492,6 +1578,7 @@
1492	1578	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1493	1579	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1494	1580	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1581	+ //XYZPanel.setName("XYZ");
1495	1582
1496	1583	/*
1497	1584	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1529,17 +1616,29 @@
1529	1616	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1530	1617	//tmp.setName("Edit");
1531	1618	objectPanel.add(materialPanel);
	1619	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1620	+ objectPanel.setToolTipTextAt(0, "Material");
	1621	+
	1622	+ objectPanel.add(toolboxPanel);
	1623	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1624	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1625	+
	1626	+ objectPanel.add(skyboxPanel);
	1627	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1628	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1629	+
1532	1630	// JPanel north = new JPanel(new BorderLayout());
1533	1631	// north.setName("Edit");
1534	1632	// north.add(ctrlPanel, BorderLayout.NORTH);
1535	1633	// objectPanel.add(north);
1536	1634	objectPanel.add(editPanel);
	1635	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1636	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1537	1637
1538		- //if (Globals.ADVANCED)
1539		- objectPanel.add(infoPanel);
	1638	+ objectPanel.add(XYZPanel);
	1639	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1640	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1540	1641
1541		- objectPanel.add(toolboxPanel);
1542		-
1543	1642	/*
1544	1643	aConstraints.gridx = 0;
1545	1644	aConstraints.gridwidth = 1;
..	..	@@ -1559,7 +1658,7 @@
1559	1658	scrollpane.addMouseWheelListener(this); // Default not fast enough
1560	1659
1561	1660	/JTabbedPane/ scenePanel = new cGridBag();
1562		- scenePanel.preferredWidth = 6;
	1661	+ scenePanel.preferredWidth = 5;
1563	1662
1564	1663	JTabbedPane tabbedPane = new JTabbedPane();
1565	1664	tabbedPane.add(scrollpane);
..	..	@@ -1576,6 +1675,11 @@
1576	1675
1577	1676	scenePanel.add(tabbedPane);
1578	1677
	1678	+ //if (Globals.ADVANCED)
	1679	+ tabbedPane.add(infoPanel);
	1680	+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1681	+ tabbedPane.setToolTipTextAt(3, "Information");
	1682	+
1579	1683	/*
1580	1684	cTree jTree = new cTree(null);
1581	1685	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1637,7 +1741,7 @@
1637	1741	bigThree = new cGridBag();
1638	1742	bigThree.addComponent(scenePanel);
1639	1743	bigThree.addComponent(centralPanel);
1640		- bigThree.addComponent(XYZPanel);
	1744	+ //bigThree.addComponent(XYZPanel);
1641	1745
1642	1746	// // SIDE EFFECT!!!
1643	1747	// aConstraints.gridx = 0;
..	..	@@ -1646,6 +1750,23 @@
1646	1750	// aConstraints.gridheight = 1;
1647	1751
1648	1752	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1753	+
	1754	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1755	+ new java.beans.PropertyChangeListener()
	1756	+ {
	1757	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1758	+ {
	1759	+ if ((Integer)pce.getOldValue() == 1)
	1760	+ {
	1761	+ if (radio.layout != expandedLayout)
	1762	+ {
	1763	+ radio.layout = expandedLayout;
	1764	+ radio.layout.doClick();
	1765	+ }
	1766	+ }
	1767	+ }
	1768	+ });
	1769	+
1649	1770	framePanel.setContinuousLayout(false);
1650	1771	framePanel.setOneTouchExpandable(false);
1651	1772	//.setDividerLocation(0.8);
..	..	@@ -1678,7 +1799,6 @@
1678	1799	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1679	1800	frame.addWindowListener(new WindowAdapter()
1680	1801	{
1681		-
1682	1802	public void windowClosing(WindowEvent e)
1683	1803	{
1684	1804	Close();
..	..	@@ -1701,12 +1821,403 @@
1701	1821	ctrlPanel.removeAll();
1702	1822	}
1703	1823
1704		- void SetupMaterial(cGridBag panel)
	1824	+ void SetupMaterial(cGridBag materialpanel)
1705	1825	{
1706		- /*
	1826	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1827	+
	1828	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1829	+ skin.setToolTipText("Skin");
	1830	+ skin.addMouseListener(new MouseAdapter()
	1831	+ {
	1832	+ public void mouseClicked(MouseEvent e)
	1833	+ {
	1834	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1835	+ cMaterial material = object.material;
	1836	+
	1837	+ // Skin
	1838	+ colorField.setFloat(material.color);
	1839	+ saturationField.setFloat(material.modulation);
	1840	+ subsurfaceField.setFloat(material.subsurface);
	1841	+ selfshadowField.setFloat(material.diffuseness);
	1842	+ diffusenessField.setFloat(material.factor);
	1843	+ shininessField.setFloat(material.shininess);
	1844	+ shadowbiasField.setFloat(material.shadowbias);
	1845	+ diffuseField.setFloat(material.diffuse);
	1846	+ specularField.setFloat(material.specular);
	1847	+
	1848	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1849	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1850	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1851	+
	1852	+ materialtouched = true;
	1853	+ applySelf();
	1854	+ }
	1855	+ });
	1856	+ presetpanel.add(skin);
	1857	+
	1858	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1859	+ lambert.setToolTipText("Diffuse");
	1860	+ lambert.addMouseListener(new MouseAdapter()
	1861	+ {
	1862	+ public void mouseClicked(MouseEvent e)
	1863	+ {
	1864	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1865	+ cMaterial material = object.material;
	1866	+
	1867	+ diffusenessField.setFloat(material.factor);
	1868	+ selfshadowField.setFloat(material.diffuseness);
	1869	+
	1870	+ materialtouched = true;
	1871	+ applySelf();
	1872	+ }
	1873	+ });
	1874	+ presetpanel.add(lambert);
	1875	+
	1876	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1877	+ diffuse2.setToolTipText("Diffuse2");
	1878	+ diffuse2.addMouseListener(new MouseAdapter()
	1879	+ {
	1880	+ public void mouseClicked(MouseEvent e)
	1881	+ {
	1882	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1883	+ cMaterial material = object.material;
	1884	+
	1885	+ diffusenessField.setFloat(material.factor);
	1886	+ selfshadowField.setFloat(material.diffuseness);
	1887	+
	1888	+ materialtouched = true;
	1889	+ applySelf();
	1890	+ }
	1891	+ });
	1892	+ presetpanel.add(diffuse2);
	1893	+
	1894	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1895	+ diffusemoon.setToolTipText("Moon");
	1896	+ diffusemoon.addMouseListener(new MouseAdapter()
	1897	+ {
	1898	+ public void mouseClicked(MouseEvent e)
	1899	+ {
	1900	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1901	+ cMaterial material = object.material;
	1902	+
	1903	+ diffusenessField.setFloat(material.factor);
	1904	+ selfshadowField.setFloat(material.diffuseness);
	1905	+
	1906	+ materialtouched = true;
	1907	+ applySelf();
	1908	+ }
	1909	+ });
	1910	+ presetpanel.add(diffusemoon);
	1911	+
	1912	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1913	+ diffusemoon2.setToolTipText("Moon2");
	1914	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1915	+ {
	1916	+ public void mouseClicked(MouseEvent e)
	1917	+ {
	1918	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1919	+ cMaterial material = object.material;
	1920	+
	1921	+ diffusenessField.setFloat(material.factor);
	1922	+ selfshadowField.setFloat(material.diffuseness);
	1923	+
	1924	+ materialtouched = true;
	1925	+ applySelf();
	1926	+ }
	1927	+ });
	1928	+ presetpanel.add(diffusemoon2);
	1929	+
	1930	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1931	+ diffusemoon3.setToolTipText("Moon3");
	1932	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1933	+ {
	1934	+ public void mouseClicked(MouseEvent e)
	1935	+ {
	1936	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1937	+ cMaterial material = object.material;
	1938	+
	1939	+ diffusenessField.setFloat(material.factor);
	1940	+ selfshadowField.setFloat(material.diffuseness);
	1941	+
	1942	+ materialtouched = true;
	1943	+ applySelf();
	1944	+ }
	1945	+ });
	1946	+ presetpanel.add(diffusemoon3);
	1947	+
	1948	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1949	+ diffusesheen.setToolTipText("Sheen");
	1950	+ diffusesheen.addMouseListener(new MouseAdapter()
	1951	+ {
	1952	+ public void mouseClicked(MouseEvent e)
	1953	+ {
	1954	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1955	+ cMaterial material = object.material;
	1956	+
	1957	+ sheenField.setFloat(material.sheen);
	1958	+
	1959	+ materialtouched = true;
	1960	+ applySelf();
	1961	+ }
	1962	+ });
	1963	+ presetpanel.add(diffusesheen);
	1964	+
	1965	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1966	+ rough.setToolTipText("Rough metal");
	1967	+ rough.addMouseListener(new MouseAdapter()
	1968	+ {
	1969	+ public void mouseClicked(MouseEvent e)
	1970	+ {
	1971	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1972	+ cMaterial material = object.material;
	1973	+
	1974	+ shininessField.setFloat(material.shininess);
	1975	+ velvetField.setFloat(material.velvet);
	1976	+
	1977	+ materialtouched = true;
	1978	+ applySelf();
	1979	+ }
	1980	+ });
	1981	+ presetpanel.add(rough);
	1982	+
	1983	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1984	+ rough2.setToolTipText("Medium metal");
	1985	+ rough2.addMouseListener(new MouseAdapter()
	1986	+ {
	1987	+ public void mouseClicked(MouseEvent e)
	1988	+ {
	1989	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1990	+ cMaterial material = object.material;
	1991	+
	1992	+ shininessField.setFloat(material.shininess);
	1993	+ lightareaField.setFloat(material.lightarea);
	1994	+
	1995	+ materialtouched = true;
	1996	+ applySelf();
	1997	+ }
	1998	+ });
	1999	+ presetpanel.add(rough2);
	2000	+
	2001	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2002	+ shini0.setToolTipText("Shiny");
	2003	+ shini0.addMouseListener(new MouseAdapter()
	2004	+ {
	2005	+ public void mouseClicked(MouseEvent e)
	2006	+ {
	2007	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2008	+ cMaterial material = object.material;
	2009	+
	2010	+ shininessField.setFloat(material.shininess);
	2011	+ lightareaField.setFloat(material.lightarea);
	2012	+
	2013	+ materialtouched = true;
	2014	+ applySelf();
	2015	+ }
	2016	+ });
	2017	+ presetpanel.add(shini0);
	2018	+
	2019	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2020	+ shini1.setToolTipText("Shiny2");
	2021	+ shini1.addMouseListener(new MouseAdapter()
	2022	+ {
	2023	+ public void mouseClicked(MouseEvent e)
	2024	+ {
	2025	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2026	+ cMaterial material = object.material;
	2027	+
	2028	+ shininessField.setFloat(material.shininess);
	2029	+ lightareaField.setFloat(material.lightarea);
	2030	+
	2031	+ materialtouched = true;
	2032	+ applySelf();
	2033	+ }
	2034	+ });
	2035	+ presetpanel.add(shini1);
	2036	+
	2037	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2038	+ shini2.setToolTipText("Shiny3");
	2039	+ shini2.addMouseListener(new MouseAdapter()
	2040	+ {
	2041	+ public void mouseClicked(MouseEvent e)
	2042	+ {
	2043	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2044	+ cMaterial material = object.material;
	2045	+
	2046	+ shininessField.setFloat(material.shininess);
	2047	+ lightareaField.setFloat(material.lightarea);
	2048	+
	2049	+ materialtouched = true;
	2050	+ applySelf();
	2051	+ }
	2052	+ });
	2053	+ presetpanel.add(shini2);
	2054	+
	2055	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2056	+ aniso.setToolTipText("AnisoU");
	2057	+ aniso.addMouseListener(new MouseAdapter()
	2058	+ {
	2059	+ public void mouseClicked(MouseEvent e)
	2060	+ {
	2061	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2062	+ cMaterial material = object.material;
	2063	+
	2064	+ anisoField.setFloat(material.aniso);
	2065	+ anisoVField.setFloat(material.anisoV);
	2066	+
	2067	+ materialtouched = true;
	2068	+ applySelf();
	2069	+ }
	2070	+ });
	2071	+ presetpanel.add(aniso);
	2072	+
	2073	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2074	+ aniso2.setToolTipText("AnisoV");
	2075	+ aniso2.addMouseListener(new MouseAdapter()
	2076	+ {
	2077	+ public void mouseClicked(MouseEvent e)
	2078	+ {
	2079	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2080	+ cMaterial material = object.material;
	2081	+
	2082	+ anisoField.setFloat(material.aniso);
	2083	+ anisoVField.setFloat(material.anisoV);
	2084	+
	2085	+ materialtouched = true;
	2086	+ applySelf();
	2087	+ }
	2088	+ });
	2089	+ presetpanel.add(aniso2);
	2090	+
	2091	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2092	+ aniso3.setToolTipText("AnisoUV");
	2093	+ aniso3.addMouseListener(new MouseAdapter()
	2094	+ {
	2095	+ public void mouseClicked(MouseEvent e)
	2096	+ {
	2097	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2098	+ cMaterial material = object.material;
	2099	+
	2100	+ anisoField.setFloat(material.aniso);
	2101	+ anisoVField.setFloat(material.anisoV);
	2102	+
	2103	+ materialtouched = true;
	2104	+ applySelf();
	2105	+ }
	2106	+ });
	2107	+ presetpanel.add(aniso3);
	2108	+
	2109	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2110	+ velvet0.setToolTipText("Velvet");
	2111	+ velvet0.addMouseListener(new MouseAdapter()
	2112	+ {
	2113	+ public void mouseClicked(MouseEvent e)
	2114	+ {
	2115	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2116	+ cMaterial material = object.material;
	2117	+
	2118	+ diffusenessField.setFloat(material.factor);
	2119	+ selfshadowField.setFloat(material.diffuseness);
	2120	+ sheenField.setFloat(material.sheen);
	2121	+ shininessField.setFloat(material.shininess);
	2122	+ velvetField.setFloat(material.velvet);
	2123	+ shiftField.setFloat(material.shift);
	2124	+
	2125	+ materialtouched = true;
	2126	+ applySelf();
	2127	+ }
	2128	+ });
	2129	+ presetpanel.add(velvet0);
	2130	+
	2131	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2132	+ bump0.setToolTipText("Bump texture");
	2133	+ bump0.addMouseListener(new MouseAdapter()
	2134	+ {
	2135	+ public void mouseClicked(MouseEvent e)
	2136	+ {
	2137	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2138	+ cMaterial material = object.material;
	2139	+
	2140	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2141	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2142	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2143	+
	2144	+ materialtouched = true;
	2145	+ applySelf();
	2146	+ }
	2147	+ });
	2148	+ presetpanel.add(bump0);
	2149	+
	2150	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2151	+ halo.setToolTipText("Halo");
	2152	+ halo.addMouseListener(new MouseAdapter()
	2153	+ {
	2154	+ public void mouseClicked(MouseEvent e)
	2155	+ {
	2156	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2157	+ cMaterial material = object.material;
	2158	+
	2159	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2160	+
	2161	+ materialtouched = true;
	2162	+ applySelf();
	2163	+ }
	2164	+ });
	2165	+ presetpanel.add(halo);
	2166	+
	2167	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2168	+ candle.setToolTipText("Candle");
	2169	+ candle.addMouseListener(new MouseAdapter()
	2170	+ {
	2171	+ public void mouseClicked(MouseEvent e)
	2172	+ {
	2173	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2174	+ cMaterial material = object.material;
	2175	+
	2176	+ subsurfaceField.setFloat(material.subsurface);
	2177	+ shadowbiasField.setFloat(material.shadowbias);
	2178	+ ambientField.setFloat(material.ambient);
	2179	+ specularField.setFloat(material.specular);
	2180	+ lightareaField.setFloat(material.lightarea);
	2181	+ shininessField.setFloat(material.shininess);
	2182	+
	2183	+ materialtouched = true;
	2184	+ applySelf();
	2185	+ }
	2186	+ });
	2187	+ presetpanel.add(candle);
	2188	+
	2189	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2190	+ shadowShader.setToolTipText("Shadow");
	2191	+ shadowShader.addMouseListener(new MouseAdapter()
	2192	+ {
	2193	+ public void mouseClicked(MouseEvent e)
	2194	+ {
	2195	+ diffuseField.setFloat(0.001);
	2196	+ ambientField.setFloat(0.001);
	2197	+ cameraField.setFloat(0.001);
	2198	+ specularField.setFloat(0.001);
	2199	+ fakedepthField.setFloat(0.001);
	2200	+ opacityField.setFloat(0.6);
	2201	+
	2202	+ materialtouched = true;
	2203	+ applySelf();
	2204	+ }
	2205	+ });
	2206	+ presetpanel.add(shadowShader);
	2207	+
	2208	+ cGridBag panel = new cGridBag().setVertical(true);
	2209	+
	2210	+ presetpanel.preferredWidth = 1;
	2211	+
	2212	+ materialpanel.add(presetpanel);
	2213	+ materialpanel.add(panel);
	2214	+
	2215	+ panel.preferredWidth = 8;
	2216	+
	2217	+ /*
1707	2218	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1708	2219	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1709		- */
	2220	+ */
1710	2221
1711	2222	cGridBag editBar = new cGridBag().setVertical(false);
1712	2223
..	..	@@ -1740,27 +2251,50 @@
1740	2251	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1741	2252
1742	2253	cGridBag colorSection = new cGridBag().setVertical(true);
	2254	+
	2255	+ cGridBag huepanel = new cGridBag();
	2256	+ cGridBag huelabel = new cGridBag();
	2257	+ skin = GetLabel("icons/hue.png", false);
	2258	+ skin.fit = true;
	2259	+ huelabel.add(skin);
	2260	+ huelabel.preferredWidth = 20;
	2261	+ huepanel.add(new cGridBag()); // Label
	2262	+ huepanel.add(huelabel); // Field/slider
	2263	+
	2264	+ huepanel.preferredHeight = 7;
	2265	+
	2266	+ colorSection.add(huepanel);
1743	2267
1744	2268	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);
	2269	+
	2270	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2271	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2272	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2273	+
1748	2274	//colorField.preferredWidth = 200;
1749	2275	colorSection.add(color);
1750	2276
1751	2277	cGridBag modulation = new cGridBag();
1752	2278	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1753	2279	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1754		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2280	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1755	2281	colorSection.add(modulation);
1756	2282
	2283	+ cGridBag opacity = new cGridBag();
	2284	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2285	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2286	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2287	+ colorSection.add(opacity);
	2288	+
	2289	+ colorSection.add(GetSeparator());
	2290	+
1757	2291	cGridBag texture = new cGridBag();
1758	2292	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1759	2293	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1760	2294	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1761	2295	colorSection.add(texture);
1762	2296
1763		- panel.add(new JSeparator());
	2297	+ panel.add(GetSeparator());
1764	2298
1765	2299	panel.add(colorSection);
1766	2300
..	..	@@ -1816,7 +2350,7 @@
1816	2350	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1817	2351	diffuseSection.add(shadowbias);
1818	2352
1819		- panel.add(new JSeparator());
	2353	+ panel.add(GetSeparator());
1820	2354
1821	2355	panel.add(diffuseSection);
1822	2356
..	..	@@ -1879,7 +2413,7 @@
1879	2413	specularSection.add(anisoV);
1880	2414
1881	2415
1882		- panel.add(new JSeparator());
	2416	+ panel.add(GetSeparator());
1883	2417
1884	2418	panel.add(specularSection);
1885	2419
..	..	@@ -1904,12 +2438,6 @@
1904	2438	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1905	2439	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1906	2440	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	2441
1914	2442	//panel.add(new JSeparator());
1915	2443
..	..	@@ -1955,7 +2483,7 @@
1955	2483	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1956	2484	textureSection.add(opacityPower);
1957	2485
1958		- panel.add(new JSeparator());
	2486	+ panel.add(GetSeparator());
1959	2487
1960	2488	panel.add(textureSection);
1961	2489
..	..	@@ -2942,7 +3470,7 @@
2942	3470
2943	3471	freezematerial = true;
2944	3472	colorField.setFloat(mat.color);
2945		- modulationField.setFloat(mat.modulation);
	3473	+ saturationField.setFloat(mat.modulation);
2946	3474	metalnessField.setFloat(mat.metalness);
2947	3475	diffuseField.setFloat(mat.diffuse);
2948	3476	specularField.setFloat(mat.specular);
..	..	@@ -3149,6 +3677,17 @@
3149	3677	public void itemStateChanged(ItemEvent event)
3150	3678	{
3151	3679	// System.out.println("Propagate = " + propagate);
	3680	+ if (event.getSource() == pinButton)
	3681	+ {
	3682	+ copy.pinned ^= true;
	3683	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3684	+ {
	3685	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3686	+ copy.CloseUI();
	3687	+ //copy.editWindow.refreshContents();
	3688	+ }
	3689	+ }
	3690	+ else
3152	3691	if (event.getSource() == propagateToggle)
3153	3692	{
3154	3693	propagate ^= true;
..	..	@@ -3253,8 +3792,9 @@
3253	3792	} else if (event.getSource() == liveCB)
3254	3793	{
3255	3794	copy.live ^= true;
	3795	+ objEditor.refreshContents(true); // To show item colors
3256	3796	return;
3257		- } else if (event.getSource() == selectCB)
	3797	+ } else if (event.getSource() == selectableCB)
3258	3798	{
3259	3799	copy.dontselect ^= true;
3260	3800	return;
..	..	@@ -3262,7 +3802,7 @@
3262	3802	{
3263	3803	copy.hide ^= true;
3264	3804	copy.Touch(); // display list issue
3265		- objEditor.refreshContents();
	3805	+ objEditor.refreshContents(true); // To show item colors
3266	3806	return;
3267	3807	} else if (event.getSource() == link2masterCB)
3268	3808	{
..	..	@@ -3518,6 +4058,7 @@
3518	4058
3519	4059	static public byte[] Compress(Object3D o)
3520	4060	{
	4061	+ // Slower to actually compress.
3521	4062	try
3522	4063	{
3523	4064	ByteArrayOutputStream baos = new ByteArrayOutputStream();
..	..	@@ -3619,6 +4160,7 @@
3619	4160	{
3620	4161	//Save(true);
3621	4162	Replace();
	4163	+ SetVersionStates();
3622	4164	}
3623	4165
3624	4166	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3639,29 +4181,46 @@
3639	4181
3640	4182	java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3641	4183
	4184	+ void DeleteVersion()
	4185	+ {
	4186	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4187	+ {
	4188	+ copy.versionlist[i] = copy.versionlist[i+1];
	4189	+ }
	4190	+
	4191	+ CopyChanged();
	4192	+
	4193	+ SetVersionStates();
	4194	+ }
	4195	+
3642	4196	public boolean Save(boolean user)
3643	4197	{
3644	4198	System.err.println("Save");
	4199	+ Replace();
3645	4200
3646		- cRadio tab = GetCurrentTab();
	4201	+ //cRadio tab = GetCurrentTab();
3647	4202
3648		- byte[] compress = CompressCopy();
	4203	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3649	4204
3650	4205	boolean thesame = false;
3651	4206
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		- }
	4207	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4208	+// {
	4209	+// thesame = true;
	4210	+// }
3657	4211
3658	4212	//EditorFrame.m_MainFrame.requestFocusInWindow();
3659	4213	if (!thesame)
3660	4214	{
	4215	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4216	+ {
	4217	+ copy.versionlist[i] = copy.versionlist[i-1];
	4218	+ }
	4219	+
3661	4220	//tab.user[tab.versionindex] = user;
3662	4221	//boolean increment = true; // tab.graphs[tab.versionindex] == null;
3663	4222
3664		- copy.versions[++copy.versionindex] = compress;
	4223	+ copy.versionlist[++copy.versionindex] = compress;
3665	4224
3666	4225	// if (increment)
3667	4226	// tab.versionindex++;
..	..	@@ -3671,13 +4230,13 @@
3671	4230
3672	4231	//assert(hashtable.isEmpty());
3673	4232
3674		- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3675		- {
3676		- //tab.user[i] = false;
3677		- copy.versions[i] = null;
3678		- }
	4233	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4234	+// {
	4235	+// //tab.user[i] = false;
	4236	+// copy.versionlist[i] = null;
	4237	+// }
3679	4238
3680		- SetUndoStates();
	4239	+ SetVersionStates();
3681	4240
3682	4241	// test save
3683	4242	if (false)
..	..	@@ -3700,10 +4259,44 @@
3700	4259
3701	4260	return !thesame;
3702	4261	}
3703		-
3704		- void CopyChanged(Object3D obj)
	4262	+
	4263	+ boolean flashIt = true;
	4264	+
	4265	+ void RefreshSelection()
3705	4266	{
3706		- SetUndoStates();
	4267	+ Object3D selection = new Object3D();
	4268	+
	4269	+ for (int i = 0; i < copy.selection.size(); i++)
	4270	+ {
	4271	+ Object3D elem = copy.selection.elementAt(i);
	4272	+
	4273	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4274	+
	4275	+ if (obj == null)
	4276	+ {
	4277	+ copy.selection.remove(i--);
	4278	+ }
	4279	+ else
	4280	+ {
	4281	+ selection.add(obj);
	4282	+ copy.selection.setElementAt(obj, i);
	4283	+ }
	4284	+ }
	4285	+
	4286	+ flashIt = false;
	4287	+ GetTree().clearSelection();
	4288	+ for (int i = 0; i < selection.size(); i++)
	4289	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4290	+ flashIt = true;
	4291	+
	4292	+ //refreshContents(false);
	4293	+ }
	4294	+
	4295	+ void CopyChanged()
	4296	+ {
	4297	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4298	+
	4299	+ SetVersionStates();
3707	4300
3708	4301	boolean temp = CameraPane.SWITCH;
3709	4302	CameraPane.SWITCH = false;
..	..	@@ -3712,6 +4305,9 @@
3712	4305
3713	4306	copy.clear();
3714	4307
	4308	+ copy.skyboxname = obj.skyboxname;
	4309	+ copy.skyboxext = obj.skyboxext;
	4310	+
3715	4311	for (int i=0; i<obj.Size(); i++)
3716	4312	{
3717	4313	copy.add(obj.get(i));
..	..	@@ -3721,6 +4317,7 @@
3721	4317
3722	4318	CameraPane.SWITCH = temp;
3723	4319
	4320	+ RefreshSelection();
3724	4321	//assert(hashtable.isEmpty());
3725	4322
3726	4323	copy.Touch();
..	..	@@ -3741,13 +4338,15 @@
3741	4338	}
3742	4339	}
3743	4340
3744		- refreshContents();
	4341	+ refreshContents(true);
3745	4342	}
3746	4343
3747		- cButton undoButton;
	4344	+ cButton previousVersionButton;
3748	4345	cButton restoreButton;
3749	4346	cButton replaceButton;
3750		- cButton redoButton;
	4347	+ cButton nextVersionButton;
	4348	+ cButton saveVersionButton;
	4349	+ cButton deleteVersionButton;
3751	4350
3752	4351	boolean muteSlider;
3753	4352
..	..	@@ -3755,39 +4354,47 @@
3755	4354	{
3756	4355	int count = 0;
3757	4356
3758		- for (int i = copy.versions.length; --i >= 0;)
	4357	+ for (int i = copy.versionlist.length; --i >= 0;)
3759	4358	{
3760		- if (copy.versions[i] != null)
	4359	+ if (copy.versionlist[i] != null)
3761	4360	count++;
3762	4361	}
3763	4362
3764	4363	return count;
3765	4364	}
3766	4365
3767		- void SetUndoStates()
	4366	+ void SetVersionStates()
3768	4367	{
3769		- cRadio tab = GetCurrentTab();
	4368	+ //if (true)
	4369	+ // return;
	4370	+
	4371	+ //cRadio tab = GetCurrentTab();
3770	4372
3771	4373	restoreButton.setEnabled(copy.versionindex != -1);
3772	4374	replaceButton.setEnabled(copy.versionindex != -1);
3773	4375
3774		- undoButton.setEnabled(copy.versionindex > 0);
3775		- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	4376	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4377	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4378	+
	4379	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4380	+ copy.versionlist[copy.versionindex + 1] != null);
3776	4381
3777	4382	muteSlider = true;
	4383	+ versionSlider.setMinimum(0);
3778	4384	versionSlider.setMaximum(VersionCount() - 1);
3779	4385	versionSlider.setInteger(copy.versionindex);
	4386	+ versionSlider.setEnabled(copy.versionindex != -1);
3780	4387	muteSlider = false;
3781	4388	}
3782	4389
3783		- public boolean Undo()
	4390	+ public boolean PreviousVersion()
3784	4391	{
3785	4392	// Option?
3786	4393	Replace();
3787	4394
3788	4395	System.err.println("Undo");
3789	4396
3790		- cRadio tab = GetCurrentTab();
	4397	+ //cRadio tab = GetCurrentTab();
3791	4398
3792	4399	if (copy.versionindex == 0)
3793	4400	{
..	..	@@ -3810,7 +4417,7 @@
3810	4417
3811	4418	copy.versionindex -= 1;
3812	4419
3813		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4420	+ CopyChanged();
3814	4421
3815	4422	return true;
3816	4423	}
..	..	@@ -3819,15 +4426,16 @@
3819	4426	{
3820	4427	System.err.println("Restore");
3821	4428
3822		- cRadio tab = GetCurrentTab();
	4429	+ //cRadio tab = GetCurrentTab();
3823	4430
3824		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4431	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3825	4432	{
3826	4433	java.awt.Toolkit.getDefaultToolkit().beep();
3827	4434	return false;
3828	4435	}
3829	4436
3830		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4437	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4438	+ CopyChanged();
3831	4439
3832	4440	return true;
3833	4441	}
..	..	@@ -3836,27 +4444,27 @@
3836	4444	{
3837	4445	System.err.println("Replace");
3838	4446
3839		- cRadio tab = GetCurrentTab();
	4447	+ //cRadio tab = GetCurrentTab();
3840	4448
3841		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4449	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3842	4450	{
3843	4451	// No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3844	4452	return false;
3845	4453	}
3846	4454
3847		- copy.versions[copy.versionindex] = CompressCopy();
	4455	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
3848	4456
3849	4457	return true;
3850	4458	}
3851	4459
3852		- public void Redo()
	4460	+ public void NextVersion()
3853	4461	{
3854	4462	// Option?
3855	4463	Replace();
3856	4464
3857		- cRadio tab = GetCurrentTab();
	4465	+ //cRadio tab = GetCurrentTab();
3858	4466
3859		- if (copy.versions[copy.versionindex + 1] == null)
	4467	+ if (copy.versionlist[copy.versionindex + 1] == null)
3860	4468	{
3861	4469	java.awt.Toolkit.getDefaultToolkit().beep();
3862	4470	return;
..	..	@@ -3864,7 +4472,7 @@
3864	4472
3865	4473	copy.versionindex += 1;
3866	4474
3867		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4475	+ CopyChanged();
3868	4476
3869	4477	//if (!tab.user[tab.versionindex])
3870	4478	// tab.graphs[tab.versionindex] = null;
..	..	@@ -4078,7 +4686,7 @@
4078	4686	//copy.material = new cMaterial(copy.GetMaterial());
4079	4687
4080	4688	current.color = (float) colorField.getFloat();
4081		- current.modulation = (float) modulationField.getFloat();
	4689	+ current.modulation = (float) saturationField.getFloat();
4082	4690	current.metalness = (float) metalnessField.getFloat();
4083	4691	current.diffuse = (float) diffuseField.getFloat();
4084	4692	current.specular = (float) specularField.getFloat();
..	..	@@ -4111,7 +4719,7 @@
4111	4719	cMaterial mat = copy.material;
4112	4720
4113	4721	colorField.SetToolTipValue((mat.color));
4114		- modulationField.SetToolTipValue((mat.modulation));
	4722	+ saturationField.SetToolTipValue((mat.modulation));
4115	4723	metalnessField.SetToolTipValue((mat.metalness));
4116	4724	diffuseField.SetToolTipValue((mat.diffuse));
4117	4725	specularField.SetToolTipValue((mat.specular));
..	..	@@ -4175,9 +4783,10 @@
4175	4783
4176	4784	int version = versionSlider.getInteger();
4177	4785
4178		- if (copy.versions[version] != null)
	4786	+ if (version != -1 && copy.versionlist[version] != null)
4179	4787	{
4180		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4788	+ copy.versionindex = version;
	4789	+ CopyChanged();
4181	4790	}
4182	4791
4183	4792	return;
..	..	@@ -4217,6 +4826,12 @@
4217	4826	{
4218	4827	//System.out.println("stateChanged = " + this);
4219	4828	materialtouched = true;
	4829	+
	4830	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4831	+ {
	4832	+ saturationField.setFloat(1);
	4833	+ }
	4834	+
4220	4835	applySelf();
4221	4836	//System.out.println("this = " + this);
4222	4837	//System.out.println("PARENT = " + parent);
..	..	@@ -4516,6 +5131,7 @@
4516	5131	{
4517	5132	if (GetTree() != null)
4518	5133	{
	5134	+ GetTree().revalidate();
4519	5135	GetTree().repaint();
4520	5136	}
4521	5137
..	..	@@ -4524,6 +5140,9 @@
4524	5140	ctrlPanel.validate(); // ? new
4525	5141	ctrlPanel.repaint();
4526	5142	}
	5143	+
	5144	+ if (previousVersionButton != null && copy.versionlist != null)
	5145	+ SetVersionStates();
4527	5146	}
4528	5147
4529	5148	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4772,7 +5391,9 @@
4772	5391	readobj.ResetDisplayList();
4773	5392	} catch (Exception e)
4774	5393	{
4775		- //e.printStackTrace();
	5394	+ if (!e.toString().contains("GZIP"))
	5395	+ e.printStackTrace();
	5396	+
4776	5397	try
4777	5398	{
4778	5399	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4852,6 +5473,8 @@
4852	5473	{
4853	5474	//readobj.deepCopySelf(copy);
4854	5475	copy.clear(); // june 2014
	5476	+ copy.skyboxname = readobj.skyboxname;
	5477	+ copy.skyboxext = readobj.skyboxext;
4855	5478	for (int i = 0; i < readobj.size(); i++)
4856	5479	{
4857	5480	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4892,6 +5515,7 @@
4892	5515	}
4893	5516	} catch (ClassCastException e)
4894	5517	{
	5518	+ e.printStackTrace();
4895	5519	assert (false);
4896	5520	Composite c = (Composite) copy;
4897	5521	c.children.clear();
..	..	@@ -4902,13 +5526,16 @@
4902	5526	c.addChild(csg);
4903	5527	}
4904	5528
4905		- copy.versions = readobj.versions;
	5529	+ copy.versionlist = readobj.versionlist;
4906	5530	copy.versionindex = readobj.versionindex;
4907	5531
4908		- if (copy.versions == null)
	5532	+ if (copy.versionlist == null)
4909	5533	{
4910		- copy.versions = new byte[100][];
	5534	+ // Backward compatibility
	5535	+ copy.versionlist = new Object3D[100];
4911	5536	copy.versionindex = -1;
	5537	+
	5538	+ Save(true);
4912	5539	}
4913	5540
4914	5541	//? SetUndoStates();
..	..	@@ -4923,7 +5550,7 @@
4923	5550	{
4924	5551	if (Grafreed.standAlone)
4925	5552	{
4926		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5553	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4927	5554	browser.show();
4928	5555	String filename = browser.getFile();
4929	5556	if (filename != null && filename.length() > 0)
..	..	@@ -5000,6 +5627,8 @@
5000	5627
5001	5628	void save()
5002	5629	{
	5630	+ Replace();
	5631	+
5003	5632	if (lastname == null)
5004	5633	{
5005	5634	return;
..	..	@@ -5022,6 +5651,7 @@
5022	5651	//ps.print(buffer.toString());
5023	5652	} catch (IOException e)
5024	5653	{
	5654	+ e.printStackTrace();
5025	5655	}
5026	5656	}
5027	5657
..	..	@@ -5241,6 +5871,7 @@
5241	5871	ButtonGroup buttonGroup;
5242	5872
5243	5873	cGridBag toolboxPanel;
	5874	+ cGridBag skyboxPanel;
5244	5875	cGridBag materialPanel;
5245	5876	cGridBag ctrlPanel;
5246	5877
..	..	@@ -5314,7 +5945,7 @@
5314	5945	JLabel colorLabel;
5315	5946	cNumberSlider colorField;
5316	5947	JLabel modulationLabel;
5317		- cNumberSlider modulationField;
	5948	+ cNumberSlider saturationField;
5318	5949	JLabel metalnessLabel;
5319	5950	cNumberSlider metalnessField;
5320	5951	JLabel diffuseLabel;
..	..	@@ -5345,6 +5976,7 @@
5345	5976	cNumberSlider anisoField;
5346	5977	JLabel anisoVLabel;
5347	5978	cNumberSlider anisoVField;
	5979	+
5348	5980	JLabel cameraLabel;
5349	5981	cNumberSlider cameraField;
5350	5982	JLabel selfshadowLabel;
..	..	@@ -5359,6 +5991,7 @@
5359	5991	cNumberSlider fakedepthField;
5360	5992	JLabel shadowbiasLabel;
5361	5993	cNumberSlider shadowbiasField;
	5994	+
5362	5995	JLabel bumpLabel;
5363	5996	cNumberSlider bumpField;
5364	5997	JLabel noiseLabel;