~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,57 @@
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	85	ImageIcon icon = GetIcon(name);
48		- return new cButton(icon, border);
	86	+ if (icon != null \|\| name.contains("/"))
	87	+ return new cButton(icon, border);
	88	+ else
	89	+ return new cButton(name, border);
	90	+ }
	91	+
	92	+ cLabel GetLabel(String name, boolean border)
	93	+ {
	94	+ //ImageIcon icon = GetIcon(name);
	95	+ return new cLabel(GetImage(name), border);
49	96	}
50	97
51	98	cToggleButton GetToggleButton(String name, boolean border)
..	..	@@ -60,26 +107,52 @@
60	107	return new cCheckBox(icon, border);
61	108	}
62	109
63		- private ImageIcon GetIcon(String name)
	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	+
	120	+ try
	121	+ {
	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;
	141	+ }
	142	+ catch (Exception e)
	143	+ {
	144	+ //icons.put(name, null);
	145	+ return null;
	146	+ }
	147	+ }
	148	+
	149	+ BufferedImage GetImage(String name)
64	150	{
65	151	try
66	152	{
67	153	BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
68	154
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;
	155	+ return image;
83	156	}
84	157	catch (Exception e)
85	158	{
..	..	@@ -268,11 +341,13 @@
268	341	client = inClient;
269	342	copy = client;
270	343
271		- if (copy.versions == null)
272		- {
273		- copy.versions = new byte[100][];
274		- copy.versionindex = -1;
275		- }
	344	+// if (copy.versionlist == null)
	345	+// {
	346	+// copy.versionlist = new Object3D[100];
	347	+// copy.versionindex = -1;
	348	+//
	349	+// callee.Save(true);
	350	+// }
276	351
277	352	// "this" is not called: SetupUI2(objEditor);
278	353	}
..	..	@@ -287,10 +362,12 @@
287	362	client = inClient;
288	363	copy = client;
289	364
290		- if (copy.versions == null)
	365	+ if (copy.versionlist == null)
291	366	{
292		- copy.versions = new byte[100][];
	367	+ copy.versionlist = new Object3D[100];
293	368	copy.versionindex = -1;
	369	+
	370	+// Save(true);
294	371	}
295	372
296	373	SetupUI2(callee.GetEditor());
..	..	@@ -314,7 +391,8 @@
314	391	//parent = p;
315	392
316	393	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
317		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	394	+ if (Globals.DEBUG)
	395	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
318	396	//gd.setFullScreenWindow(this);
319	397	//setResizable(false);
320	398	//if (!isDisplayable())
..	..	@@ -325,11 +403,13 @@
325	403	copy = localCopy;
326	404	copy.editWindow = this;
327	405
328		- if (copy.versions == null)
329		- {
330		-// copy.versions = new byte[100][];
	406	+// if (copy.versionlist == null)
	407	+// {
	408	+// copy.versionlist = new Object3D[100];
331	409	// copy.versionindex = -1;
332		- }
	410	+//
	411	+// Save(true);
	412	+// }
333	413
334	414	SetupMenu();
335	415
..	..	@@ -349,6 +429,9 @@
349	429
350	430	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
351	431
	432	+ // This is to refresh the UI of the material panel.
	433	+ boolean patchMaterial;
	434	+
352	435	void SetupMenu()
353	436	{
354	437	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -398,6 +481,8 @@
398	481
399	482	ChangeListener changeListener = new ChangeListener()
400	483	{
	484	+ //String name;
	485	+
401	486	public void stateChanged(ChangeEvent changeEvent)
402	487	{
403	488	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -416,7 +501,37 @@
416	501	// EditSelection(false);
417	502	// }
418	503
419		- 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();
420	535	}
421	536	};
422	537	objectPanel.addChangeListener(changeListener);
..	..	@@ -436,10 +551,12 @@
436	551	editPanel.add(editCommandsPanel);
437	552	editPanel.add(ctrlPanel);
438	553
439		- toolboxPanel = new cGridBag().setVertical(false);
	554	+ toolboxPanel = new cGridBag().setVertical(true);
440	555	//toolboxPanel.setName("Toolbox");
441	556
442		- materialPanel = new cGridBag().setVertical(true);
	557	+ skyboxPanel = new cGridBag().setVertical(true);
	558	+
	559	+ materialPanel = new cGridBag().setVertical(false);
443	560	//materialPanel.setName("Material");
444	561
445	562	/JTextPane/
..	..	@@ -723,6 +840,7 @@
723	840	boolean maximized;
724	841
725	842	cButton fullscreenLayout;
	843	+ cButton expandedLayout;
726	844
727	845	void Minimize()
728	846	{
..	..	@@ -762,10 +880,12 @@
762	880	cButton minButton;
763	881	cButton maxButton;
764	882	cButton fullButton;
	883	+ cButton collapseButton;
	884	+ cButton maximize3DButton;
765	885
766	886	void ToggleFullScreen()
767	887	{
768		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	888	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
769	889
770	890	cameraView.ToggleFullScreen();
771	891
..	..	@@ -786,13 +906,13 @@
786	906	// X frame.getContentPane().remove(/"Center",/bigThree);
787	907	// X framePanel.add(bigThree);
788	908	// X frame.getContentPane().add(/"Center",/framePanel);
789		- framePanel.setDividerLocation(46);
	909	+// framePanel.setDividerLocation(46); // icons are 24x24
790	910
791	911	//frame.setVisible(true);
792		- radio.layout = keepButton;
	912	+// radio.layout = keepButton;
793	913	//theFrame = null;
794	914	keepButton = null;
795		- radio.layout.doClick();
	915	+// radio.layout.doClick();
796	916
797	917	} else
798	918	{
..	..	@@ -813,31 +933,53 @@
813	933	// X frame.getContentPane().remove(/"Center",/framePanel);
814	934	// X framePanel.remove(bigThree);
815	935	// X frame.getContentPane().add(/"Center",/bigThree);
816		- framePanel.setDividerLocation(0);
	936	+// framePanel.setDividerLocation(0);
817	937
818		- radio.layout = fullscreenLayout;
819		- radio.layout.doClick();
	938	+// radio.layout = fullscreenLayout;
	939	+// radio.layout.doClick();
820	940	//frame.setVisible(true);
821	941	}
822	942	frame.validate();
	943	+
	944	+ cameraView.requestFocusInWindow();
823	945	}
824	946
825		- 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)
826	956	{
827	957	boolean temp = CameraPane.SWITCH;
828	958	CameraPane.SWITCH = false;
829	959
830		- 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);
831	964	// if (copy == client)
832	965
833		- byte[] versions[] = copy.versions;
834		- 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;
835	970
836		- byte[] compress = Compress(copy);
	971	+ Object3D parent = object.parent;
	972	+ object.parent = null;
837	973
838		- copy.versions = versions;
	974	+ //byte[] compress = Compress(copy);
	975	+ Object3D compress = (Object3D)Grafreed.clone(object);
839	976
840		- 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);
841	983
842	984	CameraPane.SWITCH = temp;
843	985
..	..	@@ -965,6 +1107,7 @@
965	1107	{
966	1108	SetupMaterial(materialPanel);
967	1109	}
	1110	+
968	1111	//SetupName();
969	1112	//SetupViews();
970	1113	}
..	..	@@ -1173,6 +1316,18 @@
1173	1316
1174	1317	namePanel = new cGridBag();
1175	1318
	1319	+ //if (copy.pinned)
	1320	+ {
	1321	+ pinButton = GetToggleButton("icons/pin.png", !Globals.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	+
1176	1331	nameField = AddText(namePanel, copy.GetName());
1177	1332	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1178	1333	oe.ctrlPanel.add(namePanel);
..	..	@@ -1186,14 +1341,16 @@
1186	1341
1187	1342	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1188	1343	liveCB.setToolTipText("Animate object");
	1344	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1345	+ markCB.setToolTipText("Set target transform");
1189	1346	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1190	1347	selectableCB.setToolTipText("Make object selectable");
1191	1348	// Return();
1192	1349
1193	1350	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1194	1351	hideCB.setToolTipText("Hide object");
1195		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1196		- markCB.setToolTipText("As animation target transform");
	1352	+
	1353	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1197	1354
1198	1355	setupPanel2 = new cGridBag().setVertical(false);
1199	1356
..	..	@@ -1393,6 +1550,7 @@
1393	1550
1394	1551	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1395	1552	{
	1553	+ if (Globals.DEBUG)
1396	1554	System.out.println("CREATE CAMERAS");
1397	1555	cams = new cTemplate();
1398	1556	cams.name = "Cameras";
..	..	@@ -1474,6 +1632,45 @@
1474	1632	//frontView.object = copy;
1475	1633	//sideView.object = copy;
1476	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", !Globals.NIMBUSLAF);
	1642	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1643	+ resetTransform.addMouseListener(new MouseAdapter()
	1644	+ {
	1645	+ public void mouseClicked(MouseEvent e)
	1646	+ {
	1647	+ ResetTransform();
	1648	+ }
	1649	+ });
	1650	+ resetTransformPanel.add(resetTransform);
	1651	+
	1652	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1653	+ resetTransform.setToolTipText("Reset Translation only");
	1654	+ resetTransform.addMouseListener(new MouseAdapter()
	1655	+ {
	1656	+ public void mouseClicked(MouseEvent e)
	1657	+ {
	1658	+ ResetTransform(1);
	1659	+ }
	1660	+ });
	1661	+ resetTransformPanel.add(resetTransform);
	1662	+
	1663	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1664	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1665	+ resetTransform.addMouseListener(new MouseAdapter()
	1666	+ {
	1667	+ public void mouseClicked(MouseEvent e)
	1668	+ {
	1669	+ ResetTransform(2);
	1670	+ }
	1671	+ });
	1672	+ resetTransformPanel.add(resetTransform);
	1673	+
1477	1674	XYZPanel = new cGridBag().setVertical(true);
1478	1675	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1479	1676
..	..	@@ -1483,6 +1680,9 @@
1483	1680	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1484	1681	//XYZPanel.setName("XYZ");
1485	1682
	1683	+ transformPanel.add(resetTransformPanel);
	1684	+ transformPanel.add(XYZPanel);
	1685	+
1486	1686	/*
1487	1687	gridPanel = new JPanel(); //new BorderLayout());
1488	1688	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1490,12 +1690,12 @@
1490	1690	gridPanel.add(cameraView);
1491	1691	gridPanel.add(XYZPanel);
1492	1692	*/
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);
	1693	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1694	+// gridPanel.setContinuousLayout(true);
	1695	+// gridPanel.setOneTouchExpandable(true);
	1696	+// gridPanel.setDividerLocation(1.0);
	1697	+// gridPanel.setDividerSize(9);
	1698	+// gridPanel.setResizeWeight(0.85);
1499	1699
1500	1700	// aConstraints.weighty = 0;
1501	1701	//System.out.println("THIS = " + this);
..	..	@@ -1518,25 +1718,34 @@
1518	1718
1519	1719	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1520	1720	//tmp.setName("Edit");
	1721	+ objectPanel.add(toolboxPanel);
	1722	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1723	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
	1724	+
1521	1725	objectPanel.add(materialPanel);
1522		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1726	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1727	+ objectPanel.setToolTipTextAt(1, "Material");
	1728	+
	1729	+ objectPanel.add(skyboxPanel);
	1730	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1731	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1732	+
1523	1733	// JPanel north = new JPanel(new BorderLayout());
1524	1734	// north.setName("Edit");
1525	1735	// north.add(ctrlPanel, BorderLayout.NORTH);
1526	1736	// objectPanel.add(north);
1527	1737	objectPanel.add(editPanel);
1528		- objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1738	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1739	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1529	1740
1530		- //if (Globals.ADVANCED)
1531		- objectPanel.add(infoPanel);
1532		- objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1741	+ objectPanel.add(transformPanel);
	1742	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1743	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1533	1744
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		-
	1745	+ patchMaterial = true;
	1746	+ cameraView.patchMaterial = this;
	1747	+ objectPanel.setSelectedIndex(1);
	1748	+
1540	1749	/*
1541	1750	aConstraints.gridx = 0;
1542	1751	aConstraints.gridwidth = 1;
..	..	@@ -1556,7 +1765,7 @@
1556	1765	scrollpane.addMouseWheelListener(this); // Default not fast enough
1557	1766
1558	1767	/JTabbedPane/ scenePanel = new cGridBag();
1559		- scenePanel.preferredWidth = 5;
	1768	+ scenePanel.preferredWidth = 6;
1560	1769
1561	1770	JTabbedPane tabbedPane = new JTabbedPane();
1562	1771	tabbedPane.add(scrollpane);
..	..	@@ -1567,11 +1776,51 @@
1567	1776
1568	1777	AddOptions(optionsPanel); //, aConstraints);
1569	1778
1570		- tabbedPane.add(optionsPanel);
1571		-
1572	1779	tabbedPane.add(FSPane = new cFileSystemPane(this));
1573	1780
	1781	+ tabbedPane.add(optionsPanel);
	1782	+
1574	1783	scenePanel.add(tabbedPane);
	1784	+
	1785	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1786	+ creditsPanel.setName("Credits");
	1787	+
	1788	+ cLabel ogaLabel = new cLabel(" Most Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1789	+ creditsPanel.add(ogaLabel);
	1790	+
	1791	+ cButton opengameartButton;
	1792	+ creditsPanel.add(opengameartButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1793	+ opengameartButton.setToolTipText("https://opengameart.org");
	1794	+
	1795	+ opengameartButton.addMouseListener(new MouseAdapter()
	1796	+ {
	1797	+ public void mouseClicked(MouseEvent e)
	1798	+ {
	1799	+ try
	1800	+ {
	1801	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1802	+ } catch (Exception e1)
	1803	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1804	+ {
	1805	+ e1.printStackTrace();
	1806	+ }
	1807	+ }
	1808	+ });
	1809	+
	1810	+ for (int i=10; --i>=0;)
	1811	+ {
	1812	+ creditsPanel.add(new cGridBag());
	1813	+ }
	1814	+
	1815	+ tabbedPane.add(creditsPanel);
	1816	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1817	+
	1818	+ if (Globals.ADVANCED)
	1819	+ {
	1820	+ tabbedPane.add(infoPanel);
	1821	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1822	+ tabbedPane.setToolTipTextAt(4, "Information");
	1823	+ }
1575	1824
1576	1825	/*
1577	1826	cTree jTree = new cTree(null);
..	..	@@ -1593,13 +1842,13 @@
1593	1842	jtp.add(tree);
1594	1843	*/
1595	1844
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");
	1845	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1846	+// bigPanel.setContinuousLayout(true);
	1847	+// bigPanel.setOneTouchExpandable(true);
	1848	+// bigPanel.setDividerLocation(0.8);
	1849	+// bigPanel.setDividerSize(15);
	1850	+// bigPanel.setResizeWeight(0.15);
	1851	+// bigPanel.setName("Scene");
1603	1852
1604	1853	//bigPanel.setLayout(new BorderLayout());
1605	1854	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1643,6 +1892,23 @@
1643	1892	// aConstraints.gridheight = 1;
1644	1893
1645	1894	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1895	+
	1896	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1897	+ new java.beans.PropertyChangeListener()
	1898	+ {
	1899	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1900	+ {
	1901	+ if ((Integer)pce.getOldValue() == 1)
	1902	+ {
	1903	+ if (radio.layout != expandedLayout)
	1904	+ {
	1905	+ radio.layout = expandedLayout;
	1906	+ radio.layout.doClick();
	1907	+ }
	1908	+ }
	1909	+ }
	1910	+ });
	1911	+
1646	1912	framePanel.setContinuousLayout(false);
1647	1913	framePanel.setOneTouchExpandable(false);
1648	1914	//.setDividerLocation(0.8);
..	..	@@ -1652,7 +1918,7 @@
1652	1918
1653	1919	frame.getContentPane().setLayout(new BorderLayout());
1654	1920	/**/
1655		- JTabbedPane worldPane = new JTabbedPane();
	1921	+ //JTabbedPane worldPane = new JTabbedPane();
1656	1922	//worldPane.add(bigPanel);
1657	1923	//worldPane.add(worldPanel);
1658	1924	/**/
..	..	@@ -1666,7 +1932,7 @@
1666	1932
1667	1933	cameraView.requestFocusInWindow();
1668	1934
1669		- gridPanel.setDividerLocation(1.0);
	1935	+// gridPanel.setDividerLocation(1.0);
1670	1936
1671	1937	frame.validate();
1672	1938
..	..	@@ -1675,7 +1941,6 @@
1675	1941	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1676	1942	frame.addWindowListener(new WindowAdapter()
1677	1943	{
1678		-
1679	1944	public void windowClosing(WindowEvent e)
1680	1945	{
1681	1946	Close();
..	..	@@ -1698,28 +1963,442 @@
1698	1963	ctrlPanel.removeAll();
1699	1964	}
1700	1965
1701		- void SetupMaterial(cGridBag panel)
	1966	+ void SetupMaterial(cGridBag materialpanel)
1702	1967	{
1703		- /*
	1968	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1969	+
	1970	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	1971	+ skin.setToolTipText("Skin");
	1972	+ skin.addMouseListener(new MouseAdapter()
	1973	+ {
	1974	+ public void mouseClicked(MouseEvent e)
	1975	+ {
	1976	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1977	+ cMaterial material = object.material;
	1978	+
	1979	+ // Skin
	1980	+ colorField.setFloat(material.color);
	1981	+ float saturation = material.modulation;
	1982	+
	1983	+ if (!cameraView.Skinshader)
	1984	+ {
	1985	+ saturation /= 1.5;
	1986	+ }
	1987	+
	1988	+ saturationField.setFloat(saturation);
	1989	+
	1990	+ subsurfaceField.setFloat(material.subsurface);
	1991	+ selfshadowField.setFloat(material.diffuseness);
	1992	+ diffusenessField.setFloat(material.factor);
	1993	+ shininessField.setFloat(material.shininess);
	1994	+ shadowbiasField.setFloat(material.shadowbias);
	1995	+ diffuseField.setFloat(material.diffuse);
	1996	+ specularField.setFloat(material.specular);
	1997	+
	1998	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1999	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2000	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2001	+
	2002	+ materialtouched = true;
	2003	+ applySelf();
	2004	+ }
	2005	+ });
	2006	+ presetpanel.add(skin);
	2007	+
	2008	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2009	+ lambert.setToolTipText("Diffuse");
	2010	+ lambert.addMouseListener(new MouseAdapter()
	2011	+ {
	2012	+ public void mouseClicked(MouseEvent e)
	2013	+ {
	2014	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2015	+ cMaterial material = object.material;
	2016	+
	2017	+ diffusenessField.setFloat(material.factor);
	2018	+ selfshadowField.setFloat(material.diffuseness);
	2019	+
	2020	+ materialtouched = true;
	2021	+ applySelf();
	2022	+ }
	2023	+ });
	2024	+ presetpanel.add(lambert);
	2025	+
	2026	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2027	+ diffuse2.setToolTipText("Diffuse2");
	2028	+ diffuse2.addMouseListener(new MouseAdapter()
	2029	+ {
	2030	+ public void mouseClicked(MouseEvent e)
	2031	+ {
	2032	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2033	+ cMaterial material = object.material;
	2034	+
	2035	+ diffusenessField.setFloat(material.factor);
	2036	+ selfshadowField.setFloat(material.diffuseness);
	2037	+
	2038	+ materialtouched = true;
	2039	+ applySelf();
	2040	+ }
	2041	+ });
	2042	+ presetpanel.add(diffuse2);
	2043	+
	2044	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2045	+ diffusemoon.setToolTipText("Moon");
	2046	+ diffusemoon.addMouseListener(new MouseAdapter()
	2047	+ {
	2048	+ public void mouseClicked(MouseEvent e)
	2049	+ {
	2050	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2051	+ cMaterial material = object.material;
	2052	+
	2053	+ diffusenessField.setFloat(material.factor);
	2054	+ selfshadowField.setFloat(material.diffuseness);
	2055	+
	2056	+ materialtouched = true;
	2057	+ applySelf();
	2058	+ }
	2059	+ });
	2060	+ presetpanel.add(diffusemoon);
	2061	+
	2062	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2063	+ diffusemoon2.setToolTipText("Moon2");
	2064	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2065	+ {
	2066	+ public void mouseClicked(MouseEvent e)
	2067	+ {
	2068	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2069	+ cMaterial material = object.material;
	2070	+
	2071	+ diffusenessField.setFloat(material.factor);
	2072	+ selfshadowField.setFloat(material.diffuseness);
	2073	+
	2074	+ materialtouched = true;
	2075	+ applySelf();
	2076	+ }
	2077	+ });
	2078	+ presetpanel.add(diffusemoon2);
	2079	+
	2080	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2081	+ diffusemoon3.setToolTipText("Moon3");
	2082	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2083	+ {
	2084	+ public void mouseClicked(MouseEvent e)
	2085	+ {
	2086	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2087	+ cMaterial material = object.material;
	2088	+
	2089	+ diffusenessField.setFloat(material.factor);
	2090	+ selfshadowField.setFloat(material.diffuseness);
	2091	+
	2092	+ materialtouched = true;
	2093	+ applySelf();
	2094	+ }
	2095	+ });
	2096	+ presetpanel.add(diffusemoon3);
	2097	+
	2098	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2099	+ diffusesheen.setToolTipText("Sheen");
	2100	+ diffusesheen.addMouseListener(new MouseAdapter()
	2101	+ {
	2102	+ public void mouseClicked(MouseEvent e)
	2103	+ {
	2104	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2105	+ cMaterial material = object.material;
	2106	+
	2107	+ sheenField.setFloat(material.sheen);
	2108	+
	2109	+ materialtouched = true;
	2110	+ applySelf();
	2111	+ }
	2112	+ });
	2113	+ presetpanel.add(diffusesheen);
	2114	+
	2115	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2116	+ rough.setToolTipText("Rough metal");
	2117	+ rough.addMouseListener(new MouseAdapter()
	2118	+ {
	2119	+ public void mouseClicked(MouseEvent e)
	2120	+ {
	2121	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2122	+ cMaterial material = object.material;
	2123	+
	2124	+ shininessField.setFloat(material.shininess);
	2125	+ velvetField.setFloat(material.velvet);
	2126	+
	2127	+ materialtouched = true;
	2128	+ applySelf();
	2129	+ }
	2130	+ });
	2131	+ presetpanel.add(rough);
	2132	+
	2133	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2134	+ rough2.setToolTipText("Medium metal");
	2135	+ rough2.addMouseListener(new MouseAdapter()
	2136	+ {
	2137	+ public void mouseClicked(MouseEvent e)
	2138	+ {
	2139	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2140	+ cMaterial material = object.material;
	2141	+
	2142	+ shininessField.setFloat(material.shininess);
	2143	+ lightareaField.setFloat(material.lightarea);
	2144	+
	2145	+ materialtouched = true;
	2146	+ applySelf();
	2147	+ }
	2148	+ });
	2149	+ presetpanel.add(rough2);
	2150	+
	2151	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2152	+ shini0.setToolTipText("Shiny");
	2153	+ shini0.addMouseListener(new MouseAdapter()
	2154	+ {
	2155	+ public void mouseClicked(MouseEvent e)
	2156	+ {
	2157	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2158	+ cMaterial material = object.material;
	2159	+
	2160	+ shininessField.setFloat(material.shininess);
	2161	+ lightareaField.setFloat(material.lightarea);
	2162	+
	2163	+ materialtouched = true;
	2164	+ applySelf();
	2165	+ }
	2166	+ });
	2167	+ presetpanel.add(shini0);
	2168	+
	2169	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2170	+ shini1.setToolTipText("Shiny2");
	2171	+ shini1.addMouseListener(new MouseAdapter()
	2172	+ {
	2173	+ public void mouseClicked(MouseEvent e)
	2174	+ {
	2175	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2176	+ cMaterial material = object.material;
	2177	+
	2178	+ shininessField.setFloat(material.shininess);
	2179	+ lightareaField.setFloat(material.lightarea);
	2180	+
	2181	+ materialtouched = true;
	2182	+ applySelf();
	2183	+ }
	2184	+ });
	2185	+ presetpanel.add(shini1);
	2186	+
	2187	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2188	+ shini2.setToolTipText("Shiny3");
	2189	+ shini2.addMouseListener(new MouseAdapter()
	2190	+ {
	2191	+ public void mouseClicked(MouseEvent e)
	2192	+ {
	2193	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2194	+ cMaterial material = object.material;
	2195	+
	2196	+ shininessField.setFloat(material.shininess);
	2197	+ lightareaField.setFloat(material.lightarea);
	2198	+
	2199	+ materialtouched = true;
	2200	+ applySelf();
	2201	+ }
	2202	+ });
	2203	+ presetpanel.add(shini2);
	2204	+
	2205	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2206	+ aniso.setToolTipText("AnisoU");
	2207	+ aniso.addMouseListener(new MouseAdapter()
	2208	+ {
	2209	+ public void mouseClicked(MouseEvent e)
	2210	+ {
	2211	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2212	+ cMaterial material = object.material;
	2213	+
	2214	+ anisoField.setFloat(material.aniso);
	2215	+ anisoVField.setFloat(material.anisoV);
	2216	+
	2217	+ materialtouched = true;
	2218	+ applySelf();
	2219	+ }
	2220	+ });
	2221	+ presetpanel.add(aniso);
	2222	+
	2223	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2224	+ aniso2.setToolTipText("AnisoV");
	2225	+ aniso2.addMouseListener(new MouseAdapter()
	2226	+ {
	2227	+ public void mouseClicked(MouseEvent e)
	2228	+ {
	2229	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2230	+ cMaterial material = object.material;
	2231	+
	2232	+ anisoField.setFloat(material.aniso);
	2233	+ anisoVField.setFloat(material.anisoV);
	2234	+
	2235	+ materialtouched = true;
	2236	+ applySelf();
	2237	+ }
	2238	+ });
	2239	+ presetpanel.add(aniso2);
	2240	+
	2241	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2242	+ aniso3.setToolTipText("AnisoUV");
	2243	+ aniso3.addMouseListener(new MouseAdapter()
	2244	+ {
	2245	+ public void mouseClicked(MouseEvent e)
	2246	+ {
	2247	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2248	+ cMaterial material = object.material;
	2249	+
	2250	+ anisoField.setFloat(material.aniso);
	2251	+ anisoVField.setFloat(material.anisoV);
	2252	+
	2253	+ materialtouched = true;
	2254	+ applySelf();
	2255	+ }
	2256	+ });
	2257	+ presetpanel.add(aniso3);
	2258	+
	2259	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2260	+ velvet0.setToolTipText("Velvet");
	2261	+ velvet0.addMouseListener(new MouseAdapter()
	2262	+ {
	2263	+ public void mouseClicked(MouseEvent e)
	2264	+ {
	2265	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2266	+ cMaterial material = object.material;
	2267	+
	2268	+ diffusenessField.setFloat(material.factor);
	2269	+ selfshadowField.setFloat(material.diffuseness);
	2270	+ sheenField.setFloat(material.sheen);
	2271	+ shininessField.setFloat(material.shininess);
	2272	+ velvetField.setFloat(material.velvet);
	2273	+ shiftField.setFloat(material.shift);
	2274	+
	2275	+ materialtouched = true;
	2276	+ applySelf();
	2277	+ }
	2278	+ });
	2279	+ presetpanel.add(velvet0);
	2280	+
	2281	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2282	+ bump0.setToolTipText("Bump texture");
	2283	+ bump0.addMouseListener(new MouseAdapter()
	2284	+ {
	2285	+ public void mouseClicked(MouseEvent e)
	2286	+ {
	2287	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2288	+ cMaterial material = object.material;
	2289	+
	2290	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2291	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2292	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2293	+
	2294	+ materialtouched = true;
	2295	+ applySelf();
	2296	+ }
	2297	+ });
	2298	+ presetpanel.add(bump0);
	2299	+
	2300	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2301	+ borderShader.setToolTipText("Border fade");
	2302	+ borderShader.addMouseListener(new MouseAdapter()
	2303	+ {
	2304	+ public void mouseClicked(MouseEvent e)
	2305	+ {
	2306	+ borderfadeField.setFloat(0.5);
	2307	+ opacityField.setFloat(0.75);
	2308	+
	2309	+ materialtouched = true;
	2310	+ applySelf();
	2311	+ }
	2312	+ });
	2313	+ presetpanel.add(borderShader);
	2314	+
	2315	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
	2316	+ halo.setToolTipText("Halo");
	2317	+ halo.addMouseListener(new MouseAdapter()
	2318	+ {
	2319	+ public void mouseClicked(MouseEvent e)
	2320	+ {
	2321	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2322	+ cMaterial material = object.material;
	2323	+
	2324	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2325	+
	2326	+ materialtouched = true;
	2327	+ applySelf();
	2328	+ }
	2329	+ });
	2330	+ presetpanel.add(halo);
	2331	+
	2332	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2333	+ candle.setToolTipText("Candle");
	2334	+ candle.addMouseListener(new MouseAdapter()
	2335	+ {
	2336	+ public void mouseClicked(MouseEvent e)
	2337	+ {
	2338	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2339	+ cMaterial material = object.material;
	2340	+
	2341	+ subsurfaceField.setFloat(material.subsurface);
	2342	+ shadowbiasField.setFloat(material.shadowbias);
	2343	+ ambientField.setFloat(material.ambient);
	2344	+ specularField.setFloat(material.specular);
	2345	+ lightareaField.setFloat(material.lightarea);
	2346	+ shininessField.setFloat(material.shininess);
	2347	+
	2348	+ materialtouched = true;
	2349	+ applySelf();
	2350	+ }
	2351	+ });
	2352	+ presetpanel.add(candle);
	2353	+
	2354	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2355	+ shadowShader.setToolTipText("Shadow");
	2356	+ shadowShader.addMouseListener(new MouseAdapter()
	2357	+ {
	2358	+ public void mouseClicked(MouseEvent e)
	2359	+ {
	2360	+ diffuseField.setFloat(0.001);
	2361	+ ambientField.setFloat(0.001);
	2362	+ cameraField.setFloat(0.001);
	2363	+ specularField.setFloat(0.001);
	2364	+ fakedepthField.setFloat(0.001);
	2365	+ opacityField.setFloat(0.6);
	2366	+
	2367	+ materialtouched = true;
	2368	+ applySelf();
	2369	+ }
	2370	+ });
	2371	+ presetpanel.add(shadowShader);
	2372	+
	2373	+ cGridBag panel = new cGridBag().setVertical(true);
	2374	+
	2375	+ presetpanel.preferredWidth = 1;
	2376	+
	2377	+ materialpanel.add(presetpanel);
	2378	+ materialpanel.add(panel);
	2379	+
	2380	+ panel.preferredWidth = 8;
	2381	+
	2382	+ /*
1704	2383	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1705	2384	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706		- */
	2385	+ */
1707	2386
1708	2387	cGridBag editBar = new cGridBag().setVertical(false);
1709	2388
1710		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2389	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
1711	2390	createMaterialButton.setToolTipText("Create material");
1712	2391
1713	2392	/*
1714	2393	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1715	2394	*/
1716	2395
1717		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2396	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
1718	2397	clearMaterialButton.setToolTipText("Clear material");
1719	2398
1720	2399	if (Globals.ADVANCED)
1721	2400	{
1722		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2401	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
1723	2402	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1724	2403	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1725	2404	}
..	..	@@ -1737,27 +2416,61 @@
1737	2416	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1738	2417
1739	2418	cGridBag colorSection = new cGridBag().setVertical(true);
	2419	+
	2420	+ cGridBag huepanel = new cGridBag();
	2421	+ cGridBag huelabel = new cGridBag();
	2422	+ cLabel hue = GetLabel("icons/hue.png", false);
	2423	+ hue.fit = true;
	2424	+
	2425	+ hue.addMouseListener(new MouseAdapter()
	2426	+ {
	2427	+ public void mousePressed(MouseEvent e)
	2428	+ {
	2429	+ int x = e.getX();
	2430	+
	2431	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2432	+ }
	2433	+ });
	2434	+
	2435	+ huelabel.add(hue);
	2436	+ huelabel.preferredWidth = 20;
	2437	+ huepanel.add(new cGridBag()); // Label
	2438	+ huepanel.add(huelabel); // Field/slider
	2439	+
	2440	+ huepanel.preferredHeight = 7;
	2441	+
	2442	+ colorSection.add(huepanel);
1740	2443
1741	2444	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);
	2445	+
	2446	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2447	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2448	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2449	+
1745	2450	//colorField.preferredWidth = 200;
1746	2451	colorSection.add(color);
1747	2452
1748	2453	cGridBag modulation = new cGridBag();
1749	2454	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1750	2455	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1751		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2456	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1752	2457	colorSection.add(modulation);
1753	2458
	2459	+ cGridBag opacity = new cGridBag();
	2460	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2461	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2462	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2463	+ colorSection.add(opacity);
	2464	+
	2465	+ colorSection.add(GetSeparator());
	2466	+
1754	2467	cGridBag texture = new cGridBag();
1755	2468	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1756	2469	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1757	2470	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1758	2471	colorSection.add(texture);
1759	2472
1760		- panel.add(new JSeparator());
	2473	+ panel.add(GetSeparator());
1761	2474
1762	2475	panel.add(colorSection);
1763	2476
..	..	@@ -1813,7 +2526,7 @@
1813	2526	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1814	2527	diffuseSection.add(shadowbias);
1815	2528
1816		- panel.add(new JSeparator());
	2529	+ panel.add(GetSeparator());
1817	2530
1818	2531	panel.add(diffuseSection);
1819	2532
..	..	@@ -1876,7 +2589,7 @@
1876	2589	specularSection.add(anisoV);
1877	2590
1878	2591
1879		- panel.add(new JSeparator());
	2592	+ panel.add(GetSeparator());
1880	2593
1881	2594	panel.add(specularSection);
1882	2595
..	..	@@ -1901,12 +2614,6 @@
1901	2614	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1902	2615	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1903	2616	colorSection.add(backlit);
1904		-
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	2617
1911	2618	//panel.add(new JSeparator());
1912	2619
..	..	@@ -1952,7 +2659,7 @@
1952	2659	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1953	2660	textureSection.add(opacityPower);
1954	2661
1955		- panel.add(new JSeparator());
	2662	+ panel.add(GetSeparator());
1956	2663
1957	2664	panel.add(textureSection);
1958	2665
..	..	@@ -2939,7 +3646,7 @@
2939	3646
2940	3647	freezematerial = true;
2941	3648	colorField.setFloat(mat.color);
2942		- modulationField.setFloat(mat.modulation);
	3649	+ saturationField.setFloat(mat.modulation);
2943	3650	metalnessField.setFloat(mat.metalness);
2944	3651	diffuseField.setFloat(mat.diffuse);
2945	3652	specularField.setFloat(mat.specular);
..	..	@@ -3001,32 +3708,8 @@
3001	3708
3002	3709	if (multiplyToggle != null)
3003	3710	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		- }
	3711	+
	3712	+ AllocProjectedVertices(object);
3030	3713
3031	3714	SetMaterial(mat, object.projectedVertices);
3032	3715	}
..	..	@@ -3146,6 +3829,17 @@
3146	3829	public void itemStateChanged(ItemEvent event)
3147	3830	{
3148	3831	// System.out.println("Propagate = " + propagate);
	3832	+ if (event.getSource() == pinButton)
	3833	+ {
	3834	+ copy.pinned ^= true;
	3835	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3836	+ {
	3837	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3838	+ copy.CloseUI();
	3839	+ //copy.editWindow.refreshContents();
	3840	+ }
	3841	+ }
	3842	+ else
3149	3843	if (event.getSource() == propagateToggle)
3150	3844	{
3151	3845	propagate ^= true;
..	..	@@ -3250,6 +3944,7 @@
3250	3944	} else if (event.getSource() == liveCB)
3251	3945	{
3252	3946	copy.live ^= true;
	3947	+ objEditor.refreshContents(true); // To show item colors
3253	3948	return;
3254	3949	} else if (event.getSource() == selectableCB)
3255	3950	{
..	..	@@ -3259,7 +3954,7 @@
3259	3954	{
3260	3955	copy.hide ^= true;
3261	3956	copy.Touch(); // display list issue
3262		- objEditor.refreshContents();
	3957	+ objEditor.refreshContents(true); // To show item colors
3263	3958	return;
3264	3959	} else if (event.getSource() == link2masterCB)
3265	3960	{
..	..	@@ -3324,7 +4019,7 @@
3324	4019	//System.out.println("ObjEditor " + event);
3325	4020	applySelf0(true);
3326	4021	//parent.applySelf();
3327		- objEditor.refreshContents();
	4022	+ // conflicts with requestFocus objEditor.refreshContents();
3328	4023	} else if (source == resetButton)
3329	4024	{
3330	4025	CameraPane.fullreset = true;
..	..	@@ -3504,17 +4199,21 @@
3504	4199
3505	4200	void New()
3506	4201	{
3507		- while (copy.Size() > 1)
	4202	+ while (copy.Size() > 0)
3508	4203	{
3509		- copy.remove(1);
	4204	+ copy.remove(0);
3510	4205	}
3511	4206
	4207	+ copy.selection.clear();
	4208	+
3512	4209	ResetModel();
	4210	+ SetupViews();
3513	4211	objEditor.refreshContents();
3514	4212	}
3515	4213
3516	4214	static public byte[] Compress(Object3D o)
3517	4215	{
	4216	+ // Slower to actually compress.
3518	4217	try
3519	4218	{
3520	4219	ByteArrayOutputStream baos = new ByteArrayOutputStream();
..	..	@@ -3616,6 +4315,7 @@
3616	4315	{
3617	4316	//Save(true);
3618	4317	Replace();
	4318	+ SetVersionStates();
3619	4319	}
3620	4320
3621	4321	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3634,31 +4334,50 @@
3634	4334	return true;
3635	4335	}
3636	4336
3637		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4337	+ void DeleteVersion()
	4338	+ {
	4339	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4340	+ {
	4341	+ copy.versionlist[i] = copy.versionlist[i+1];
	4342	+ }
	4343	+
	4344	+ if (copy.versionlist[copy.versionindex] == null)
	4345	+ copy.versionindex -= 1;
	4346	+
	4347	+ if (copy.versionindex != -1)
	4348	+ CopyChanged();
	4349	+
	4350	+ SetVersionStates();
	4351	+ }
3638	4352
3639	4353	public boolean Save(boolean user)
3640	4354	{
3641	4355	System.err.println("Save");
	4356	+ Replace();
3642	4357
3643		- cRadio tab = GetCurrentTab();
	4358	+ //cRadio tab = GetCurrentTab();
3644	4359
3645		- byte[] compress = CompressCopy();
	4360	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3646	4361
3647	4362	boolean thesame = false;
3648	4363
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		- }
	4364	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4365	+// {
	4366	+// thesame = true;
	4367	+// }
3654	4368
3655	4369	//EditorFrame.m_MainFrame.requestFocusInWindow();
3656	4370	if (!thesame)
3657	4371	{
	4372	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4373	+ {
	4374	+ copy.versionlist[i] = copy.versionlist[i-1];
	4375	+ }
	4376	+
3658	4377	//tab.user[tab.versionindex] = user;
3659	4378	//boolean increment = true; // tab.graphs[tab.versionindex] == null;
3660	4379
3661		- copy.versions[++copy.versionindex] = compress;
	4380	+ copy.versionlist[++copy.versionindex] = compress;
3662	4381
3663	4382	// if (increment)
3664	4383	// tab.versionindex++;
..	..	@@ -3668,13 +4387,13 @@
3668	4387
3669	4388	//assert(hashtable.isEmpty());
3670	4389
3671		- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3672		- {
3673		- //tab.user[i] = false;
3674		- copy.versions[i] = null;
3675		- }
	4390	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4391	+// {
	4392	+// //tab.user[i] = false;
	4393	+// copy.versionlist[i] = null;
	4394	+// }
3676	4395
3677		- SetUndoStates();
	4396	+ SetVersionStates();
3678	4397
3679	4398	// test save
3680	4399	if (false)
..	..	@@ -3697,27 +4416,65 @@
3697	4416
3698	4417	return !thesame;
3699	4418	}
3700		-
3701		- void CopyChanged(Object3D obj)
	4419	+
	4420	+ boolean flashIt = true;
	4421	+
	4422	+ void RefreshSelection()
3702	4423	{
3703		- SetUndoStates();
	4424	+ Object3D selection = new Object3D();
	4425	+
	4426	+ for (int i = 0; i < copy.selection.size(); i++)
	4427	+ {
	4428	+ Object3D elem = copy.selection.elementAt(i);
	4429	+
	4430	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4431	+
	4432	+ if (obj == null)
	4433	+ {
	4434	+ copy.selection.remove(i--);
	4435	+ }
	4436	+ else
	4437	+ {
	4438	+ selection.add(obj);
	4439	+ copy.selection.setElementAt(obj, i);
	4440	+ }
	4441	+ }
	4442	+
	4443	+ flashIt = false;
	4444	+ GetTree().clearSelection();
	4445	+ for (int i = 0; i < selection.size(); i++)
	4446	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4447	+ flashIt = true;
	4448	+
	4449	+ //refreshContents(false);
	4450	+ }
	4451	+
	4452	+ void CopyChanged()
	4453	+ {
	4454	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4455	+
	4456	+ SetVersionStates();
3704	4457
3705	4458	boolean temp = CameraPane.SWITCH;
3706	4459	CameraPane.SWITCH = false;
3707	4460
3708		- copy.ExtractBigData(versiontable);
	4461	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3709	4462
3710	4463	copy.clear();
3711	4464
	4465	+ copy.skyboxname = obj.skyboxname;
	4466	+ copy.skyboxext = obj.skyboxext;
	4467	+
3712	4468	for (int i=0; i<obj.Size(); i++)
3713	4469	{
3714	4470	copy.add(obj.get(i));
3715	4471	}
3716	4472
3717		- copy.RestoreBigData(versiontable);
	4473	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3718	4474
3719	4475	CameraPane.SWITCH = temp;
3720	4476
	4477	+ RefreshSelection();
3721	4478	//assert(hashtable.isEmpty());
3722	4479
3723	4480	copy.Touch();
..	..	@@ -3738,13 +4495,15 @@
3738	4495	}
3739	4496	}
3740	4497
3741		- refreshContents();
	4498	+ refreshContents(true);
3742	4499	}
3743	4500
3744		- cButton undoButton;
	4501	+ cButton previousVersionButton;
3745	4502	cButton restoreButton;
3746	4503	cButton replaceButton;
3747		- cButton redoButton;
	4504	+ cButton nextVersionButton;
	4505	+ cButton saveVersionButton;
	4506	+ cButton deleteVersionButton;
3748	4507
3749	4508	boolean muteSlider;
3750	4509
..	..	@@ -3752,39 +4511,64 @@
3752	4511	{
3753	4512	int count = 0;
3754	4513
3755		- for (int i = copy.versions.length; --i >= 0;)
	4514	+ for (int i = copy.versionlist.length; --i >= 0;)
3756	4515	{
3757		- if (copy.versions[i] != null)
	4516	+ if (copy.versionlist[i] != null)
3758	4517	count++;
3759	4518	}
3760	4519
3761	4520	return count;
3762	4521	}
3763	4522
3764		- void SetUndoStates()
	4523	+ public cGridBag versionSliderPane;
	4524	+
	4525	+ void SetVersionStates()
3765	4526	{
3766		- cRadio tab = GetCurrentTab();
	4527	+ //if (true)
	4528	+ // return;
	4529	+
	4530	+ //cRadio tab = GetCurrentTab();
3767	4531
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;
	4532	+ if (copy.versionlist == null)
	4533	+ {
	4534	+ saveVersionButton.setEnabled(false);
	4535	+ restoreButton.setEnabled(false);
	4536	+ replaceButton.setEnabled(false);
	4537	+ previousVersionButton.setEnabled(false);
	4538	+ nextVersionButton.setEnabled(false);
	4539	+ deleteVersionButton.setEnabled(false);
	4540	+ versionSliderPane.setVisible(false);
	4541	+ }
	4542	+ else
	4543	+ {
	4544	+ restoreButton.setEnabled(copy.versionindex != -1);
	4545	+ replaceButton.setEnabled(copy.versionindex != -1);
	4546	+
	4547	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4548	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4549	+
	4550	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4551	+ //copy.versionlist[copy.versionindex + 1] != null);
	4552	+
	4553	+ muteSlider = true;
	4554	+ versionSlider.setMinimum(0);
	4555	+ versionSlider.setMaximum(VersionCount() - 1);
	4556	+ versionSlider.setInteger(copy.versionindex);
	4557	+ versionSlider.setEnabled(copy.versionindex != -1);
	4558	+ muteSlider = false;
	4559	+
	4560	+ versionSliderPane.setVisible(true);
	4561	+ }
3778	4562	}
3779	4563
3780		- public boolean Undo()
	4564	+ public boolean PreviousVersion()
3781	4565	{
3782	4566	// Option?
3783	4567	Replace();
3784	4568
3785	4569	System.err.println("Undo");
3786	4570
3787		- cRadio tab = GetCurrentTab();
	4571	+ //cRadio tab = GetCurrentTab();
3788	4572
3789	4573	if (copy.versionindex == 0)
3790	4574	{
..	..	@@ -3807,7 +4591,7 @@
3807	4591
3808	4592	copy.versionindex -= 1;
3809	4593
3810		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4594	+ CopyChanged();
3811	4595
3812	4596	return true;
3813	4597	}
..	..	@@ -3816,44 +4600,45 @@
3816	4600	{
3817	4601	System.err.println("Restore");
3818	4602
3819		- cRadio tab = GetCurrentTab();
	4603	+ //cRadio tab = GetCurrentTab();
3820	4604
3821		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4605	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3822	4606	{
3823	4607	java.awt.Toolkit.getDefaultToolkit().beep();
3824	4608	return false;
3825	4609	}
3826	4610
3827		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4611	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4612	+ CopyChanged();
3828	4613
3829	4614	return true;
3830	4615	}
3831	4616
3832	4617	public boolean Replace()
3833	4618	{
3834		- System.err.println("Replace");
	4619	+ //System.err.println("Replace");
3835	4620
3836		- cRadio tab = GetCurrentTab();
	4621	+ //cRadio tab = GetCurrentTab();
3837	4622
3838		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4623	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3839	4624	{
3840	4625	// No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3841	4626	return false;
3842	4627	}
3843	4628
3844		- copy.versions[copy.versionindex] = CompressCopy();
	4629	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
3845	4630
3846	4631	return true;
3847	4632	}
3848	4633
3849		- public void Redo()
	4634	+ public void NextVersion()
3850	4635	{
3851	4636	// Option?
3852	4637	Replace();
3853	4638
3854		- cRadio tab = GetCurrentTab();
	4639	+ //cRadio tab = GetCurrentTab();
3855	4640
3856		- if (copy.versions[copy.versionindex + 1] == null)
	4641	+ if (copy.versionlist[copy.versionindex + 1] == null)
3857	4642	{
3858	4643	java.awt.Toolkit.getDefaultToolkit().beep();
3859	4644	return;
..	..	@@ -3861,7 +4646,7 @@
3861	4646
3862	4647	copy.versionindex += 1;
3863	4648
3864		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4649	+ CopyChanged();
3865	4650
3866	4651	//if (!tab.user[tab.versionindex])
3867	4652	// tab.graphs[tab.versionindex] = null;
..	..	@@ -4058,6 +4843,12 @@
4058	4843	// else
4059	4844	// applySelf(true);
4060	4845	// }
	4846	+
	4847	+ boolean Equal(double a, double b)
	4848	+ {
	4849	+ return Math.abs(a - b) < 0.001;
	4850	+ }
	4851	+
4061	4852	void applySelf0(boolean name)
4062	4853	{
4063	4854	if (name)
..	..	@@ -4075,7 +4866,7 @@
4075	4866	//copy.material = new cMaterial(copy.GetMaterial());
4076	4867
4077	4868	current.color = (float) colorField.getFloat();
4078		- current.modulation = (float) modulationField.getFloat();
	4869	+ current.modulation = (float) saturationField.getFloat();
4079	4870	current.metalness = (float) metalnessField.getFloat();
4080	4871	current.diffuse = (float) diffuseField.getFloat();
4081	4872	current.specular = (float) specularField.getFloat();
..	..	@@ -4107,29 +4898,52 @@
4107	4898	{
4108	4899	cMaterial mat = copy.material;
4109	4900
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));
	4901	+ if (!Equal(colorField.getFloat(), mat.color))
	4902	+ colorField.SetToolTipValue((mat.color));
	4903	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4904	+ saturationField.SetToolTipValue((mat.modulation));
	4905	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4906	+ metalnessField.SetToolTipValue((mat.metalness));
	4907	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4908	+ diffuseField.SetToolTipValue((mat.diffuse));
	4909	+ if (!Equal(specularField.getFloat(), mat.specular))
	4910	+ specularField.SetToolTipValue((mat.specular));
	4911	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4912	+ shininessField.SetToolTipValue((mat.shininess));
	4913	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4914	+ shiftField.SetToolTipValue((mat.shift));
	4915	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4916	+ ambientField.SetToolTipValue((mat.ambient));
	4917	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4918	+ lightareaField.SetToolTipValue((mat.lightarea));
	4919	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4920	+ diffusenessField.SetToolTipValue((mat.factor));
	4921	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4922	+ velvetField.SetToolTipValue((mat.velvet));
	4923	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4924	+ sheenField.SetToolTipValue((mat.sheen));
	4925	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4926	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4927	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4928	+ backlitField.SetToolTipValue((mat.bump));
	4929	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4930	+ anisoField.SetToolTipValue((mat.aniso));
	4931	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4932	+ anisoVField.SetToolTipValue((mat.anisoV));
	4933	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4934	+ cameraField.SetToolTipValue((mat.cameralight));
	4935	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	4936	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4937	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	4938	+ shadowField.SetToolTipValue((mat.shadow));
	4939	+ if (!Equal(textureField.getFloat(), mat.texture))
	4940	+ textureField.SetToolTipValue((mat.texture));
	4941	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	4942	+ opacityField.SetToolTipValue((mat.opacity));
	4943	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	4944	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4945	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	4946	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4133	4947	}
4134	4948
4135	4949	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4164,17 +4978,20 @@
4164	4978
4165	4979	public void stateChanged(ChangeEvent e)
4166	4980	{
4167		- // assert(false);
	4981	+ // assert(false);
4168	4982	if (e.getSource() == versionSlider)
4169	4983	{
4170	4984	if (muteSlider)
4171	4985	return;
4172	4986
	4987	+ Replace();
	4988	+
4173	4989	int version = versionSlider.getInteger();
4174	4990
4175		- if (copy.versions[version] != null)
	4991	+ if (version != -1 && copy.versionlist[version] != null)
4176	4992	{
4177		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4993	+ copy.versionindex = version;
	4994	+ CopyChanged();
4178	4995	}
4179	4996
4180	4997	return;
..	..	@@ -4214,6 +5031,12 @@
4214	5031	{
4215	5032	//System.out.println("stateChanged = " + this);
4216	5033	materialtouched = true;
	5034	+
	5035	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5036	+ {
	5037	+ saturationField.setFloat(1);
	5038	+ }
	5039	+
4217	5040	applySelf();
4218	5041	//System.out.println("this = " + this);
4219	5042	//System.out.println("PARENT = " + parent);
..	..	@@ -4513,6 +5336,7 @@
4513	5336	{
4514	5337	if (GetTree() != null)
4515	5338	{
	5339	+ GetTree().revalidate();
4516	5340	GetTree().repaint();
4517	5341	}
4518	5342
..	..	@@ -4521,6 +5345,11 @@
4521	5345	ctrlPanel.validate(); // ? new
4522	5346	ctrlPanel.repaint();
4523	5347	}
	5348	+
	5349	+ if (previousVersionButton != null && copy.versionlist != null)
	5350	+ SetVersionStates();
	5351	+
	5352	+ cameraView.requestFocusInWindow();
4524	5353	}
4525	5354
4526	5355	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4552,7 +5381,7 @@
4552	5381	// group = (Composite) group.get(0);
4553	5382	// }
4554	5383
4555		- System.out.println("makeSomething of " + thing);
	5384	+ //System.out.println("makeSomething of " + thing);
4556	5385
4557	5386	/*
4558	5387	if (deselect && jList != null)
..	..	@@ -4769,7 +5598,9 @@
4769	5598	readobj.ResetDisplayList();
4770	5599	} catch (Exception e)
4771	5600	{
4772		- e.printStackTrace();
	5601	+ if (!e.toString().contains("GZIP"))
	5602	+ e.printStackTrace();
	5603	+
4773	5604	try
4774	5605	{
4775	5606	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4849,6 +5680,8 @@
4849	5680	{
4850	5681	//readobj.deepCopySelf(copy);
4851	5682	copy.clear(); // june 2014
	5683	+ copy.skyboxname = readobj.skyboxname;
	5684	+ copy.skyboxext = readobj.skyboxext;
4852	5685	for (int i = 0; i < readobj.size(); i++)
4853	5686	{
4854	5687	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4889,6 +5722,7 @@
4889	5722	}
4890	5723	} catch (ClassCastException e)
4891	5724	{
	5725	+ e.printStackTrace();
4892	5726	assert (false);
4893	5727	Composite c = (Composite) copy;
4894	5728	c.children.clear();
..	..	@@ -4899,13 +5733,17 @@
4899	5733	c.addChild(csg);
4900	5734	}
4901	5735
4902		- copy.versions = readobj.versions;
	5736	+ copy.versionlist = readobj.versionlist;
4903	5737	copy.versionindex = readobj.versionindex;
	5738	+ copy.versiontable = readobj.versiontable;
4904	5739
4905		- if (copy.versions == null)
	5740	+ if (copy.versionlist == null)
4906	5741	{
4907		- copy.versions = new byte[100][];
	5742	+ // Backward compatibility
	5743	+ copy.versionlist = new Object3D[100];
4908	5744	copy.versionindex = -1;
	5745	+
	5746	+ //Save(true);
4909	5747	}
4910	5748
4911	5749	//? SetUndoStates();
..	..	@@ -4920,7 +5758,7 @@
4920	5758	{
4921	5759	if (Grafreed.standAlone)
4922	5760	{
4923		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5761	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4924	5762	browser.show();
4925	5763	String filename = browser.getFile();
4926	5764	if (filename != null && filename.length() > 0)
..	..	@@ -4997,6 +5835,8 @@
4997	5835
4998	5836	void save()
4999	5837	{
	5838	+ Replace();
	5839	+
5000	5840	if (lastname == null)
5001	5841	{
5002	5842	return;
..	..	@@ -5239,6 +6079,7 @@
5239	6079	ButtonGroup buttonGroup;
5240	6080
5241	6081	cGridBag toolboxPanel;
	6082	+ cGridBag skyboxPanel;
5242	6083	cGridBag materialPanel;
5243	6084	cGridBag ctrlPanel;
5244	6085
..	..	@@ -5250,6 +6091,7 @@
5250	6091	boolean materialFlushed;
5251	6092	Object3D latestObject;
5252	6093
	6094	+ cGridBag transformPanel;
5253	6095	cGridBag XYZPanel;
5254	6096
5255	6097	JSplitPane gridPanel;
..	..	@@ -5312,7 +6154,7 @@
5312	6154	JLabel colorLabel;
5313	6155	cNumberSlider colorField;
5314	6156	JLabel modulationLabel;
5315		- cNumberSlider modulationField;
	6157	+ cNumberSlider saturationField;
5316	6158	JLabel metalnessLabel;
5317	6159	cNumberSlider metalnessField;
5318	6160	JLabel diffuseLabel;
..	..	@@ -5343,6 +6185,7 @@
5343	6185	cNumberSlider anisoField;
5344	6186	JLabel anisoVLabel;
5345	6187	cNumberSlider anisoVField;
	6188	+
5346	6189	JLabel cameraLabel;
5347	6190	cNumberSlider cameraField;
5348	6191	JLabel selfshadowLabel;
..	..	@@ -5357,6 +6200,7 @@
5357	6200	cNumberSlider fakedepthField;
5358	6201	JLabel shadowbiasLabel;
5359	6202	cNumberSlider shadowbiasField;
	6203	+
5360	6204	JLabel bumpLabel;
5361	6205	cNumberSlider bumpField;
5362	6206	JLabel noiseLabel;