~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,6 +42,50 @@
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	+ }
44	89
45	90	public cGridBag GetSeparator()
46	91	{
..	..	@@ -53,7 +98,10 @@
53	98	cButton GetButton(String name, boolean border)
54	99	{
55	100	ImageIcon icon = GetIcon(name);
56		- 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);
57	105	}
58	106
59	107	cLabel GetLabel(String name, boolean border)
..	..	@@ -74,12 +122,26 @@
74	122	return new cCheckBox(icon, border);
75	123	}
76	124
77		- 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)
78	128	{
	129	+ javax.swing.ImageIcon iconCache = icons.get(name);
	130	+ if (iconCache != null)
	131	+ {
	132	+ return iconCache;
	133	+ }
	134	+
79	135	try
80	136	{
81		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
82		-
	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	+
83	145	// if (image.getWidth() > 48 && image.getHeight() > 48)
84	146	// {
85	147	// BufferedImage resized = new BufferedImage(48, 48, image.getType());
..	..	@@ -93,10 +155,14 @@
93	155	// }
94	156
95	157	javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	158	+
	159	+ icons.put(name, icon);
	160	+
96	161	return icon;
97	162	}
98	163	catch (Exception e)
99	164	{
	165	+ //icons.put(name, null);
100	166	return null;
101	167	}
102	168	}
..	..	@@ -296,11 +362,13 @@
296	362	client = inClient;
297	363	copy = client;
298	364
299		- if (copy.versionlist == null)
300		- {
301		- copy.versionlist = new Object3D[100];
302		- copy.versionindex = -1;
303		- }
	365	+// if (copy.versionlist == null)
	366	+// {
	367	+// copy.versionlist = new Object3D[100];
	368	+// copy.versionindex = -1;
	369	+//
	370	+// callee.Save(true);
	371	+// }
304	372
305	373	// "this" is not called: SetupUI2(objEditor);
306	374	}
..	..	@@ -319,6 +387,8 @@
319	387	{
320	388	copy.versionlist = new Object3D[100];
321	389	copy.versionindex = -1;
	390	+
	391	+// Save(true);
322	392	}
323	393
324	394	SetupUI2(callee.GetEditor());
..	..	@@ -342,7 +412,8 @@
342	412	//parent = p;
343	413
344	414	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
345		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	415	+ if (Globals.DEBUG)
	416	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
346	417	//gd.setFullScreenWindow(this);
347	418	//setResizable(false);
348	419	//if (!isDisplayable())
..	..	@@ -353,11 +424,13 @@
353	424	copy = localCopy;
354	425	copy.editWindow = this;
355	426
356		- if (copy.versionlist == null)
357		- {
358		-// copy.versions = new byte[100][];
	427	+// if (copy.versionlist == null)
	428	+// {
	429	+// copy.versionlist = new Object3D[100];
359	430	// copy.versionindex = -1;
360		- }
	431	+//
	432	+// Save(true);
	433	+// }
361	434
362	435	SetupMenu();
363	436
..	..	@@ -377,6 +450,9 @@
377	450
378	451	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
379	452
	453	+ // This is to refresh the UI of the material panel.
	454	+ boolean patchMaterial;
	455	+
380	456	void SetupMenu()
381	457	{
382	458	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -390,8 +466,11 @@
390	466	importOBJItem.addActionListener(this);
391	467	import3DSItem = menu.add(new MenuItem("3DS file..."));
392	468	import3DSItem.addActionListener(this);
	469	+ if (Globals.ADVANCED)
	470	+ {
393	471	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
394	472	importVRMLX3DItem.addActionListener(this);
	473	+ }
395	474	menu.add("-");
396	475	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
397	476	importGFDItem.addActionListener(this);
..	..	@@ -426,6 +505,8 @@
426	505
427	506	ChangeListener changeListener = new ChangeListener()
428	507	{
	508	+ //String name;
	509	+
429	510	public void stateChanged(ChangeEvent changeEvent)
430	511	{
431	512	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -444,7 +525,37 @@
444	525	// EditSelection(false);
445	526	// }
446	527
447		- 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();
448	559	}
449	560	};
450	561	objectPanel.addChangeListener(changeListener);
..	..	@@ -466,6 +577,8 @@
466	577
467	578	toolboxPanel = new cGridBag().setVertical(true);
468	579	//toolboxPanel.setName("Toolbox");
	580	+
	581	+ skyboxPanel = new cGridBag().setVertical(true);
469	582
470	583	materialPanel = new cGridBag().setVertical(false);
471	584	//materialPanel.setName("Material");
..	..	@@ -751,6 +864,7 @@
751	864	boolean maximized;
752	865
753	866	cButton fullscreenLayout;
	867	+ cButton expandedLayout;
754	868
755	869	void Minimize()
756	870	{
..	..	@@ -790,10 +904,12 @@
790	904	cButton minButton;
791	905	cButton maxButton;
792	906	cButton fullButton;
	907	+ cButton collapseButton;
	908	+ cButton maximize3DButton;
793	909
794	910	void ToggleFullScreen()
795	911	{
796		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	912	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797	913
798	914	cameraView.ToggleFullScreen();
799	915
..	..	@@ -814,13 +930,13 @@
814	930	// X frame.getContentPane().remove(/"Center",/bigThree);
815	931	// X framePanel.add(bigThree);
816	932	// X frame.getContentPane().add(/"Center",/framePanel);
817		- framePanel.setDividerLocation(46);
	933	+// framePanel.setDividerLocation(46); // icons are 24x24
818	934
819	935	//frame.setVisible(true);
820		- radio.layout = keepButton;
	936	+// radio.layout = keepButton;
821	937	//theFrame = null;
822	938	keepButton = null;
823		- radio.layout.doClick();
	939	+// radio.layout.doClick();
824	940
825	941	} else
826	942	{
..	..	@@ -841,10 +957,10 @@
841	957	// X frame.getContentPane().remove(/"Center",/framePanel);
842	958	// X framePanel.remove(bigThree);
843	959	// X frame.getContentPane().add(/"Center",/bigThree);
844		- framePanel.setDividerLocation(0);
	960	+// framePanel.setDividerLocation(0);
845	961
846		- radio.layout = fullscreenLayout;
847		- radio.layout.doClick();
	962	+// radio.layout = fullscreenLayout;
	963	+// radio.layout.doClick();
848	964	//frame.setVisible(true);
849	965	}
850	966	frame.validate();
..	..	@@ -852,23 +968,42 @@
852	968	cameraView.requestFocusInWindow();
853	969	}
854	970
855		- private Object3D CompressCopy()
	971	+ void CollapseToolbar()
	972	+ {
	973	+ framePanel.setDividerLocation(0);
	974	+ //frame.validate();
	975	+
	976	+ cameraView.requestFocusInWindow();
	977	+ }
	978	+
	979	+ private Object3D Duplicate(Object3D object)
856	980	{
857	981	boolean temp = CameraPane.SWITCH;
858	982	CameraPane.SWITCH = false;
859	983
860		- 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);
861	988	// if (copy == client)
862	989
863		- Object3D versions[] = copy.versionlist;
864		- copy.versionlist = 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;
	994	+
	995	+ Object3D parent = object.parent;
	996	+ object.parent = null;
865	997
866	998	//byte[] compress = Compress(copy);
867		- Object3D compress = (Object3D)Grafreed.clone(copy);
	999	+ Object3D compress = (Object3D)Grafreed.clone(object);
868	1000
869		- copy.versionlist = versions;
	1001	+ object.parent = parent;
870	1002
871		- copy.RestoreBigData(versiontable);
	1003	+ object.versionlist = versions;
	1004	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	1005	+
	1006	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
872	1007
873	1008	CameraPane.SWITCH = temp;
874	1009
..	..	@@ -1205,6 +1340,18 @@
1205	1340
1206	1341	namePanel = new cGridBag();
1207	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	+
1208	1355	nameField = AddText(namePanel, copy.GetName());
1209	1356	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1210	1357	oe.ctrlPanel.add(namePanel);
..	..	@@ -1218,14 +1365,14 @@
1218	1365
1219	1366	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1220	1367	liveCB.setToolTipText("Animate object");
	1368	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1369	+ markCB.setToolTipText("Set target transform");
1221	1370	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1222	1371	selectableCB.setToolTipText("Make object selectable");
1223	1372	// Return();
1224	1373
1225	1374	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1226	1375	hideCB.setToolTipText("Hide object");
1227		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1228		- markCB.setToolTipText("As animation target transform");
1229	1376
1230	1377	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1231	1378
..	..	@@ -1427,22 +1574,9 @@
1427	1574
1428	1575	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1429	1576	{
1430		- System.out.println("CREATE CAMERAS");
1431		- cams = new cTemplate();
1432		- cams.name = "Cameras";
1433		- copy.insertElementAt(cams, 0);
1434		- //cams.parent = copy;
1435		-
1436		- cam = new Camera(); // LA.newVector(3, 2, 1));
1437		- cams.addChild(cam);
1438		- cam = new Camera(1);
1439		- cams.addChild(cam);
1440		- cam = new Camera(2);
1441		- cams.addChild(cam);
1442		- cam = new Camera(3);
1443		- cams.addChild(cam);
1444		- cam = new Camera(4); // Light
1445		- cams.addChild(cam);
	1577	+ if (Globals.DEBUG)
	1578	+ System.out.println("CREATE CAMERAS");
	1579	+ cams = CreateCameras();
1446	1580	} else
1447	1581	{
1448	1582	cams = (cGroup) copy.get(0);
..	..	@@ -1508,6 +1642,45 @@
1508	1642	//frontView.object = copy;
1509	1643	//sideView.object = copy;
1510	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	+
1511	1684	XYZPanel = new cGridBag().setVertical(true);
1512	1685	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1513	1686
..	..	@@ -1517,6 +1690,9 @@
1517	1690	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1518	1691	//XYZPanel.setName("XYZ");
1519	1692
	1693	+ transformPanel.add(resetTransformPanel);
	1694	+ transformPanel.add(XYZPanel);
	1695	+
1520	1696	/*
1521	1697	gridPanel = new JPanel(); //new BorderLayout());
1522	1698	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1524,12 +1700,12 @@
1524	1700	gridPanel.add(cameraView);
1525	1701	gridPanel.add(XYZPanel);
1526	1702	*/
1527		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1528		- gridPanel.setContinuousLayout(true);
1529		- gridPanel.setOneTouchExpandable(true);
1530		- gridPanel.setDividerLocation(1.0);
1531		- gridPanel.setDividerSize(9);
1532		- 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);
1533	1709
1534	1710	// aConstraints.weighty = 0;
1535	1711	//System.out.println("THIS = " + this);
..	..	@@ -1552,31 +1728,34 @@
1552	1728
1553	1729	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1554	1730	//tmp.setName("Edit");
1555		- objectPanel.add(materialPanel);
1556		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1557		- objectPanel.setToolTipTextAt(0, "Material");
1558		-
	1731	+ objectPanel.add(skyboxPanel);
	1732	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1733	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1734	+
1559	1735	objectPanel.add(toolboxPanel);
1560	1736	objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1561		- objectPanel.setToolTipTextAt(1, "Objects & backgrounds");
	1737	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1562	1738
	1739	+ objectPanel.add(materialPanel);
	1740	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1741	+ objectPanel.setToolTipTextAt(2, "Material");
	1742	+
1563	1743	// JPanel north = new JPanel(new BorderLayout());
1564	1744	// north.setName("Edit");
1565	1745	// north.add(ctrlPanel, BorderLayout.NORTH);
1566	1746	// objectPanel.add(north);
1567	1747	objectPanel.add(editPanel);
1568		- objectPanel.setIconAt(2, GetIcon("icons/write.png"));
1569		- objectPanel.setToolTipTextAt(2, "Edit controls");
	1748	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
	1749	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1570	1750
1571		- //if (Globals.ADVANCED)
1572		- objectPanel.add(infoPanel);
1573		- objectPanel.setIconAt(3, GetIcon("icons/info.png"));
1574		- objectPanel.setToolTipTextAt(3, "Information");
1575		-
1576		- objectPanel.add(XYZPanel);
	1751	+ objectPanel.add(transformPanel);
1577	1752	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1578		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1753	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1579	1754
	1755	+ patchMaterial = true;
	1756	+ cameraView.patchMaterial = this;
	1757	+ objectPanel.setSelectedIndex(2);
	1758	+
1580	1759	/*
1581	1760	aConstraints.gridx = 0;
1582	1761	aConstraints.gridwidth = 1;
..	..	@@ -1596,7 +1775,7 @@
1596	1775	scrollpane.addMouseWheelListener(this); // Default not fast enough
1597	1776
1598	1777	/JTabbedPane/ scenePanel = new cGridBag();
1599		- scenePanel.preferredWidth = 5;
	1778	+ scenePanel.preferredWidth = 6;
1600	1779
1601	1780	JTabbedPane tabbedPane = new JTabbedPane();
1602	1781	tabbedPane.add(scrollpane);
..	..	@@ -1607,11 +1786,108 @@
1607	1786
1608	1787	AddOptions(optionsPanel); //, aConstraints);
1609	1788
1610		- tabbedPane.add(optionsPanel);
1611		-
1612	1789	tabbedPane.add(FSPane = new cFileSystemPane(this));
1613	1790
	1791	+ tabbedPane.add(optionsPanel);
	1792	+
1614	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	+ }
1615	1891
1616	1892	/*
1617	1893	cTree jTree = new cTree(null);
..	..	@@ -1633,13 +1909,13 @@
1633	1909	jtp.add(tree);
1634	1910	*/
1635	1911
1636		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1637		- bigPanel.setContinuousLayout(true);
1638		- bigPanel.setOneTouchExpandable(true);
1639		- bigPanel.setDividerLocation(0.8);
1640		- bigPanel.setDividerSize(15);
1641		- bigPanel.setResizeWeight(0.15);
1642		- 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");
1643	1919
1644	1920	//bigPanel.setLayout(new BorderLayout());
1645	1921	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1683,6 +1959,23 @@
1683	1959	// aConstraints.gridheight = 1;
1684	1960
1685	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	+
1686	1979	framePanel.setContinuousLayout(false);
1687	1980	framePanel.setOneTouchExpandable(false);
1688	1981	//.setDividerLocation(0.8);
..	..	@@ -1692,7 +1985,7 @@
1692	1985
1693	1986	frame.getContentPane().setLayout(new BorderLayout());
1694	1987	/**/
1695		- JTabbedPane worldPane = new JTabbedPane();
	1988	+ //JTabbedPane worldPane = new JTabbedPane();
1696	1989	//worldPane.add(bigPanel);
1697	1990	//worldPane.add(worldPanel);
1698	1991	/**/
..	..	@@ -1706,7 +1999,7 @@
1706	1999
1707	2000	cameraView.requestFocusInWindow();
1708	2001
1709		- gridPanel.setDividerLocation(1.0);
	2002	+// gridPanel.setDividerLocation(1.0);
1710	2003
1711	2004	frame.validate();
1712	2005
..	..	@@ -1741,7 +2034,7 @@
1741	2034	{
1742	2035	cGridBag presetpanel = new cGridBag().setVertical(true);
1743	2036
1744		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	2037	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1745	2038	skin.setToolTipText("Skin");
1746	2039	skin.addMouseListener(new MouseAdapter()
1747	2040	{
..	..	@@ -1752,7 +2045,15 @@
1752	2045
1753	2046	// Skin
1754	2047	colorField.setFloat(material.color);
1755		- saturationField.setFloat(material.modulation);
	2048	+ float saturation = material.modulation;
	2049	+
	2050	+ if (!cameraView.Skinshader)
	2051	+ {
	2052	+ saturation /= 1.5;
	2053	+ }
	2054	+
	2055	+ saturationField.setFloat(saturation);
	2056	+
1756	2057	subsurfaceField.setFloat(material.subsurface);
1757	2058	selfshadowField.setFloat(material.diffuseness);
1758	2059	diffusenessField.setFloat(material.factor);
..	..	@@ -1771,7 +2072,7 @@
1771	2072	});
1772	2073	presetpanel.add(skin);
1773	2074
1774		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2075	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1775	2076	lambert.setToolTipText("Diffuse");
1776	2077	lambert.addMouseListener(new MouseAdapter()
1777	2078	{
..	..	@@ -1789,7 +2090,7 @@
1789	2090	});
1790	2091	presetpanel.add(lambert);
1791	2092
1792		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2093	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1793	2094	diffuse2.setToolTipText("Diffuse2");
1794	2095	diffuse2.addMouseListener(new MouseAdapter()
1795	2096	{
..	..	@@ -1807,7 +2108,7 @@
1807	2108	});
1808	2109	presetpanel.add(diffuse2);
1809	2110
1810		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2111	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1811	2112	diffusemoon.setToolTipText("Moon");
1812	2113	diffusemoon.addMouseListener(new MouseAdapter()
1813	2114	{
..	..	@@ -1825,7 +2126,7 @@
1825	2126	});
1826	2127	presetpanel.add(diffusemoon);
1827	2128
1828		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2129	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1829	2130	diffusemoon2.setToolTipText("Moon2");
1830	2131	diffusemoon2.addMouseListener(new MouseAdapter()
1831	2132	{
..	..	@@ -1843,7 +2144,7 @@
1843	2144	});
1844	2145	presetpanel.add(diffusemoon2);
1845	2146
1846		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2147	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1847	2148	diffusemoon3.setToolTipText("Moon3");
1848	2149	diffusemoon3.addMouseListener(new MouseAdapter()
1849	2150	{
..	..	@@ -1861,7 +2162,7 @@
1861	2162	});
1862	2163	presetpanel.add(diffusemoon3);
1863	2164
1864		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2165	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1865	2166	diffusesheen.setToolTipText("Sheen");
1866	2167	diffusesheen.addMouseListener(new MouseAdapter()
1867	2168	{
..	..	@@ -1878,7 +2179,7 @@
1878	2179	});
1879	2180	presetpanel.add(diffusesheen);
1880	2181
1881		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2182	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
1882	2183	rough.setToolTipText("Rough metal");
1883	2184	rough.addMouseListener(new MouseAdapter()
1884	2185	{
..	..	@@ -1896,7 +2197,7 @@
1896	2197	});
1897	2198	presetpanel.add(rough);
1898	2199
1899		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2200	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
1900	2201	rough2.setToolTipText("Medium metal");
1901	2202	rough2.addMouseListener(new MouseAdapter()
1902	2203	{
..	..	@@ -1914,7 +2215,7 @@
1914	2215	});
1915	2216	presetpanel.add(rough2);
1916	2217
1917		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2218	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
1918	2219	shini0.setToolTipText("Shiny");
1919	2220	shini0.addMouseListener(new MouseAdapter()
1920	2221	{
..	..	@@ -1932,7 +2233,7 @@
1932	2233	});
1933	2234	presetpanel.add(shini0);
1934	2235
1935		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2236	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
1936	2237	shini1.setToolTipText("Shiny2");
1937	2238	shini1.addMouseListener(new MouseAdapter()
1938	2239	{
..	..	@@ -1950,7 +2251,7 @@
1950	2251	});
1951	2252	presetpanel.add(shini1);
1952	2253
1953		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2254	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
1954	2255	shini2.setToolTipText("Shiny3");
1955	2256	shini2.addMouseListener(new MouseAdapter()
1956	2257	{
..	..	@@ -1968,7 +2269,7 @@
1968	2269	});
1969	2270	presetpanel.add(shini2);
1970	2271
1971		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2272	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
1972	2273	aniso.setToolTipText("AnisoU");
1973	2274	aniso.addMouseListener(new MouseAdapter()
1974	2275	{
..	..	@@ -1986,7 +2287,7 @@
1986	2287	});
1987	2288	presetpanel.add(aniso);
1988	2289
1989		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2290	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
1990	2291	aniso2.setToolTipText("AnisoV");
1991	2292	aniso2.addMouseListener(new MouseAdapter()
1992	2293	{
..	..	@@ -2004,7 +2305,7 @@
2004	2305	});
2005	2306	presetpanel.add(aniso2);
2006	2307
2007		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2308	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2008	2309	aniso3.setToolTipText("AnisoUV");
2009	2310	aniso3.addMouseListener(new MouseAdapter()
2010	2311	{
..	..	@@ -2022,7 +2323,7 @@
2022	2323	});
2023	2324	presetpanel.add(aniso3);
2024	2325
2025		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2326	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2026	2327	velvet0.setToolTipText("Velvet");
2027	2328	velvet0.addMouseListener(new MouseAdapter()
2028	2329	{
..	..	@@ -2044,7 +2345,7 @@
2044	2345	});
2045	2346	presetpanel.add(velvet0);
2046	2347
2047		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2348	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2048	2349	bump0.setToolTipText("Bump texture");
2049	2350	bump0.addMouseListener(new MouseAdapter()
2050	2351	{
..	..	@@ -2063,7 +2364,22 @@
2063	2364	});
2064	2365	presetpanel.add(bump0);
2065	2366
2066		- cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	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);
2067	2383	halo.setToolTipText("Halo");
2068	2384	halo.addMouseListener(new MouseAdapter()
2069	2385	{
..	..	@@ -2080,7 +2396,7 @@
2080	2396	});
2081	2397	presetpanel.add(halo);
2082	2398
2083		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2399	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2084	2400	candle.setToolTipText("Candle");
2085	2401	candle.addMouseListener(new MouseAdapter()
2086	2402	{
..	..	@@ -2102,6 +2418,25 @@
2102	2418	});
2103	2419	presetpanel.add(candle);
2104	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	+
2105	2440	cGridBag panel = new cGridBag().setVertical(true);
2106	2441
2107	2442	presetpanel.preferredWidth = 1;
..	..	@@ -2118,19 +2453,19 @@
2118	2453
2119	2454	cGridBag editBar = new cGridBag().setVertical(false);
2120	2455
2121		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2456	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2122	2457	createMaterialButton.setToolTipText("Create material");
2123	2458
2124	2459	/*
2125	2460	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2126	2461	*/
2127	2462
2128		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2463	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2129	2464	clearMaterialButton.setToolTipText("Clear material");
2130	2465
2131	2466	if (Globals.ADVANCED)
2132	2467	{
2133		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2468	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2134	2469	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2135	2470	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2136	2471	}
..	..	@@ -2151,9 +2486,20 @@
2151	2486
2152	2487	cGridBag huepanel = new cGridBag();
2153	2488	cGridBag huelabel = new cGridBag();
2154		- skin = GetLabel("icons/hue.png", false);
2155		- skin.fit = true;
2156		- huelabel.add(skin);
	2489	+ cLabel hue = GetLabel("icons/hue.png", false);
	2490	+ hue.fit = true;
	2491	+
	2492	+ hue.addMouseListener(new MouseAdapter()
	2493	+ {
	2494	+ public void mousePressed(MouseEvent e)
	2495	+ {
	2496	+ int x = e.getX();
	2497	+
	2498	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2499	+ }
	2500	+ });
	2501	+
	2502	+ huelabel.add(hue);
2157	2503	huelabel.preferredWidth = 20;
2158	2504	huepanel.add(new cGridBag()); // Label
2159	2505	huepanel.add(huelabel); // Field/slider
..	..	@@ -2336,6 +2682,12 @@
2336	2682	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
2337	2683	colorSection.add(backlit);
2338	2684
	2685	+ cGridBag parallax = new cGridBag();
	2686	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2687	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2688	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.5, -0.25)); // , aConstraints);
	2689	+ colorSection.add(parallax);
	2690	+
2339	2691	//panel.add(new JSeparator());
2340	2692
2341	2693	//panel.add(globalSection);
..	..	@@ -3387,6 +3739,7 @@
3387	3739	shadowField.setFloat(mat.shadow);
3388	3740	textureField.setFloat(mat.texture);
3389	3741	opacityField.setFloat(mat.opacity);
	3742	+ parallaxField.setFloat(mat.parallax + 0.25f);
3390	3743	fakedepthField.setFloat(mat.fakedepth);
3391	3744	shadowbiasField.setFloat(mat.shadowbias);
3392	3745	bumpField.setInteger(1); // dec 2013
..	..	@@ -3429,32 +3782,8 @@
3429	3782
3430	3783	if (multiplyToggle != null)
3431	3784	multiplyToggle.setSelected(mat.multiply);
3432		-
3433		- assert (object.projectedVertices != null);
3434		-
3435		- if (object.projectedVertices.length <= 2)
3436		- {
3437		- // Side effect...
3438		- Object3D.cVector2[] keep = object.projectedVertices;
3439		- object.projectedVertices = new Object3D.cVector2[3];
3440		- for (int i = 0; i < 3; i++)
3441		- {
3442		- if (i < keep.length)
3443		- {
3444		- object.projectedVertices[i] = keep[i];
3445		- } else
3446		- {
3447		- object.projectedVertices[i] = new Object3D.cVector2();
3448		- }
3449		- /*
3450		- if(keep.length == 0)
3451		- object.projectedVertices[0] = new Object3D.cVector2();
3452		- else
3453		- object.projectedVertices[0] = keep[0];
3454		- object.projectedVertices[1] = new Object3D.cVector2();
3455		- */
3456		- }
3457		- }
	3785	+
	3786	+ AllocProjectedVertices(object);
3458	3787
3459	3788	SetMaterial(mat, object.projectedVertices);
3460	3789	}
..	..	@@ -3574,6 +3903,17 @@
3574	3903	public void itemStateChanged(ItemEvent event)
3575	3904	{
3576	3905	// System.out.println("Propagate = " + propagate);
	3906	+ if (event.getSource() == pinButton)
	3907	+ {
	3908	+ copy.pinned ^= true;
	3909	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3910	+ {
	3911	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3912	+ copy.CloseUI();
	3913	+ //copy.editWindow.refreshContents();
	3914	+ }
	3915	+ }
	3916	+ else
3577	3917	if (event.getSource() == propagateToggle)
3578	3918	{
3579	3919	propagate ^= true;
..	..	@@ -3753,7 +4093,7 @@
3753	4093	//System.out.println("ObjEditor " + event);
3754	4094	applySelf0(true);
3755	4095	//parent.applySelf();
3756		- objEditor.refreshContents();
	4096	+ // conflicts with requestFocus objEditor.refreshContents();
3757	4097	} else if (source == resetButton)
3758	4098	{
3759	4099	CameraPane.fullreset = true;
..	..	@@ -3933,11 +4273,18 @@
3933	4273
3934	4274	void New()
3935	4275	{
3936		- while (copy.Size() > 1)
	4276	+ while (copy.Size() > 0)
3937	4277	{
3938		- copy.remove(1);
	4278	+ copy.remove(0);
3939	4279	}
3940	4280
	4281	+ copy.selection.clear();
	4282	+
	4283	+ if (copy == Grafreed.grafreed.universe)
	4284	+ {
	4285	+ CreateCameras();
	4286	+ cameraView.SetCamera(GetCamera(copy, 0));
	4287	+ }
3941	4288	ResetModel();
3942	4289	objEditor.refreshContents();
3943	4290	}
..	..	@@ -4046,7 +4393,7 @@
4046	4393	{
4047	4394	//Save(true);
4048	4395	Replace();
4049		- SetUndoStates();
	4396	+ SetVersionStates();
4050	4397	}
4051	4398
4052	4399	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -4065,8 +4412,6 @@
4065	4412	return true;
4066	4413	}
4067	4414
4068		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4069		-
4070	4415	void DeleteVersion()
4071	4416	{
4072	4417	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4074,19 +4419,23 @@
4074	4419	copy.versionlist[i] = copy.versionlist[i+1];
4075	4420	}
4076	4421
4077		- CopyChanged();
	4422	+ if (copy.versionlist[copy.versionindex] == null)
	4423	+ copy.versionindex -= 1;
4078	4424
4079		- SetUndoStates();
	4425	+ if (copy.versionindex != -1)
	4426	+ CopyChanged();
	4427	+
	4428	+ SetVersionStates();
4080	4429	}
4081	4430
4082	4431	public boolean Save(boolean user)
4083	4432	{
4084	4433	System.err.println("Save");
4085		- //Replace();
	4434	+ Replace();
4086	4435
4087		- cRadio tab = GetCurrentTab();
	4436	+ //cRadio tab = GetCurrentTab();
4088	4437
4089		- Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
	4438	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4090	4439
4091	4440	boolean thesame = false;
4092	4441
..	..	@@ -4122,7 +4471,7 @@
4122	4471	// copy.versionlist[i] = null;
4123	4472	// }
4124	4473
4125		- SetUndoStates();
	4474	+ SetVersionStates();
4126	4475
4127	4476	// test save
4128	4477	if (false)
..	..	@@ -4180,14 +4529,14 @@
4180	4529
4181	4530	void CopyChanged()
4182	4531	{
4183		- Object3D obj = copy.versionlist[copy.versionindex];
	4532	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4184	4533
4185		- SetUndoStates();
	4534	+ SetVersionStates();
4186	4535
4187	4536	boolean temp = CameraPane.SWITCH;
4188	4537	CameraPane.SWITCH = false;
4189	4538
4190		- copy.ExtractBigData(versiontable);
	4539	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4191	4540
4192	4541	copy.clear();
4193	4542
..	..	@@ -4199,7 +4548,7 @@
4199	4548	copy.add(obj.get(i));
4200	4549	}
4201	4550
4202		- copy.RestoreBigData(versiontable);
	4551	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4203	4552
4204	4553	CameraPane.SWITCH = temp;
4205	4554
..	..	@@ -4249,23 +4598,45 @@
4249	4598	return count;
4250	4599	}
4251	4600
4252		- void SetUndoStates()
	4601	+ public cGridBag versionSliderPane;
	4602	+
	4603	+ void SetVersionStates()
4253	4604	{
4254		- cRadio tab = GetCurrentTab();
	4605	+ //if (true)
	4606	+ // return;
	4607	+
	4608	+ //cRadio tab = GetCurrentTab();
4255	4609
4256		- restoreButton.setEnabled(true); // copy.versionindex != -1);
4257		- replaceButton.setEnabled(true); // copy.versionindex != -1);
4258		-
4259		- previousVersionButton.setEnabled(copy.versionindex > 0);
4260		- nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4261		-
4262		- deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4263		- copy.versionlist[copy.versionindex + 1] != null);
4264		-
4265		- muteSlider = true;
4266		- versionSlider.setMaximum(VersionCount() - 1);
4267		- versionSlider.setInteger(copy.versionindex);
4268		- muteSlider = false;
	4610	+ if (copy.versionlist == null)
	4611	+ {
	4612	+ saveVersionButton.setEnabled(false);
	4613	+ restoreButton.setEnabled(false);
	4614	+ replaceButton.setEnabled(false);
	4615	+ previousVersionButton.setEnabled(false);
	4616	+ nextVersionButton.setEnabled(false);
	4617	+ deleteVersionButton.setEnabled(false);
	4618	+ versionSliderPane.setVisible(false);
	4619	+ }
	4620	+ else
	4621	+ {
	4622	+ restoreButton.setEnabled(copy.versionindex != -1);
	4623	+ replaceButton.setEnabled(copy.versionindex != -1);
	4624	+
	4625	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4626	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4627	+
	4628	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4629	+ //copy.versionlist[copy.versionindex + 1] != null);
	4630	+
	4631	+ muteSlider = true;
	4632	+ versionSlider.setMinimum(0);
	4633	+ versionSlider.setMaximum(VersionCount() - 1);
	4634	+ versionSlider.setInteger(copy.versionindex);
	4635	+ versionSlider.setEnabled(copy.versionindex != -1);
	4636	+ muteSlider = false;
	4637	+
	4638	+ versionSliderPane.setVisible(true);
	4639	+ }
4269	4640	}
4270	4641
4271	4642	public boolean PreviousVersion()
..	..	@@ -4275,7 +4646,7 @@
4275	4646
4276	4647	System.err.println("Undo");
4277	4648
4278		- cRadio tab = GetCurrentTab();
	4649	+ //cRadio tab = GetCurrentTab();
4279	4650
4280	4651	if (copy.versionindex == 0)
4281	4652	{
..	..	@@ -4307,7 +4678,7 @@
4307	4678	{
4308	4679	System.err.println("Restore");
4309	4680
4310		- cRadio tab = GetCurrentTab();
	4681	+ //cRadio tab = GetCurrentTab();
4311	4682
4312	4683	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4313	4684	{
..	..	@@ -4323,9 +4694,9 @@
4323	4694
4324	4695	public boolean Replace()
4325	4696	{
4326		- System.err.println("Replace");
	4697	+ //System.err.println("Replace");
4327	4698
4328		- cRadio tab = GetCurrentTab();
	4699	+ //cRadio tab = GetCurrentTab();
4329	4700
4330	4701	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4331	4702	{
..	..	@@ -4333,7 +4704,7 @@
4333	4704	return false;
4334	4705	}
4335	4706
4336		- copy.versionlist[copy.versionindex] = CompressCopy();
	4707	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
4337	4708
4338	4709	return true;
4339	4710	}
..	..	@@ -4343,7 +4714,7 @@
4343	4714	// Option?
4344	4715	Replace();
4345	4716
4346		- cRadio tab = GetCurrentTab();
	4717	+ //cRadio tab = GetCurrentTab();
4347	4718
4348	4719	if (copy.versionlist[copy.versionindex + 1] == null)
4349	4720	{
..	..	@@ -4550,6 +4921,12 @@
4550	4921	// else
4551	4922	// applySelf(true);
4552	4923	// }
	4924	+
	4925	+ boolean Equal(double a, double b)
	4926	+ {
	4927	+ return Math.abs(a - b) < 0.001;
	4928	+ }
	4929	+
4553	4930	void applySelf0(boolean name)
4554	4931	{
4555	4932	if (name)
..	..	@@ -4587,6 +4964,7 @@
4587	4964	current.shadow = (float) shadowField.getFloat();
4588	4965	current.texture = (float) textureField.getFloat();
4589	4966	current.opacity = (float) opacityField.getFloat();
	4967	+ current.parallax = (float) parallaxField.getFloat() - 0.25f;
4590	4968	current.fakedepth = (float) fakedepthField.getFloat();
4591	4969	current.shadowbias = (float) shadowbiasField.getFloat();
4592	4970
..	..	@@ -4599,29 +4977,54 @@
4599	4977	{
4600	4978	cMaterial mat = copy.material;
4601	4979
4602		- colorField.SetToolTipValue((mat.color));
4603		- saturationField.SetToolTipValue((mat.modulation));
4604		- metalnessField.SetToolTipValue((mat.metalness));
4605		- diffuseField.SetToolTipValue((mat.diffuse));
4606		- specularField.SetToolTipValue((mat.specular));
4607		- shininessField.SetToolTipValue((mat.shininess));
4608		- shiftField.SetToolTipValue((mat.shift));
4609		- ambientField.SetToolTipValue((mat.ambient));
4610		- lightareaField.SetToolTipValue((mat.lightarea));
4611		- diffusenessField.SetToolTipValue((mat.factor));
4612		- velvetField.SetToolTipValue((mat.velvet));
4613		- sheenField.SetToolTipValue((mat.sheen));
4614		- subsurfaceField.SetToolTipValue((mat.subsurface));
4615		- backlitField.SetToolTipValue((mat.bump));
4616		- anisoField.SetToolTipValue((mat.aniso));
4617		- anisoVField.SetToolTipValue((mat.anisoV));
4618		- cameraField.SetToolTipValue((mat.cameralight));
4619		- selfshadowField.SetToolTipValue((mat.diffuseness));
4620		- shadowField.SetToolTipValue((mat.shadow));
4621		- textureField.SetToolTipValue((mat.texture));
4622		- opacityField.SetToolTipValue((mat.opacity));
4623		- fakedepthField.SetToolTipValue((mat.fakedepth));
4624		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	4980	+ if (!Equal(colorField.getFloat(), mat.color))
	4981	+ colorField.SetToolTipValue((mat.color));
	4982	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4983	+ saturationField.SetToolTipValue((mat.modulation));
	4984	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4985	+ metalnessField.SetToolTipValue((mat.metalness));
	4986	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4987	+ diffuseField.SetToolTipValue((mat.diffuse));
	4988	+ if (!Equal(specularField.getFloat(), mat.specular))
	4989	+ specularField.SetToolTipValue((mat.specular));
	4990	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4991	+ shininessField.SetToolTipValue((mat.shininess));
	4992	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4993	+ shiftField.SetToolTipValue((mat.shift));
	4994	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4995	+ ambientField.SetToolTipValue((mat.ambient));
	4996	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4997	+ lightareaField.SetToolTipValue((mat.lightarea));
	4998	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4999	+ diffusenessField.SetToolTipValue((mat.factor));
	5000	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	5001	+ velvetField.SetToolTipValue((mat.velvet));
	5002	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	5003	+ sheenField.SetToolTipValue((mat.sheen));
	5004	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	5005	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	5006	+ if (!Equal(backlitField.getFloat(), mat.bump))
	5007	+ backlitField.SetToolTipValue((mat.bump));
	5008	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5009	+ anisoField.SetToolTipValue((mat.aniso));
	5010	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5011	+ anisoVField.SetToolTipValue((mat.anisoV));
	5012	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5013	+ cameraField.SetToolTipValue((mat.cameralight));
	5014	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5015	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5016	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5017	+ shadowField.SetToolTipValue((mat.shadow));
	5018	+ if (!Equal(textureField.getFloat(), mat.texture))
	5019	+ textureField.SetToolTipValue((mat.texture));
	5020	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5021	+ opacityField.SetToolTipValue((mat.opacity));
	5022	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5023	+ parallaxField.SetToolTipValue((mat.parallax));
	5024	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5025	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5026	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5027	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4625	5028	}
4626	5029
4627	5030	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4656,15 +5059,17 @@
4656	5059
4657	5060	public void stateChanged(ChangeEvent e)
4658	5061	{
4659		- // assert(false);
	5062	+ // assert(false);
4660	5063	if (e.getSource() == versionSlider)
4661	5064	{
4662	5065	if (muteSlider)
4663	5066	return;
4664	5067
	5068	+ Replace();
	5069	+
4665	5070	int version = versionSlider.getInteger();
4666	5071
4667		- if (copy.versionlist[version] != null)
	5072	+ if (version != -1 && copy.versionlist[version] != null)
4668	5073	{
4669	5074	copy.versionindex = version;
4670	5075	CopyChanged();
..	..	@@ -4708,7 +5113,7 @@
4708	5113	//System.out.println("stateChanged = " + this);
4709	5114	materialtouched = true;
4710	5115
4711		- if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5116	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
4712	5117	{
4713	5118	saturationField.setFloat(1);
4714	5119	}
..	..	@@ -5023,7 +5428,9 @@
5023	5428	}
5024	5429
5025	5430	if (previousVersionButton != null && copy.versionlist != null)
5026		- SetUndoStates();
	5431	+ SetVersionStates();
	5432	+
	5433	+ cameraView.requestFocusInWindow();
5027	5434	}
5028	5435
5029	5436	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5055,7 +5462,7 @@
5055	5462	// group = (Composite) group.get(0);
5056	5463	// }
5057	5464
5058		- System.out.println("makeSomething of " + thing);
	5465	+ //System.out.println("makeSomething of " + thing);
5059	5466
5060	5467	/*
5061	5468	if (deselect && jList != null)
..	..	@@ -5409,11 +5816,15 @@
5409	5816
5410	5817	copy.versionlist = readobj.versionlist;
5411	5818	copy.versionindex = readobj.versionindex;
	5819	+ copy.versiontable = readobj.versiontable;
5412	5820
5413	5821	if (copy.versionlist == null)
5414	5822	{
	5823	+ // Backward compatibility
5415	5824	copy.versionlist = new Object3D[100];
5416	5825	copy.versionindex = -1;
	5826	+
	5827	+ //Save(true);
5417	5828	}
5418	5829
5419	5830	//? SetUndoStates();
..	..	@@ -5505,6 +5916,8 @@
5505	5916
5506	5917	void save()
5507	5918	{
	5919	+ Replace();
	5920	+
5508	5921	if (lastname == null)
5509	5922	{
5510	5923	return;
..	..	@@ -5747,6 +6160,7 @@
5747	6160	ButtonGroup buttonGroup;
5748	6161
5749	6162	cGridBag toolboxPanel;
	6163	+ cGridBag skyboxPanel;
5750	6164	cGridBag materialPanel;
5751	6165	cGridBag ctrlPanel;
5752	6166
..	..	@@ -5758,6 +6172,7 @@
5758	6172	boolean materialFlushed;
5759	6173	Object3D latestObject;
5760	6174
	6175	+ cGridBag transformPanel;
5761	6176	cGridBag XYZPanel;
5762	6177
5763	6178	JSplitPane gridPanel;
..	..	@@ -5851,6 +6266,7 @@
5851	6266	cNumberSlider anisoField;
5852	6267	JLabel anisoVLabel;
5853	6268	cNumberSlider anisoVField;
	6269	+
5854	6270	JLabel cameraLabel;
5855	6271	cNumberSlider cameraField;
5856	6272	JLabel selfshadowLabel;
..	..	@@ -5861,10 +6277,13 @@
5861	6277	cNumberSlider textureField;
5862	6278	JLabel opacityLabel;
5863	6279	cNumberSlider opacityField;
	6280	+ JLabel parallaxLabel;
	6281	+ cNumberSlider parallaxField;
5864	6282	JLabel fakedepthLabel;
5865	6283	cNumberSlider fakedepthField;
5866	6284	JLabel shadowbiasLabel;
5867	6285	cNumberSlider shadowbiasField;
	6286	+
5868	6287	JLabel bumpLabel;
5869	6288	cNumberSlider bumpField;
5870	6289	JLabel noiseLabel;