~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,122 @@
41	42	JFrame frame;
42	43
43	44	static ObjEditor theFrame;
	45	+
	46	+ public void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
	75	+ public cGridBag GetSeparator()
	76	+ {
	77	+ cGridBag separator = new cGridBag();
	78	+ separator.add(new JSeparator());
	79	+ separator.preferredHeight = 5;
	80	+ return separator;
	81	+ }
44	82
45	83	cButton GetButton(String name, boolean border)
46	84	{
47		- try
48		- {
49		- ImageIcon icon = GetIcon(name);
	85	+ ImageIcon icon = GetIcon(name);
	86	+ if (icon != null)
50	87	return new cButton(icon, border);
51		- }
52		- catch (Exception e)
53		- {
	88	+ else
54	89	return new cButton(name, border);
55		- }
	90	+ }
	91	+
	92	+ cLabel GetLabel(String name, boolean border)
	93	+ {
	94	+ //ImageIcon icon = GetIcon(name);
	95	+ return new cLabel(GetImage(name), border);
56	96	}
57	97
58	98	cToggleButton GetToggleButton(String name, boolean border)
59	99	{
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		- }
	100	+ ImageIcon icon = GetIcon(name);
	101	+ return new cToggleButton(icon, border);
69	102	}
70	103
71	104	cCheckBox GetCheckBox(String name, boolean border)
72	105	{
	106	+ ImageIcon icon = GetIcon(name);
	107	+ return new cCheckBox(icon, border);
	108	+ }
	109	+
	110	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	111	+
	112	+ static ImageIcon GetIcon(String name)
	113	+ {
	114	+ javax.swing.ImageIcon iconCache = icons.get(name);
	115	+ if (iconCache != null)
	116	+ {
	117	+ return iconCache;
	118	+ }
	119	+
73	120	try
74	121	{
75		- ImageIcon icon = GetIcon(name);
76		- return new cCheckBox(icon, border);
	122	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	123	+
	124	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	125	+// {
	126	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	127	+// Graphics2D g = resized.createGraphics();
	128	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	129	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	130	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	131	+// g.dispose();
	132	+//
	133	+// image = resized;
	134	+// }
	135	+
	136	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	137	+
	138	+ icons.put(name, icon);
	139	+
	140	+ return icon;
77	141	}
78	142	catch (Exception e)
79	143	{
80		- return new cCheckBox(name, border);
	144	+ //icons.put(name, null);
	145	+ return null;
81	146	}
82	147	}
83		-
84		- private ImageIcon GetIcon(String name) throws IOException
	148	+
	149	+ BufferedImage GetImage(String name)
85	150	{
86		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87		-
88		- if (image.getWidth() != 24 && image.getHeight() != 24)
	151	+ try
89	152	{
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;
	153	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	154	+
	155	+ return image;
98	156	}
99		-
100		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101		- return icon;
	157	+ catch (Exception e)
	158	+ {
	159	+ return null;
	160	+ }
102	161	}
103	162
104	163	// SCRIPT
..	..	@@ -282,11 +341,13 @@
282	341	client = inClient;
283	342	copy = client;
284	343
285		- if (copy.versions == null)
286		- {
287		- copy.versions = new byte[100][];
288		- copy.versionindex = -1;
289		- }
	344	+// if (copy.versionlist == null)
	345	+// {
	346	+// copy.versionlist = new Object3D[100];
	347	+// copy.versionindex = -1;
	348	+//
	349	+// callee.Save(true);
	350	+// }
290	351
291	352	// "this" is not called: SetupUI2(objEditor);
292	353	}
..	..	@@ -301,10 +362,12 @@
301	362	client = inClient;
302	363	copy = client;
303	364
304		- if (copy.versions == null)
	365	+ if (copy.versionlist == null)
305	366	{
306		- copy.versions = new byte[100][];
	367	+ copy.versionlist = new Object3D[100];
307	368	copy.versionindex = -1;
	369	+
	370	+// Save(true);
308	371	}
309	372
310	373	SetupUI2(callee.GetEditor());
..	..	@@ -328,7 +391,8 @@
328	391	//parent = p;
329	392
330	393	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
331		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	394	+ if (Globals.DEBUG)
	395	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
332	396	//gd.setFullScreenWindow(this);
333	397	//setResizable(false);
334	398	//if (!isDisplayable())
..	..	@@ -339,11 +403,13 @@
339	403	copy = localCopy;
340	404	copy.editWindow = this;
341	405
342		- if (copy.versions == null)
343		- {
344		- copy.versions = new byte[100][];
345		- copy.versionindex = -1;
346		- }
	406	+// if (copy.versionlist == null)
	407	+// {
	408	+// copy.versionlist = new Object3D[100];
	409	+// copy.versionindex = -1;
	410	+//
	411	+// Save(true);
	412	+// }
347	413
348	414	SetupMenu();
349	415
..	..	@@ -363,6 +429,9 @@
363	429
364	430	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
365	431
	432	+ // This is to refresh the UI of the material panel.
	433	+ boolean patchMaterial;
	434	+
366	435	void SetupMenu()
367	436	{
368	437	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -412,6 +481,8 @@
412	481
413	482	ChangeListener changeListener = new ChangeListener()
414	483	{
	484	+ //String name;
	485	+
415	486	public void stateChanged(ChangeEvent changeEvent)
416	487	{
417	488	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -430,18 +501,49 @@
430	501	// EditSelection(false);
431	502	// }
432	503
433		- refreshContents(false); // To refresh Info tab
	504	+// if (objectPanel.getSelectedIndex() == 4)
	505	+// {
	506	+// name = copy.skyboxname;
	507	+//
	508	+// if (name == null)
	509	+// {
	510	+// name = "";
	511	+// }
	512	+//
	513	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	514	+// copy.skyboxext = "jpg";
	515	+// }
	516	+// else
	517	+// {
	518	+// if (name != null)
	519	+// {
	520	+// if (name.equals(""))
	521	+// {
	522	+// copy.skyboxname = null;
	523	+// copy.skyboxext = null;
	524	+// }
	525	+// else
	526	+// {
	527	+// copy.skyboxname = name;
	528	+// }
	529	+// }
	530	+// }
	531	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	532	+
	533	+// refreshContents(false); // To refresh Info tab
	534	+ cameraView.repaint();
434	535	}
435	536	};
436	537	objectPanel.addChangeListener(changeListener);
437	538
438	539	toolbarPanel = new JPanel();
439	540	toolbarPanel.setName("Toolbar");
	541	+
440	542	treePanel = new cGridBag();
441	543	treePanel.setName("Tree");
442	544
443	545	editPanel = new cGridBag().setVertical(true);
444		- editPanel.setName("Edit");
	546	+ //editPanel.setName("Edit");
445	547
446	548	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
447	549
..	..	@@ -449,11 +551,13 @@
449	551	editPanel.add(editCommandsPanel);
450	552	editPanel.add(ctrlPanel);
451	553
452		- toolboxPanel = new cGridBag().setVertical(false);
453		- toolboxPanel.setName("Toolbox");
	554	+ toolboxPanel = new cGridBag().setVertical(true);
	555	+ //toolboxPanel.setName("Toolbox");
454	556
455		- materialPanel = new cGridBag().setVertical(true);
456		- materialPanel.setName("Material");
	557	+ skyboxPanel = new cGridBag().setVertical(true);
	558	+
	559	+ materialPanel = new cGridBag().setVertical(false);
	560	+ //materialPanel.setName("Material");
457	561
458	562	/JTextPane/
459	563	infoarea = createTextPane();
..	..	@@ -461,6 +565,7 @@
461	565
462	566	infoarea.setEditable(true);
463	567	SetText();
	568	+
464	569	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
465	570	// infoarea.setOpaque(false);
466	571	// //infoarea.setForeground(textcolor);
..	..	@@ -468,7 +573,7 @@
468	573	// TEXTAREA infoarea.setWrapStyleWord(true);
469	574	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
470	575	infoPanel.setPreferredSize(new Dimension(1, 1));
471		- infoPanel.setName("Info");
	576	+ //infoPanel.setName("Info");
472	577	//infoPanel.setLayout(new BorderLayout());
473	578	//infoPanel.add(createTextPane());
474	579
..	..	@@ -735,6 +840,7 @@
735	840	boolean maximized;
736	841
737	842	cButton fullscreenLayout;
	843	+ cButton expandedLayout;
738	844
739	845	void Minimize()
740	846	{
..	..	@@ -774,10 +880,12 @@
774	880	cButton minButton;
775	881	cButton maxButton;
776	882	cButton fullButton;
	883	+ cButton collapseButton;
	884	+ cButton maximize3DButton;
777	885
778	886	void ToggleFullScreen()
779	887	{
780		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	888	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
781	889
782	890	cameraView.ToggleFullScreen();
783	891
..	..	@@ -798,13 +906,13 @@
798	906	// X frame.getContentPane().remove(/"Center",/bigThree);
799	907	// X framePanel.add(bigThree);
800	908	// X frame.getContentPane().add(/"Center",/framePanel);
801		- framePanel.setDividerLocation(46);
	909	+// framePanel.setDividerLocation(46); // icons are 24x24
802	910
803	911	//frame.setVisible(true);
804		- radio.layout = keepButton;
	912	+// radio.layout = keepButton;
805	913	//theFrame = null;
806	914	keepButton = null;
807		- radio.layout.doClick();
	915	+// radio.layout.doClick();
808	916
809	917	} else
810	918	{
..	..	@@ -825,31 +933,53 @@
825	933	// X frame.getContentPane().remove(/"Center",/framePanel);
826	934	// X framePanel.remove(bigThree);
827	935	// X frame.getContentPane().add(/"Center",/bigThree);
828		- framePanel.setDividerLocation(0);
	936	+// framePanel.setDividerLocation(0);
829	937
830		- radio.layout = fullscreenLayout;
831		- radio.layout.doClick();
	938	+// radio.layout = fullscreenLayout;
	939	+// radio.layout.doClick();
832	940	//frame.setVisible(true);
833	941	}
834	942	frame.validate();
	943	+
	944	+ cameraView.requestFocusInWindow();
835	945	}
836	946
837		- private byte[] CompressCopy()
	947	+ void CollapseToolbar()
	948	+ {
	949	+ framePanel.setDividerLocation(0);
	950	+ //frame.validate();
	951	+
	952	+ cameraView.requestFocusInWindow();
	953	+ }
	954	+
	955	+ private Object3D Duplicate(Object3D object)
838	956	{
839	957	boolean temp = CameraPane.SWITCH;
840	958	CameraPane.SWITCH = false;
841	959
842		- copy.ExtractBigData(versiontable);
	960	+ if (Grafreed.grafreed.universe.versiontable == null)
	961	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	962	+
	963	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
843	964	// if (copy == client)
844	965
845		- byte[] versions[] = copy.versions;
846		- copy.versions = null;
	966	+ Object3D versions[] = object.versionlist;
	967	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	968	+ object.versionlist = null;
	969	+ object.versiontable = null;
847	970
848		- byte[] compress = Compress(copy);
	971	+ Object3D parent = object.parent;
	972	+ object.parent = null;
849	973
850		- copy.versions = versions;
	974	+ //byte[] compress = Compress(copy);
	975	+ Object3D compress = (Object3D)Grafreed.clone(object);
851	976
852		- copy.RestoreBigData(versiontable);
	977	+ object.parent = parent;
	978	+
	979	+ object.versionlist = versions;
	980	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	981	+
	982	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
853	983
854	984	CameraPane.SWITCH = temp;
855	985
..	..	@@ -977,6 +1107,7 @@
977	1107	{
978	1108	SetupMaterial(materialPanel);
979	1109	}
	1110	+
980	1111	//SetupName();
981	1112	//SetupViews();
982	1113	}
..	..	@@ -986,7 +1117,7 @@
986	1117	// NumberSlider vDivsField;
987	1118	// JCheckBox endcaps;
988	1119	JCheckBox liveCB;
989		- JCheckBox selectCB;
	1120	+ JCheckBox selectableCB;
990	1121	JCheckBox hideCB;
991	1122	JCheckBox link2masterCB;
992	1123	JCheckBox markCB;
..	..	@@ -1185,6 +1316,18 @@
1185	1316
1186	1317	namePanel = new cGridBag();
1187	1318
	1319	+ //if (copy.pinned)
	1320	+ {
	1321	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1322	+ pinButton.setSelected(copy.pinned);
	1323	+ cGridBag t = new cGridBag();
	1324	+ t.preferredWidth = 2;
	1325	+ t.add(pinButton);
	1326	+ namePanel.add(t);
	1327	+
	1328	+ pinButton.addItemListener(this);
	1329	+ }
	1330	+
1188	1331	nameField = AddText(namePanel, copy.GetName());
1189	1332	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1190	1333	oe.ctrlPanel.add(namePanel);
..	..	@@ -1198,13 +1341,16 @@
1198	1341
1199	1342	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1200	1343	liveCB.setToolTipText("Animate object");
1201		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1202		- selectCB.setToolTipText("Make object selectable");
	1344	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1345	+ markCB.setToolTipText("Set target transform");
	1346	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1347	+ selectableCB.setToolTipText("Make object selectable");
1203	1348	// Return();
	1349	+
1204	1350	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1205	1351	hideCB.setToolTipText("Hide object");
1206		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1207		- markCB.setToolTipText("As animation target transform");
	1352	+
	1353	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1208	1354
1209	1355	setupPanel2 = new cGridBag().setVertical(false);
1210	1356
..	..	@@ -1404,6 +1550,7 @@
1404	1550
1405	1551	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1406	1552	{
	1553	+ if (Globals.DEBUG)
1407	1554	System.out.println("CREATE CAMERAS");
1408	1555	cams = new cTemplate();
1409	1556	cams.name = "Cameras";
..	..	@@ -1485,6 +1632,42 @@
1485	1632	//frontView.object = copy;
1486	1633	//sideView.object = copy;
1487	1634
	1635	+ transformPanel = new cGridBag().setVertical(true);
	1636	+
	1637	+ cGridBag resetTransformPanel = new cGridBag();
	1638	+
	1639	+ resetTransformPanel.preferredHeight = 2;
	1640	+
	1641	+ cButton resetTransform = GetButton("Reset all", !Grafreed.NIMBUSLAF);
	1642	+ resetTransform.addMouseListener(new MouseAdapter()
	1643	+ {
	1644	+ public void mouseClicked(MouseEvent e)
	1645	+ {
	1646	+ ResetTransform();
	1647	+ }
	1648	+ });
	1649	+ resetTransformPanel.add(resetTransform);
	1650	+
	1651	+ resetTransform = GetButton("T only", !Grafreed.NIMBUSLAF);
	1652	+ resetTransform.addMouseListener(new MouseAdapter()
	1653	+ {
	1654	+ public void mouseClicked(MouseEvent e)
	1655	+ {
	1656	+ ResetTransform(1);
	1657	+ }
	1658	+ });
	1659	+ resetTransformPanel.add(resetTransform);
	1660	+
	1661	+ resetTransform = GetButton("RS only", !Grafreed.NIMBUSLAF);
	1662	+ resetTransform.addMouseListener(new MouseAdapter()
	1663	+ {
	1664	+ public void mouseClicked(MouseEvent e)
	1665	+ {
	1666	+ ResetTransform(2);
	1667	+ }
	1668	+ });
	1669	+ resetTransformPanel.add(resetTransform);
	1670	+
1488	1671	XYZPanel = new cGridBag().setVertical(true);
1489	1672	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1490	1673
..	..	@@ -1492,7 +1675,11 @@
1492	1675	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1493	1676	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1494	1677	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1678	+ //XYZPanel.setName("XYZ");
1495	1679
	1680	+ transformPanel.add(resetTransformPanel);
	1681	+ transformPanel.add(XYZPanel);
	1682	+
1496	1683	/*
1497	1684	gridPanel = new JPanel(); //new BorderLayout());
1498	1685	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1500,12 +1687,12 @@
1500	1687	gridPanel.add(cameraView);
1501	1688	gridPanel.add(XYZPanel);
1502	1689	*/
1503		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1504		- gridPanel.setContinuousLayout(true);
1505		- gridPanel.setOneTouchExpandable(true);
1506		- gridPanel.setDividerLocation(1.0);
1507		- gridPanel.setDividerSize(9);
1508		- gridPanel.setResizeWeight(0.85);
	1690	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1691	+// gridPanel.setContinuousLayout(true);
	1692	+// gridPanel.setOneTouchExpandable(true);
	1693	+// gridPanel.setDividerLocation(1.0);
	1694	+// gridPanel.setDividerSize(9);
	1695	+// gridPanel.setResizeWeight(0.85);
1509	1696
1510	1697	// aConstraints.weighty = 0;
1511	1698	//System.out.println("THIS = " + this);
..	..	@@ -1528,18 +1715,34 @@
1528	1715
1529	1716	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1530	1717	//tmp.setName("Edit");
	1718	+ objectPanel.add(toolboxPanel);
	1719	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1720	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
	1721	+
1531	1722	objectPanel.add(materialPanel);
	1723	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1724	+ objectPanel.setToolTipTextAt(1, "Material");
	1725	+
	1726	+ objectPanel.add(skyboxPanel);
	1727	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1728	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1729	+
1532	1730	// JPanel north = new JPanel(new BorderLayout());
1533	1731	// north.setName("Edit");
1534	1732	// north.add(ctrlPanel, BorderLayout.NORTH);
1535	1733	// objectPanel.add(north);
1536	1734	objectPanel.add(editPanel);
	1735	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1736	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1537	1737
1538		- //if (Globals.ADVANCED)
1539		- objectPanel.add(infoPanel);
	1738	+ objectPanel.add(transformPanel);
	1739	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1740	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1540	1741
1541		- objectPanel.add(toolboxPanel);
1542		-
	1742	+ patchMaterial = true;
	1743	+ cameraView.patchMaterial = this;
	1744	+ objectPanel.setSelectedIndex(1);
	1745	+
1543	1746	/*
1544	1747	aConstraints.gridx = 0;
1545	1748	aConstraints.gridwidth = 1;
..	..	@@ -1576,6 +1779,11 @@
1576	1779
1577	1780	scenePanel.add(tabbedPane);
1578	1781
	1782	+ //if (Globals.ADVANCED)
	1783	+// tabbedPane.add(infoPanel);
	1784	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1785	+// tabbedPane.setToolTipTextAt(3, "Information");
	1786	+
1579	1787	/*
1580	1788	cTree jTree = new cTree(null);
1581	1789	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1596,13 +1804,13 @@
1596	1804	jtp.add(tree);
1597	1805	*/
1598	1806
1599		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1600		- bigPanel.setContinuousLayout(true);
1601		- bigPanel.setOneTouchExpandable(true);
1602		- bigPanel.setDividerLocation(0.8);
1603		- bigPanel.setDividerSize(15);
1604		- bigPanel.setResizeWeight(0.15);
1605		- bigPanel.setName("Scene");
	1807	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1808	+// bigPanel.setContinuousLayout(true);
	1809	+// bigPanel.setOneTouchExpandable(true);
	1810	+// bigPanel.setDividerLocation(0.8);
	1811	+// bigPanel.setDividerSize(15);
	1812	+// bigPanel.setResizeWeight(0.15);
	1813	+// bigPanel.setName("Scene");
1606	1814
1607	1815	//bigPanel.setLayout(new BorderLayout());
1608	1816	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1637,7 +1845,7 @@
1637	1845	bigThree = new cGridBag();
1638	1846	bigThree.addComponent(scenePanel);
1639	1847	bigThree.addComponent(centralPanel);
1640		- bigThree.addComponent(XYZPanel);
	1848	+ //bigThree.addComponent(XYZPanel);
1641	1849
1642	1850	// // SIDE EFFECT!!!
1643	1851	// aConstraints.gridx = 0;
..	..	@@ -1646,6 +1854,23 @@
1646	1854	// aConstraints.gridheight = 1;
1647	1855
1648	1856	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1857	+
	1858	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1859	+ new java.beans.PropertyChangeListener()
	1860	+ {
	1861	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1862	+ {
	1863	+ if ((Integer)pce.getOldValue() == 1)
	1864	+ {
	1865	+ if (radio.layout != expandedLayout)
	1866	+ {
	1867	+ radio.layout = expandedLayout;
	1868	+ radio.layout.doClick();
	1869	+ }
	1870	+ }
	1871	+ }
	1872	+ });
	1873	+
1649	1874	framePanel.setContinuousLayout(false);
1650	1875	framePanel.setOneTouchExpandable(false);
1651	1876	//.setDividerLocation(0.8);
..	..	@@ -1655,7 +1880,7 @@
1655	1880
1656	1881	frame.getContentPane().setLayout(new BorderLayout());
1657	1882	/**/
1658		- JTabbedPane worldPane = new JTabbedPane();
	1883	+ //JTabbedPane worldPane = new JTabbedPane();
1659	1884	//worldPane.add(bigPanel);
1660	1885	//worldPane.add(worldPanel);
1661	1886	/**/
..	..	@@ -1669,7 +1894,7 @@
1669	1894
1670	1895	cameraView.requestFocusInWindow();
1671	1896
1672		- gridPanel.setDividerLocation(1.0);
	1897	+// gridPanel.setDividerLocation(1.0);
1673	1898
1674	1899	frame.validate();
1675	1900
..	..	@@ -1678,7 +1903,6 @@
1678	1903	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1679	1904	frame.addWindowListener(new WindowAdapter()
1680	1905	{
1681		-
1682	1906	public void windowClosing(WindowEvent e)
1683	1907	{
1684	1908	Close();
..	..	@@ -1701,12 +1925,426 @@
1701	1925	ctrlPanel.removeAll();
1702	1926	}
1703	1927
1704		- void SetupMaterial(cGridBag panel)
	1928	+ void SetupMaterial(cGridBag materialpanel)
1705	1929	{
1706		- /*
	1930	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1931	+
	1932	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1933	+ skin.setToolTipText("Skin");
	1934	+ skin.addMouseListener(new MouseAdapter()
	1935	+ {
	1936	+ public void mouseClicked(MouseEvent e)
	1937	+ {
	1938	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1939	+ cMaterial material = object.material;
	1940	+
	1941	+ // Skin
	1942	+ colorField.setFloat(material.color);
	1943	+ float saturation = material.modulation;
	1944	+
	1945	+ if (!cameraView.Skinshader)
	1946	+ {
	1947	+ saturation /= 1.5;
	1948	+ }
	1949	+
	1950	+ saturationField.setFloat(saturation);
	1951	+
	1952	+ subsurfaceField.setFloat(material.subsurface);
	1953	+ selfshadowField.setFloat(material.diffuseness);
	1954	+ diffusenessField.setFloat(material.factor);
	1955	+ shininessField.setFloat(material.shininess);
	1956	+ shadowbiasField.setFloat(material.shadowbias);
	1957	+ diffuseField.setFloat(material.diffuse);
	1958	+ specularField.setFloat(material.specular);
	1959	+
	1960	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1961	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1962	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1963	+
	1964	+ materialtouched = true;
	1965	+ applySelf();
	1966	+ }
	1967	+ });
	1968	+ presetpanel.add(skin);
	1969	+
	1970	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1971	+ lambert.setToolTipText("Diffuse");
	1972	+ lambert.addMouseListener(new MouseAdapter()
	1973	+ {
	1974	+ public void mouseClicked(MouseEvent e)
	1975	+ {
	1976	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1977	+ cMaterial material = object.material;
	1978	+
	1979	+ diffusenessField.setFloat(material.factor);
	1980	+ selfshadowField.setFloat(material.diffuseness);
	1981	+
	1982	+ materialtouched = true;
	1983	+ applySelf();
	1984	+ }
	1985	+ });
	1986	+ presetpanel.add(lambert);
	1987	+
	1988	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1989	+ diffuse2.setToolTipText("Diffuse2");
	1990	+ diffuse2.addMouseListener(new MouseAdapter()
	1991	+ {
	1992	+ public void mouseClicked(MouseEvent e)
	1993	+ {
	1994	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1995	+ cMaterial material = object.material;
	1996	+
	1997	+ diffusenessField.setFloat(material.factor);
	1998	+ selfshadowField.setFloat(material.diffuseness);
	1999	+
	2000	+ materialtouched = true;
	2001	+ applySelf();
	2002	+ }
	2003	+ });
	2004	+ presetpanel.add(diffuse2);
	2005	+
	2006	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2007	+ diffusemoon.setToolTipText("Moon");
	2008	+ diffusemoon.addMouseListener(new MouseAdapter()
	2009	+ {
	2010	+ public void mouseClicked(MouseEvent e)
	2011	+ {
	2012	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2013	+ cMaterial material = object.material;
	2014	+
	2015	+ diffusenessField.setFloat(material.factor);
	2016	+ selfshadowField.setFloat(material.diffuseness);
	2017	+
	2018	+ materialtouched = true;
	2019	+ applySelf();
	2020	+ }
	2021	+ });
	2022	+ presetpanel.add(diffusemoon);
	2023	+
	2024	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2025	+ diffusemoon2.setToolTipText("Moon2");
	2026	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2027	+ {
	2028	+ public void mouseClicked(MouseEvent e)
	2029	+ {
	2030	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2031	+ cMaterial material = object.material;
	2032	+
	2033	+ diffusenessField.setFloat(material.factor);
	2034	+ selfshadowField.setFloat(material.diffuseness);
	2035	+
	2036	+ materialtouched = true;
	2037	+ applySelf();
	2038	+ }
	2039	+ });
	2040	+ presetpanel.add(diffusemoon2);
	2041	+
	2042	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2043	+ diffusemoon3.setToolTipText("Moon3");
	2044	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2045	+ {
	2046	+ public void mouseClicked(MouseEvent e)
	2047	+ {
	2048	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2049	+ cMaterial material = object.material;
	2050	+
	2051	+ diffusenessField.setFloat(material.factor);
	2052	+ selfshadowField.setFloat(material.diffuseness);
	2053	+
	2054	+ materialtouched = true;
	2055	+ applySelf();
	2056	+ }
	2057	+ });
	2058	+ presetpanel.add(diffusemoon3);
	2059	+
	2060	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2061	+ diffusesheen.setToolTipText("Sheen");
	2062	+ diffusesheen.addMouseListener(new MouseAdapter()
	2063	+ {
	2064	+ public void mouseClicked(MouseEvent e)
	2065	+ {
	2066	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2067	+ cMaterial material = object.material;
	2068	+
	2069	+ sheenField.setFloat(material.sheen);
	2070	+
	2071	+ materialtouched = true;
	2072	+ applySelf();
	2073	+ }
	2074	+ });
	2075	+ presetpanel.add(diffusesheen);
	2076	+
	2077	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2078	+ rough.setToolTipText("Rough metal");
	2079	+ rough.addMouseListener(new MouseAdapter()
	2080	+ {
	2081	+ public void mouseClicked(MouseEvent e)
	2082	+ {
	2083	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2084	+ cMaterial material = object.material;
	2085	+
	2086	+ shininessField.setFloat(material.shininess);
	2087	+ velvetField.setFloat(material.velvet);
	2088	+
	2089	+ materialtouched = true;
	2090	+ applySelf();
	2091	+ }
	2092	+ });
	2093	+ presetpanel.add(rough);
	2094	+
	2095	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2096	+ rough2.setToolTipText("Medium metal");
	2097	+ rough2.addMouseListener(new MouseAdapter()
	2098	+ {
	2099	+ public void mouseClicked(MouseEvent e)
	2100	+ {
	2101	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2102	+ cMaterial material = object.material;
	2103	+
	2104	+ shininessField.setFloat(material.shininess);
	2105	+ lightareaField.setFloat(material.lightarea);
	2106	+
	2107	+ materialtouched = true;
	2108	+ applySelf();
	2109	+ }
	2110	+ });
	2111	+ presetpanel.add(rough2);
	2112	+
	2113	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2114	+ shini0.setToolTipText("Shiny");
	2115	+ shini0.addMouseListener(new MouseAdapter()
	2116	+ {
	2117	+ public void mouseClicked(MouseEvent e)
	2118	+ {
	2119	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2120	+ cMaterial material = object.material;
	2121	+
	2122	+ shininessField.setFloat(material.shininess);
	2123	+ lightareaField.setFloat(material.lightarea);
	2124	+
	2125	+ materialtouched = true;
	2126	+ applySelf();
	2127	+ }
	2128	+ });
	2129	+ presetpanel.add(shini0);
	2130	+
	2131	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2132	+ shini1.setToolTipText("Shiny2");
	2133	+ shini1.addMouseListener(new MouseAdapter()
	2134	+ {
	2135	+ public void mouseClicked(MouseEvent e)
	2136	+ {
	2137	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2138	+ cMaterial material = object.material;
	2139	+
	2140	+ shininessField.setFloat(material.shininess);
	2141	+ lightareaField.setFloat(material.lightarea);
	2142	+
	2143	+ materialtouched = true;
	2144	+ applySelf();
	2145	+ }
	2146	+ });
	2147	+ presetpanel.add(shini1);
	2148	+
	2149	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2150	+ shini2.setToolTipText("Shiny3");
	2151	+ shini2.addMouseListener(new MouseAdapter()
	2152	+ {
	2153	+ public void mouseClicked(MouseEvent e)
	2154	+ {
	2155	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2156	+ cMaterial material = object.material;
	2157	+
	2158	+ shininessField.setFloat(material.shininess);
	2159	+ lightareaField.setFloat(material.lightarea);
	2160	+
	2161	+ materialtouched = true;
	2162	+ applySelf();
	2163	+ }
	2164	+ });
	2165	+ presetpanel.add(shini2);
	2166	+
	2167	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2168	+ aniso.setToolTipText("AnisoU");
	2169	+ aniso.addMouseListener(new MouseAdapter()
	2170	+ {
	2171	+ public void mouseClicked(MouseEvent e)
	2172	+ {
	2173	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2174	+ cMaterial material = object.material;
	2175	+
	2176	+ anisoField.setFloat(material.aniso);
	2177	+ anisoVField.setFloat(material.anisoV);
	2178	+
	2179	+ materialtouched = true;
	2180	+ applySelf();
	2181	+ }
	2182	+ });
	2183	+ presetpanel.add(aniso);
	2184	+
	2185	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2186	+ aniso2.setToolTipText("AnisoV");
	2187	+ aniso2.addMouseListener(new MouseAdapter()
	2188	+ {
	2189	+ public void mouseClicked(MouseEvent e)
	2190	+ {
	2191	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2192	+ cMaterial material = object.material;
	2193	+
	2194	+ anisoField.setFloat(material.aniso);
	2195	+ anisoVField.setFloat(material.anisoV);
	2196	+
	2197	+ materialtouched = true;
	2198	+ applySelf();
	2199	+ }
	2200	+ });
	2201	+ presetpanel.add(aniso2);
	2202	+
	2203	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2204	+ aniso3.setToolTipText("AnisoUV");
	2205	+ aniso3.addMouseListener(new MouseAdapter()
	2206	+ {
	2207	+ public void mouseClicked(MouseEvent e)
	2208	+ {
	2209	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2210	+ cMaterial material = object.material;
	2211	+
	2212	+ anisoField.setFloat(material.aniso);
	2213	+ anisoVField.setFloat(material.anisoV);
	2214	+
	2215	+ materialtouched = true;
	2216	+ applySelf();
	2217	+ }
	2218	+ });
	2219	+ presetpanel.add(aniso3);
	2220	+
	2221	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2222	+ velvet0.setToolTipText("Velvet");
	2223	+ velvet0.addMouseListener(new MouseAdapter()
	2224	+ {
	2225	+ public void mouseClicked(MouseEvent e)
	2226	+ {
	2227	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2228	+ cMaterial material = object.material;
	2229	+
	2230	+ diffusenessField.setFloat(material.factor);
	2231	+ selfshadowField.setFloat(material.diffuseness);
	2232	+ sheenField.setFloat(material.sheen);
	2233	+ shininessField.setFloat(material.shininess);
	2234	+ velvetField.setFloat(material.velvet);
	2235	+ shiftField.setFloat(material.shift);
	2236	+
	2237	+ materialtouched = true;
	2238	+ applySelf();
	2239	+ }
	2240	+ });
	2241	+ presetpanel.add(velvet0);
	2242	+
	2243	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2244	+ bump0.setToolTipText("Bump texture");
	2245	+ bump0.addMouseListener(new MouseAdapter()
	2246	+ {
	2247	+ public void mouseClicked(MouseEvent e)
	2248	+ {
	2249	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2250	+ cMaterial material = object.material;
	2251	+
	2252	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2253	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2254	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2255	+
	2256	+ materialtouched = true;
	2257	+ applySelf();
	2258	+ }
	2259	+ });
	2260	+ presetpanel.add(bump0);
	2261	+
	2262	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2263	+ borderShader.setToolTipText("Border fade");
	2264	+ borderShader.addMouseListener(new MouseAdapter()
	2265	+ {
	2266	+ public void mouseClicked(MouseEvent e)
	2267	+ {
	2268	+ borderfadeField.setFloat(0.5);
	2269	+ opacityField.setFloat(0.75);
	2270	+
	2271	+ materialtouched = true;
	2272	+ applySelf();
	2273	+ }
	2274	+ });
	2275	+ presetpanel.add(borderShader);
	2276	+
	2277	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2278	+ halo.setToolTipText("Halo");
	2279	+ halo.addMouseListener(new MouseAdapter()
	2280	+ {
	2281	+ public void mouseClicked(MouseEvent e)
	2282	+ {
	2283	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2284	+ cMaterial material = object.material;
	2285	+
	2286	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2287	+
	2288	+ materialtouched = true;
	2289	+ applySelf();
	2290	+ }
	2291	+ });
	2292	+ presetpanel.add(halo);
	2293	+
	2294	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2295	+ candle.setToolTipText("Candle");
	2296	+ candle.addMouseListener(new MouseAdapter()
	2297	+ {
	2298	+ public void mouseClicked(MouseEvent e)
	2299	+ {
	2300	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2301	+ cMaterial material = object.material;
	2302	+
	2303	+ subsurfaceField.setFloat(material.subsurface);
	2304	+ shadowbiasField.setFloat(material.shadowbias);
	2305	+ ambientField.setFloat(material.ambient);
	2306	+ specularField.setFloat(material.specular);
	2307	+ lightareaField.setFloat(material.lightarea);
	2308	+ shininessField.setFloat(material.shininess);
	2309	+
	2310	+ materialtouched = true;
	2311	+ applySelf();
	2312	+ }
	2313	+ });
	2314	+ presetpanel.add(candle);
	2315	+
	2316	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2317	+ shadowShader.setToolTipText("Shadow");
	2318	+ shadowShader.addMouseListener(new MouseAdapter()
	2319	+ {
	2320	+ public void mouseClicked(MouseEvent e)
	2321	+ {
	2322	+ diffuseField.setFloat(0.001);
	2323	+ ambientField.setFloat(0.001);
	2324	+ cameraField.setFloat(0.001);
	2325	+ specularField.setFloat(0.001);
	2326	+ fakedepthField.setFloat(0.001);
	2327	+ opacityField.setFloat(0.6);
	2328	+
	2329	+ materialtouched = true;
	2330	+ applySelf();
	2331	+ }
	2332	+ });
	2333	+ presetpanel.add(shadowShader);
	2334	+
	2335	+ cGridBag panel = new cGridBag().setVertical(true);
	2336	+
	2337	+ presetpanel.preferredWidth = 1;
	2338	+
	2339	+ materialpanel.add(presetpanel);
	2340	+ materialpanel.add(panel);
	2341	+
	2342	+ panel.preferredWidth = 8;
	2343	+
	2344	+ /*
1707	2345	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1708	2346	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1709		- */
	2347	+ */
1710	2348
1711	2349	cGridBag editBar = new cGridBag().setVertical(false);
1712	2350
..	..	@@ -1740,27 +2378,61 @@
1740	2378	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1741	2379
1742	2380	cGridBag colorSection = new cGridBag().setVertical(true);
	2381	+
	2382	+ cGridBag huepanel = new cGridBag();
	2383	+ cGridBag huelabel = new cGridBag();
	2384	+ cLabel hue = GetLabel("icons/hue.png", false);
	2385	+ hue.fit = true;
	2386	+
	2387	+ hue.addMouseListener(new MouseAdapter()
	2388	+ {
	2389	+ public void mousePressed(MouseEvent e)
	2390	+ {
	2391	+ int x = e.getX();
	2392	+
	2393	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2394	+ }
	2395	+ });
	2396	+
	2397	+ huelabel.add(hue);
	2398	+ huelabel.preferredWidth = 20;
	2399	+ huepanel.add(new cGridBag()); // Label
	2400	+ huepanel.add(huelabel); // Field/slider
	2401	+
	2402	+ huepanel.preferredHeight = 7;
	2403	+
	2404	+ colorSection.add(huepanel);
1743	2405
1744	2406	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);
	2407	+
	2408	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2409	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2410	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2411	+
1748	2412	//colorField.preferredWidth = 200;
1749	2413	colorSection.add(color);
1750	2414
1751	2415	cGridBag modulation = new cGridBag();
1752	2416	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1753	2417	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1754		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2418	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1755	2419	colorSection.add(modulation);
1756	2420
	2421	+ cGridBag opacity = new cGridBag();
	2422	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2423	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2424	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2425	+ colorSection.add(opacity);
	2426	+
	2427	+ colorSection.add(GetSeparator());
	2428	+
1757	2429	cGridBag texture = new cGridBag();
1758	2430	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1759	2431	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1760	2432	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1761	2433	colorSection.add(texture);
1762	2434
1763		- panel.add(new JSeparator());
	2435	+ panel.add(GetSeparator());
1764	2436
1765	2437	panel.add(colorSection);
1766	2438
..	..	@@ -1816,7 +2488,7 @@
1816	2488	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1817	2489	diffuseSection.add(shadowbias);
1818	2490
1819		- panel.add(new JSeparator());
	2491	+ panel.add(GetSeparator());
1820	2492
1821	2493	panel.add(diffuseSection);
1822	2494
..	..	@@ -1879,7 +2551,7 @@
1879	2551	specularSection.add(anisoV);
1880	2552
1881	2553
1882		- panel.add(new JSeparator());
	2554	+ panel.add(GetSeparator());
1883	2555
1884	2556	panel.add(specularSection);
1885	2557
..	..	@@ -1904,12 +2576,6 @@
1904	2576	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1905	2577	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1906	2578	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	2579
1914	2580	//panel.add(new JSeparator());
1915	2581
..	..	@@ -1955,7 +2621,7 @@
1955	2621	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1956	2622	textureSection.add(opacityPower);
1957	2623
1958		- panel.add(new JSeparator());
	2624	+ panel.add(GetSeparator());
1959	2625
1960	2626	panel.add(textureSection);
1961	2627
..	..	@@ -2942,7 +3608,7 @@
2942	3608
2943	3609	freezematerial = true;
2944	3610	colorField.setFloat(mat.color);
2945		- modulationField.setFloat(mat.modulation);
	3611	+ saturationField.setFloat(mat.modulation);
2946	3612	metalnessField.setFloat(mat.metalness);
2947	3613	diffuseField.setFloat(mat.diffuse);
2948	3614	specularField.setFloat(mat.specular);
..	..	@@ -3004,32 +3670,8 @@
3004	3670
3005	3671	if (multiplyToggle != null)
3006	3672	multiplyToggle.setSelected(mat.multiply);
3007		-
3008		- assert (object.projectedVertices != null);
3009		-
3010		- if (object.projectedVertices.length <= 2)
3011		- {
3012		- // Side effect...
3013		- Object3D.cVector2[] keep = object.projectedVertices;
3014		- object.projectedVertices = new Object3D.cVector2[3];
3015		- for (int i = 0; i < 3; i++)
3016		- {
3017		- if (i < keep.length)
3018		- {
3019		- object.projectedVertices[i] = keep[i];
3020		- } else
3021		- {
3022		- object.projectedVertices[i] = new Object3D.cVector2();
3023		- }
3024		- /*
3025		- if(keep.length == 0)
3026		- object.projectedVertices[0] = new Object3D.cVector2();
3027		- else
3028		- object.projectedVertices[0] = keep[0];
3029		- object.projectedVertices[1] = new Object3D.cVector2();
3030		- */
3031		- }
3032		- }
	3673	+
	3674	+ AllocProjectedVertices(object);
3033	3675
3034	3676	SetMaterial(mat, object.projectedVertices);
3035	3677	}
..	..	@@ -3149,6 +3791,17 @@
3149	3791	public void itemStateChanged(ItemEvent event)
3150	3792	{
3151	3793	// System.out.println("Propagate = " + propagate);
	3794	+ if (event.getSource() == pinButton)
	3795	+ {
	3796	+ copy.pinned ^= true;
	3797	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3798	+ {
	3799	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3800	+ copy.CloseUI();
	3801	+ //copy.editWindow.refreshContents();
	3802	+ }
	3803	+ }
	3804	+ else
3152	3805	if (event.getSource() == propagateToggle)
3153	3806	{
3154	3807	propagate ^= true;
..	..	@@ -3253,8 +3906,9 @@
3253	3906	} else if (event.getSource() == liveCB)
3254	3907	{
3255	3908	copy.live ^= true;
	3909	+ objEditor.refreshContents(true); // To show item colors
3256	3910	return;
3257		- } else if (event.getSource() == selectCB)
	3911	+ } else if (event.getSource() == selectableCB)
3258	3912	{
3259	3913	copy.dontselect ^= true;
3260	3914	return;
..	..	@@ -3262,7 +3916,7 @@
3262	3916	{
3263	3917	copy.hide ^= true;
3264	3918	copy.Touch(); // display list issue
3265		- objEditor.refreshContents();
	3919	+ objEditor.refreshContents(true); // To show item colors
3266	3920	return;
3267	3921	} else if (event.getSource() == link2masterCB)
3268	3922	{
..	..	@@ -3327,7 +3981,7 @@
3327	3981	//System.out.println("ObjEditor " + event);
3328	3982	applySelf0(true);
3329	3983	//parent.applySelf();
3330		- objEditor.refreshContents();
	3984	+ // conflicts with requestFocus objEditor.refreshContents();
3331	3985	} else if (source == resetButton)
3332	3986	{
3333	3987	CameraPane.fullreset = true;
..	..	@@ -3518,6 +4172,7 @@
3518	4172
3519	4173	static public byte[] Compress(Object3D o)
3520	4174	{
	4175	+ // Slower to actually compress.
3521	4176	try
3522	4177	{
3523	4178	ByteArrayOutputStream baos = new ByteArrayOutputStream();
..	..	@@ -3619,6 +4274,7 @@
3619	4274	{
3620	4275	//Save(true);
3621	4276	Replace();
	4277	+ SetVersionStates();
3622	4278	}
3623	4279
3624	4280	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3637,31 +4293,50 @@
3637	4293	return true;
3638	4294	}
3639	4295
3640		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4296	+ void DeleteVersion()
	4297	+ {
	4298	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4299	+ {
	4300	+ copy.versionlist[i] = copy.versionlist[i+1];
	4301	+ }
	4302	+
	4303	+ if (copy.versionlist[copy.versionindex] == null)
	4304	+ copy.versionindex -= 1;
	4305	+
	4306	+ if (copy.versionindex != -1)
	4307	+ CopyChanged();
	4308	+
	4309	+ SetVersionStates();
	4310	+ }
3641	4311
3642	4312	public boolean Save(boolean user)
3643	4313	{
3644	4314	System.err.println("Save");
	4315	+ Replace();
3645	4316
3646		- cRadio tab = GetCurrentTab();
	4317	+ //cRadio tab = GetCurrentTab();
3647	4318
3648		- byte[] compress = CompressCopy();
	4319	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3649	4320
3650	4321	boolean thesame = false;
3651	4322
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		- }
	4323	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4324	+// {
	4325	+// thesame = true;
	4326	+// }
3657	4327
3658	4328	//EditorFrame.m_MainFrame.requestFocusInWindow();
3659	4329	if (!thesame)
3660	4330	{
	4331	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4332	+ {
	4333	+ copy.versionlist[i] = copy.versionlist[i-1];
	4334	+ }
	4335	+
3661	4336	//tab.user[tab.versionindex] = user;
3662	4337	//boolean increment = true; // tab.graphs[tab.versionindex] == null;
3663	4338
3664		- copy.versions[++copy.versionindex] = compress;
	4339	+ copy.versionlist[++copy.versionindex] = compress;
3665	4340
3666	4341	// if (increment)
3667	4342	// tab.versionindex++;
..	..	@@ -3671,13 +4346,13 @@
3671	4346
3672	4347	//assert(hashtable.isEmpty());
3673	4348
3674		- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3675		- {
3676		- //tab.user[i] = false;
3677		- copy.versions[i] = null;
3678		- }
	4349	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4350	+// {
	4351	+// //tab.user[i] = false;
	4352	+// copy.versionlist[i] = null;
	4353	+// }
3679	4354
3680		- SetUndoStates();
	4355	+ SetVersionStates();
3681	4356
3682	4357	// test save
3683	4358	if (false)
..	..	@@ -3700,27 +4375,65 @@
3700	4375
3701	4376	return !thesame;
3702	4377	}
3703		-
3704		- void CopyChanged(Object3D obj)
	4378	+
	4379	+ boolean flashIt = true;
	4380	+
	4381	+ void RefreshSelection()
3705	4382	{
3706		- SetUndoStates();
	4383	+ Object3D selection = new Object3D();
	4384	+
	4385	+ for (int i = 0; i < copy.selection.size(); i++)
	4386	+ {
	4387	+ Object3D elem = copy.selection.elementAt(i);
	4388	+
	4389	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4390	+
	4391	+ if (obj == null)
	4392	+ {
	4393	+ copy.selection.remove(i--);
	4394	+ }
	4395	+ else
	4396	+ {
	4397	+ selection.add(obj);
	4398	+ copy.selection.setElementAt(obj, i);
	4399	+ }
	4400	+ }
	4401	+
	4402	+ flashIt = false;
	4403	+ GetTree().clearSelection();
	4404	+ for (int i = 0; i < selection.size(); i++)
	4405	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4406	+ flashIt = true;
	4407	+
	4408	+ //refreshContents(false);
	4409	+ }
	4410	+
	4411	+ void CopyChanged()
	4412	+ {
	4413	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4414	+
	4415	+ SetVersionStates();
3707	4416
3708	4417	boolean temp = CameraPane.SWITCH;
3709	4418	CameraPane.SWITCH = false;
3710	4419
3711		- copy.ExtractBigData(versiontable);
	4420	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3712	4421
3713	4422	copy.clear();
3714	4423
	4424	+ copy.skyboxname = obj.skyboxname;
	4425	+ copy.skyboxext = obj.skyboxext;
	4426	+
3715	4427	for (int i=0; i<obj.Size(); i++)
3716	4428	{
3717	4429	copy.add(obj.get(i));
3718	4430	}
3719	4431
3720		- copy.RestoreBigData(versiontable);
	4432	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3721	4433
3722	4434	CameraPane.SWITCH = temp;
3723	4435
	4436	+ RefreshSelection();
3724	4437	//assert(hashtable.isEmpty());
3725	4438
3726	4439	copy.Touch();
..	..	@@ -3741,13 +4454,15 @@
3741	4454	}
3742	4455	}
3743	4456
3744		- refreshContents();
	4457	+ refreshContents(true);
3745	4458	}
3746	4459
3747		- cButton undoButton;
	4460	+ cButton previousVersionButton;
3748	4461	cButton restoreButton;
3749	4462	cButton replaceButton;
3750		- cButton redoButton;
	4463	+ cButton nextVersionButton;
	4464	+ cButton saveVersionButton;
	4465	+ cButton deleteVersionButton;
3751	4466
3752	4467	boolean muteSlider;
3753	4468
..	..	@@ -3755,39 +4470,64 @@
3755	4470	{
3756	4471	int count = 0;
3757	4472
3758		- for (int i = copy.versions.length; --i >= 0;)
	4473	+ for (int i = copy.versionlist.length; --i >= 0;)
3759	4474	{
3760		- if (copy.versions[i] != null)
	4475	+ if (copy.versionlist[i] != null)
3761	4476	count++;
3762	4477	}
3763	4478
3764	4479	return count;
3765	4480	}
3766	4481
3767		- void SetUndoStates()
	4482	+ public cGridBag versionSliderPane;
	4483	+
	4484	+ void SetVersionStates()
3768	4485	{
3769		- cRadio tab = GetCurrentTab();
	4486	+ //if (true)
	4487	+ // return;
	4488	+
	4489	+ //cRadio tab = GetCurrentTab();
3770	4490
3771		- restoreButton.setEnabled(copy.versionindex != -1);
3772		- replaceButton.setEnabled(copy.versionindex != -1);
3773		-
3774		- undoButton.setEnabled(copy.versionindex > 0);
3775		- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
3776		-
3777		- muteSlider = true;
3778		- versionSlider.setMaximum(VersionCount() - 1);
3779		- versionSlider.setInteger(copy.versionindex);
3780		- muteSlider = false;
	4491	+ if (copy.versionlist == null)
	4492	+ {
	4493	+ saveVersionButton.setEnabled(false);
	4494	+ restoreButton.setEnabled(false);
	4495	+ replaceButton.setEnabled(false);
	4496	+ previousVersionButton.setEnabled(false);
	4497	+ nextVersionButton.setEnabled(false);
	4498	+ deleteVersionButton.setEnabled(false);
	4499	+ versionSliderPane.setVisible(false);
	4500	+ }
	4501	+ else
	4502	+ {
	4503	+ restoreButton.setEnabled(copy.versionindex != -1);
	4504	+ replaceButton.setEnabled(copy.versionindex != -1);
	4505	+
	4506	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4507	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4508	+
	4509	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4510	+ //copy.versionlist[copy.versionindex + 1] != null);
	4511	+
	4512	+ muteSlider = true;
	4513	+ versionSlider.setMinimum(0);
	4514	+ versionSlider.setMaximum(VersionCount() - 1);
	4515	+ versionSlider.setInteger(copy.versionindex);
	4516	+ versionSlider.setEnabled(copy.versionindex != -1);
	4517	+ muteSlider = false;
	4518	+
	4519	+ versionSliderPane.setVisible(true);
	4520	+ }
3781	4521	}
3782	4522
3783		- public boolean Undo()
	4523	+ public boolean PreviousVersion()
3784	4524	{
3785	4525	// Option?
3786	4526	Replace();
3787	4527
3788	4528	System.err.println("Undo");
3789	4529
3790		- cRadio tab = GetCurrentTab();
	4530	+ //cRadio tab = GetCurrentTab();
3791	4531
3792	4532	if (copy.versionindex == 0)
3793	4533	{
..	..	@@ -3810,7 +4550,7 @@
3810	4550
3811	4551	copy.versionindex -= 1;
3812	4552
3813		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4553	+ CopyChanged();
3814	4554
3815	4555	return true;
3816	4556	}
..	..	@@ -3819,44 +4559,45 @@
3819	4559	{
3820	4560	System.err.println("Restore");
3821	4561
3822		- cRadio tab = GetCurrentTab();
	4562	+ //cRadio tab = GetCurrentTab();
3823	4563
3824		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4564	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3825	4565	{
3826	4566	java.awt.Toolkit.getDefaultToolkit().beep();
3827	4567	return false;
3828	4568	}
3829	4569
3830		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4570	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4571	+ CopyChanged();
3831	4572
3832	4573	return true;
3833	4574	}
3834	4575
3835	4576	public boolean Replace()
3836	4577	{
3837		- System.err.println("Replace");
	4578	+ //System.err.println("Replace");
3838	4579
3839		- cRadio tab = GetCurrentTab();
	4580	+ //cRadio tab = GetCurrentTab();
3840	4581
3841		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4582	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3842	4583	{
3843	4584	// No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3844	4585	return false;
3845	4586	}
3846	4587
3847		- copy.versions[copy.versionindex] = CompressCopy();
	4588	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
3848	4589
3849	4590	return true;
3850	4591	}
3851	4592
3852		- public void Redo()
	4593	+ public void NextVersion()
3853	4594	{
3854	4595	// Option?
3855	4596	Replace();
3856	4597
3857		- cRadio tab = GetCurrentTab();
	4598	+ //cRadio tab = GetCurrentTab();
3858	4599
3859		- if (copy.versions[copy.versionindex + 1] == null)
	4600	+ if (copy.versionlist[copy.versionindex + 1] == null)
3860	4601	{
3861	4602	java.awt.Toolkit.getDefaultToolkit().beep();
3862	4603	return;
..	..	@@ -3864,7 +4605,7 @@
3864	4605
3865	4606	copy.versionindex += 1;
3866	4607
3867		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4608	+ CopyChanged();
3868	4609
3869	4610	//if (!tab.user[tab.versionindex])
3870	4611	// tab.graphs[tab.versionindex] = null;
..	..	@@ -4061,6 +4802,12 @@
4061	4802	// else
4062	4803	// applySelf(true);
4063	4804	// }
	4805	+
	4806	+ boolean Equal(double a, double b)
	4807	+ {
	4808	+ return Math.abs(a - b) < 0.001;
	4809	+ }
	4810	+
4064	4811	void applySelf0(boolean name)
4065	4812	{
4066	4813	if (name)
..	..	@@ -4078,7 +4825,7 @@
4078	4825	//copy.material = new cMaterial(copy.GetMaterial());
4079	4826
4080	4827	current.color = (float) colorField.getFloat();
4081		- current.modulation = (float) modulationField.getFloat();
	4828	+ current.modulation = (float) saturationField.getFloat();
4082	4829	current.metalness = (float) metalnessField.getFloat();
4083	4830	current.diffuse = (float) diffuseField.getFloat();
4084	4831	current.specular = (float) specularField.getFloat();
..	..	@@ -4110,29 +4857,52 @@
4110	4857	{
4111	4858	cMaterial mat = copy.material;
4112	4859
4113		- colorField.SetToolTipValue((mat.color));
4114		- modulationField.SetToolTipValue((mat.modulation));
4115		- metalnessField.SetToolTipValue((mat.metalness));
4116		- diffuseField.SetToolTipValue((mat.diffuse));
4117		- specularField.SetToolTipValue((mat.specular));
4118		- shininessField.SetToolTipValue((mat.shininess));
4119		- shiftField.SetToolTipValue((mat.shift));
4120		- ambientField.SetToolTipValue((mat.ambient));
4121		- lightareaField.SetToolTipValue((mat.lightarea));
4122		- diffusenessField.SetToolTipValue((mat.factor));
4123		- velvetField.SetToolTipValue((mat.velvet));
4124		- sheenField.SetToolTipValue((mat.sheen));
4125		- subsurfaceField.SetToolTipValue((mat.subsurface));
4126		- backlitField.SetToolTipValue((mat.bump));
4127		- anisoField.SetToolTipValue((mat.aniso));
4128		- anisoVField.SetToolTipValue((mat.anisoV));
4129		- cameraField.SetToolTipValue((mat.cameralight));
4130		- selfshadowField.SetToolTipValue((mat.diffuseness));
4131		- shadowField.SetToolTipValue((mat.shadow));
4132		- textureField.SetToolTipValue((mat.texture));
4133		- opacityField.SetToolTipValue((mat.opacity));
4134		- fakedepthField.SetToolTipValue((mat.fakedepth));
4135		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	4860	+ if (!Equal(colorField.getFloat(), mat.color))
	4861	+ colorField.SetToolTipValue((mat.color));
	4862	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4863	+ saturationField.SetToolTipValue((mat.modulation));
	4864	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4865	+ metalnessField.SetToolTipValue((mat.metalness));
	4866	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4867	+ diffuseField.SetToolTipValue((mat.diffuse));
	4868	+ if (!Equal(specularField.getFloat(), mat.specular))
	4869	+ specularField.SetToolTipValue((mat.specular));
	4870	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4871	+ shininessField.SetToolTipValue((mat.shininess));
	4872	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4873	+ shiftField.SetToolTipValue((mat.shift));
	4874	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4875	+ ambientField.SetToolTipValue((mat.ambient));
	4876	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4877	+ lightareaField.SetToolTipValue((mat.lightarea));
	4878	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4879	+ diffusenessField.SetToolTipValue((mat.factor));
	4880	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4881	+ velvetField.SetToolTipValue((mat.velvet));
	4882	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4883	+ sheenField.SetToolTipValue((mat.sheen));
	4884	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4885	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4886	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4887	+ backlitField.SetToolTipValue((mat.bump));
	4888	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4889	+ anisoField.SetToolTipValue((mat.aniso));
	4890	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4891	+ anisoVField.SetToolTipValue((mat.anisoV));
	4892	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4893	+ cameraField.SetToolTipValue((mat.cameralight));
	4894	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	4895	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4896	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	4897	+ shadowField.SetToolTipValue((mat.shadow));
	4898	+ if (!Equal(textureField.getFloat(), mat.texture))
	4899	+ textureField.SetToolTipValue((mat.texture));
	4900	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	4901	+ opacityField.SetToolTipValue((mat.opacity));
	4902	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	4903	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4904	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	4905	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4136	4906	}
4137	4907
4138	4908	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4167,17 +4937,20 @@
4167	4937
4168	4938	public void stateChanged(ChangeEvent e)
4169	4939	{
4170		- // assert(false);
	4940	+ // assert(false);
4171	4941	if (e.getSource() == versionSlider)
4172	4942	{
4173	4943	if (muteSlider)
4174	4944	return;
4175	4945
	4946	+ Replace();
	4947	+
4176	4948	int version = versionSlider.getInteger();
4177	4949
4178		- if (copy.versions[version] != null)
	4950	+ if (version != -1 && copy.versionlist[version] != null)
4179	4951	{
4180		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4952	+ copy.versionindex = version;
	4953	+ CopyChanged();
4181	4954	}
4182	4955
4183	4956	return;
..	..	@@ -4217,6 +4990,12 @@
4217	4990	{
4218	4991	//System.out.println("stateChanged = " + this);
4219	4992	materialtouched = true;
	4993	+
	4994	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4995	+ {
	4996	+ saturationField.setFloat(1);
	4997	+ }
	4998	+
4220	4999	applySelf();
4221	5000	//System.out.println("this = " + this);
4222	5001	//System.out.println("PARENT = " + parent);
..	..	@@ -4516,6 +5295,7 @@
4516	5295	{
4517	5296	if (GetTree() != null)
4518	5297	{
	5298	+ GetTree().revalidate();
4519	5299	GetTree().repaint();
4520	5300	}
4521	5301
..	..	@@ -4524,6 +5304,11 @@
4524	5304	ctrlPanel.validate(); // ? new
4525	5305	ctrlPanel.repaint();
4526	5306	}
	5307	+
	5308	+ if (previousVersionButton != null && copy.versionlist != null)
	5309	+ SetVersionStates();
	5310	+
	5311	+ cameraView.requestFocusInWindow();
4527	5312	}
4528	5313
4529	5314	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4555,7 +5340,7 @@
4555	5340	// group = (Composite) group.get(0);
4556	5341	// }
4557	5342
4558		- System.out.println("makeSomething of " + thing);
	5343	+ //System.out.println("makeSomething of " + thing);
4559	5344
4560	5345	/*
4561	5346	if (deselect && jList != null)
..	..	@@ -4772,7 +5557,9 @@
4772	5557	readobj.ResetDisplayList();
4773	5558	} catch (Exception e)
4774	5559	{
4775		- //e.printStackTrace();
	5560	+ if (!e.toString().contains("GZIP"))
	5561	+ e.printStackTrace();
	5562	+
4776	5563	try
4777	5564	{
4778	5565	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4852,6 +5639,8 @@
4852	5639	{
4853	5640	//readobj.deepCopySelf(copy);
4854	5641	copy.clear(); // june 2014
	5642	+ copy.skyboxname = readobj.skyboxname;
	5643	+ copy.skyboxext = readobj.skyboxext;
4855	5644	for (int i = 0; i < readobj.size(); i++)
4856	5645	{
4857	5646	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4892,6 +5681,7 @@
4892	5681	}
4893	5682	} catch (ClassCastException e)
4894	5683	{
	5684	+ e.printStackTrace();
4895	5685	assert (false);
4896	5686	Composite c = (Composite) copy;
4897	5687	c.children.clear();
..	..	@@ -4902,13 +5692,17 @@
4902	5692	c.addChild(csg);
4903	5693	}
4904	5694
4905		- copy.versions = readobj.versions;
	5695	+ copy.versionlist = readobj.versionlist;
4906	5696	copy.versionindex = readobj.versionindex;
	5697	+ copy.versiontable = readobj.versiontable;
4907	5698
4908		- if (copy.versions == null)
	5699	+ if (copy.versionlist == null)
4909	5700	{
4910		- copy.versions = new byte[100][];
	5701	+ // Backward compatibility
	5702	+ copy.versionlist = new Object3D[100];
4911	5703	copy.versionindex = -1;
	5704	+
	5705	+ //Save(true);
4912	5706	}
4913	5707
4914	5708	//? SetUndoStates();
..	..	@@ -4923,7 +5717,7 @@
4923	5717	{
4924	5718	if (Grafreed.standAlone)
4925	5719	{
4926		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5720	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4927	5721	browser.show();
4928	5722	String filename = browser.getFile();
4929	5723	if (filename != null && filename.length() > 0)
..	..	@@ -5000,6 +5794,8 @@
5000	5794
5001	5795	void save()
5002	5796	{
	5797	+ Replace();
	5798	+
5003	5799	if (lastname == null)
5004	5800	{
5005	5801	return;
..	..	@@ -5022,6 +5818,7 @@
5022	5818	//ps.print(buffer.toString());
5023	5819	} catch (IOException e)
5024	5820	{
	5821	+ e.printStackTrace();
5025	5822	}
5026	5823	}
5027	5824
..	..	@@ -5241,6 +6038,7 @@
5241	6038	ButtonGroup buttonGroup;
5242	6039
5243	6040	cGridBag toolboxPanel;
	6041	+ cGridBag skyboxPanel;
5244	6042	cGridBag materialPanel;
5245	6043	cGridBag ctrlPanel;
5246	6044
..	..	@@ -5252,6 +6050,7 @@
5252	6050	boolean materialFlushed;
5253	6051	Object3D latestObject;
5254	6052
	6053	+ cGridBag transformPanel;
5255	6054	cGridBag XYZPanel;
5256	6055
5257	6056	JSplitPane gridPanel;
..	..	@@ -5314,7 +6113,7 @@
5314	6113	JLabel colorLabel;
5315	6114	cNumberSlider colorField;
5316	6115	JLabel modulationLabel;
5317		- cNumberSlider modulationField;
	6116	+ cNumberSlider saturationField;
5318	6117	JLabel metalnessLabel;
5319	6118	cNumberSlider metalnessField;
5320	6119	JLabel diffuseLabel;
..	..	@@ -5345,6 +6144,7 @@
5345	6144	cNumberSlider anisoField;
5346	6145	JLabel anisoVLabel;
5347	6146	cNumberSlider anisoVField;
	6147	+
5348	6148	JLabel cameraLabel;
5349	6149	cNumberSlider cameraField;
5350	6150	JLabel selfshadowLabel;
..	..	@@ -5359,6 +6159,7 @@
5359	6159	cNumberSlider fakedepthField;
5360	6160	JLabel shadowbiasLabel;
5361	6161	cNumberSlider shadowbiasField;
	6162	+
5362	6163	JLabel bumpLabel;
5363	6164	cNumberSlider bumpField;
5364	6165	JLabel noiseLabel;