~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -34,6 +34,7 @@
34	34	iSendInfo
35	35	//KeyListener
36	36	{
	37	+ public cToggleButton pinButton;
37	38	boolean timeline;
38	39	boolean wasFullScreen;
39	40
..	..	@@ -41,11 +42,72 @@
41	42	JFrame frame;
42	43
43	44	static ObjEditor theFrame;
	45	+
	46	+ public void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
	75	+ public Composite CreateCameras()
	76	+ {
	77	+ Composite cams = new cTemplate();
	78	+ cams.name = "Cameras";
	79	+ copy.insertElementAt(cams, 0);
	80	+
	81	+ cams.addChild(new Camera());
	82	+ cams.addChild(new Camera(1));
	83	+ cams.addChild(new Camera(2));
	84	+ cams.addChild(new Camera(3));
	85	+ cams.addChild(new Camera(4));
	86	+
	87	+ return cams;
	88	+ }
	89	+
	90	+ public cGridBag GetSeparator()
	91	+ {
	92	+ cGridBag separator = new cGridBag();
	93	+ separator.add(new JSeparator());
	94	+ separator.preferredHeight = 5;
	95	+ return separator;
	96	+ }
44	97
45	98	cButton GetButton(String name, boolean border)
46	99	{
47	100	ImageIcon icon = GetIcon(name);
48		- return new cButton(icon, border);
	101	+ if (icon != null \|\| name.contains("/"))
	102	+ return new cButton(icon, border);
	103	+ else
	104	+ return new cButton(name, border);
	105	+ }
	106	+
	107	+ cLabel GetLabel(String name, boolean border)
	108	+ {
	109	+ //ImageIcon icon = GetIcon(name);
	110	+ return new cLabel(GetImage(name), border);
49	111	}
50	112
51	113	cToggleButton GetToggleButton(String name, boolean border)
..	..	@@ -60,26 +122,58 @@
60	122	return new cCheckBox(icon, border);
61	123	}
62	124
63		- private ImageIcon GetIcon(String name)
	125	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	126	+
	127	+ static ImageIcon GetIcon(String name)
64	128	{
	129	+ javax.swing.ImageIcon iconCache = icons.get(name);
	130	+ if (iconCache != null)
	131	+ {
	132	+ return iconCache;
	133	+ }
	134	+
65	135	try
66	136	{
67		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
68		-
69		-// if (image.getWidth() != 24 && image.getHeight() != 24)
	137	+ BufferedImage image;
	138	+
	139	+ if (name.endsWith("jpg"))
	140	+ // Much faster!
	141	+ image = new sun.awt.image.codec.JPEGImageDecoderImpl(ObjEditor.class.getClassLoader().getResourceAsStream(name)).decodeAsBufferedImage();
	142	+ else
	143	+ image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	144	+
	145	+// if (image.getWidth() > 48 && image.getHeight() > 48)
70	146	// {
71		-// BufferedImage resized = new BufferedImage(24, 24, image.getType());
	147	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
72	148	// Graphics2D g = resized.createGraphics();
73	149	// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
74	150	// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
75		-// g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	151	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
76	152	// g.dispose();
77	153	//
78	154	// image = resized;
79	155	// }
80	156
81	157	javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	158	+
	159	+ icons.put(name, icon);
	160	+
82	161	return icon;
	162	+ }
	163	+ catch (Exception e)
	164	+ {
	165	+ //icons.put(name, null);
	166	+ return null;
	167	+ }
	168	+ }
	169	+
	170	+ BufferedImage GetImage(String name)
	171	+ {
	172	+ try
	173	+ {
	174	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	175	+
	176	+ return image;
83	177	}
84	178	catch (Exception e)
85	179	{
..	..	@@ -268,11 +362,13 @@
268	362	client = inClient;
269	363	copy = client;
270	364
271		- if (copy.versions == null)
272		- {
273		- copy.versions = new byte[100][];
274		- copy.versionindex = -1;
275		- }
	365	+// if (copy.versionlist == null)
	366	+// {
	367	+// copy.versionlist = new Object3D[100];
	368	+// copy.versionindex = -1;
	369	+//
	370	+// callee.Save(true);
	371	+// }
276	372
277	373	// "this" is not called: SetupUI2(objEditor);
278	374	}
..	..	@@ -287,10 +383,12 @@
287	383	client = inClient;
288	384	copy = client;
289	385
290		- if (copy.versions == null)
	386	+ if (copy.versionlist == null)
291	387	{
292		- copy.versions = new byte[100][];
	388	+ copy.versionlist = new Object3D[100];
293	389	copy.versionindex = -1;
	390	+
	391	+// Save(true);
294	392	}
295	393
296	394	SetupUI2(callee.GetEditor());
..	..	@@ -314,7 +412,8 @@
314	412	//parent = p;
315	413
316	414	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
317		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	415	+ if (Globals.DEBUG)
	416	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
318	417	//gd.setFullScreenWindow(this);
319	418	//setResizable(false);
320	419	//if (!isDisplayable())
..	..	@@ -325,11 +424,13 @@
325	424	copy = localCopy;
326	425	copy.editWindow = this;
327	426
328		- if (copy.versions == null)
329		- {
330		-// copy.versions = new byte[100][];
	427	+// if (copy.versionlist == null)
	428	+// {
	429	+// copy.versionlist = new Object3D[100];
331	430	// copy.versionindex = -1;
332		- }
	431	+//
	432	+// Save(true);
	433	+// }
333	434
334	435	SetupMenu();
335	436
..	..	@@ -349,6 +450,9 @@
349	450
350	451	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
351	452
	453	+ // This is to refresh the UI of the material panel.
	454	+ boolean patchMaterial;
	455	+
352	456	void SetupMenu()
353	457	{
354	458	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -362,8 +466,11 @@
362	466	importOBJItem.addActionListener(this);
363	467	import3DSItem = menu.add(new MenuItem("3DS file..."));
364	468	import3DSItem.addActionListener(this);
	469	+ if (Globals.ADVANCED)
	470	+ {
365	471	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
366	472	importVRMLX3DItem.addActionListener(this);
	473	+ }
367	474	menu.add("-");
368	475	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
369	476	importGFDItem.addActionListener(this);
..	..	@@ -398,6 +505,8 @@
398	505
399	506	ChangeListener changeListener = new ChangeListener()
400	507	{
	508	+ //String name;
	509	+
401	510	public void stateChanged(ChangeEvent changeEvent)
402	511	{
403	512	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -416,7 +525,37 @@
416	525	// EditSelection(false);
417	526	// }
418	527
419		- refreshContents(false); // To refresh Info tab
	528	+// if (objectPanel.getSelectedIndex() == 4)
	529	+// {
	530	+// name = copy.skyboxname;
	531	+//
	532	+// if (name == null)
	533	+// {
	534	+// name = "";
	535	+// }
	536	+//
	537	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	538	+// copy.skyboxext = "jpg";
	539	+// }
	540	+// else
	541	+// {
	542	+// if (name != null)
	543	+// {
	544	+// if (name.equals(""))
	545	+// {
	546	+// copy.skyboxname = null;
	547	+// copy.skyboxext = null;
	548	+// }
	549	+// else
	550	+// {
	551	+// copy.skyboxname = name;
	552	+// }
	553	+// }
	554	+// }
	555	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	556	+
	557	+// refreshContents(false); // To refresh Info tab
	558	+ cameraView.repaint();
420	559	}
421	560	};
422	561	objectPanel.addChangeListener(changeListener);
..	..	@@ -439,7 +578,9 @@
439	578	toolboxPanel = new cGridBag().setVertical(true);
440	579	//toolboxPanel.setName("Toolbox");
441	580
442		- materialPanel = new cGridBag().setVertical(true);
	581	+ skyboxPanel = new cGridBag().setVertical(true);
	582	+
	583	+ materialPanel = new cGridBag().setVertical(false);
443	584	//materialPanel.setName("Material");
444	585
445	586	/JTextPane/
..	..	@@ -723,6 +864,7 @@
723	864	boolean maximized;
724	865
725	866	cButton fullscreenLayout;
	867	+ cButton expandedLayout;
726	868
727	869	void Minimize()
728	870	{
..	..	@@ -762,10 +904,12 @@
762	904	cButton minButton;
763	905	cButton maxButton;
764	906	cButton fullButton;
	907	+ cButton collapseButton;
	908	+ cButton maximize3DButton;
765	909
766	910	void ToggleFullScreen()
767	911	{
768		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	912	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
769	913
770	914	cameraView.ToggleFullScreen();
771	915
..	..	@@ -786,13 +930,13 @@
786	930	// X frame.getContentPane().remove(/"Center",/bigThree);
787	931	// X framePanel.add(bigThree);
788	932	// X frame.getContentPane().add(/"Center",/framePanel);
789		- framePanel.setDividerLocation(46);
	933	+// framePanel.setDividerLocation(46); // icons are 24x24
790	934
791	935	//frame.setVisible(true);
792		- radio.layout = keepButton;
	936	+// radio.layout = keepButton;
793	937	//theFrame = null;
794	938	keepButton = null;
795		- radio.layout.doClick();
	939	+// radio.layout.doClick();
796	940
797	941	} else
798	942	{
..	..	@@ -813,31 +957,53 @@
813	957	// X frame.getContentPane().remove(/"Center",/framePanel);
814	958	// X framePanel.remove(bigThree);
815	959	// X frame.getContentPane().add(/"Center",/bigThree);
816		- framePanel.setDividerLocation(0);
	960	+// framePanel.setDividerLocation(0);
817	961
818		- radio.layout = fullscreenLayout;
819		- radio.layout.doClick();
	962	+// radio.layout = fullscreenLayout;
	963	+// radio.layout.doClick();
820	964	//frame.setVisible(true);
821	965	}
822	966	frame.validate();
	967	+
	968	+ cameraView.requestFocusInWindow();
823	969	}
824	970
825		- private byte[] CompressCopy()
	971	+ void CollapseToolbar()
	972	+ {
	973	+ framePanel.setDividerLocation(0);
	974	+ //frame.validate();
	975	+
	976	+ cameraView.requestFocusInWindow();
	977	+ }
	978	+
	979	+ private Object3D Duplicate(Object3D object)
826	980	{
827	981	boolean temp = CameraPane.SWITCH;
828	982	CameraPane.SWITCH = false;
829	983
830		- copy.ExtractBigData(versiontable);
	984	+ if (Grafreed.grafreed.universe.versiontable == null)
	985	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	986	+
	987	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
831	988	// if (copy == client)
832	989
833		- byte[] versions[] = copy.versions;
834		- copy.versions = null;
	990	+ Object3D versions[] = object.versionlist;
	991	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	992	+ object.versionlist = null;
	993	+ object.versiontable = null;
835	994
836		- byte[] compress = Compress(copy);
	995	+ Object3D parent = object.parent;
	996	+ object.parent = null;
837	997
838		- copy.versions = versions;
	998	+ //byte[] compress = Compress(copy);
	999	+ Object3D compress = (Object3D)Grafreed.clone(object);
839	1000
840		- copy.RestoreBigData(versiontable);
	1001	+ object.parent = parent;
	1002	+
	1003	+ object.versionlist = versions;
	1004	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	1005	+
	1006	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
841	1007
842	1008	CameraPane.SWITCH = temp;
843	1009
..	..	@@ -965,6 +1131,7 @@
965	1131	{
966	1132	SetupMaterial(materialPanel);
967	1133	}
	1134	+
968	1135	//SetupName();
969	1136	//SetupViews();
970	1137	}
..	..	@@ -1173,6 +1340,18 @@
1173	1340
1174	1341	namePanel = new cGridBag();
1175	1342
	1343	+ //if (copy.pinned)
	1344	+ {
	1345	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1346	+ pinButton.setSelected(copy.pinned);
	1347	+ cGridBag t = new cGridBag();
	1348	+ t.preferredWidth = 2;
	1349	+ t.add(pinButton);
	1350	+ namePanel.add(t);
	1351	+
	1352	+ pinButton.addItemListener(this);
	1353	+ }
	1354	+
1176	1355	nameField = AddText(namePanel, copy.GetName());
1177	1356	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1178	1357	oe.ctrlPanel.add(namePanel);
..	..	@@ -1186,14 +1365,14 @@
1186	1365
1187	1366	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1188	1367	liveCB.setToolTipText("Animate object");
	1368	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1369	+ markCB.setToolTipText("Set target transform");
1189	1370	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1190	1371	selectableCB.setToolTipText("Make object selectable");
1191	1372	// Return();
1192	1373
1193	1374	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1194	1375	hideCB.setToolTipText("Hide object");
1195		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1196		- markCB.setToolTipText("As animation target transform");
1197	1376
1198	1377	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1199	1378
..	..	@@ -1395,22 +1574,9 @@
1395	1574
1396	1575	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1397	1576	{
1398		- System.out.println("CREATE CAMERAS");
1399		- cams = new cTemplate();
1400		- cams.name = "Cameras";
1401		- copy.insertElementAt(cams, 0);
1402		- //cams.parent = copy;
1403		-
1404		- cam = new Camera(); // LA.newVector(3, 2, 1));
1405		- cams.addChild(cam);
1406		- cam = new Camera(1);
1407		- cams.addChild(cam);
1408		- cam = new Camera(2);
1409		- cams.addChild(cam);
1410		- cam = new Camera(3);
1411		- cams.addChild(cam);
1412		- cam = new Camera(4); // Light
1413		- cams.addChild(cam);
	1577	+ if (Globals.DEBUG)
	1578	+ System.out.println("CREATE CAMERAS");
	1579	+ cams = CreateCameras();
1414	1580	} else
1415	1581	{
1416	1582	cams = (cGroup) copy.get(0);
..	..	@@ -1476,6 +1642,45 @@
1476	1642	//frontView.object = copy;
1477	1643	//sideView.object = copy;
1478	1644
	1645	+ transformPanel = new cGridBag().setVertical(true);
	1646	+
	1647	+ cGridBag resetTransformPanel = new cGridBag();
	1648	+
	1649	+ resetTransformPanel.preferredHeight = 2;
	1650	+
	1651	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1652	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1653	+ resetTransform.addMouseListener(new MouseAdapter()
	1654	+ {
	1655	+ public void mouseClicked(MouseEvent e)
	1656	+ {
	1657	+ ResetTransform();
	1658	+ }
	1659	+ });
	1660	+ resetTransformPanel.add(resetTransform);
	1661	+
	1662	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1663	+ resetTransform.setToolTipText("Reset Translation only");
	1664	+ resetTransform.addMouseListener(new MouseAdapter()
	1665	+ {
	1666	+ public void mouseClicked(MouseEvent e)
	1667	+ {
	1668	+ ResetTransform(1);
	1669	+ }
	1670	+ });
	1671	+ resetTransformPanel.add(resetTransform);
	1672	+
	1673	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1674	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1675	+ resetTransform.addMouseListener(new MouseAdapter()
	1676	+ {
	1677	+ public void mouseClicked(MouseEvent e)
	1678	+ {
	1679	+ ResetTransform(2);
	1680	+ }
	1681	+ });
	1682	+ resetTransformPanel.add(resetTransform);
	1683	+
1479	1684	XYZPanel = new cGridBag().setVertical(true);
1480	1685	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1481	1686
..	..	@@ -1485,6 +1690,9 @@
1485	1690	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1486	1691	//XYZPanel.setName("XYZ");
1487	1692
	1693	+ transformPanel.add(resetTransformPanel);
	1694	+ transformPanel.add(XYZPanel);
	1695	+
1488	1696	/*
1489	1697	gridPanel = new JPanel(); //new BorderLayout());
1490	1698	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1492,12 +1700,12 @@
1492	1700	gridPanel.add(cameraView);
1493	1701	gridPanel.add(XYZPanel);
1494	1702	*/
1495		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1496		- gridPanel.setContinuousLayout(true);
1497		- gridPanel.setOneTouchExpandable(true);
1498		- gridPanel.setDividerLocation(1.0);
1499		- gridPanel.setDividerSize(9);
1500		- gridPanel.setResizeWeight(0.85);
	1703	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1704	+// gridPanel.setContinuousLayout(true);
	1705	+// gridPanel.setOneTouchExpandable(true);
	1706	+// gridPanel.setDividerLocation(1.0);
	1707	+// gridPanel.setDividerSize(9);
	1708	+// gridPanel.setResizeWeight(0.85);
1501	1709
1502	1710	// aConstraints.weighty = 0;
1503	1711	//System.out.println("THIS = " + this);
..	..	@@ -1520,25 +1728,34 @@
1520	1728
1521	1729	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1522	1730	//tmp.setName("Edit");
	1731	+ objectPanel.add(skyboxPanel);
	1732	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1733	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1734	+
	1735	+ objectPanel.add(toolboxPanel);
	1736	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1737	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1738	+
1523	1739	objectPanel.add(materialPanel);
1524		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1740	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1741	+ objectPanel.setToolTipTextAt(2, "Material");
	1742	+
1525	1743	// JPanel north = new JPanel(new BorderLayout());
1526	1744	// north.setName("Edit");
1527	1745	// north.add(ctrlPanel, BorderLayout.NORTH);
1528	1746	// objectPanel.add(north);
1529	1747	objectPanel.add(editPanel);
1530		- objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1748	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
	1749	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1531	1750
1532		- //if (Globals.ADVANCED)
1533		- objectPanel.add(infoPanel);
1534		- objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1751	+ objectPanel.add(transformPanel);
	1752	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1753	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1535	1754
1536		- objectPanel.add(XYZPanel);
1537		- objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1538		-
1539		- objectPanel.add(toolboxPanel);
1540		- objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1541		-
	1755	+ patchMaterial = true;
	1756	+ cameraView.patchMaterial = this;
	1757	+ objectPanel.setSelectedIndex(2);
	1758	+
1542	1759	/*
1543	1760	aConstraints.gridx = 0;
1544	1761	aConstraints.gridwidth = 1;
..	..	@@ -1558,7 +1775,7 @@
1558	1775	scrollpane.addMouseWheelListener(this); // Default not fast enough
1559	1776
1560	1777	/JTabbedPane/ scenePanel = new cGridBag();
1561		- scenePanel.preferredWidth = 5;
	1778	+ scenePanel.preferredWidth = 6;
1562	1779
1563	1780	JTabbedPane tabbedPane = new JTabbedPane();
1564	1781	tabbedPane.add(scrollpane);
..	..	@@ -1569,11 +1786,108 @@
1569	1786
1570	1787	AddOptions(optionsPanel); //, aConstraints);
1571	1788
1572		- tabbedPane.add(optionsPanel);
1573		-
1574	1789	tabbedPane.add(FSPane = new cFileSystemPane(this));
1575	1790
	1791	+ tabbedPane.add(optionsPanel);
	1792	+
1576	1793	scenePanel.add(tabbedPane);
	1794	+
	1795	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1796	+ creditsPanel.setName("Credits");
	1797	+
	1798	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1799	+ creditsPanel.add(ogaLabel);
	1800	+
	1801	+ cButton creditButton;
	1802	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1803	+ creditButton.setToolTipText("https://opengameart.org");
	1804	+
	1805	+ creditButton.addMouseListener(new MouseAdapter()
	1806	+ {
	1807	+ public void mouseClicked(MouseEvent e)
	1808	+ {
	1809	+ try
	1810	+ {
	1811	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1812	+ } catch (Exception e1)
	1813	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1814	+ {
	1815	+ e1.printStackTrace();
	1816	+ }
	1817	+ }
	1818	+ });
	1819	+
	1820	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1821	+ creditsPanel.add(ogaLabel);
	1822	+
	1823	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1824	+ creditButton.setToolTipText("https://3delicious.net");
	1825	+
	1826	+ creditButton.addMouseListener(new MouseAdapter()
	1827	+ {
	1828	+ public void mouseClicked(MouseEvent e)
	1829	+ {
	1830	+ try
	1831	+ {
	1832	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1833	+ } catch (Exception e1)
	1834	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1835	+ {
	1836	+ e1.printStackTrace();
	1837	+ }
	1838	+ }
	1839	+ });
	1840	+
	1841	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1842	+ creditButton.setToolTipText("https://archive3d.net");
	1843	+
	1844	+ creditButton.addMouseListener(new MouseAdapter()
	1845	+ {
	1846	+ public void mouseClicked(MouseEvent e)
	1847	+ {
	1848	+ try
	1849	+ {
	1850	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1851	+ } catch (Exception e1)
	1852	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1853	+ {
	1854	+ e1.printStackTrace();
	1855	+ }
	1856	+ }
	1857	+ });
	1858	+
	1859	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1860	+ creditButton.setToolTipText("https://turbosquid.com");
	1861	+
	1862	+ creditButton.addMouseListener(new MouseAdapter()
	1863	+ {
	1864	+ public void mouseClicked(MouseEvent e)
	1865	+ {
	1866	+ try
	1867	+ {
	1868	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1869	+ } catch (Exception e1)
	1870	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1871	+ {
	1872	+ e1.printStackTrace();
	1873	+ }
	1874	+ }
	1875	+ });
	1876	+
	1877	+ for (int i=6; --i>=0;)
	1878	+ {
	1879	+ creditsPanel.add(new cGridBag());
	1880	+ }
	1881	+
	1882	+ tabbedPane.add(creditsPanel);
	1883	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1884	+
	1885	+ if (Globals.ADVANCED)
	1886	+ {
	1887	+ tabbedPane.add(infoPanel);
	1888	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1889	+ tabbedPane.setToolTipTextAt(4, "Information");
	1890	+ }
1577	1891
1578	1892	/*
1579	1893	cTree jTree = new cTree(null);
..	..	@@ -1595,13 +1909,13 @@
1595	1909	jtp.add(tree);
1596	1910	*/
1597	1911
1598		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1599		- bigPanel.setContinuousLayout(true);
1600		- bigPanel.setOneTouchExpandable(true);
1601		- bigPanel.setDividerLocation(0.8);
1602		- bigPanel.setDividerSize(15);
1603		- bigPanel.setResizeWeight(0.15);
1604		- bigPanel.setName("Scene");
	1912	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1913	+// bigPanel.setContinuousLayout(true);
	1914	+// bigPanel.setOneTouchExpandable(true);
	1915	+// bigPanel.setDividerLocation(0.8);
	1916	+// bigPanel.setDividerSize(15);
	1917	+// bigPanel.setResizeWeight(0.15);
	1918	+// bigPanel.setName("Scene");
1605	1919
1606	1920	//bigPanel.setLayout(new BorderLayout());
1607	1921	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1634,8 +1948,8 @@
1634	1948	/**/
1635	1949
1636	1950	bigThree = new cGridBag();
1637		- bigThree.addComponent(centralPanel);
1638	1951	bigThree.addComponent(scenePanel);
	1952	+ bigThree.addComponent(centralPanel);
1639	1953	//bigThree.addComponent(XYZPanel);
1640	1954
1641	1955	// // SIDE EFFECT!!!
..	..	@@ -1645,6 +1959,23 @@
1645	1959	// aConstraints.gridheight = 1;
1646	1960
1647	1961	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1962	+
	1963	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1964	+ new java.beans.PropertyChangeListener()
	1965	+ {
	1966	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1967	+ {
	1968	+ if ((Integer)pce.getOldValue() == 1)
	1969	+ {
	1970	+ if (radio.layout != expandedLayout)
	1971	+ {
	1972	+ radio.layout = expandedLayout;
	1973	+ radio.layout.doClick();
	1974	+ }
	1975	+ }
	1976	+ }
	1977	+ });
	1978	+
1648	1979	framePanel.setContinuousLayout(false);
1649	1980	framePanel.setOneTouchExpandable(false);
1650	1981	//.setDividerLocation(0.8);
..	..	@@ -1654,7 +1985,7 @@
1654	1985
1655	1986	frame.getContentPane().setLayout(new BorderLayout());
1656	1987	/**/
1657		- JTabbedPane worldPane = new JTabbedPane();
	1988	+ //JTabbedPane worldPane = new JTabbedPane();
1658	1989	//worldPane.add(bigPanel);
1659	1990	//worldPane.add(worldPanel);
1660	1991	/**/
..	..	@@ -1668,7 +1999,7 @@
1668	1999
1669	2000	cameraView.requestFocusInWindow();
1670	2001
1671		- gridPanel.setDividerLocation(1.0);
	2002	+// gridPanel.setDividerLocation(1.0);
1672	2003
1673	2004	frame.validate();
1674	2005
..	..	@@ -1677,7 +2008,6 @@
1677	2008	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1678	2009	frame.addWindowListener(new WindowAdapter()
1679	2010	{
1680		-
1681	2011	public void windowClosing(WindowEvent e)
1682	2012	{
1683	2013	Close();
..	..	@@ -1700,28 +2030,484 @@
1700	2030	ctrlPanel.removeAll();
1701	2031	}
1702	2032
1703		- void SetupMaterial(cGridBag panel)
	2033	+ void SetupMaterial(cGridBag materialpanel)
1704	2034	{
1705		- /*
	2035	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	2036	+
	2037	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	2038	+ skin.setToolTipText("Skin");
	2039	+ skin.addMouseListener(new MouseAdapter()
	2040	+ {
	2041	+ public void mouseClicked(MouseEvent e)
	2042	+ {
	2043	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	2044	+ cMaterial material = object.material;
	2045	+
	2046	+ // Skin
	2047	+ colorField.setFloat(material.color);
	2048	+ float saturation = material.modulation;
	2049	+
	2050	+ if (!cameraView.Skinshader)
	2051	+ {
	2052	+ saturation /= 1.5;
	2053	+ }
	2054	+
	2055	+ saturationField.setFloat(saturation);
	2056	+
	2057	+ subsurfaceField.setFloat(material.subsurface);
	2058	+ selfshadowField.setFloat(material.diffuseness);
	2059	+ diffusenessField.setFloat(material.factor);
	2060	+ shininessField.setFloat(material.shininess);
	2061	+ shadowbiasField.setFloat(material.shadowbias);
	2062	+ diffuseField.setFloat(material.diffuse);
	2063	+ specularField.setFloat(material.specular);
	2064	+
	2065	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2066	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2067	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2068	+
	2069	+ materialtouched = true;
	2070	+ applySelf();
	2071	+ }
	2072	+ });
	2073	+ presetpanel.add(skin);
	2074	+
	2075	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2076	+ lambert.setToolTipText("Diffuse");
	2077	+ lambert.addMouseListener(new MouseAdapter()
	2078	+ {
	2079	+ public void mouseClicked(MouseEvent e)
	2080	+ {
	2081	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2082	+ cMaterial material = object.material;
	2083	+
	2084	+ diffusenessField.setFloat(material.factor);
	2085	+ selfshadowField.setFloat(material.diffuseness);
	2086	+
	2087	+ materialtouched = true;
	2088	+ applySelf();
	2089	+ }
	2090	+ });
	2091	+ presetpanel.add(lambert);
	2092	+
	2093	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2094	+ diffuse2.setToolTipText("Diffuse2");
	2095	+ diffuse2.addMouseListener(new MouseAdapter()
	2096	+ {
	2097	+ public void mouseClicked(MouseEvent e)
	2098	+ {
	2099	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2100	+ cMaterial material = object.material;
	2101	+
	2102	+ diffusenessField.setFloat(material.factor);
	2103	+ selfshadowField.setFloat(material.diffuseness);
	2104	+
	2105	+ materialtouched = true;
	2106	+ applySelf();
	2107	+ }
	2108	+ });
	2109	+ presetpanel.add(diffuse2);
	2110	+
	2111	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2112	+ diffusemoon.setToolTipText("Moon");
	2113	+ diffusemoon.addMouseListener(new MouseAdapter()
	2114	+ {
	2115	+ public void mouseClicked(MouseEvent e)
	2116	+ {
	2117	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2118	+ cMaterial material = object.material;
	2119	+
	2120	+ diffusenessField.setFloat(material.factor);
	2121	+ selfshadowField.setFloat(material.diffuseness);
	2122	+
	2123	+ materialtouched = true;
	2124	+ applySelf();
	2125	+ }
	2126	+ });
	2127	+ presetpanel.add(diffusemoon);
	2128	+
	2129	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2130	+ diffusemoon2.setToolTipText("Moon2");
	2131	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2132	+ {
	2133	+ public void mouseClicked(MouseEvent e)
	2134	+ {
	2135	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2136	+ cMaterial material = object.material;
	2137	+
	2138	+ diffusenessField.setFloat(material.factor);
	2139	+ selfshadowField.setFloat(material.diffuseness);
	2140	+
	2141	+ materialtouched = true;
	2142	+ applySelf();
	2143	+ }
	2144	+ });
	2145	+ presetpanel.add(diffusemoon2);
	2146	+
	2147	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2148	+ diffusemoon3.setToolTipText("Moon3");
	2149	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2150	+ {
	2151	+ public void mouseClicked(MouseEvent e)
	2152	+ {
	2153	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2154	+ cMaterial material = object.material;
	2155	+
	2156	+ diffusenessField.setFloat(material.factor);
	2157	+ selfshadowField.setFloat(material.diffuseness);
	2158	+
	2159	+ materialtouched = true;
	2160	+ applySelf();
	2161	+ }
	2162	+ });
	2163	+ presetpanel.add(diffusemoon3);
	2164	+
	2165	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2166	+ diffusesheen.setToolTipText("Sheen");
	2167	+ diffusesheen.addMouseListener(new MouseAdapter()
	2168	+ {
	2169	+ public void mouseClicked(MouseEvent e)
	2170	+ {
	2171	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2172	+ cMaterial material = object.material;
	2173	+
	2174	+ sheenField.setFloat(material.sheen);
	2175	+
	2176	+ materialtouched = true;
	2177	+ applySelf();
	2178	+ }
	2179	+ });
	2180	+ presetpanel.add(diffusesheen);
	2181	+
	2182	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2183	+ rough.setToolTipText("Rough metal");
	2184	+ rough.addMouseListener(new MouseAdapter()
	2185	+ {
	2186	+ public void mouseClicked(MouseEvent e)
	2187	+ {
	2188	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2189	+ cMaterial material = object.material;
	2190	+
	2191	+ shininessField.setFloat(material.shininess);
	2192	+ velvetField.setFloat(material.velvet);
	2193	+
	2194	+ materialtouched = true;
	2195	+ applySelf();
	2196	+ }
	2197	+ });
	2198	+ presetpanel.add(rough);
	2199	+
	2200	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2201	+ rough2.setToolTipText("Medium metal");
	2202	+ rough2.addMouseListener(new MouseAdapter()
	2203	+ {
	2204	+ public void mouseClicked(MouseEvent e)
	2205	+ {
	2206	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2207	+ cMaterial material = object.material;
	2208	+
	2209	+ shininessField.setFloat(material.shininess);
	2210	+ lightareaField.setFloat(material.lightarea);
	2211	+
	2212	+ materialtouched = true;
	2213	+ applySelf();
	2214	+ }
	2215	+ });
	2216	+ presetpanel.add(rough2);
	2217	+
	2218	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2219	+ shini0.setToolTipText("Shiny");
	2220	+ shini0.addMouseListener(new MouseAdapter()
	2221	+ {
	2222	+ public void mouseClicked(MouseEvent e)
	2223	+ {
	2224	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2225	+ cMaterial material = object.material;
	2226	+
	2227	+ shininessField.setFloat(material.shininess);
	2228	+ lightareaField.setFloat(material.lightarea);
	2229	+
	2230	+ materialtouched = true;
	2231	+ applySelf();
	2232	+ }
	2233	+ });
	2234	+ presetpanel.add(shini0);
	2235	+
	2236	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2237	+ shini1.setToolTipText("Shiny2");
	2238	+ shini1.addMouseListener(new MouseAdapter()
	2239	+ {
	2240	+ public void mouseClicked(MouseEvent e)
	2241	+ {
	2242	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2243	+ cMaterial material = object.material;
	2244	+
	2245	+ shininessField.setFloat(material.shininess);
	2246	+ lightareaField.setFloat(material.lightarea);
	2247	+
	2248	+ materialtouched = true;
	2249	+ applySelf();
	2250	+ }
	2251	+ });
	2252	+ presetpanel.add(shini1);
	2253	+
	2254	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2255	+ shini2.setToolTipText("Shiny3");
	2256	+ shini2.addMouseListener(new MouseAdapter()
	2257	+ {
	2258	+ public void mouseClicked(MouseEvent e)
	2259	+ {
	2260	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2261	+ cMaterial material = object.material;
	2262	+
	2263	+ shininessField.setFloat(material.shininess);
	2264	+ lightareaField.setFloat(material.lightarea);
	2265	+
	2266	+ materialtouched = true;
	2267	+ applySelf();
	2268	+ }
	2269	+ });
	2270	+ presetpanel.add(shini2);
	2271	+
	2272	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2273	+ aniso.setToolTipText("AnisoU");
	2274	+ aniso.addMouseListener(new MouseAdapter()
	2275	+ {
	2276	+ public void mouseClicked(MouseEvent e)
	2277	+ {
	2278	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2279	+ cMaterial material = object.material;
	2280	+
	2281	+ anisoField.setFloat(material.aniso);
	2282	+ anisoVField.setFloat(material.anisoV);
	2283	+
	2284	+ materialtouched = true;
	2285	+ applySelf();
	2286	+ }
	2287	+ });
	2288	+ presetpanel.add(aniso);
	2289	+
	2290	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2291	+ aniso2.setToolTipText("AnisoV");
	2292	+ aniso2.addMouseListener(new MouseAdapter()
	2293	+ {
	2294	+ public void mouseClicked(MouseEvent e)
	2295	+ {
	2296	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2297	+ cMaterial material = object.material;
	2298	+
	2299	+ anisoField.setFloat(material.aniso);
	2300	+ anisoVField.setFloat(material.anisoV);
	2301	+
	2302	+ materialtouched = true;
	2303	+ applySelf();
	2304	+ }
	2305	+ });
	2306	+ presetpanel.add(aniso2);
	2307	+
	2308	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2309	+ aniso3.setToolTipText("AnisoUV");
	2310	+ aniso3.addMouseListener(new MouseAdapter()
	2311	+ {
	2312	+ public void mouseClicked(MouseEvent e)
	2313	+ {
	2314	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2315	+ cMaterial material = object.material;
	2316	+
	2317	+ anisoField.setFloat(material.aniso);
	2318	+ anisoVField.setFloat(material.anisoV);
	2319	+
	2320	+ materialtouched = true;
	2321	+ applySelf();
	2322	+ }
	2323	+ });
	2324	+ presetpanel.add(aniso3);
	2325	+
	2326	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2327	+ velvet0.setToolTipText("Velvet");
	2328	+ velvet0.addMouseListener(new MouseAdapter()
	2329	+ {
	2330	+ public void mouseClicked(MouseEvent e)
	2331	+ {
	2332	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2333	+ cMaterial material = object.material;
	2334	+
	2335	+ diffusenessField.setFloat(material.factor);
	2336	+ selfshadowField.setFloat(material.diffuseness);
	2337	+ sheenField.setFloat(material.sheen);
	2338	+ shininessField.setFloat(material.shininess);
	2339	+ velvetField.setFloat(material.velvet);
	2340	+ shiftField.setFloat(material.shift);
	2341	+
	2342	+ materialtouched = true;
	2343	+ applySelf();
	2344	+ }
	2345	+ });
	2346	+ presetpanel.add(velvet0);
	2347	+
	2348	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2349	+ bump0.setToolTipText("Bump texture");
	2350	+ bump0.addMouseListener(new MouseAdapter()
	2351	+ {
	2352	+ public void mouseClicked(MouseEvent e)
	2353	+ {
	2354	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2355	+ cMaterial material = object.material;
	2356	+
	2357	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2358	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2359	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2360	+
	2361	+ materialtouched = true;
	2362	+ applySelf();
	2363	+ }
	2364	+ });
	2365	+ presetpanel.add(bump0);
	2366	+
	2367	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2368	+ borderShader.setToolTipText("Border fade");
	2369	+ borderShader.addMouseListener(new MouseAdapter()
	2370	+ {
	2371	+ public void mouseClicked(MouseEvent e)
	2372	+ {
	2373	+ borderfadeField.setFloat(0.5);
	2374	+ opacityField.setFloat(0.75);
	2375	+
	2376	+ materialtouched = true;
	2377	+ applySelf();
	2378	+ }
	2379	+ });
	2380	+ presetpanel.add(borderShader);
	2381	+
	2382	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
	2383	+ halo.setToolTipText("Halo");
	2384	+ halo.addMouseListener(new MouseAdapter()
	2385	+ {
	2386	+ public void mouseClicked(MouseEvent e)
	2387	+ {
	2388	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2389	+ cMaterial material = object.material;
	2390	+
	2391	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2392	+
	2393	+ materialtouched = true;
	2394	+ applySelf();
	2395	+ }
	2396	+ });
	2397	+ presetpanel.add(halo);
	2398	+
	2399	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2400	+ candle.setToolTipText("Candle");
	2401	+ candle.addMouseListener(new MouseAdapter()
	2402	+ {
	2403	+ public void mouseClicked(MouseEvent e)
	2404	+ {
	2405	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2406	+ cMaterial material = object.material;
	2407	+
	2408	+ subsurfaceField.setFloat(material.subsurface);
	2409	+ shadowbiasField.setFloat(material.shadowbias);
	2410	+ ambientField.setFloat(material.ambient);
	2411	+ specularField.setFloat(material.specular);
	2412	+ lightareaField.setFloat(material.lightarea);
	2413	+ shininessField.setFloat(material.shininess);
	2414	+
	2415	+ materialtouched = true;
	2416	+ applySelf();
	2417	+ }
	2418	+ });
	2419	+ presetpanel.add(candle);
	2420	+
	2421	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2422	+ shadowShader.setToolTipText("Shadow");
	2423	+ shadowShader.addMouseListener(new MouseAdapter()
	2424	+ {
	2425	+ public void mouseClicked(MouseEvent e)
	2426	+ {
	2427	+ diffuseField.setFloat(0.001);
	2428	+ ambientField.setFloat(0.001);
	2429	+ cameraField.setFloat(0.001);
	2430	+ specularField.setFloat(0.001);
	2431	+ fakedepthField.setFloat(0.001);
	2432	+ opacityField.setFloat(0.6);
	2433	+
	2434	+ materialtouched = true;
	2435	+ applySelf();
	2436	+ }
	2437	+ });
	2438	+ presetpanel.add(shadowShader);
	2439	+
	2440	+ cLabel para0 = GetLabel("icons/shadericons/parallax0.png", !Globals.NIMBUSLAF);
	2441	+ para0.setToolTipText("No parallax");
	2442	+ para0.addMouseListener(new MouseAdapter()
	2443	+ {
	2444	+ public void mouseClicked(MouseEvent e)
	2445	+ {
	2446	+ parallaxField.setFloat(0.25);
	2447	+
	2448	+ materialtouched = true;
	2449	+ applySelf();
	2450	+ }
	2451	+ });
	2452	+ presetpanel.add(para0);
	2453	+
	2454	+ cLabel para1 = GetLabel("icons/shadericons/parallax1.png", !Globals.NIMBUSLAF);
	2455	+ para1.setToolTipText("With parallax");
	2456	+ para1.addMouseListener(new MouseAdapter()
	2457	+ {
	2458	+ public void mouseClicked(MouseEvent e)
	2459	+ {
	2460	+ parallaxField.setFloat(0.255);
	2461	+
	2462	+ materialtouched = true;
	2463	+ applySelf();
	2464	+ }
	2465	+ });
	2466	+ presetpanel.add(para1);
	2467	+
	2468	+ cLabel para2 = GetLabel("icons/shadericons/parallax2.png", !Globals.NIMBUSLAF);
	2469	+ para2.setToolTipText("Reset parallax");
	2470	+ para2.addMouseListener(new MouseAdapter()
	2471	+ {
	2472	+ public void mouseClicked(MouseEvent e)
	2473	+ {
	2474	+ parallaxField.setFloat(0.265);
	2475	+
	2476	+ materialtouched = true;
	2477	+ applySelf();
	2478	+ }
	2479	+ });
	2480	+ presetpanel.add(para2);
	2481	+
	2482	+ cGridBag panel = new cGridBag().setVertical(true);
	2483	+
	2484	+ presetpanel.preferredWidth = 1;
	2485	+
	2486	+ materialpanel.add(presetpanel);
	2487	+ materialpanel.add(panel);
	2488	+
	2489	+ panel.preferredWidth = 8;
	2490	+
	2491	+ /*
1706	2492	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1707	2493	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1708		- */
	2494	+ */
1709	2495
1710	2496	cGridBag editBar = new cGridBag().setVertical(false);
1711	2497
1712		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2498	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
1713	2499	createMaterialButton.setToolTipText("Create material");
1714	2500
1715	2501	/*
1716	2502	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1717	2503	*/
1718	2504
1719		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2505	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
1720	2506	clearMaterialButton.setToolTipText("Clear material");
1721	2507
1722	2508	if (Globals.ADVANCED)
1723	2509	{
1724		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2510	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
1725	2511	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1726	2512	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1727	2513	}
..	..	@@ -1739,27 +2525,61 @@
1739	2525	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1740	2526
1741	2527	cGridBag colorSection = new cGridBag().setVertical(true);
	2528	+
	2529	+ cGridBag huepanel = new cGridBag();
	2530	+ cGridBag huelabel = new cGridBag();
	2531	+ cLabel hue = GetLabel("icons/hue.png", false);
	2532	+ hue.fit = true;
	2533	+
	2534	+ hue.addMouseListener(new MouseAdapter()
	2535	+ {
	2536	+ public void mousePressed(MouseEvent e)
	2537	+ {
	2538	+ int x = e.getX();
	2539	+
	2540	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2541	+ }
	2542	+ });
	2543	+
	2544	+ huelabel.add(hue);
	2545	+ huelabel.preferredWidth = 20;
	2546	+ huepanel.add(new cGridBag()); // Label
	2547	+ huepanel.add(huelabel); // Field/slider
	2548	+
	2549	+ huepanel.preferredHeight = 7;
	2550	+
	2551	+ colorSection.add(huepanel);
1742	2552
1743	2553	cGridBag color = new cGridBag();
1744		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1745		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1746		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2554	+
	2555	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2556	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2557	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2558	+
1747	2559	//colorField.preferredWidth = 200;
1748	2560	colorSection.add(color);
1749	2561
1750	2562	cGridBag modulation = new cGridBag();
1751	2563	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1752	2564	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1753		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2565	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1754	2566	colorSection.add(modulation);
1755	2567
	2568	+ cGridBag opacity = new cGridBag();
	2569	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2570	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2571	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2572	+ colorSection.add(opacity);
	2573	+
	2574	+ colorSection.add(GetSeparator());
	2575	+
1756	2576	cGridBag texture = new cGridBag();
1757	2577	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1758	2578	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1759	2579	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1760	2580	colorSection.add(texture);
1761	2581
1762		- panel.add(new JSeparator());
	2582	+ panel.add(GetSeparator());
1763	2583
1764	2584	panel.add(colorSection);
1765	2585
..	..	@@ -1815,7 +2635,7 @@
1815	2635	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1816	2636	diffuseSection.add(shadowbias);
1817	2637
1818		- panel.add(new JSeparator());
	2638	+ panel.add(GetSeparator());
1819	2639
1820	2640	panel.add(diffuseSection);
1821	2641
..	..	@@ -1878,7 +2698,7 @@
1878	2698	specularSection.add(anisoV);
1879	2699
1880	2700
1881		- panel.add(new JSeparator());
	2701	+ panel.add(GetSeparator());
1882	2702
1883	2703	panel.add(specularSection);
1884	2704
..	..	@@ -1904,12 +2724,12 @@
1904	2724	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1905	2725	colorSection.add(backlit);
1906	2726
1907		- cGridBag opacity = new cGridBag();
1908		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1909		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1910		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1911		- colorSection.add(opacity);
1912		-
	2727	+ cGridBag parallax = new cGridBag();
	2728	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2729	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2730	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.5, -0.25)); // , aConstraints);
	2731	+ colorSection.add(parallax);
	2732	+
1913	2733	//panel.add(new JSeparator());
1914	2734
1915	2735	//panel.add(globalSection);
..	..	@@ -1954,7 +2774,7 @@
1954	2774	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1955	2775	textureSection.add(opacityPower);
1956	2776
1957		- panel.add(new JSeparator());
	2777	+ panel.add(GetSeparator());
1958	2778
1959	2779	panel.add(textureSection);
1960	2780
..	..	@@ -2941,7 +3761,7 @@
2941	3761
2942	3762	freezematerial = true;
2943	3763	colorField.setFloat(mat.color);
2944		- modulationField.setFloat(mat.modulation);
	3764	+ saturationField.setFloat(mat.modulation);
2945	3765	metalnessField.setFloat(mat.metalness);
2946	3766	diffuseField.setFloat(mat.diffuse);
2947	3767	specularField.setFloat(mat.specular);
..	..	@@ -2961,6 +3781,7 @@
2961	3781	shadowField.setFloat(mat.shadow);
2962	3782	textureField.setFloat(mat.texture);
2963	3783	opacityField.setFloat(mat.opacity);
	3784	+ parallaxField.setFloat(mat.parallax + 0.25f);
2964	3785	fakedepthField.setFloat(mat.fakedepth);
2965	3786	shadowbiasField.setFloat(mat.shadowbias);
2966	3787	bumpField.setInteger(1); // dec 2013
..	..	@@ -3003,32 +3824,8 @@
3003	3824
3004	3825	if (multiplyToggle != null)
3005	3826	multiplyToggle.setSelected(mat.multiply);
3006		-
3007		- assert (object.projectedVertices != null);
3008		-
3009		- if (object.projectedVertices.length <= 2)
3010		- {
3011		- // Side effect...
3012		- Object3D.cVector2[] keep = object.projectedVertices;
3013		- object.projectedVertices = new Object3D.cVector2[3];
3014		- for (int i = 0; i < 3; i++)
3015		- {
3016		- if (i < keep.length)
3017		- {
3018		- object.projectedVertices[i] = keep[i];
3019		- } else
3020		- {
3021		- object.projectedVertices[i] = new Object3D.cVector2();
3022		- }
3023		- /*
3024		- if(keep.length == 0)
3025		- object.projectedVertices[0] = new Object3D.cVector2();
3026		- else
3027		- object.projectedVertices[0] = keep[0];
3028		- object.projectedVertices[1] = new Object3D.cVector2();
3029		- */
3030		- }
3031		- }
	3827	+
	3828	+ AllocProjectedVertices(object);
3032	3829
3033	3830	SetMaterial(mat, object.projectedVertices);
3034	3831	}
..	..	@@ -3148,6 +3945,17 @@
3148	3945	public void itemStateChanged(ItemEvent event)
3149	3946	{
3150	3947	// System.out.println("Propagate = " + propagate);
	3948	+ if (event.getSource() == pinButton)
	3949	+ {
	3950	+ copy.pinned ^= true;
	3951	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3952	+ {
	3953	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3954	+ copy.CloseUI();
	3955	+ //copy.editWindow.refreshContents();
	3956	+ }
	3957	+ }
	3958	+ else
3151	3959	if (event.getSource() == propagateToggle)
3152	3960	{
3153	3961	propagate ^= true;
..	..	@@ -3252,6 +4060,7 @@
3252	4060	} else if (event.getSource() == liveCB)
3253	4061	{
3254	4062	copy.live ^= true;
	4063	+ objEditor.refreshContents(true); // To show item colors
3255	4064	return;
3256	4065	} else if (event.getSource() == selectableCB)
3257	4066	{
..	..	@@ -3261,7 +4070,7 @@
3261	4070	{
3262	4071	copy.hide ^= true;
3263	4072	copy.Touch(); // display list issue
3264		- objEditor.refreshContents();
	4073	+ objEditor.refreshContents(true); // To show item colors
3265	4074	return;
3266	4075	} else if (event.getSource() == link2masterCB)
3267	4076	{
..	..	@@ -3326,7 +4135,7 @@
3326	4135	//System.out.println("ObjEditor " + event);
3327	4136	applySelf0(true);
3328	4137	//parent.applySelf();
3329		- objEditor.refreshContents();
	4138	+ // conflicts with requestFocus objEditor.refreshContents();
3330	4139	} else if (source == resetButton)
3331	4140	{
3332	4141	CameraPane.fullreset = true;
..	..	@@ -3506,17 +4315,25 @@
3506	4315
3507	4316	void New()
3508	4317	{
3509		- while (copy.Size() > 1)
	4318	+ while (copy.Size() > 0)
3510	4319	{
3511		- copy.remove(1);
	4320	+ copy.remove(0);
3512	4321	}
3513	4322
	4323	+ copy.selection.clear();
	4324	+
	4325	+ if (copy == Grafreed.grafreed.universe)
	4326	+ {
	4327	+ CreateCameras();
	4328	+ cameraView.SetCamera(GetCamera(copy, 0));
	4329	+ }
3514	4330	ResetModel();
3515	4331	objEditor.refreshContents();
3516	4332	}
3517	4333
3518	4334	static public byte[] Compress(Object3D o)
3519	4335	{
	4336	+ // Slower to actually compress.
3520	4337	try
3521	4338	{
3522	4339	ByteArrayOutputStream baos = new ByteArrayOutputStream();
..	..	@@ -3618,6 +4435,7 @@
3618	4435	{
3619	4436	//Save(true);
3620	4437	Replace();
	4438	+ SetVersionStates();
3621	4439	}
3622	4440
3623	4441	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3636,31 +4454,50 @@
3636	4454	return true;
3637	4455	}
3638	4456
3639		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4457	+ void DeleteVersion()
	4458	+ {
	4459	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4460	+ {
	4461	+ copy.versionlist[i] = copy.versionlist[i+1];
	4462	+ }
	4463	+
	4464	+ if (copy.versionlist[copy.versionindex] == null)
	4465	+ copy.versionindex -= 1;
	4466	+
	4467	+ if (copy.versionindex != -1)
	4468	+ CopyChanged();
	4469	+
	4470	+ SetVersionStates();
	4471	+ }
3640	4472
3641	4473	public boolean Save(boolean user)
3642	4474	{
3643	4475	System.err.println("Save");
	4476	+ Replace();
3644	4477
3645		- cRadio tab = GetCurrentTab();
	4478	+ //cRadio tab = GetCurrentTab();
3646	4479
3647		- byte[] compress = CompressCopy();
	4480	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3648	4481
3649	4482	boolean thesame = false;
3650	4483
3651		- // Quick heuristic using length. Works only when stream is compressed.
3652		- if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3653		- {
3654		- thesame = true;
3655		- }
	4484	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4485	+// {
	4486	+// thesame = true;
	4487	+// }
3656	4488
3657	4489	//EditorFrame.m_MainFrame.requestFocusInWindow();
3658	4490	if (!thesame)
3659	4491	{
	4492	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4493	+ {
	4494	+ copy.versionlist[i] = copy.versionlist[i-1];
	4495	+ }
	4496	+
3660	4497	//tab.user[tab.versionindex] = user;
3661	4498	//boolean increment = true; // tab.graphs[tab.versionindex] == null;
3662	4499
3663		- copy.versions[++copy.versionindex] = compress;
	4500	+ copy.versionlist[++copy.versionindex] = compress;
3664	4501
3665	4502	// if (increment)
3666	4503	// tab.versionindex++;
..	..	@@ -3670,13 +4507,13 @@
3670	4507
3671	4508	//assert(hashtable.isEmpty());
3672	4509
3673		- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3674		- {
3675		- //tab.user[i] = false;
3676		- copy.versions[i] = null;
3677		- }
	4510	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4511	+// {
	4512	+// //tab.user[i] = false;
	4513	+// copy.versionlist[i] = null;
	4514	+// }
3678	4515
3679		- SetUndoStates();
	4516	+ SetVersionStates();
3680	4517
3681	4518	// test save
3682	4519	if (false)
..	..	@@ -3699,27 +4536,65 @@
3699	4536
3700	4537	return !thesame;
3701	4538	}
3702		-
3703		- void CopyChanged(Object3D obj)
	4539	+
	4540	+ boolean flashIt = true;
	4541	+
	4542	+ void RefreshSelection()
3704	4543	{
3705		- SetUndoStates();
	4544	+ Object3D selection = new Object3D();
	4545	+
	4546	+ for (int i = 0; i < copy.selection.size(); i++)
	4547	+ {
	4548	+ Object3D elem = copy.selection.elementAt(i);
	4549	+
	4550	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4551	+
	4552	+ if (obj == null)
	4553	+ {
	4554	+ copy.selection.remove(i--);
	4555	+ }
	4556	+ else
	4557	+ {
	4558	+ selection.add(obj);
	4559	+ copy.selection.setElementAt(obj, i);
	4560	+ }
	4561	+ }
	4562	+
	4563	+ flashIt = false;
	4564	+ GetTree().clearSelection();
	4565	+ for (int i = 0; i < selection.size(); i++)
	4566	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4567	+ flashIt = true;
	4568	+
	4569	+ //refreshContents(false);
	4570	+ }
	4571	+
	4572	+ void CopyChanged()
	4573	+ {
	4574	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4575	+
	4576	+ SetVersionStates();
3706	4577
3707	4578	boolean temp = CameraPane.SWITCH;
3708	4579	CameraPane.SWITCH = false;
3709	4580
3710		- copy.ExtractBigData(versiontable);
	4581	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3711	4582
3712	4583	copy.clear();
3713	4584
	4585	+ copy.skyboxname = obj.skyboxname;
	4586	+ copy.skyboxext = obj.skyboxext;
	4587	+
3714	4588	for (int i=0; i<obj.Size(); i++)
3715	4589	{
3716	4590	copy.add(obj.get(i));
3717	4591	}
3718	4592
3719		- copy.RestoreBigData(versiontable);
	4593	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3720	4594
3721	4595	CameraPane.SWITCH = temp;
3722	4596
	4597	+ RefreshSelection();
3723	4598	//assert(hashtable.isEmpty());
3724	4599
3725	4600	copy.Touch();
..	..	@@ -3740,13 +4615,15 @@
3740	4615	}
3741	4616	}
3742	4617
3743		- refreshContents();
	4618	+ refreshContents(true);
3744	4619	}
3745	4620
3746		- cButton undoButton;
	4621	+ cButton previousVersionButton;
3747	4622	cButton restoreButton;
3748	4623	cButton replaceButton;
3749		- cButton redoButton;
	4624	+ cButton nextVersionButton;
	4625	+ cButton saveVersionButton;
	4626	+ cButton deleteVersionButton;
3750	4627
3751	4628	boolean muteSlider;
3752	4629
..	..	@@ -3754,39 +4631,64 @@
3754	4631	{
3755	4632	int count = 0;
3756	4633
3757		- for (int i = copy.versions.length; --i >= 0;)
	4634	+ for (int i = copy.versionlist.length; --i >= 0;)
3758	4635	{
3759		- if (copy.versions[i] != null)
	4636	+ if (copy.versionlist[i] != null)
3760	4637	count++;
3761	4638	}
3762	4639
3763	4640	return count;
3764	4641	}
3765	4642
3766		- void SetUndoStates()
	4643	+ public cGridBag versionSliderPane;
	4644	+
	4645	+ void SetVersionStates()
3767	4646	{
3768		- cRadio tab = GetCurrentTab();
	4647	+ //if (true)
	4648	+ // return;
	4649	+
	4650	+ //cRadio tab = GetCurrentTab();
3769	4651
3770		- restoreButton.setEnabled(copy.versionindex != -1);
3771		- replaceButton.setEnabled(copy.versionindex != -1);
3772		-
3773		- undoButton.setEnabled(copy.versionindex > 0);
3774		- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
3775		-
3776		- muteSlider = true;
3777		- versionSlider.setMaximum(VersionCount() - 1);
3778		- versionSlider.setInteger(copy.versionindex);
3779		- muteSlider = false;
	4652	+ if (copy.versionlist == null)
	4653	+ {
	4654	+ saveVersionButton.setEnabled(false);
	4655	+ restoreButton.setEnabled(false);
	4656	+ replaceButton.setEnabled(false);
	4657	+ previousVersionButton.setEnabled(false);
	4658	+ nextVersionButton.setEnabled(false);
	4659	+ deleteVersionButton.setEnabled(false);
	4660	+ versionSliderPane.setVisible(false);
	4661	+ }
	4662	+ else
	4663	+ {
	4664	+ restoreButton.setEnabled(copy.versionindex != -1);
	4665	+ replaceButton.setEnabled(copy.versionindex != -1);
	4666	+
	4667	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4668	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4669	+
	4670	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4671	+ //copy.versionlist[copy.versionindex + 1] != null);
	4672	+
	4673	+ muteSlider = true;
	4674	+ versionSlider.setMinimum(0);
	4675	+ versionSlider.setMaximum(VersionCount() - 1);
	4676	+ versionSlider.setInteger(copy.versionindex);
	4677	+ versionSlider.setEnabled(copy.versionindex != -1);
	4678	+ muteSlider = false;
	4679	+
	4680	+ versionSliderPane.setVisible(true);
	4681	+ }
3780	4682	}
3781	4683
3782		- public boolean Undo()
	4684	+ public boolean PreviousVersion()
3783	4685	{
3784	4686	// Option?
3785	4687	Replace();
3786	4688
3787	4689	System.err.println("Undo");
3788	4690
3789		- cRadio tab = GetCurrentTab();
	4691	+ //cRadio tab = GetCurrentTab();
3790	4692
3791	4693	if (copy.versionindex == 0)
3792	4694	{
..	..	@@ -3809,7 +4711,7 @@
3809	4711
3810	4712	copy.versionindex -= 1;
3811	4713
3812		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4714	+ CopyChanged();
3813	4715
3814	4716	return true;
3815	4717	}
..	..	@@ -3818,44 +4720,45 @@
3818	4720	{
3819	4721	System.err.println("Restore");
3820	4722
3821		- cRadio tab = GetCurrentTab();
	4723	+ //cRadio tab = GetCurrentTab();
3822	4724
3823		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4725	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3824	4726	{
3825	4727	java.awt.Toolkit.getDefaultToolkit().beep();
3826	4728	return false;
3827	4729	}
3828	4730
3829		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4731	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4732	+ CopyChanged();
3830	4733
3831	4734	return true;
3832	4735	}
3833	4736
3834	4737	public boolean Replace()
3835	4738	{
3836		- System.err.println("Replace");
	4739	+ //System.err.println("Replace");
3837	4740
3838		- cRadio tab = GetCurrentTab();
	4741	+ //cRadio tab = GetCurrentTab();
3839	4742
3840		- if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	4743	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3841	4744	{
3842	4745	// No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3843	4746	return false;
3844	4747	}
3845	4748
3846		- copy.versions[copy.versionindex] = CompressCopy();
	4749	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
3847	4750
3848	4751	return true;
3849	4752	}
3850	4753
3851		- public void Redo()
	4754	+ public void NextVersion()
3852	4755	{
3853	4756	// Option?
3854	4757	Replace();
3855	4758
3856		- cRadio tab = GetCurrentTab();
	4759	+ //cRadio tab = GetCurrentTab();
3857	4760
3858		- if (copy.versions[copy.versionindex + 1] == null)
	4761	+ if (copy.versionlist[copy.versionindex + 1] == null)
3859	4762	{
3860	4763	java.awt.Toolkit.getDefaultToolkit().beep();
3861	4764	return;
..	..	@@ -3863,7 +4766,7 @@
3863	4766
3864	4767	copy.versionindex += 1;
3865	4768
3866		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4769	+ CopyChanged();
3867	4770
3868	4771	//if (!tab.user[tab.versionindex])
3869	4772	// tab.graphs[tab.versionindex] = null;
..	..	@@ -4060,6 +4963,12 @@
4060	4963	// else
4061	4964	// applySelf(true);
4062	4965	// }
	4966	+
	4967	+ boolean Equal(double a, double b)
	4968	+ {
	4969	+ return Math.abs(a - b) < 0.001;
	4970	+ }
	4971	+
4063	4972	void applySelf0(boolean name)
4064	4973	{
4065	4974	if (name)
..	..	@@ -4077,7 +4986,7 @@
4077	4986	//copy.material = new cMaterial(copy.GetMaterial());
4078	4987
4079	4988	current.color = (float) colorField.getFloat();
4080		- current.modulation = (float) modulationField.getFloat();
	4989	+ current.modulation = (float) saturationField.getFloat();
4081	4990	current.metalness = (float) metalnessField.getFloat();
4082	4991	current.diffuse = (float) diffuseField.getFloat();
4083	4992	current.specular = (float) specularField.getFloat();
..	..	@@ -4097,6 +5006,7 @@
4097	5006	current.shadow = (float) shadowField.getFloat();
4098	5007	current.texture = (float) textureField.getFloat();
4099	5008	current.opacity = (float) opacityField.getFloat();
	5009	+ current.parallax = (float) parallaxField.getFloat() - 0.25f;
4100	5010	current.fakedepth = (float) fakedepthField.getFloat();
4101	5011	current.shadowbias = (float) shadowbiasField.getFloat();
4102	5012
..	..	@@ -4109,29 +5019,54 @@
4109	5019	{
4110	5020	cMaterial mat = copy.material;
4111	5021
4112		- colorField.SetToolTipValue((mat.color));
4113		- modulationField.SetToolTipValue((mat.modulation));
4114		- metalnessField.SetToolTipValue((mat.metalness));
4115		- diffuseField.SetToolTipValue((mat.diffuse));
4116		- specularField.SetToolTipValue((mat.specular));
4117		- shininessField.SetToolTipValue((mat.shininess));
4118		- shiftField.SetToolTipValue((mat.shift));
4119		- ambientField.SetToolTipValue((mat.ambient));
4120		- lightareaField.SetToolTipValue((mat.lightarea));
4121		- diffusenessField.SetToolTipValue((mat.factor));
4122		- velvetField.SetToolTipValue((mat.velvet));
4123		- sheenField.SetToolTipValue((mat.sheen));
4124		- subsurfaceField.SetToolTipValue((mat.subsurface));
4125		- backlitField.SetToolTipValue((mat.bump));
4126		- anisoField.SetToolTipValue((mat.aniso));
4127		- anisoVField.SetToolTipValue((mat.anisoV));
4128		- cameraField.SetToolTipValue((mat.cameralight));
4129		- selfshadowField.SetToolTipValue((mat.diffuseness));
4130		- shadowField.SetToolTipValue((mat.shadow));
4131		- textureField.SetToolTipValue((mat.texture));
4132		- opacityField.SetToolTipValue((mat.opacity));
4133		- fakedepthField.SetToolTipValue((mat.fakedepth));
4134		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	5022	+ if (!Equal(colorField.getFloat(), mat.color))
	5023	+ colorField.SetToolTipValue((mat.color));
	5024	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	5025	+ saturationField.SetToolTipValue((mat.modulation));
	5026	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	5027	+ metalnessField.SetToolTipValue((mat.metalness));
	5028	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	5029	+ diffuseField.SetToolTipValue((mat.diffuse));
	5030	+ if (!Equal(specularField.getFloat(), mat.specular))
	5031	+ specularField.SetToolTipValue((mat.specular));
	5032	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	5033	+ shininessField.SetToolTipValue((mat.shininess));
	5034	+ if (!Equal(shiftField.getFloat(), mat.shift))
	5035	+ shiftField.SetToolTipValue((mat.shift));
	5036	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	5037	+ ambientField.SetToolTipValue((mat.ambient));
	5038	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	5039	+ lightareaField.SetToolTipValue((mat.lightarea));
	5040	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	5041	+ diffusenessField.SetToolTipValue((mat.factor));
	5042	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	5043	+ velvetField.SetToolTipValue((mat.velvet));
	5044	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	5045	+ sheenField.SetToolTipValue((mat.sheen));
	5046	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	5047	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	5048	+ if (!Equal(backlitField.getFloat(), mat.bump))
	5049	+ backlitField.SetToolTipValue((mat.bump));
	5050	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5051	+ anisoField.SetToolTipValue((mat.aniso));
	5052	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5053	+ anisoVField.SetToolTipValue((mat.anisoV));
	5054	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5055	+ cameraField.SetToolTipValue((mat.cameralight));
	5056	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5057	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5058	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5059	+ shadowField.SetToolTipValue((mat.shadow));
	5060	+ if (!Equal(textureField.getFloat(), mat.texture))
	5061	+ textureField.SetToolTipValue((mat.texture));
	5062	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5063	+ opacityField.SetToolTipValue((mat.opacity));
	5064	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5065	+ parallaxField.SetToolTipValue((mat.parallax));
	5066	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5067	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5068	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5069	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4135	5070	}
4136	5071
4137	5072	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4166,17 +5101,20 @@
4166	5101
4167	5102	public void stateChanged(ChangeEvent e)
4168	5103	{
4169		- // assert(false);
	5104	+ // assert(false);
4170	5105	if (e.getSource() == versionSlider)
4171	5106	{
4172	5107	if (muteSlider)
4173	5108	return;
4174	5109
	5110	+ Replace();
	5111	+
4175	5112	int version = versionSlider.getInteger();
4176	5113
4177		- if (copy.versions[version] != null)
	5114	+ if (version != -1 && copy.versionlist[version] != null)
4178	5115	{
4179		- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	5116	+ copy.versionindex = version;
	5117	+ CopyChanged();
4180	5118	}
4181	5119
4182	5120	return;
..	..	@@ -4216,6 +5154,12 @@
4216	5154	{
4217	5155	//System.out.println("stateChanged = " + this);
4218	5156	materialtouched = true;
	5157	+
	5158	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5159	+ {
	5160	+ saturationField.setFloat(1);
	5161	+ }
	5162	+
4219	5163	applySelf();
4220	5164	//System.out.println("this = " + this);
4221	5165	//System.out.println("PARENT = " + parent);
..	..	@@ -4515,6 +5459,7 @@
4515	5459	{
4516	5460	if (GetTree() != null)
4517	5461	{
	5462	+ GetTree().revalidate();
4518	5463	GetTree().repaint();
4519	5464	}
4520	5465
..	..	@@ -4523,6 +5468,11 @@
4523	5468	ctrlPanel.validate(); // ? new
4524	5469	ctrlPanel.repaint();
4525	5470	}
	5471	+
	5472	+ if (previousVersionButton != null && copy.versionlist != null)
	5473	+ SetVersionStates();
	5474	+
	5475	+ cameraView.requestFocusInWindow();
4526	5476	}
4527	5477
4528	5478	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4554,7 +5504,7 @@
4554	5504	// group = (Composite) group.get(0);
4555	5505	// }
4556	5506
4557		- System.out.println("makeSomething of " + thing);
	5507	+ //System.out.println("makeSomething of " + thing);
4558	5508
4559	5509	/*
4560	5510	if (deselect && jList != null)
..	..	@@ -4853,6 +5803,8 @@
4853	5803	{
4854	5804	//readobj.deepCopySelf(copy);
4855	5805	copy.clear(); // june 2014
	5806	+ copy.skyboxname = readobj.skyboxname;
	5807	+ copy.skyboxext = readobj.skyboxext;
4856	5808	for (int i = 0; i < readobj.size(); i++)
4857	5809	{
4858	5810	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4904,13 +5856,17 @@
4904	5856	c.addChild(csg);
4905	5857	}
4906	5858
4907		- copy.versions = readobj.versions;
	5859	+ copy.versionlist = readobj.versionlist;
4908	5860	copy.versionindex = readobj.versionindex;
	5861	+ copy.versiontable = readobj.versiontable;
4909	5862
4910		- if (copy.versions == null)
	5863	+ if (copy.versionlist == null)
4911	5864	{
4912		- copy.versions = new byte[100][];
	5865	+ // Backward compatibility
	5866	+ copy.versionlist = new Object3D[100];
4913	5867	copy.versionindex = -1;
	5868	+
	5869	+ //Save(true);
4914	5870	}
4915	5871
4916	5872	//? SetUndoStates();
..	..	@@ -4925,7 +5881,7 @@
4925	5881	{
4926	5882	if (Grafreed.standAlone)
4927	5883	{
4928		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5884	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4929	5885	browser.show();
4930	5886	String filename = browser.getFile();
4931	5887	if (filename != null && filename.length() > 0)
..	..	@@ -5002,6 +5958,8 @@
5002	5958
5003	5959	void save()
5004	5960	{
	5961	+ Replace();
	5962	+
5005	5963	if (lastname == null)
5006	5964	{
5007	5965	return;
..	..	@@ -5244,6 +6202,7 @@
5244	6202	ButtonGroup buttonGroup;
5245	6203
5246	6204	cGridBag toolboxPanel;
	6205	+ cGridBag skyboxPanel;
5247	6206	cGridBag materialPanel;
5248	6207	cGridBag ctrlPanel;
5249	6208
..	..	@@ -5255,6 +6214,7 @@
5255	6214	boolean materialFlushed;
5256	6215	Object3D latestObject;
5257	6216
	6217	+ cGridBag transformPanel;
5258	6218	cGridBag XYZPanel;
5259	6219
5260	6220	JSplitPane gridPanel;
..	..	@@ -5317,7 +6277,7 @@
5317	6277	JLabel colorLabel;
5318	6278	cNumberSlider colorField;
5319	6279	JLabel modulationLabel;
5320		- cNumberSlider modulationField;
	6280	+ cNumberSlider saturationField;
5321	6281	JLabel metalnessLabel;
5322	6282	cNumberSlider metalnessField;
5323	6283	JLabel diffuseLabel;
..	..	@@ -5348,6 +6308,7 @@
5348	6308	cNumberSlider anisoField;
5349	6309	JLabel anisoVLabel;
5350	6310	cNumberSlider anisoVField;
	6311	+
5351	6312	JLabel cameraLabel;
5352	6313	cNumberSlider cameraField;
5353	6314	JLabel selfshadowLabel;
..	..	@@ -5358,10 +6319,13 @@
5358	6319	cNumberSlider textureField;
5359	6320	JLabel opacityLabel;
5360	6321	cNumberSlider opacityField;
	6322	+ JLabel parallaxLabel;
	6323	+ cNumberSlider parallaxField;
5361	6324	JLabel fakedepthLabel;
5362	6325	cNumberSlider fakedepthField;
5363	6326	JLabel shadowbiasLabel;
5364	6327	cNumberSlider shadowbiasField;
	6328	+
5365	6329	JLabel bumpLabel;
5366	6330	cNumberSlider bumpField;
5367	6331	JLabel noiseLabel;