~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -34,6 +34,7 @@
34	34	iSendInfo
35	35	//KeyListener
36	36	{
	37	+ public cToggleButton pinButton;
37	38	boolean timeline;
38	39	boolean wasFullScreen;
39	40
..	..	@@ -41,11 +42,72 @@
41	42	JFrame frame;
42	43
43	44	static ObjEditor theFrame;
	45	+
	46	+ public void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
	75	+ public Composite CreateCameras()
	76	+ {
	77	+ Composite cams = new cTemplate();
	78	+ cams.name = "Cameras";
	79	+ copy.insertElementAt(cams, 0);
	80	+
	81	+ cams.addChild(new Camera());
	82	+ cams.addChild(new Camera(1));
	83	+ cams.addChild(new Camera(2));
	84	+ cams.addChild(new Camera(3));
	85	+ cams.addChild(new Camera(4));
	86	+
	87	+ return cams;
	88	+ }
	89	+
	90	+ public cGridBag GetSeparator()
	91	+ {
	92	+ cGridBag separator = new cGridBag();
	93	+ separator.add(new JSeparator());
	94	+ separator.preferredHeight = 5;
	95	+ return separator;
	96	+ }
44	97
45	98	cButton GetButton(String name, boolean border)
46	99	{
47	100	ImageIcon icon = GetIcon(name);
48		- return new cButton(icon, border);
	101	+ if (icon != null \|\| name.contains("/"))
	102	+ return new cButton(icon, border);
	103	+ else
	104	+ return new cButton(name, border);
	105	+ }
	106	+
	107	+ cLabel GetLabel(String name, boolean border)
	108	+ {
	109	+ //ImageIcon icon = GetIcon(name);
	110	+ return new cLabel(GetImage(name), border);
49	111	}
50	112
51	113	cToggleButton GetToggleButton(String name, boolean border)
..	..	@@ -60,26 +122,58 @@
60	122	return new cCheckBox(icon, border);
61	123	}
62	124
63		- private ImageIcon GetIcon(String name)
	125	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	126	+
	127	+ static ImageIcon GetIcon(String name)
	128	+ {
	129	+ javax.swing.ImageIcon iconCache = icons.get(name);
	130	+ if (iconCache != null)
	131	+ {
	132	+ return iconCache;
	133	+ }
	134	+
	135	+ try
	136	+ {
	137	+ BufferedImage image;
	138	+
	139	+ if (name.endsWith("jpg"))
	140	+ // Much faster!
	141	+ image = new sun.awt.image.codec.JPEGImageDecoderImpl(ObjEditor.class.getClassLoader().getResourceAsStream(name)).decodeAsBufferedImage();
	142	+ else
	143	+ image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	144	+
	145	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	146	+// {
	147	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	148	+// Graphics2D g = resized.createGraphics();
	149	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	150	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	151	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	152	+// g.dispose();
	153	+//
	154	+// image = resized;
	155	+// }
	156	+
	157	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	158	+
	159	+ icons.put(name, icon);
	160	+
	161	+ return icon;
	162	+ }
	163	+ catch (Exception e)
	164	+ {
	165	+ //icons.put(name, null);
	166	+ return null;
	167	+ }
	168	+ }
	169	+
	170	+ BufferedImage GetImage(String name)
64	171	{
65	172	try
66	173	{
67	174	BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
68	175
69		- if (image.getWidth() != 24 && image.getHeight() != 24)
70		- {
71		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
72		- Graphics2D g = resized.createGraphics();
73		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
74		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
75		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
76		- g.dispose();
77		-
78		- image = resized;
79		- }
80		-
81		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
82		- return icon;
	176	+ return image;
83	177	}
84	178	catch (Exception e)
85	179	{
..	..	@@ -222,6 +316,8 @@
222	316	objEditor.ctrlPanel.remove(setupPanel2);
223	317	objEditor.ctrlPanel.remove(objectCommandsPanel);
224	318	objEditor.ctrlPanel.remove(pushPanel);
	319	+ if (versionPanel != null)
	320	+ objEditor.ctrlPanel.remove(versionPanel);
225	321	//objEditor.ctrlPanel.remove(fillPanel);
226	322
227	323	//Remove(normalpushField);
..	..	@@ -268,11 +364,13 @@
268	364	client = inClient;
269	365	copy = client;
270	366
271		- if (copy.versions == null)
272		- {
273		- copy.versions = new byte[100][];
274		- copy.versionindex = -1;
275		- }
	367	+// if (copy.versionlist == null)
	368	+// {
	369	+// copy.versionlist = new Object3D[100];
	370	+// copy.versionindex = -1;
	371	+//
	372	+// callee.Save(true);
	373	+// }
276	374
277	375	// "this" is not called: SetupUI2(objEditor);
278	376	}
..	..	@@ -287,12 +385,6 @@
287	385	client = inClient;
288	386	copy = client;
289	387
290		- if (copy.versions == null)
291		- {
292		- copy.versions = new byte[100][];
293		- copy.versionindex = -1;
294		- }
295		-
296	388	SetupUI2(callee.GetEditor());
297	389	}
298	390
..	..	@@ -314,7 +406,8 @@
314	406	//parent = p;
315	407
316	408	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
317		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	409	+ if (Globals.DEBUG)
	410	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
318	411	//gd.setFullScreenWindow(this);
319	412	//setResizable(false);
320	413	//if (!isDisplayable())
..	..	@@ -325,11 +418,13 @@
325	418	copy = localCopy;
326	419	copy.editWindow = this;
327	420
328		- if (copy.versions == null)
329		- {
330		-// copy.versions = new byte[100][];
	421	+// if (copy.versionlist == null)
	422	+// {
	423	+// copy.versionlist = new Object3D[100];
331	424	// copy.versionindex = -1;
332		- }
	425	+//
	426	+// Save(true);
	427	+// }
333	428
334	429	SetupMenu();
335	430
..	..	@@ -349,6 +444,9 @@
349	444
350	445	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
351	446
	447	+ // This is to refresh the UI of the material panel.
	448	+ boolean patchMaterial;
	449	+
352	450	void SetupMenu()
353	451	{
354	452	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -362,8 +460,11 @@
362	460	importOBJItem.addActionListener(this);
363	461	import3DSItem = menu.add(new MenuItem("3DS file..."));
364	462	import3DSItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
365	465	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
366	466	importVRMLX3DItem.addActionListener(this);
	467	+ }
367	468	menu.add("-");
368	469	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
369	470	importGFDItem.addActionListener(this);
..	..	@@ -398,6 +499,8 @@
398	499
399	500	ChangeListener changeListener = new ChangeListener()
400	501	{
	502	+ //String name;
	503	+
401	504	public void stateChanged(ChangeEvent changeEvent)
402	505	{
403	506	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -416,7 +519,37 @@
416	519	// EditSelection(false);
417	520	// }
418	521
419		- refreshContents(false); // To refresh Info tab
	522	+// if (objectPanel.getSelectedIndex() == 4)
	523	+// {
	524	+// name = copy.skyboxname;
	525	+//
	526	+// if (name == null)
	527	+// {
	528	+// name = "";
	529	+// }
	530	+//
	531	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	532	+// copy.skyboxext = "jpg";
	533	+// }
	534	+// else
	535	+// {
	536	+// if (name != null)
	537	+// {
	538	+// if (name.equals(""))
	539	+// {
	540	+// copy.skyboxname = null;
	541	+// copy.skyboxext = null;
	542	+// }
	543	+// else
	544	+// {
	545	+// copy.skyboxname = name;
	546	+// }
	547	+// }
	548	+// }
	549	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	550	+
	551	+// refreshContents(false); // To refresh Info tab
	552	+ cameraView.repaint();
420	553	}
421	554	};
422	555	objectPanel.addChangeListener(changeListener);
..	..	@@ -436,10 +569,12 @@
436	569	editPanel.add(editCommandsPanel);
437	570	editPanel.add(ctrlPanel);
438	571
439		- toolboxPanel = new cGridBag().setVertical(false);
	572	+ toolboxPanel = new cGridBag().setVertical(true);
440	573	//toolboxPanel.setName("Toolbox");
441	574
442		- materialPanel = new cGridBag().setVertical(true);
	575	+ skyboxPanel = new cGridBag().setVertical(true);
	576	+
	577	+ materialPanel = new cGridBag().setVertical(false);
443	578	//materialPanel.setName("Material");
444	579
445	580	/JTextPane/
..	..	@@ -723,6 +858,7 @@
723	858	boolean maximized;
724	859
725	860	cButton fullscreenLayout;
	861	+ cButton expandedLayout;
726	862
727	863	void Minimize()
728	864	{
..	..	@@ -762,10 +898,12 @@
762	898	cButton minButton;
763	899	cButton maxButton;
764	900	cButton fullButton;
	901	+ cButton collapseButton;
	902	+ cButton maximize3DButton;
765	903
766	904	void ToggleFullScreen()
767	905	{
768		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	906	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
769	907
770	908	cameraView.ToggleFullScreen();
771	909
..	..	@@ -786,13 +924,13 @@
786	924	// X frame.getContentPane().remove(/"Center",/bigThree);
787	925	// X framePanel.add(bigThree);
788	926	// X frame.getContentPane().add(/"Center",/framePanel);
789		- framePanel.setDividerLocation(46);
	927	+// framePanel.setDividerLocation(46); // icons are 24x24
790	928
791	929	//frame.setVisible(true);
792		- radio.layout = keepButton;
	930	+// radio.layout = keepButton;
793	931	//theFrame = null;
794	932	keepButton = null;
795		- radio.layout.doClick();
	933	+// radio.layout.doClick();
796	934
797	935	} else
798	936	{
..	..	@@ -813,31 +951,53 @@
813	951	// X frame.getContentPane().remove(/"Center",/framePanel);
814	952	// X framePanel.remove(bigThree);
815	953	// X frame.getContentPane().add(/"Center",/bigThree);
816		- framePanel.setDividerLocation(0);
	954	+// framePanel.setDividerLocation(0);
817	955
818		- radio.layout = fullscreenLayout;
819		- radio.layout.doClick();
	956	+// radio.layout = fullscreenLayout;
	957	+// radio.layout.doClick();
820	958	//frame.setVisible(true);
821	959	}
822	960	frame.validate();
	961	+
	962	+ cameraView.requestFocusInWindow();
823	963	}
824	964
825		- private byte[] CompressCopy()
	965	+ void CollapseToolbar()
	966	+ {
	967	+ framePanel.setDividerLocation(0);
	968	+ //frame.validate();
	969	+
	970	+ cameraView.requestFocusInWindow();
	971	+ }
	972	+
	973	+ private Object3D Duplicate(Object3D object)
826	974	{
827	975	boolean temp = CameraPane.SWITCH;
828	976	CameraPane.SWITCH = false;
829	977
830		- copy.ExtractBigData(versiontable);
	978	+ if (Grafreed.grafreed.universe.versiontable == null)
	979	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	980	+
	981	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
831	982	// if (copy == client)
832	983
833		- byte[] versions[] = copy.versions;
834		- copy.versions = null;
	984	+ Object3D versions[] = object.versionlist;
	985	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	986	+ object.versionlist = null;
	987	+ object.versiontable = null;
835	988
836		- byte[] compress = Compress(copy);
	989	+ Object3D parent = object.parent;
	990	+ object.parent = null;
837	991
838		- copy.versions = versions;
	992	+ //byte[] compress = Compress(copy);
	993	+ Object3D compress = (Object3D)Grafreed.clone(object);
839	994
840		- copy.RestoreBigData(versiontable);
	995	+ object.parent = parent;
	996	+
	997	+ object.versionlist = versions;
	998	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	999	+
	1000	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
841	1001
842	1002	CameraPane.SWITCH = temp;
843	1003
..	..	@@ -965,6 +1125,7 @@
965	1125	{
966	1126	SetupMaterial(materialPanel);
967	1127	}
	1128	+
968	1129	//SetupName();
969	1130	//SetupViews();
970	1131	}
..	..	@@ -1004,6 +1165,7 @@
1004	1165	cGridBag setupPanel2;
1005	1166	cGridBag objectCommandsPanel;
1006	1167	cGridBag pushPanel;
	1168	+ cGridBag versionPanel;
1007	1169	cGridBag fillPanel;
1008	1170
1009	1171	JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
..	..	@@ -1173,6 +1335,18 @@
1173	1335
1174	1336	namePanel = new cGridBag();
1175	1337
	1338	+ //if (copy.pinned)
	1339	+ {
	1340	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1341	+ pinButton.setSelected(copy.pinned);
	1342	+ cGridBag t = new cGridBag();
	1343	+ t.preferredWidth = 2;
	1344	+ t.add(pinButton);
	1345	+ namePanel.add(t);
	1346	+
	1347	+ pinButton.addItemListener(this);
	1348	+ }
	1349	+
1176	1350	nameField = AddText(namePanel, copy.GetName());
1177	1351	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1178	1352	oe.ctrlPanel.add(namePanel);
..	..	@@ -1186,14 +1360,16 @@
1186	1360
1187	1361	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1188	1362	liveCB.setToolTipText("Animate object");
	1363	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1364	+ markCB.setToolTipText("Set target transform");
1189	1365	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1190	1366	selectableCB.setToolTipText("Make object selectable");
1191	1367	// Return();
1192	1368
1193	1369	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1194	1370	hideCB.setToolTipText("Hide object");
1195		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1196		- markCB.setToolTipText("As animation target transform");
	1371	+
	1372	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1197	1373
1198	1374	setupPanel2 = new cGridBag().setVertical(false);
1199	1375
..	..	@@ -1236,9 +1412,14 @@
1236	1412	oe.ctrlPanel.add(objectCommandsPanel);
1237	1413	oe.ctrlPanel.Return();
1238	1414
1239		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1415	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH * 100, 1.1); // To have the buttons
1240	1416	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1241		- //Return();
	1417	+ if (false && copy.versionlist != null && copy.versionindex != -1)
	1418	+ {
	1419	+ oe.ctrlPanel.Return();
	1420	+ versionPanel = AddSlider(oe.ctrlPanel, "Version", 0, copy.VersionCount() - 1, copy.versionindex);
	1421	+ versionField = (cNumberSlider)versionPanel.getComponent(1);
	1422	+ }
1242	1423
1243	1424	oe.ctrlPanel.Return();
1244	1425
..	..	@@ -1393,22 +1574,9 @@
1393	1574
1394	1575	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1395	1576	{
1396		- System.out.println("CREATE CAMERAS");
1397		- cams = new cTemplate();
1398		- cams.name = "Cameras";
1399		- copy.insertElementAt(cams, 0);
1400		- //cams.parent = copy;
1401		-
1402		- cam = new Camera(); // LA.newVector(3, 2, 1));
1403		- cams.addChild(cam);
1404		- cam = new Camera(1);
1405		- cams.addChild(cam);
1406		- cam = new Camera(2);
1407		- cams.addChild(cam);
1408		- cam = new Camera(3);
1409		- cams.addChild(cam);
1410		- cam = new Camera(4); // Light
1411		- cams.addChild(cam);
	1577	+ if (Globals.DEBUG)
	1578	+ System.out.println("CREATE CAMERAS");
	1579	+ cams = CreateCameras();
1412	1580	} else
1413	1581	{
1414	1582	cams = (cGroup) copy.get(0);
..	..	@@ -1474,6 +1642,45 @@
1474	1642	//frontView.object = copy;
1475	1643	//sideView.object = copy;
1476	1644
	1645	+ transformPanel = new cGridBag().setVertical(true);
	1646	+
	1647	+ cGridBag resetTransformPanel = new cGridBag();
	1648	+
	1649	+ resetTransformPanel.preferredHeight = 2;
	1650	+
	1651	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1652	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1653	+ resetTransform.addMouseListener(new MouseAdapter()
	1654	+ {
	1655	+ public void mouseClicked(MouseEvent e)
	1656	+ {
	1657	+ ResetTransform();
	1658	+ }
	1659	+ });
	1660	+ resetTransformPanel.add(resetTransform);
	1661	+
	1662	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1663	+ resetTransform.setToolTipText("Reset Translation only");
	1664	+ resetTransform.addMouseListener(new MouseAdapter()
	1665	+ {
	1666	+ public void mouseClicked(MouseEvent e)
	1667	+ {
	1668	+ ResetTransform(1);
	1669	+ }
	1670	+ });
	1671	+ resetTransformPanel.add(resetTransform);
	1672	+
	1673	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1674	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1675	+ resetTransform.addMouseListener(new MouseAdapter()
	1676	+ {
	1677	+ public void mouseClicked(MouseEvent e)
	1678	+ {
	1679	+ ResetTransform(2);
	1680	+ }
	1681	+ });
	1682	+ resetTransformPanel.add(resetTransform);
	1683	+
1477	1684	XYZPanel = new cGridBag().setVertical(true);
1478	1685	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1479	1686
..	..	@@ -1483,6 +1690,9 @@
1483	1690	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1484	1691	//XYZPanel.setName("XYZ");
1485	1692
	1693	+ transformPanel.add(resetTransformPanel);
	1694	+ transformPanel.add(XYZPanel);
	1695	+
1486	1696	/*
1487	1697	gridPanel = new JPanel(); //new BorderLayout());
1488	1698	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1490,12 +1700,12 @@
1490	1700	gridPanel.add(cameraView);
1491	1701	gridPanel.add(XYZPanel);
1492	1702	*/
1493		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1494		- gridPanel.setContinuousLayout(true);
1495		- gridPanel.setOneTouchExpandable(true);
1496		- gridPanel.setDividerLocation(1.0);
1497		- gridPanel.setDividerSize(9);
1498		- gridPanel.setResizeWeight(0.85);
	1703	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1704	+// gridPanel.setContinuousLayout(true);
	1705	+// gridPanel.setOneTouchExpandable(true);
	1706	+// gridPanel.setDividerLocation(1.0);
	1707	+// gridPanel.setDividerSize(9);
	1708	+// gridPanel.setResizeWeight(0.85);
1499	1709
1500	1710	// aConstraints.weighty = 0;
1501	1711	//System.out.println("THIS = " + this);
..	..	@@ -1518,25 +1728,34 @@
1518	1728
1519	1729	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1520	1730	//tmp.setName("Edit");
	1731	+ objectPanel.add(skyboxPanel);
	1732	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1733	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1734	+
	1735	+ objectPanel.add(toolboxPanel);
	1736	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1737	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1738	+
1521	1739	objectPanel.add(materialPanel);
1522		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1740	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1741	+ objectPanel.setToolTipTextAt(2, "Material");
	1742	+
1523	1743	// JPanel north = new JPanel(new BorderLayout());
1524	1744	// north.setName("Edit");
1525	1745	// north.add(ctrlPanel, BorderLayout.NORTH);
1526	1746	// objectPanel.add(north);
1527	1747	objectPanel.add(editPanel);
1528		- objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1748	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
	1749	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1529	1750
1530		- //if (Globals.ADVANCED)
1531		- objectPanel.add(infoPanel);
1532		- objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1751	+ objectPanel.add(transformPanel);
	1752	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1753	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1533	1754
1534		- objectPanel.add(XYZPanel);
1535		- objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1536		-
1537		- objectPanel.add(toolboxPanel);
1538		- objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1539		-
	1755	+ patchMaterial = true;
	1756	+ cameraView.patchMaterial = this;
	1757	+ objectPanel.setSelectedIndex(2);
	1758	+
1540	1759	/*
1541	1760	aConstraints.gridx = 0;
1542	1761	aConstraints.gridwidth = 1;
..	..	@@ -1567,11 +1786,108 @@
1567	1786
1568	1787	AddOptions(optionsPanel); //, aConstraints);
1569	1788
1570		- tabbedPane.add(optionsPanel);
1571		-
1572	1789	tabbedPane.add(FSPane = new cFileSystemPane(this));
1573	1790
	1791	+ tabbedPane.add(optionsPanel);
	1792	+
1574	1793	scenePanel.add(tabbedPane);
	1794	+
	1795	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1796	+ creditsPanel.setName("Credits");
	1797	+
	1798	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1799	+ creditsPanel.add(ogaLabel);
	1800	+
	1801	+ cButton creditButton;
	1802	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1803	+ creditButton.setToolTipText("https://opengameart.org");
	1804	+
	1805	+ creditButton.addMouseListener(new MouseAdapter()
	1806	+ {
	1807	+ public void mouseClicked(MouseEvent e)
	1808	+ {
	1809	+ try
	1810	+ {
	1811	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1812	+ } catch (Exception e1)
	1813	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1814	+ {
	1815	+ e1.printStackTrace();
	1816	+ }
	1817	+ }
	1818	+ });
	1819	+
	1820	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1821	+ creditsPanel.add(ogaLabel);
	1822	+
	1823	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1824	+ creditButton.setToolTipText("https://3delicious.net");
	1825	+
	1826	+ creditButton.addMouseListener(new MouseAdapter()
	1827	+ {
	1828	+ public void mouseClicked(MouseEvent e)
	1829	+ {
	1830	+ try
	1831	+ {
	1832	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1833	+ } catch (Exception e1)
	1834	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1835	+ {
	1836	+ e1.printStackTrace();
	1837	+ }
	1838	+ }
	1839	+ });
	1840	+
	1841	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1842	+ creditButton.setToolTipText("https://archive3d.net");
	1843	+
	1844	+ creditButton.addMouseListener(new MouseAdapter()
	1845	+ {
	1846	+ public void mouseClicked(MouseEvent e)
	1847	+ {
	1848	+ try
	1849	+ {
	1850	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1851	+ } catch (Exception e1)
	1852	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1853	+ {
	1854	+ e1.printStackTrace();
	1855	+ }
	1856	+ }
	1857	+ });
	1858	+
	1859	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1860	+ creditButton.setToolTipText("https://turbosquid.com");
	1861	+
	1862	+ creditButton.addMouseListener(new MouseAdapter()
	1863	+ {
	1864	+ public void mouseClicked(MouseEvent e)
	1865	+ {
	1866	+ try
	1867	+ {
	1868	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1869	+ } catch (Exception e1)
	1870	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1871	+ {
	1872	+ e1.printStackTrace();
	1873	+ }
	1874	+ }
	1875	+ });
	1876	+
	1877	+ for (int i=6; --i>=0;)
	1878	+ {
	1879	+ creditsPanel.add(new cGridBag());
	1880	+ }
	1881	+
	1882	+ tabbedPane.add(creditsPanel);
	1883	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1884	+
	1885	+ if (Globals.ADVANCED)
	1886	+ {
	1887	+ objectPanel.add(infoPanel);
	1888	+ objectPanel.setIconAt(5, GetIcon("icons/info.png"));
	1889	+ objectPanel.setToolTipTextAt(4, "Information");
	1890	+ }
1575	1891
1576	1892	/*
1577	1893	cTree jTree = new cTree(null);
..	..	@@ -1593,13 +1909,13 @@
1593	1909	jtp.add(tree);
1594	1910	*/
1595	1911
1596		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1597		- bigPanel.setContinuousLayout(true);
1598		- bigPanel.setOneTouchExpandable(true);
1599		- bigPanel.setDividerLocation(0.8);
1600		- bigPanel.setDividerSize(15);
1601		- bigPanel.setResizeWeight(0.15);
1602		- bigPanel.setName("Scene");
	1912	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1913	+// bigPanel.setContinuousLayout(true);
	1914	+// bigPanel.setOneTouchExpandable(true);
	1915	+// bigPanel.setDividerLocation(0.8);
	1916	+// bigPanel.setDividerSize(15);
	1917	+// bigPanel.setResizeWeight(0.15);
	1918	+// bigPanel.setName("Scene");
1603	1919
1604	1920	//bigPanel.setLayout(new BorderLayout());
1605	1921	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1643,6 +1959,23 @@
1643	1959	// aConstraints.gridheight = 1;
1644	1960
1645	1961	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1962	+
	1963	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1964	+ new java.beans.PropertyChangeListener()
	1965	+ {
	1966	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1967	+ {
	1968	+ if ((Integer)pce.getOldValue() == 1)
	1969	+ {
	1970	+ if (radio.layout != expandedLayout)
	1971	+ {
	1972	+ radio.layout = expandedLayout;
	1973	+ radio.layout.doClick();
	1974	+ }
	1975	+ }
	1976	+ }
	1977	+ });
	1978	+
1646	1979	framePanel.setContinuousLayout(false);
1647	1980	framePanel.setOneTouchExpandable(false);
1648	1981	//.setDividerLocation(0.8);
..	..	@@ -1652,7 +1985,7 @@
1652	1985
1653	1986	frame.getContentPane().setLayout(new BorderLayout());
1654	1987	/**/
1655		- JTabbedPane worldPane = new JTabbedPane();
	1988	+ //JTabbedPane worldPane = new JTabbedPane();
1656	1989	//worldPane.add(bigPanel);
1657	1990	//worldPane.add(worldPanel);
1658	1991	/**/
..	..	@@ -1666,7 +1999,7 @@
1666	1999
1667	2000	cameraView.requestFocusInWindow();
1668	2001
1669		- gridPanel.setDividerLocation(1.0);
	2002	+// gridPanel.setDividerLocation(1.0);
1670	2003
1671	2004	frame.validate();
1672	2005
..	..	@@ -1675,7 +2008,6 @@
1675	2008	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1676	2009	frame.addWindowListener(new WindowAdapter()
1677	2010	{
1678		-
1679	2011	public void windowClosing(WindowEvent e)
1680	2012	{
1681	2013	Close();
..	..	@@ -1698,28 +2030,484 @@
1698	2030	ctrlPanel.removeAll();
1699	2031	}
1700	2032
1701		- void SetupMaterial(cGridBag panel)
	2033	+ void SetupMaterial(cGridBag materialpanel)
1702	2034	{
1703		- /*
	2035	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	2036	+
	2037	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	2038	+ skin.setToolTipText("Skin");
	2039	+ skin.addMouseListener(new MouseAdapter()
	2040	+ {
	2041	+ public void mouseClicked(MouseEvent e)
	2042	+ {
	2043	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	2044	+ cMaterial material = object.material;
	2045	+
	2046	+ // Skin
	2047	+ colorField.setFloat(material.color);
	2048	+ float saturation = material.modulation;
	2049	+
	2050	+ if (!cameraView.Skinshader)
	2051	+ {
	2052	+ saturation /= 1.5;
	2053	+ }
	2054	+
	2055	+ saturationField.setFloat(saturation);
	2056	+
	2057	+ subsurfaceField.setFloat(material.subsurface);
	2058	+ selfshadowField.setFloat(material.diffuseness);
	2059	+ diffusenessField.setFloat(material.factor);
	2060	+ shininessField.setFloat(material.shininess);
	2061	+ shadowbiasField.setFloat(material.shadowbias);
	2062	+ diffuseField.setFloat(material.diffuse);
	2063	+ specularField.setFloat(material.specular);
	2064	+
	2065	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2066	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2067	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2068	+
	2069	+ materialtouched = true;
	2070	+ applySelf();
	2071	+ }
	2072	+ });
	2073	+ presetpanel.add(skin);
	2074	+
	2075	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2076	+ lambert.setToolTipText("Diffuse");
	2077	+ lambert.addMouseListener(new MouseAdapter()
	2078	+ {
	2079	+ public void mouseClicked(MouseEvent e)
	2080	+ {
	2081	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2082	+ cMaterial material = object.material;
	2083	+
	2084	+ diffusenessField.setFloat(material.factor);
	2085	+ selfshadowField.setFloat(material.diffuseness);
	2086	+
	2087	+ materialtouched = true;
	2088	+ applySelf();
	2089	+ }
	2090	+ });
	2091	+ presetpanel.add(lambert);
	2092	+
	2093	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2094	+ diffuse2.setToolTipText("Diffuse2");
	2095	+ diffuse2.addMouseListener(new MouseAdapter()
	2096	+ {
	2097	+ public void mouseClicked(MouseEvent e)
	2098	+ {
	2099	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2100	+ cMaterial material = object.material;
	2101	+
	2102	+ diffusenessField.setFloat(material.factor);
	2103	+ selfshadowField.setFloat(material.diffuseness);
	2104	+
	2105	+ materialtouched = true;
	2106	+ applySelf();
	2107	+ }
	2108	+ });
	2109	+ presetpanel.add(diffuse2);
	2110	+
	2111	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2112	+ diffusemoon.setToolTipText("Moon");
	2113	+ diffusemoon.addMouseListener(new MouseAdapter()
	2114	+ {
	2115	+ public void mouseClicked(MouseEvent e)
	2116	+ {
	2117	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2118	+ cMaterial material = object.material;
	2119	+
	2120	+ diffusenessField.setFloat(material.factor);
	2121	+ selfshadowField.setFloat(material.diffuseness);
	2122	+
	2123	+ materialtouched = true;
	2124	+ applySelf();
	2125	+ }
	2126	+ });
	2127	+ presetpanel.add(diffusemoon);
	2128	+
	2129	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2130	+ diffusemoon2.setToolTipText("Moon2");
	2131	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2132	+ {
	2133	+ public void mouseClicked(MouseEvent e)
	2134	+ {
	2135	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2136	+ cMaterial material = object.material;
	2137	+
	2138	+ diffusenessField.setFloat(material.factor);
	2139	+ selfshadowField.setFloat(material.diffuseness);
	2140	+
	2141	+ materialtouched = true;
	2142	+ applySelf();
	2143	+ }
	2144	+ });
	2145	+ presetpanel.add(diffusemoon2);
	2146	+
	2147	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2148	+ diffusemoon3.setToolTipText("Moon3");
	2149	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2150	+ {
	2151	+ public void mouseClicked(MouseEvent e)
	2152	+ {
	2153	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2154	+ cMaterial material = object.material;
	2155	+
	2156	+ diffusenessField.setFloat(material.factor);
	2157	+ selfshadowField.setFloat(material.diffuseness);
	2158	+
	2159	+ materialtouched = true;
	2160	+ applySelf();
	2161	+ }
	2162	+ });
	2163	+ presetpanel.add(diffusemoon3);
	2164	+
	2165	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2166	+ diffusesheen.setToolTipText("Sheen");
	2167	+ diffusesheen.addMouseListener(new MouseAdapter()
	2168	+ {
	2169	+ public void mouseClicked(MouseEvent e)
	2170	+ {
	2171	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2172	+ cMaterial material = object.material;
	2173	+
	2174	+ sheenField.setFloat(material.sheen);
	2175	+
	2176	+ materialtouched = true;
	2177	+ applySelf();
	2178	+ }
	2179	+ });
	2180	+ presetpanel.add(diffusesheen);
	2181	+
	2182	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2183	+ rough.setToolTipText("Rough metal");
	2184	+ rough.addMouseListener(new MouseAdapter()
	2185	+ {
	2186	+ public void mouseClicked(MouseEvent e)
	2187	+ {
	2188	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2189	+ cMaterial material = object.material;
	2190	+
	2191	+ shininessField.setFloat(material.shininess);
	2192	+ velvetField.setFloat(material.velvet);
	2193	+
	2194	+ materialtouched = true;
	2195	+ applySelf();
	2196	+ }
	2197	+ });
	2198	+ presetpanel.add(rough);
	2199	+
	2200	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2201	+ rough2.setToolTipText("Medium metal");
	2202	+ rough2.addMouseListener(new MouseAdapter()
	2203	+ {
	2204	+ public void mouseClicked(MouseEvent e)
	2205	+ {
	2206	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2207	+ cMaterial material = object.material;
	2208	+
	2209	+ shininessField.setFloat(material.shininess);
	2210	+ lightareaField.setFloat(material.lightarea);
	2211	+
	2212	+ materialtouched = true;
	2213	+ applySelf();
	2214	+ }
	2215	+ });
	2216	+ presetpanel.add(rough2);
	2217	+
	2218	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2219	+ shini0.setToolTipText("Shiny");
	2220	+ shini0.addMouseListener(new MouseAdapter()
	2221	+ {
	2222	+ public void mouseClicked(MouseEvent e)
	2223	+ {
	2224	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2225	+ cMaterial material = object.material;
	2226	+
	2227	+ shininessField.setFloat(material.shininess);
	2228	+ lightareaField.setFloat(material.lightarea);
	2229	+
	2230	+ materialtouched = true;
	2231	+ applySelf();
	2232	+ }
	2233	+ });
	2234	+ presetpanel.add(shini0);
	2235	+
	2236	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2237	+ shini1.setToolTipText("Shiny2");
	2238	+ shini1.addMouseListener(new MouseAdapter()
	2239	+ {
	2240	+ public void mouseClicked(MouseEvent e)
	2241	+ {
	2242	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2243	+ cMaterial material = object.material;
	2244	+
	2245	+ shininessField.setFloat(material.shininess);
	2246	+ lightareaField.setFloat(material.lightarea);
	2247	+
	2248	+ materialtouched = true;
	2249	+ applySelf();
	2250	+ }
	2251	+ });
	2252	+ presetpanel.add(shini1);
	2253	+
	2254	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2255	+ shini2.setToolTipText("Shiny3");
	2256	+ shini2.addMouseListener(new MouseAdapter()
	2257	+ {
	2258	+ public void mouseClicked(MouseEvent e)
	2259	+ {
	2260	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2261	+ cMaterial material = object.material;
	2262	+
	2263	+ shininessField.setFloat(material.shininess);
	2264	+ lightareaField.setFloat(material.lightarea);
	2265	+
	2266	+ materialtouched = true;
	2267	+ applySelf();
	2268	+ }
	2269	+ });
	2270	+ presetpanel.add(shini2);
	2271	+
	2272	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2273	+ aniso.setToolTipText("AnisoU");
	2274	+ aniso.addMouseListener(new MouseAdapter()
	2275	+ {
	2276	+ public void mouseClicked(MouseEvent e)
	2277	+ {
	2278	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2279	+ cMaterial material = object.material;
	2280	+
	2281	+ anisoField.setFloat(material.aniso);
	2282	+ anisoVField.setFloat(material.anisoV);
	2283	+
	2284	+ materialtouched = true;
	2285	+ applySelf();
	2286	+ }
	2287	+ });
	2288	+ presetpanel.add(aniso);
	2289	+
	2290	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2291	+ aniso2.setToolTipText("AnisoV");
	2292	+ aniso2.addMouseListener(new MouseAdapter()
	2293	+ {
	2294	+ public void mouseClicked(MouseEvent e)
	2295	+ {
	2296	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2297	+ cMaterial material = object.material;
	2298	+
	2299	+ anisoField.setFloat(material.aniso);
	2300	+ anisoVField.setFloat(material.anisoV);
	2301	+
	2302	+ materialtouched = true;
	2303	+ applySelf();
	2304	+ }
	2305	+ });
	2306	+ presetpanel.add(aniso2);
	2307	+
	2308	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2309	+ aniso3.setToolTipText("AnisoUV");
	2310	+ aniso3.addMouseListener(new MouseAdapter()
	2311	+ {
	2312	+ public void mouseClicked(MouseEvent e)
	2313	+ {
	2314	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2315	+ cMaterial material = object.material;
	2316	+
	2317	+ anisoField.setFloat(material.aniso);
	2318	+ anisoVField.setFloat(material.anisoV);
	2319	+
	2320	+ materialtouched = true;
	2321	+ applySelf();
	2322	+ }
	2323	+ });
	2324	+ presetpanel.add(aniso3);
	2325	+
	2326	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2327	+ velvet0.setToolTipText("Velvet");
	2328	+ velvet0.addMouseListener(new MouseAdapter()
	2329	+ {
	2330	+ public void mouseClicked(MouseEvent e)
	2331	+ {
	2332	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2333	+ cMaterial material = object.material;
	2334	+
	2335	+ diffusenessField.setFloat(material.factor);
	2336	+ selfshadowField.setFloat(material.diffuseness);
	2337	+ sheenField.setFloat(material.sheen);
	2338	+ shininessField.setFloat(material.shininess);
	2339	+ velvetField.setFloat(material.velvet);
	2340	+ shiftField.setFloat(material.shift);
	2341	+
	2342	+ materialtouched = true;
	2343	+ applySelf();
	2344	+ }
	2345	+ });
	2346	+ presetpanel.add(velvet0);
	2347	+
	2348	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2349	+ bump0.setToolTipText("Bump texture");
	2350	+ bump0.addMouseListener(new MouseAdapter()
	2351	+ {
	2352	+ public void mouseClicked(MouseEvent e)
	2353	+ {
	2354	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2355	+ cMaterial material = object.material;
	2356	+
	2357	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2358	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2359	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2360	+
	2361	+ materialtouched = true;
	2362	+ applySelf();
	2363	+ }
	2364	+ });
	2365	+ presetpanel.add(bump0);
	2366	+
	2367	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2368	+ borderShader.setToolTipText("Border fade");
	2369	+ borderShader.addMouseListener(new MouseAdapter()
	2370	+ {
	2371	+ public void mouseClicked(MouseEvent e)
	2372	+ {
	2373	+ borderfadeField.setFloat(0.4);
	2374	+ opacityField.setFloat(0.75);
	2375	+
	2376	+ materialtouched = true;
	2377	+ applySelf();
	2378	+ }
	2379	+ });
	2380	+ presetpanel.add(borderShader);
	2381	+
	2382	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
	2383	+ halo.setToolTipText("Halo");
	2384	+ halo.addMouseListener(new MouseAdapter()
	2385	+ {
	2386	+ public void mouseClicked(MouseEvent e)
	2387	+ {
	2388	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2389	+ cMaterial material = object.material;
	2390	+
	2391	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2392	+
	2393	+ materialtouched = true;
	2394	+ applySelf();
	2395	+ }
	2396	+ });
	2397	+ presetpanel.add(halo);
	2398	+
	2399	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2400	+ candle.setToolTipText("Candle");
	2401	+ candle.addMouseListener(new MouseAdapter()
	2402	+ {
	2403	+ public void mouseClicked(MouseEvent e)
	2404	+ {
	2405	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2406	+ cMaterial material = object.material;
	2407	+
	2408	+ subsurfaceField.setFloat(material.subsurface);
	2409	+ shadowbiasField.setFloat(material.shadowbias);
	2410	+ ambientField.setFloat(material.ambient);
	2411	+ specularField.setFloat(material.specular);
	2412	+ lightareaField.setFloat(material.lightarea);
	2413	+ shininessField.setFloat(material.shininess);
	2414	+
	2415	+ materialtouched = true;
	2416	+ applySelf();
	2417	+ }
	2418	+ });
	2419	+ presetpanel.add(candle);
	2420	+
	2421	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2422	+ shadowShader.setToolTipText("Shadow");
	2423	+ shadowShader.addMouseListener(new MouseAdapter()
	2424	+ {
	2425	+ public void mouseClicked(MouseEvent e)
	2426	+ {
	2427	+ diffuseField.setFloat(0.001);
	2428	+ ambientField.setFloat(0.001);
	2429	+ cameraField.setFloat(0.001);
	2430	+ specularField.setFloat(0.001);
	2431	+ fakedepthField.setFloat(0.001);
	2432	+ opacityField.setFloat(0.4);
	2433	+
	2434	+ materialtouched = true;
	2435	+ applySelf();
	2436	+ }
	2437	+ });
	2438	+ presetpanel.add(shadowShader);
	2439	+
	2440	+ cLabel para0 = GetLabel("icons/shadericons/parallax0.png", !Globals.NIMBUSLAF);
	2441	+ para0.setToolTipText("No parallax");
	2442	+ para0.addMouseListener(new MouseAdapter()
	2443	+ {
	2444	+ public void mouseClicked(MouseEvent e)
	2445	+ {
	2446	+ parallaxField.setFloat(0.125);
	2447	+
	2448	+ materialtouched = true;
	2449	+ applySelf();
	2450	+ }
	2451	+ });
	2452	+ presetpanel.add(para0);
	2453	+
	2454	+ cLabel para1 = GetLabel("icons/shadericons/parallax1.png", !Globals.NIMBUSLAF);
	2455	+ para1.setToolTipText("With parallax");
	2456	+ para1.addMouseListener(new MouseAdapter()
	2457	+ {
	2458	+ public void mouseClicked(MouseEvent e)
	2459	+ {
	2460	+ parallaxField.setFloat(0.13);
	2461	+
	2462	+ materialtouched = true;
	2463	+ applySelf();
	2464	+ }
	2465	+ });
	2466	+ presetpanel.add(para1);
	2467	+
	2468	+ cLabel para2 = GetLabel("icons/shadericons/parallax2.png", !Globals.NIMBUSLAF);
	2469	+ para2.setToolTipText("Reset parallax");
	2470	+ para2.addMouseListener(new MouseAdapter()
	2471	+ {
	2472	+ public void mouseClicked(MouseEvent e)
	2473	+ {
	2474	+ parallaxField.setFloat(0.14);
	2475	+
	2476	+ materialtouched = true;
	2477	+ applySelf();
	2478	+ }
	2479	+ });
	2480	+ presetpanel.add(para2);
	2481	+
	2482	+ cGridBag panel = new cGridBag().setVertical(true);
	2483	+
	2484	+ presetpanel.preferredWidth = 1;
	2485	+
	2486	+ materialpanel.add(presetpanel);
	2487	+ materialpanel.add(panel);
	2488	+
	2489	+ panel.preferredWidth = 8;
	2490	+
	2491	+ /*
1704	2492	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1705	2493	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706		- */
	2494	+ */
1707	2495
1708	2496	cGridBag editBar = new cGridBag().setVertical(false);
1709	2497
1710		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2498	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
1711	2499	createMaterialButton.setToolTipText("Create material");
1712	2500
1713	2501	/*
1714	2502	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1715	2503	*/
1716	2504
1717		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2505	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
1718	2506	clearMaterialButton.setToolTipText("Clear material");
1719	2507
1720	2508	if (Globals.ADVANCED)
1721	2509	{
1722		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2510	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
1723	2511	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1724	2512	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1725	2513	}
..	..	@@ -1737,27 +2525,61 @@
1737	2525	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1738	2526
1739	2527	cGridBag colorSection = new cGridBag().setVertical(true);
	2528	+
	2529	+ cGridBag huepanel = new cGridBag();
	2530	+ cGridBag huelabel = new cGridBag();
	2531	+ cLabel hue = GetLabel("icons/hue.png", false);
	2532	+ hue.fit = true;
	2533	+
	2534	+ hue.addMouseListener(new MouseAdapter()
	2535	+ {
	2536	+ public void mousePressed(MouseEvent e)
	2537	+ {
	2538	+ int x = e.getX();
	2539	+
	2540	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2541	+ }
	2542	+ });
	2543	+
	2544	+ huelabel.add(hue);
	2545	+ huelabel.preferredWidth = 20;
	2546	+ huepanel.add(new cGridBag()); // Label
	2547	+ huepanel.add(huelabel); // Field/slider
	2548	+
	2549	+ huepanel.preferredHeight = 7;
	2550	+
	2551	+ colorSection.add(huepanel);
1740	2552
1741	2553	cGridBag color = new cGridBag();
1742		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1743		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1744		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2554	+
	2555	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2556	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2557	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2558	+
1745	2559	//colorField.preferredWidth = 200;
1746	2560	colorSection.add(color);
1747	2561
1748	2562	cGridBag modulation = new cGridBag();
1749	2563	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1750	2564	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1751		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2565	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1752	2566	colorSection.add(modulation);
1753	2567
	2568	+ cGridBag opacity = new cGridBag();
	2569	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2570	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2571	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2572	+ colorSection.add(opacity);
	2573	+
	2574	+ colorSection.add(GetSeparator());
	2575	+
1754	2576	cGridBag texture = new cGridBag();
1755	2577	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1756	2578	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1757	2579	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1758	2580	colorSection.add(texture);
1759	2581
1760		- panel.add(new JSeparator());
	2582	+ panel.add(GetSeparator());
1761	2583
1762	2584	panel.add(colorSection);
1763	2585
..	..	@@ -1813,7 +2635,7 @@
1813	2635	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1814	2636	diffuseSection.add(shadowbias);
1815	2637
1816		- panel.add(new JSeparator());
	2638	+ panel.add(GetSeparator());
1817	2639
1818	2640	panel.add(diffuseSection);
1819	2641
..	..	@@ -1876,7 +2698,7 @@
1876	2698	specularSection.add(anisoV);
1877	2699
1878	2700
1879		- panel.add(new JSeparator());
	2701	+ panel.add(GetSeparator());
1880	2702
1881	2703	panel.add(specularSection);
1882	2704
..	..	@@ -1902,12 +2724,12 @@
1902	2724	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1903	2725	colorSection.add(backlit);
1904	2726
1905		- cGridBag opacity = new cGridBag();
1906		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1907		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1908		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1909		- colorSection.add(opacity);
1910		-
	2727	+ cGridBag parallax = new cGridBag();
	2728	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2729	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2730	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.25, -0.125)); // , aConstraints);
	2731	+ colorSection.add(parallax);
	2732	+
1911	2733	//panel.add(new JSeparator());
1912	2734
1913	2735	//panel.add(globalSection);
..	..	@@ -1952,7 +2774,7 @@
1952	2774	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1953	2775	textureSection.add(opacityPower);
1954	2776
1955		- panel.add(new JSeparator());
	2777	+ panel.add(GetSeparator());
1956	2778
1957	2779	panel.add(textureSection);
1958	2780
..	..	@@ -2939,7 +3761,7 @@
2939	3761
2940	3762	freezematerial = true;
2941	3763	colorField.setFloat(mat.color);
2942		- modulationField.setFloat(mat.modulation);
	3764	+ saturationField.setFloat(mat.modulation);
2943	3765	metalnessField.setFloat(mat.metalness);
2944	3766	diffuseField.setFloat(mat.diffuse);
2945	3767	specularField.setFloat(mat.specular);
..	..	@@ -2959,6 +3781,7 @@
2959	3781	shadowField.setFloat(mat.shadow);
2960	3782	textureField.setFloat(mat.texture);
2961	3783	opacityField.setFloat(mat.opacity);
	3784	+ parallaxField.setFloat(mat.parallax + 0.125f);
2962	3785	fakedepthField.setFloat(mat.fakedepth);
2963	3786	shadowbiasField.setFloat(mat.shadowbias);
2964	3787	bumpField.setInteger(1); // dec 2013
..	..	@@ -3001,32 +3824,8 @@
3001	3824
3002	3825	if (multiplyToggle != null)
3003	3826	multiplyToggle.setSelected(mat.multiply);
3004		-
3005		- assert (object.projectedVertices != null);
3006		-
3007		- if (object.projectedVertices.length <= 2)
3008		- {
3009		- // Side effect...
3010		- Object3D.cVector2[] keep = object.projectedVertices;
3011		- object.projectedVertices = new Object3D.cVector2[3];
3012		- for (int i = 0; i < 3; i++)
3013		- {
3014		- if (i < keep.length)
3015		- {
3016		- object.projectedVertices[i] = keep[i];
3017		- } else
3018		- {
3019		- object.projectedVertices[i] = new Object3D.cVector2();
3020		- }
3021		- /*
3022		- if(keep.length == 0)
3023		- object.projectedVertices[0] = new Object3D.cVector2();
3024		- else
3025		- object.projectedVertices[0] = keep[0];
3026		- object.projectedVertices[1] = new Object3D.cVector2();
3027		- */
3028		- }
3029		- }
	3827	+
	3828	+ AllocProjectedVertices(object);
3030	3829
3031	3830	SetMaterial(mat, object.projectedVertices);
3032	3831	}
..	..	@@ -3146,6 +3945,17 @@
3146	3945	public void itemStateChanged(ItemEvent event)
3147	3946	{
3148	3947	// System.out.println("Propagate = " + propagate);
	3948	+ if (event.getSource() == pinButton)
	3949	+ {
	3950	+ copy.pinned ^= true;
	3951	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3952	+ {
	3953	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3954	+ copy.CloseUI();
	3955	+ //copy.editWindow.refreshContents();
	3956	+ }
	3957	+ }
	3958	+ else
3149	3959	if (event.getSource() == propagateToggle)
3150	3960	{
3151	3961	propagate ^= true;
..	..	@@ -3250,6 +4060,7 @@
3250	4060	} else if (event.getSource() == liveCB)
3251	4061	{
3252	4062	copy.live ^= true;
	4063	+ objEditor.refreshContents(true); // To show item colors
3253	4064	return;
3254	4065	} else if (event.getSource() == selectableCB)
3255	4066	{
..	..	@@ -3259,11 +4070,12 @@
3259	4070	{
3260	4071	copy.hide ^= true;
3261	4072	copy.Touch(); // display list issue
3262		- objEditor.refreshContents();
	4073	+ objEditor.refreshContents(true); // To show item colors
3263	4074	return;
3264	4075	} else if (event.getSource() == link2masterCB)
3265	4076	{
3266	4077	copy.link2master ^= true;
	4078	+ objEditor.refreshContents();
3267	4079	return;
3268	4080	}
3269	4081	if (event.getSource() == randomCB)
..	..	@@ -3324,7 +4136,7 @@
3324	4136	//System.out.println("ObjEditor " + event);
3325	4137	applySelf0(true);
3326	4138	//parent.applySelf();
3327		- objEditor.refreshContents();
	4139	+ // conflicts with requestFocus objEditor.refreshContents();
3328	4140	} else if (source == resetButton)
3329	4141	{
3330	4142	CameraPane.fullreset = true;
..	..	@@ -3504,17 +4316,25 @@
3504	4316
3505	4317	void New()
3506	4318	{
3507		- while (copy.Size() > 1)
	4319	+ while (copy.Size() > 0)
3508	4320	{
3509		- copy.remove(1);
	4321	+ copy.remove(0);
3510	4322	}
3511	4323
	4324	+ copy.selection.clear();
	4325	+
	4326	+ if (copy == Grafreed.grafreed.universe)
	4327	+ {
	4328	+ CreateCameras();
	4329	+ cameraView.SetCamera(GetCamera(copy, 0));
	4330	+ }
3512	4331	ResetModel();
3513	4332	objEditor.refreshContents();
3514	4333	}
3515	4334
3516	4335	static public byte[] Compress(Object3D o)
3517	4336	{
	4337	+ // Slower to actually compress.
3518	4338	try
3519	4339	{
3520	4340	ByteArrayOutputStream baos = new ByteArrayOutputStream();
..	..	@@ -3616,6 +4436,7 @@
3616	4436	{
3617	4437	//Save(true);
3618	4438	Replace();
	4439	+ SetVersionStates();
3619	4440	}
3620	4441
3621	4442	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3634,31 +4455,54 @@
3634	4455	return true;
3635	4456	}
3636	4457
3637		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4458	+ void DeleteVersion()
	4459	+ {
	4460	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4461	+ {
	4462	+ copy.versionlist[i] = copy.versionlist[i+1];
	4463	+ }
	4464	+
	4465	+ if (copy.versionlist[copy.versionindex] == null)
	4466	+ copy.versionindex -= 1;
	4467	+
	4468	+ if (copy.versionindex != -1)
	4469	+ CopyChanged(copy);
	4470	+
	4471	+ SetVersionStates();
	4472	+ }
3638	4473
3639	4474	public boolean Save(boolean user)
3640	4475	{
3641	4476	System.err.println("Save");
	4477	+ Replace();
3642	4478
3643		- cRadio tab = GetCurrentTab();
	4479	+ if (copy.versionlist == null)
	4480	+ {
	4481	+ copy.versionlist = new Object3D[100];
	4482	+ copy.versionindex = -1;
	4483	+ }
3644	4484
3645		- byte[] compress = CompressCopy();
	4485	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3646	4486
3647	4487	boolean thesame = false;
3648	4488
3649		- // Quick heuristic using length. Works only when stream is compressed.
3650		- if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3651		- {
3652		- thesame = true;
3653		- }
	4489	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4490	+// {
	4491	+// thesame = true;
	4492	+// }
3654	4493
3655	4494	//EditorFrame.m_MainFrame.requestFocusInWindow();
3656	4495	if (!thesame)
3657	4496	{
	4497	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4498	+ {
	4499	+ copy.versionlist[i] = copy.versionlist[i-1];
	4500	+ }
	4501	+
3658	4502	//tab.user[tab.versionindex] = user;
3659	4503	//boolean increment = true; // tab.graphs[tab.versionindex] == null;
3660	4504
3661		- copy.versions[++copy.versionindex] = compress;
	4505	+ copy.versionlist[++copy.versionindex] = compress;
3662	4506
3663	4507	// if (increment)
3664	4508	// tab.versionindex++;
..	..	@@ -3668,13 +4512,13 @@
3668	4512
3669	4513	//assert(hashtable.isEmpty());
3670	4514
3671		- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3672		- {
3673		- //tab.user[i] = false;
3674		- copy.versions[i] = null;
3675		- }
	4515	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4516	+// {
	4517	+// //tab.user[i] = false;
	4518	+// copy.versionlist[i] = null;
	4519	+// }
3676	4520
3677		- SetUndoStates();
	4521	+ SetVersionStates();
3678	4522
3679	4523	// test save
3680	4524	if (false)
..	..	@@ -3697,39 +4541,76 @@
3697	4541
3698	4542	return !thesame;
3699	4543	}
3700		-
3701		- void CopyChanged(Object3D obj)
	4544	+
	4545	+ boolean flashIt = true;
	4546	+
	4547	+ void RefreshSelection()
3702	4548	{
3703		- SetUndoStates();
	4549	+ Object3D selection = new Object3D();
	4550	+
	4551	+ for (int i = 0; i < objEditor.copy.selection.size(); i++)
	4552	+ {
	4553	+ Object3D elem = objEditor.copy.selection.elementAt(i);
	4554	+
	4555	+ Object3D obj = objEditor.copy.GetObject(elem.GetUUID());
	4556	+
	4557	+ if (obj == null)
	4558	+ {
	4559	+ objEditor.copy.selection.remove(i--);
	4560	+ }
	4561	+ else
	4562	+ {
	4563	+ selection.add(obj);
	4564	+ objEditor.copy.selection.setElementAt(obj, i);
	4565	+ }
	4566	+ }
	4567	+
	4568	+ flashIt = false;
	4569	+ GetTree().clearSelection();
	4570	+ for (int i = 0; i < selection.size(); i++)
	4571	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4572	+ flashIt = true;
	4573	+
	4574	+ //refreshContents(false);
	4575	+ }
	4576	+
	4577	+ void CopyChanged(Object3D changed)
	4578	+ {
	4579	+ Object3D obj = (Object3D)Grafreed.clone(changed.versionlist[copy.versionindex]);
3704	4580
3705	4581	boolean temp = CameraPane.SWITCH;
3706	4582	CameraPane.SWITCH = false;
3707	4583
3708		- copy.ExtractBigData(versiontable);
	4584	+ changed.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3709	4585
3710		- copy.clear();
	4586	+ changed.clear();
3711	4587
	4588	+ changed.skyboxname = obj.skyboxname;
	4589	+ changed.skyboxext = obj.skyboxext;
	4590	+
3712	4591	for (int i=0; i<obj.Size(); i++)
3713	4592	{
3714		- copy.add(obj.get(i));
	4593	+ changed.add(obj.get(i));
3715	4594	}
3716	4595
3717		- copy.RestoreBigData(versiontable);
	4596	+ changed.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3718	4597
3719	4598	CameraPane.SWITCH = temp;
3720	4599
	4600	+ if (objEditor == this)
	4601	+ RefreshSelection();
3721	4602	//assert(hashtable.isEmpty());
3722	4603
3723		- copy.Touch();
	4604	+ objEditor.copy.Touch();
3724	4605
3725	4606	ResetModel();
3726		- copy.HardTouch(); // recompile?
	4607	+ objEditor.copy.HardTouch(); // recompile?
3727	4608
3728	4609	cRadio ab;
3729		- for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4610	+ for (java.util.Enumeration e = objEditor.buttonGroup.getElements(); e.hasMoreElements();)
3730	4611	{
3731	4612	ab = (cRadio)e.nextElement();
3732		- Object3D test = copy.GetObject(ab.object.GetUUID());
	4613	+ Object3D test = objEditor.copy.GetObject(ab.object.GetUUID());
3733	4614	//ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
3734	4615	if (test != null)
3735	4616	{
..	..	@@ -3738,53 +4619,72 @@
3738	4619	}
3739	4620	}
3740	4621
3741		- refreshContents();
	4622	+ objEditor.refreshContents(true);
3742	4623	}
3743	4624
3744		- cButton undoButton;
	4625	+ cButton previousVersionButton;
3745	4626	cButton restoreButton;
3746	4627	cButton replaceButton;
3747		- cButton redoButton;
	4628	+ cButton nextVersionButton;
	4629	+ cButton saveVersionButton;
	4630	+ cButton deleteVersionButton;
3748	4631
3749	4632	boolean muteSlider;
3750	4633
3751	4634	int VersionCount()
3752	4635	{
3753		- int count = 0;
3754		-
3755		- for (int i = copy.versions.length; --i >= 0;)
3756		- {
3757		- if (copy.versions[i] != null)
3758		- count++;
3759		- }
3760		-
3761		- return count;
	4636	+ return copy.VersionCount();
3762	4637	}
3763	4638
3764		- void SetUndoStates()
	4639	+ public cGridBag versionSliderPane;
	4640	+
	4641	+ void SetVersionStates()
3765	4642	{
3766		- cRadio tab = GetCurrentTab();
	4643	+ //if (true)
	4644	+ // return;
	4645	+
	4646	+ //cRadio tab = GetCurrentTab();
3767	4647
3768		- restoreButton.setEnabled(copy.versionindex != -1);
3769		- replaceButton.setEnabled(copy.versionindex != -1);
3770		-
3771		- undoButton.setEnabled(copy.versionindex > 0);
3772		- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
3773		-
3774		- muteSlider = true;
3775		- versionSlider.setMaximum(VersionCount() - 1);
3776		- versionSlider.setInteger(copy.versionindex);
3777		- muteSlider = false;
	4648	+ if (copy.versionindex == -2)
	4649	+ {
	4650	+ saveVersionButton.setEnabled(false);
	4651	+ restoreButton.setEnabled(false);
	4652	+ replaceButton.setEnabled(false);
	4653	+ previousVersionButton.setEnabled(false);
	4654	+ nextVersionButton.setEnabled(false);
	4655	+ deleteVersionButton.setEnabled(false);
	4656	+ versionSliderPane.setVisible(false);
	4657	+ }
	4658	+ else
	4659	+ {
	4660	+ restoreButton.setEnabled(copy.versionindex != -1);
	4661	+ replaceButton.setEnabled(copy.versionindex != -1);
	4662	+
	4663	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4664	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4665	+
	4666	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4667	+ //copy.versionlist[copy.versionindex + 1] != null);
	4668	+
	4669	+ muteSlider = true;
	4670	+ versionSlider.setMinimum(0);
	4671	+ versionSlider.setMaximum(VersionCount() - 1);
	4672	+ versionSlider.setInteger(copy.versionindex);
	4673	+ versionSlider.setEnabled(copy.versionindex != -1);
	4674	+ muteSlider = false;
	4675	+
	4676	+ versionSliderPane.setVisible(true);
	4677	+ }
3778	4678	}
3779	4679
3780		- public boolean Undo()
	4680	+ public boolean PreviousVersion()
3781	4681	{
3782	4682	// Option?
3783	4683	Replace();
3784	4684
3785	4685	System.err.println("Undo");
3786	4686
3787		- cRadio tab = GetCurrentTab();
	4687	+ //cRadio tab = GetCurrentTab();
3788	4688
3789	4689	if (copy.versionindex == 0)
3790	4690	{
..	..	@@ -3807,7 +4707,9 @@
3807	4707
3808	4708	copy.versionindex -= 1;
3809	4709
3810		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4710	+ CopyChanged(copy);
	4711	+
	4712	+ SetVersionStates();
3811	4713
3812	4714	return true;
3813	4715	}
..	..	@@ -3816,44 +4718,47 @@
3816	4718	{
3817	4719	System.err.println("Restore");
3818	4720
3819		- cRadio tab = GetCurrentTab();
	4721	+ //cRadio tab = GetCurrentTab();
3820	4722
3821		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4723	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3822	4724	{
3823	4725	java.awt.Toolkit.getDefaultToolkit().beep();
3824	4726	return false;
3825	4727	}
3826	4728
3827		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4729	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4730	+ CopyChanged(copy);
	4731	+
	4732	+ SetVersionStates();
3828	4733
3829	4734	return true;
3830	4735	}
3831	4736
3832	4737	public boolean Replace()
3833	4738	{
3834		- System.err.println("Replace");
	4739	+ //System.err.println("Replace");
3835	4740
3836		- cRadio tab = GetCurrentTab();
	4741	+ //cRadio tab = GetCurrentTab();
3837	4742
3838		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4743	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3839	4744	{
3840	4745	// No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3841	4746	return false;
3842	4747	}
3843	4748
3844		- copy.versions[copy.versionindex] = CompressCopy();
	4749	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
3845	4750
3846	4751	return true;
3847	4752	}
3848	4753
3849		- public void Redo()
	4754	+ public void NextVersion()
3850	4755	{
3851	4756	// Option?
3852	4757	Replace();
3853	4758
3854		- cRadio tab = GetCurrentTab();
	4759	+ //cRadio tab = GetCurrentTab();
3855	4760
3856		- if (copy.versions[copy.versionindex + 1] == null)
	4761	+ if (copy.versionlist[copy.versionindex + 1] == null)
3857	4762	{
3858	4763	java.awt.Toolkit.getDefaultToolkit().beep();
3859	4764	return;
..	..	@@ -3861,10 +4766,12 @@
3861	4766
3862	4767	copy.versionindex += 1;
3863	4768
3864		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4769	+ CopyChanged(copy);
3865	4770
3866	4771	//if (!tab.user[tab.versionindex])
3867	4772	// tab.graphs[tab.versionindex] = null;
	4773	+
	4774	+ SetVersionStates();
3868	4775	}
3869	4776
3870	4777	void ImportGFD()
..	..	@@ -4058,6 +4965,12 @@
4058	4965	// else
4059	4966	// applySelf(true);
4060	4967	// }
	4968	+
	4969	+ boolean Equal(double a, double b)
	4970	+ {
	4971	+ return Math.abs(a - b) < 0.001;
	4972	+ }
	4973	+
4061	4974	void applySelf0(boolean name)
4062	4975	{
4063	4976	if (name)
..	..	@@ -4075,7 +4988,7 @@
4075	4988	//copy.material = new cMaterial(copy.GetMaterial());
4076	4989
4077	4990	current.color = (float) colorField.getFloat();
4078		- current.modulation = (float) modulationField.getFloat();
	4991	+ current.modulation = (float) saturationField.getFloat();
4079	4992	current.metalness = (float) metalnessField.getFloat();
4080	4993	current.diffuse = (float) diffuseField.getFloat();
4081	4994	current.specular = (float) specularField.getFloat();
..	..	@@ -4095,6 +5008,7 @@
4095	5008	current.shadow = (float) shadowField.getFloat();
4096	5009	current.texture = (float) textureField.getFloat();
4097	5010	current.opacity = (float) opacityField.getFloat();
	5011	+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
4098	5012	current.fakedepth = (float) fakedepthField.getFloat();
4099	5013	current.shadowbias = (float) shadowbiasField.getFloat();
4100	5014
..	..	@@ -4107,29 +5021,54 @@
4107	5021	{
4108	5022	cMaterial mat = copy.material;
4109	5023
4110		- colorField.SetToolTipValue((mat.color));
4111		- modulationField.SetToolTipValue((mat.modulation));
4112		- metalnessField.SetToolTipValue((mat.metalness));
4113		- diffuseField.SetToolTipValue((mat.diffuse));
4114		- specularField.SetToolTipValue((mat.specular));
4115		- shininessField.SetToolTipValue((mat.shininess));
4116		- shiftField.SetToolTipValue((mat.shift));
4117		- ambientField.SetToolTipValue((mat.ambient));
4118		- lightareaField.SetToolTipValue((mat.lightarea));
4119		- diffusenessField.SetToolTipValue((mat.factor));
4120		- velvetField.SetToolTipValue((mat.velvet));
4121		- sheenField.SetToolTipValue((mat.sheen));
4122		- subsurfaceField.SetToolTipValue((mat.subsurface));
4123		- backlitField.SetToolTipValue((mat.bump));
4124		- anisoField.SetToolTipValue((mat.aniso));
4125		- anisoVField.SetToolTipValue((mat.anisoV));
4126		- cameraField.SetToolTipValue((mat.cameralight));
4127		- selfshadowField.SetToolTipValue((mat.diffuseness));
4128		- shadowField.SetToolTipValue((mat.shadow));
4129		- textureField.SetToolTipValue((mat.texture));
4130		- opacityField.SetToolTipValue((mat.opacity));
4131		- fakedepthField.SetToolTipValue((mat.fakedepth));
4132		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	5024	+ if (!Equal(colorField.getFloat(), mat.color))
	5025	+ colorField.SetToolTipValue((mat.color));
	5026	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	5027	+ saturationField.SetToolTipValue((mat.modulation));
	5028	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	5029	+ metalnessField.SetToolTipValue((mat.metalness));
	5030	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	5031	+ diffuseField.SetToolTipValue((mat.diffuse));
	5032	+ if (!Equal(specularField.getFloat(), mat.specular))
	5033	+ specularField.SetToolTipValue((mat.specular));
	5034	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	5035	+ shininessField.SetToolTipValue((mat.shininess));
	5036	+ if (!Equal(shiftField.getFloat(), mat.shift))
	5037	+ shiftField.SetToolTipValue((mat.shift));
	5038	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	5039	+ ambientField.SetToolTipValue((mat.ambient));
	5040	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	5041	+ lightareaField.SetToolTipValue((mat.lightarea));
	5042	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	5043	+ diffusenessField.SetToolTipValue((mat.factor));
	5044	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	5045	+ velvetField.SetToolTipValue((mat.velvet));
	5046	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	5047	+ sheenField.SetToolTipValue((mat.sheen));
	5048	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	5049	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	5050	+ if (!Equal(backlitField.getFloat(), mat.bump))
	5051	+ backlitField.SetToolTipValue((mat.bump));
	5052	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5053	+ anisoField.SetToolTipValue((mat.aniso));
	5054	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5055	+ anisoVField.SetToolTipValue((mat.anisoV));
	5056	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5057	+ cameraField.SetToolTipValue((mat.cameralight));
	5058	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5059	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5060	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5061	+ shadowField.SetToolTipValue((mat.shadow));
	5062	+ if (!Equal(textureField.getFloat(), mat.texture))
	5063	+ textureField.SetToolTipValue((mat.texture));
	5064	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5065	+ opacityField.SetToolTipValue((mat.opacity));
	5066	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5067	+ parallaxField.SetToolTipValue((mat.parallax));
	5068	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5069	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5070	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5071	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4133	5072	}
4134	5073
4135	5074	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4161,25 +5100,43 @@
4161	5100	}
4162	5101
4163	5102	cNumberSlider versionSlider;
	5103	+ cNumberSlider versionField;
4164	5104
4165	5105	public void stateChanged(ChangeEvent e)
4166	5106	{
4167		- // assert(false);
	5107	+ // assert(false);
4168	5108	if (e.getSource() == versionSlider)
4169	5109	{
4170	5110	if (muteSlider)
4171	5111	return;
4172	5112
	5113	+ Replace();
	5114	+
4173	5115	int version = versionSlider.getInteger();
4174	5116
4175		- if (copy.versions[version] != null)
	5117	+ if (version != -1 && copy.versionlist[version] != null)
4176	5118	{
4177		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	5119	+ copy.versionindex = version;
	5120	+ CopyChanged(copy);
	5121	+ SetVersionStates();
4178	5122	}
4179	5123
4180	5124	return;
4181	5125	}
4182	5126
	5127	+ if (e.getSource() == versionField)
	5128	+ {
	5129	+ int version = versionField.getInteger();
	5130	+
	5131	+ if (version != -1 && copy.versionindex != version && copy.versionlist[version] != null)
	5132	+ {
	5133	+ copy.versionindex = version;
	5134	+ CopyChanged(copy);
	5135	+ }
	5136	+
	5137	+ return;
	5138	+ }
	5139	+
4183	5140	if (freezematerial)
4184	5141	{
4185	5142	return;
..	..	@@ -4214,6 +5171,12 @@
4214	5171	{
4215	5172	//System.out.println("stateChanged = " + this);
4216	5173	materialtouched = true;
	5174	+
	5175	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5176	+ {
	5177	+ saturationField.setFloat(1);
	5178	+ }
	5179	+
4217	5180	applySelf();
4218	5181	//System.out.println("this = " + this);
4219	5182	//System.out.println("PARENT = " + parent);
..	..	@@ -4263,7 +5226,7 @@
4263	5226	}
4264	5227
4265	5228	if (normalpushField != null)
4266		- copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
	5229	+ copy.NORMALPUSH = (float)normalpushField.getFloat() / 100;
4267	5230	}
4268	5231
4269	5232	void SnapObject()
..	..	@@ -4513,6 +5476,7 @@
4513	5476	{
4514	5477	if (GetTree() != null)
4515	5478	{
	5479	+ GetTree().revalidate();
4516	5480	GetTree().repaint();
4517	5481	}
4518	5482
..	..	@@ -4521,6 +5485,11 @@
4521	5485	ctrlPanel.validate(); // ? new
4522	5486	ctrlPanel.repaint();
4523	5487	}
	5488	+
	5489	+ if (previousVersionButton != null && copy.versionlist != null)
	5490	+ SetVersionStates();
	5491	+
	5492	+ cameraView.requestFocusInWindow();
4524	5493	}
4525	5494
4526	5495	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4552,7 +5521,7 @@
4552	5521	// group = (Composite) group.get(0);
4553	5522	// }
4554	5523
4555		- System.out.println("makeSomething of " + thing);
	5524	+ //System.out.println("makeSomething of " + thing);
4556	5525
4557	5526	/*
4558	5527	if (deselect && jList != null)
..	..	@@ -4631,7 +5600,7 @@
4631	5600	void ResetModel()
4632	5601	{
4633	5602	//assert(copy instanceof Composite);
4634		- Object3D /Composite/ group = (Object3D /Composite/) copy;
	5603	+ Object3D /Composite/ group = (Object3D /Composite/) objEditor.copy;
4635	5604
4636	5605	// necessary? group.selection = new Object3D(); // java.util.Vector();
4637	5606
..	..	@@ -4642,14 +5611,14 @@
4642	5611	//group.refreshEditWindow();
4643	5612	//refreshContents();
4644	5613
4645		- if (copy.selection == null)
	5614	+ if (objEditor.copy.selection == null)
4646	5615	{
4647		- copy.selection = new Object3D();
	5616	+ objEditor.copy.selection = new Object3D();
4648	5617	}
4649	5618
4650		- for (int j = 0; j < copy.selection.size(); j++)
	5619	+ for (int j = 0; j < objEditor.copy.selection.size(); j++)
4651	5620	{
4652		- Object3D item = copy.selection.get(j);
	5621	+ Object3D item = objEditor.copy.selection.get(j);
4653	5622
4654	5623	if (item instanceof cGroup && ((cGroup) item).transientlink)
4655	5624	{
..	..	@@ -4658,15 +5627,15 @@
4658	5627
4659	5628	if (item.count <= 1) // ??? == 0)
4660	5629	{
4661		- copy.selection.remove(item);
	5630	+ objEditor.copy.selection.remove(item);
4662	5631	}
4663	5632	}
4664	5633
4665	5634	boolean first = true;
4666	5635
4667		- for (int i = copy.selection.size(); --i >= 0;)
	5636	+ for (int i = objEditor.copy.selection.size(); --i >= 0;)
4668	5637	{
4669		- Object3D item = copy.selection.get(i);
	5638	+ Object3D item = objEditor.copy.selection.get(i);
4670	5639
4671	5640	if (item instanceof cGroup && ((cGroup) item).transientlink)
4672	5641	{
..	..	@@ -4769,7 +5738,9 @@
4769	5738	readobj.ResetDisplayList();
4770	5739	} catch (Exception e)
4771	5740	{
4772		- e.printStackTrace();
	5741	+ if (!e.toString().contains("GZIP"))
	5742	+ e.printStackTrace();
	5743	+
4773	5744	try
4774	5745	{
4775	5746	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4849,6 +5820,8 @@
4849	5820	{
4850	5821	//readobj.deepCopySelf(copy);
4851	5822	copy.clear(); // june 2014
	5823	+ copy.skyboxname = readobj.skyboxname;
	5824	+ copy.skyboxext = readobj.skyboxext;
4852	5825	for (int i = 0; i < readobj.size(); i++)
4853	5826	{
4854	5827	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4889,6 +5862,7 @@
4889	5862	}
4890	5863	} catch (ClassCastException e)
4891	5864	{
	5865	+ e.printStackTrace();
4892	5866	assert (false);
4893	5867	Composite c = (Composite) copy;
4894	5868	c.children.clear();
..	..	@@ -4899,13 +5873,17 @@
4899	5873	c.addChild(csg);
4900	5874	}
4901	5875
4902		- copy.versions = readobj.versions;
	5876	+ copy.versionlist = readobj.versionlist;
4903	5877	copy.versionindex = readobj.versionindex;
	5878	+ copy.versiontable = readobj.versiontable;
4904	5879
4905		- if (copy.versions == null)
	5880	+ if (copy.versionlist == null)
4906	5881	{
4907		- copy.versions = new byte[100][];
	5882	+ // Backward compatibility
	5883	+ copy.versionlist = new Object3D[100];
4908	5884	copy.versionindex = -1;
	5885	+
	5886	+ //Save(true);
4909	5887	}
4910	5888
4911	5889	//? SetUndoStates();
..	..	@@ -4920,7 +5898,7 @@
4920	5898	{
4921	5899	if (Grafreed.standAlone)
4922	5900	{
4923		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5901	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4924	5902	browser.show();
4925	5903	String filename = browser.getFile();
4926	5904	if (filename != null && filename.length() > 0)
..	..	@@ -4997,6 +5975,8 @@
4997	5975
4998	5976	void save()
4999	5977	{
	5978	+ Replace();
	5979	+
5000	5980	if (lastname == null)
5001	5981	{
5002	5982	return;
..	..	@@ -5019,6 +5999,7 @@
5019	5999	//ps.print(buffer.toString());
5020	6000	} catch (IOException e)
5021	6001	{
	6002	+ e.printStackTrace();
5022	6003	}
5023	6004	}
5024	6005
..	..	@@ -5238,6 +6219,7 @@
5238	6219	ButtonGroup buttonGroup;
5239	6220
5240	6221	cGridBag toolboxPanel;
	6222	+ cGridBag skyboxPanel;
5241	6223	cGridBag materialPanel;
5242	6224	cGridBag ctrlPanel;
5243	6225
..	..	@@ -5249,6 +6231,7 @@
5249	6231	boolean materialFlushed;
5250	6232	Object3D latestObject;
5251	6233
	6234	+ cGridBag transformPanel;
5252	6235	cGridBag XYZPanel;
5253	6236
5254	6237	JSplitPane gridPanel;
..	..	@@ -5311,7 +6294,7 @@
5311	6294	JLabel colorLabel;
5312	6295	cNumberSlider colorField;
5313	6296	JLabel modulationLabel;
5314		- cNumberSlider modulationField;
	6297	+ cNumberSlider saturationField;
5315	6298	JLabel metalnessLabel;
5316	6299	cNumberSlider metalnessField;
5317	6300	JLabel diffuseLabel;
..	..	@@ -5342,6 +6325,7 @@
5342	6325	cNumberSlider anisoField;
5343	6326	JLabel anisoVLabel;
5344	6327	cNumberSlider anisoVField;
	6328	+
5345	6329	JLabel cameraLabel;
5346	6330	cNumberSlider cameraField;
5347	6331	JLabel selfshadowLabel;
..	..	@@ -5352,10 +6336,13 @@
5352	6336	cNumberSlider textureField;
5353	6337	JLabel opacityLabel;
5354	6338	cNumberSlider opacityField;
	6339	+ JLabel parallaxLabel;
	6340	+ cNumberSlider parallaxField;
5355	6341	JLabel fakedepthLabel;
5356	6342	cNumberSlider fakedepthField;
5357	6343	JLabel shadowbiasLabel;
5358	6344	cNumberSlider shadowbiasField;
	6345	+
5359	6346	JLabel bumpLabel;
5360	6347	cNumberSlider bumpField;
5361	6348	JLabel noiseLabel;