~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -43,6 +43,50 @@
43	43
44	44	static ObjEditor theFrame;
45	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	+
46	90	public cGridBag GetSeparator()
47	91	{
48	92	cGridBag separator = new cGridBag();
..	..	@@ -54,7 +98,10 @@
54	98	cButton GetButton(String name, boolean border)
55	99	{
56	100	ImageIcon icon = GetIcon(name);
57		- 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);
58	105	}
59	106
60	107	cLabel GetLabel(String name, boolean border)
..	..	@@ -75,12 +122,26 @@
75	122	return new cCheckBox(icon, border);
76	123	}
77	124
78		- 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)
79	128	{
	129	+ javax.swing.ImageIcon iconCache = icons.get(name);
	130	+ if (iconCache != null)
	131	+ {
	132	+ return iconCache;
	133	+ }
	134	+
80	135	try
81	136	{
82		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
83		-
	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	+
84	145	// if (image.getWidth() > 48 && image.getHeight() > 48)
85	146	// {
86	147	// BufferedImage resized = new BufferedImage(48, 48, image.getType());
..	..	@@ -94,10 +155,14 @@
94	155	// }
95	156
96	157	javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	158	+
	159	+ icons.put(name, icon);
	160	+
97	161	return icon;
98	162	}
99	163	catch (Exception e)
100	164	{
	165	+ //icons.put(name, null);
101	166	return null;
102	167	}
103	168	}
..	..	@@ -297,11 +362,13 @@
297	362	client = inClient;
298	363	copy = client;
299	364
300		- if (copy.versionlist == null)
301		- {
302		- copy.versionlist = new Object3D[100];
303		- copy.versionindex = -1;
304		- }
	365	+// if (copy.versionlist == null)
	366	+// {
	367	+// copy.versionlist = new Object3D[100];
	368	+// copy.versionindex = -1;
	369	+//
	370	+// callee.Save(true);
	371	+// }
305	372
306	373	// "this" is not called: SetupUI2(objEditor);
307	374	}
..	..	@@ -320,6 +387,8 @@
320	387	{
321	388	copy.versionlist = new Object3D[100];
322	389	copy.versionindex = -1;
	390	+
	391	+// Save(true);
323	392	}
324	393
325	394	SetupUI2(callee.GetEditor());
..	..	@@ -343,7 +412,8 @@
343	412	//parent = p;
344	413
345	414	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
346		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	415	+ if (Globals.DEBUG)
	416	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
347	417	//gd.setFullScreenWindow(this);
348	418	//setResizable(false);
349	419	//if (!isDisplayable())
..	..	@@ -354,11 +424,13 @@
354	424	copy = localCopy;
355	425	copy.editWindow = this;
356	426
357		- if (copy.versionlist == null)
358		- {
359		-// copy.versions = new byte[100][];
	427	+// if (copy.versionlist == null)
	428	+// {
	429	+// copy.versionlist = new Object3D[100];
360	430	// copy.versionindex = -1;
361		- }
	431	+//
	432	+// Save(true);
	433	+// }
362	434
363	435	SetupMenu();
364	436
..	..	@@ -378,6 +450,9 @@
378	450
379	451	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
380	452
	453	+ // This is to refresh the UI of the material panel.
	454	+ boolean patchMaterial;
	455	+
381	456	void SetupMenu()
382	457	{
383	458	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -391,8 +466,11 @@
391	466	importOBJItem.addActionListener(this);
392	467	import3DSItem = menu.add(new MenuItem("3DS file..."));
393	468	import3DSItem.addActionListener(this);
	469	+ if (Globals.ADVANCED)
	470	+ {
394	471	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
395	472	importVRMLX3DItem.addActionListener(this);
	473	+ }
396	474	menu.add("-");
397	475	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
398	476	importGFDItem.addActionListener(this);
..	..	@@ -427,6 +505,8 @@
427	505
428	506	ChangeListener changeListener = new ChangeListener()
429	507	{
	508	+ //String name;
	509	+
430	510	public void stateChanged(ChangeEvent changeEvent)
431	511	{
432	512	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -445,7 +525,37 @@
445	525	// EditSelection(false);
446	526	// }
447	527
448		- 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();
449	559	}
450	560	};
451	561	objectPanel.addChangeListener(changeListener);
..	..	@@ -754,6 +864,7 @@
754	864	boolean maximized;
755	865
756	866	cButton fullscreenLayout;
	867	+ cButton expandedLayout;
757	868
758	869	void Minimize()
759	870	{
..	..	@@ -793,10 +904,12 @@
793	904	cButton minButton;
794	905	cButton maxButton;
795	906	cButton fullButton;
	907	+ cButton collapseButton;
	908	+ cButton maximize3DButton;
796	909
797	910	void ToggleFullScreen()
798	911	{
799		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	912	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
800	913
801	914	cameraView.ToggleFullScreen();
802	915
..	..	@@ -817,13 +930,13 @@
817	930	// X frame.getContentPane().remove(/"Center",/bigThree);
818	931	// X framePanel.add(bigThree);
819	932	// X frame.getContentPane().add(/"Center",/framePanel);
820		- framePanel.setDividerLocation(46);
	933	+// framePanel.setDividerLocation(46); // icons are 24x24
821	934
822	935	//frame.setVisible(true);
823		- radio.layout = keepButton;
	936	+// radio.layout = keepButton;
824	937	//theFrame = null;
825	938	keepButton = null;
826		- radio.layout.doClick();
	939	+// radio.layout.doClick();
827	940
828	941	} else
829	942	{
..	..	@@ -844,10 +957,10 @@
844	957	// X frame.getContentPane().remove(/"Center",/framePanel);
845	958	// X framePanel.remove(bigThree);
846	959	// X frame.getContentPane().add(/"Center",/bigThree);
847		- framePanel.setDividerLocation(0);
	960	+// framePanel.setDividerLocation(0);
848	961
849		- radio.layout = fullscreenLayout;
850		- radio.layout.doClick();
	962	+// radio.layout = fullscreenLayout;
	963	+// radio.layout.doClick();
851	964	//frame.setVisible(true);
852	965	}
853	966	frame.validate();
..	..	@@ -855,23 +968,42 @@
855	968	cameraView.requestFocusInWindow();
856	969	}
857	970
858		- 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)
859	980	{
860	981	boolean temp = CameraPane.SWITCH;
861	982	CameraPane.SWITCH = false;
862	983
863		- 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);
864	988	// if (copy == client)
865	989
866		- Object3D versions[] = copy.versionlist;
867		- 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;
868	997
869	998	//byte[] compress = Compress(copy);
870		- Object3D compress = (Object3D)Grafreed.clone(copy);
	999	+ Object3D compress = (Object3D)Grafreed.clone(object);
871	1000
872		- copy.versionlist = versions;
	1001	+ object.parent = parent;
873	1002
874		- copy.RestoreBigData(versiontable);
	1003	+ object.versionlist = versions;
	1004	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	1005	+
	1006	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
875	1007
876	1008	CameraPane.SWITCH = temp;
877	1009
..	..	@@ -1210,7 +1342,7 @@
1210	1342
1211	1343	//if (copy.pinned)
1212	1344	{
1213		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1345	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1214	1346	pinButton.setSelected(copy.pinned);
1215	1347	cGridBag t = new cGridBag();
1216	1348	t.preferredWidth = 2;
..	..	@@ -1233,14 +1365,14 @@
1233	1365
1234	1366	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1235	1367	liveCB.setToolTipText("Animate object");
	1368	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1369	+ markCB.setToolTipText("Set target transform");
1236	1370	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1237	1371	selectableCB.setToolTipText("Make object selectable");
1238	1372	// Return();
1239	1373
1240	1374	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1241	1375	hideCB.setToolTipText("Hide object");
1242		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1243		- markCB.setToolTipText("As animation target transform");
1244	1376
1245	1377	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1246	1378
..	..	@@ -1442,22 +1574,9 @@
1442	1574
1443	1575	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1444	1576	{
1445		- System.out.println("CREATE CAMERAS");
1446		- cams = new cTemplate();
1447		- cams.name = "Cameras";
1448		- copy.insertElementAt(cams, 0);
1449		- //cams.parent = copy;
1450		-
1451		- cam = new Camera(); // LA.newVector(3, 2, 1));
1452		- cams.addChild(cam);
1453		- cam = new Camera(1);
1454		- cams.addChild(cam);
1455		- cam = new Camera(2);
1456		- cams.addChild(cam);
1457		- cam = new Camera(3);
1458		- cams.addChild(cam);
1459		- cam = new Camera(4); // Light
1460		- cams.addChild(cam);
	1577	+ if (Globals.DEBUG)
	1578	+ System.out.println("CREATE CAMERAS");
	1579	+ cams = CreateCameras();
1461	1580	} else
1462	1581	{
1463	1582	cams = (cGroup) copy.get(0);
..	..	@@ -1523,6 +1642,45 @@
1523	1642	//frontView.object = copy;
1524	1643	//sideView.object = copy;
1525	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	+
1526	1684	XYZPanel = new cGridBag().setVertical(true);
1527	1685	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1528	1686
..	..	@@ -1532,6 +1690,9 @@
1532	1690	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1533	1691	//XYZPanel.setName("XYZ");
1534	1692
	1693	+ transformPanel.add(resetTransformPanel);
	1694	+ transformPanel.add(XYZPanel);
	1695	+
1535	1696	/*
1536	1697	gridPanel = new JPanel(); //new BorderLayout());
1537	1698	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1539,12 +1700,12 @@
1539	1700	gridPanel.add(cameraView);
1540	1701	gridPanel.add(XYZPanel);
1541	1702	*/
1542		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1543		- gridPanel.setContinuousLayout(true);
1544		- gridPanel.setOneTouchExpandable(true);
1545		- gridPanel.setDividerLocation(1.0);
1546		- gridPanel.setDividerSize(9);
1547		- 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);
1548	1709
1549	1710	// aConstraints.weighty = 0;
1550	1711	//System.out.println("THIS = " + this);
..	..	@@ -1567,30 +1728,34 @@
1567	1728
1568	1729	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1569	1730	//tmp.setName("Edit");
1570		- objectPanel.add(materialPanel);
1571		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1572		- objectPanel.setToolTipTextAt(0, "Material");
1573		-
	1731	+ objectPanel.add(skyboxPanel);
	1732	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1733	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1734	+
1574	1735	objectPanel.add(toolboxPanel);
1575	1736	objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1576	1737	objectPanel.setToolTipTextAt(1, "Objects & textures");
1577	1738
1578		- objectPanel.add(skyboxPanel);
1579		- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1580		- objectPanel.setToolTipTextAt(2, "Backgrounds");
1581		-
	1739	+ objectPanel.add(materialPanel);
	1740	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1741	+ objectPanel.setToolTipTextAt(2, "Material");
	1742	+
1582	1743	// JPanel north = new JPanel(new BorderLayout());
1583	1744	// north.setName("Edit");
1584	1745	// north.add(ctrlPanel, BorderLayout.NORTH);
1585	1746	// objectPanel.add(north);
1586	1747	objectPanel.add(editPanel);
1587		- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1748	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1588	1749	objectPanel.setToolTipTextAt(3, "Edit controls");
1589	1750
1590		- objectPanel.add(XYZPanel);
	1751	+ objectPanel.add(transformPanel);
1591	1752	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1592		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1753	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1593	1754
	1755	+ patchMaterial = true;
	1756	+ cameraView.patchMaterial = this;
	1757	+ objectPanel.setSelectedIndex(2);
	1758	+
1594	1759	/*
1595	1760	aConstraints.gridx = 0;
1596	1761	aConstraints.gridwidth = 1;
..	..	@@ -1610,7 +1775,7 @@
1610	1775	scrollpane.addMouseWheelListener(this); // Default not fast enough
1611	1776
1612	1777	/JTabbedPane/ scenePanel = new cGridBag();
1613		- scenePanel.preferredWidth = 5;
	1778	+ scenePanel.preferredWidth = 6;
1614	1779
1615	1780	JTabbedPane tabbedPane = new JTabbedPane();
1616	1781	tabbedPane.add(scrollpane);
..	..	@@ -1621,17 +1786,109 @@
1621	1786
1622	1787	AddOptions(optionsPanel); //, aConstraints);
1623	1788
1624		- tabbedPane.add(optionsPanel);
1625		-
1626	1789	tabbedPane.add(FSPane = new cFileSystemPane(this));
1627	1790
	1791	+ tabbedPane.add(optionsPanel);
	1792	+
1628	1793	scenePanel.add(tabbedPane);
1629	1794
1630		- //if (Globals.ADVANCED)
1631		- tabbedPane.add(infoPanel);
1632		- tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1633		- tabbedPane.setToolTipTextAt(3, "Information");
	1795	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1796	+ creditsPanel.setName("Credits");
1634	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	+ }
	1891	+
1635	1892	/*
1636	1893	cTree jTree = new cTree(null);
1637	1894	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1652,13 +1909,13 @@
1652	1909	jtp.add(tree);
1653	1910	*/
1654	1911
1655		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1656		- bigPanel.setContinuousLayout(true);
1657		- bigPanel.setOneTouchExpandable(true);
1658		- bigPanel.setDividerLocation(0.8);
1659		- bigPanel.setDividerSize(15);
1660		- bigPanel.setResizeWeight(0.15);
1661		- 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");
1662	1919
1663	1920	//bigPanel.setLayout(new BorderLayout());
1664	1921	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1702,6 +1959,23 @@
1702	1959	// aConstraints.gridheight = 1;
1703	1960
1704	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	+
1705	1979	framePanel.setContinuousLayout(false);
1706	1980	framePanel.setOneTouchExpandable(false);
1707	1981	//.setDividerLocation(0.8);
..	..	@@ -1711,7 +1985,7 @@
1711	1985
1712	1986	frame.getContentPane().setLayout(new BorderLayout());
1713	1987	/**/
1714		- JTabbedPane worldPane = new JTabbedPane();
	1988	+ //JTabbedPane worldPane = new JTabbedPane();
1715	1989	//worldPane.add(bigPanel);
1716	1990	//worldPane.add(worldPanel);
1717	1991	/**/
..	..	@@ -1725,7 +1999,7 @@
1725	1999
1726	2000	cameraView.requestFocusInWindow();
1727	2001
1728		- gridPanel.setDividerLocation(1.0);
	2002	+// gridPanel.setDividerLocation(1.0);
1729	2003
1730	2004	frame.validate();
1731	2005
..	..	@@ -1760,7 +2034,7 @@
1760	2034	{
1761	2035	cGridBag presetpanel = new cGridBag().setVertical(true);
1762	2036
1763		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	2037	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1764	2038	skin.setToolTipText("Skin");
1765	2039	skin.addMouseListener(new MouseAdapter()
1766	2040	{
..	..	@@ -1771,7 +2045,15 @@
1771	2045
1772	2046	// Skin
1773	2047	colorField.setFloat(material.color);
1774		- 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	+
1775	2057	subsurfaceField.setFloat(material.subsurface);
1776	2058	selfshadowField.setFloat(material.diffuseness);
1777	2059	diffusenessField.setFloat(material.factor);
..	..	@@ -1790,7 +2072,7 @@
1790	2072	});
1791	2073	presetpanel.add(skin);
1792	2074
1793		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2075	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1794	2076	lambert.setToolTipText("Diffuse");
1795	2077	lambert.addMouseListener(new MouseAdapter()
1796	2078	{
..	..	@@ -1808,7 +2090,7 @@
1808	2090	});
1809	2091	presetpanel.add(lambert);
1810	2092
1811		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2093	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1812	2094	diffuse2.setToolTipText("Diffuse2");
1813	2095	diffuse2.addMouseListener(new MouseAdapter()
1814	2096	{
..	..	@@ -1826,7 +2108,7 @@
1826	2108	});
1827	2109	presetpanel.add(diffuse2);
1828	2110
1829		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2111	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1830	2112	diffusemoon.setToolTipText("Moon");
1831	2113	diffusemoon.addMouseListener(new MouseAdapter()
1832	2114	{
..	..	@@ -1844,7 +2126,7 @@
1844	2126	});
1845	2127	presetpanel.add(diffusemoon);
1846	2128
1847		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2129	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1848	2130	diffusemoon2.setToolTipText("Moon2");
1849	2131	diffusemoon2.addMouseListener(new MouseAdapter()
1850	2132	{
..	..	@@ -1862,7 +2144,7 @@
1862	2144	});
1863	2145	presetpanel.add(diffusemoon2);
1864	2146
1865		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2147	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1866	2148	diffusemoon3.setToolTipText("Moon3");
1867	2149	diffusemoon3.addMouseListener(new MouseAdapter()
1868	2150	{
..	..	@@ -1880,7 +2162,7 @@
1880	2162	});
1881	2163	presetpanel.add(diffusemoon3);
1882	2164
1883		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2165	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1884	2166	diffusesheen.setToolTipText("Sheen");
1885	2167	diffusesheen.addMouseListener(new MouseAdapter()
1886	2168	{
..	..	@@ -1897,7 +2179,7 @@
1897	2179	});
1898	2180	presetpanel.add(diffusesheen);
1899	2181
1900		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2182	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
1901	2183	rough.setToolTipText("Rough metal");
1902	2184	rough.addMouseListener(new MouseAdapter()
1903	2185	{
..	..	@@ -1915,7 +2197,7 @@
1915	2197	});
1916	2198	presetpanel.add(rough);
1917	2199
1918		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2200	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
1919	2201	rough2.setToolTipText("Medium metal");
1920	2202	rough2.addMouseListener(new MouseAdapter()
1921	2203	{
..	..	@@ -1933,7 +2215,7 @@
1933	2215	});
1934	2216	presetpanel.add(rough2);
1935	2217
1936		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2218	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
1937	2219	shini0.setToolTipText("Shiny");
1938	2220	shini0.addMouseListener(new MouseAdapter()
1939	2221	{
..	..	@@ -1951,7 +2233,7 @@
1951	2233	});
1952	2234	presetpanel.add(shini0);
1953	2235
1954		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2236	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
1955	2237	shini1.setToolTipText("Shiny2");
1956	2238	shini1.addMouseListener(new MouseAdapter()
1957	2239	{
..	..	@@ -1969,7 +2251,7 @@
1969	2251	});
1970	2252	presetpanel.add(shini1);
1971	2253
1972		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2254	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
1973	2255	shini2.setToolTipText("Shiny3");
1974	2256	shini2.addMouseListener(new MouseAdapter()
1975	2257	{
..	..	@@ -1987,7 +2269,7 @@
1987	2269	});
1988	2270	presetpanel.add(shini2);
1989	2271
1990		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2272	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
1991	2273	aniso.setToolTipText("AnisoU");
1992	2274	aniso.addMouseListener(new MouseAdapter()
1993	2275	{
..	..	@@ -2005,7 +2287,7 @@
2005	2287	});
2006	2288	presetpanel.add(aniso);
2007	2289
2008		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2290	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2009	2291	aniso2.setToolTipText("AnisoV");
2010	2292	aniso2.addMouseListener(new MouseAdapter()
2011	2293	{
..	..	@@ -2023,7 +2305,7 @@
2023	2305	});
2024	2306	presetpanel.add(aniso2);
2025	2307
2026		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2308	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2027	2309	aniso3.setToolTipText("AnisoUV");
2028	2310	aniso3.addMouseListener(new MouseAdapter()
2029	2311	{
..	..	@@ -2041,7 +2323,7 @@
2041	2323	});
2042	2324	presetpanel.add(aniso3);
2043	2325
2044		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2326	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2045	2327	velvet0.setToolTipText("Velvet");
2046	2328	velvet0.addMouseListener(new MouseAdapter()
2047	2329	{
..	..	@@ -2063,7 +2345,7 @@
2063	2345	});
2064	2346	presetpanel.add(velvet0);
2065	2347
2066		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2348	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2067	2349	bump0.setToolTipText("Bump texture");
2068	2350	bump0.addMouseListener(new MouseAdapter()
2069	2351	{
..	..	@@ -2082,7 +2364,22 @@
2082	2364	});
2083	2365	presetpanel.add(bump0);
2084	2366
2085		- 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);
2086	2383	halo.setToolTipText("Halo");
2087	2384	halo.addMouseListener(new MouseAdapter()
2088	2385	{
..	..	@@ -2099,7 +2396,7 @@
2099	2396	});
2100	2397	presetpanel.add(halo);
2101	2398
2102		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2399	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2103	2400	candle.setToolTipText("Candle");
2104	2401	candle.addMouseListener(new MouseAdapter()
2105	2402	{
..	..	@@ -2121,6 +2418,25 @@
2121	2418	});
2122	2419	presetpanel.add(candle);
2123	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	+
2124	2440	cGridBag panel = new cGridBag().setVertical(true);
2125	2441
2126	2442	presetpanel.preferredWidth = 1;
..	..	@@ -2137,19 +2453,19 @@
2137	2453
2138	2454	cGridBag editBar = new cGridBag().setVertical(false);
2139	2455
2140		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2456	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2141	2457	createMaterialButton.setToolTipText("Create material");
2142	2458
2143	2459	/*
2144	2460	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2145	2461	*/
2146	2462
2147		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2463	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2148	2464	clearMaterialButton.setToolTipText("Clear material");
2149	2465
2150	2466	if (Globals.ADVANCED)
2151	2467	{
2152		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2468	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2153	2469	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2154	2470	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2155	2471	}
..	..	@@ -2170,9 +2486,20 @@
2170	2486
2171	2487	cGridBag huepanel = new cGridBag();
2172	2488	cGridBag huelabel = new cGridBag();
2173		- skin = GetLabel("icons/hue.png", false);
2174		- skin.fit = true;
2175		- 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);
2176	2503	huelabel.preferredWidth = 20;
2177	2504	huepanel.add(new cGridBag()); // Label
2178	2505	huepanel.add(huelabel); // Field/slider
..	..	@@ -3448,32 +3775,8 @@
3448	3775
3449	3776	if (multiplyToggle != null)
3450	3777	multiplyToggle.setSelected(mat.multiply);
3451		-
3452		- assert (object.projectedVertices != null);
3453		-
3454		- if (object.projectedVertices.length <= 2)
3455		- {
3456		- // Side effect...
3457		- Object3D.cVector2[] keep = object.projectedVertices;
3458		- object.projectedVertices = new Object3D.cVector2[3];
3459		- for (int i = 0; i < 3; i++)
3460		- {
3461		- if (i < keep.length)
3462		- {
3463		- object.projectedVertices[i] = keep[i];
3464		- } else
3465		- {
3466		- object.projectedVertices[i] = new Object3D.cVector2();
3467		- }
3468		- /*
3469		- if(keep.length == 0)
3470		- object.projectedVertices[0] = new Object3D.cVector2();
3471		- else
3472		- object.projectedVertices[0] = keep[0];
3473		- object.projectedVertices[1] = new Object3D.cVector2();
3474		- */
3475		- }
3476		- }
	3778	+
	3779	+ AllocProjectedVertices(object);
3477	3780
3478	3781	SetMaterial(mat, object.projectedVertices);
3479	3782	}
..	..	@@ -3783,7 +4086,7 @@
3783	4086	//System.out.println("ObjEditor " + event);
3784	4087	applySelf0(true);
3785	4088	//parent.applySelf();
3786		- objEditor.refreshContents();
	4089	+ // conflicts with requestFocus objEditor.refreshContents();
3787	4090	} else if (source == resetButton)
3788	4091	{
3789	4092	CameraPane.fullreset = true;
..	..	@@ -3963,11 +4266,18 @@
3963	4266
3964	4267	void New()
3965	4268	{
3966		- while (copy.Size() > 1)
	4269	+ while (copy.Size() > 0)
3967	4270	{
3968		- copy.remove(1);
	4271	+ copy.remove(0);
3969	4272	}
3970	4273
	4274	+ copy.selection.clear();
	4275	+
	4276	+ if (copy == Grafreed.grafreed.universe)
	4277	+ {
	4278	+ CreateCameras();
	4279	+ cameraView.SetCamera(GetCamera(copy, 0));
	4280	+ }
3971	4281	ResetModel();
3972	4282	objEditor.refreshContents();
3973	4283	}
..	..	@@ -4076,7 +4386,7 @@
4076	4386	{
4077	4387	//Save(true);
4078	4388	Replace();
4079		- SetUndoStates();
	4389	+ SetVersionStates();
4080	4390	}
4081	4391
4082	4392	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -4095,8 +4405,6 @@
4095	4405	return true;
4096	4406	}
4097	4407
4098		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4099		-
4100	4408	void DeleteVersion()
4101	4409	{
4102	4410	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4104,19 +4412,23 @@
4104	4412	copy.versionlist[i] = copy.versionlist[i+1];
4105	4413	}
4106	4414
4107		- CopyChanged();
	4415	+ if (copy.versionlist[copy.versionindex] == null)
	4416	+ copy.versionindex -= 1;
4108	4417
4109		- SetUndoStates();
	4418	+ if (copy.versionindex != -1)
	4419	+ CopyChanged();
	4420	+
	4421	+ SetVersionStates();
4110	4422	}
4111	4423
4112	4424	public boolean Save(boolean user)
4113	4425	{
4114	4426	System.err.println("Save");
4115		- //Replace();
	4427	+ Replace();
4116	4428
4117		- cRadio tab = GetCurrentTab();
	4429	+ //cRadio tab = GetCurrentTab();
4118	4430
4119		- Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
	4431	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4120	4432
4121	4433	boolean thesame = false;
4122	4434
..	..	@@ -4152,7 +4464,7 @@
4152	4464	// copy.versionlist[i] = null;
4153	4465	// }
4154	4466
4155		- SetUndoStates();
	4467	+ SetVersionStates();
4156	4468
4157	4469	// test save
4158	4470	if (false)
..	..	@@ -4210,14 +4522,14 @@
4210	4522
4211	4523	void CopyChanged()
4212	4524	{
4213		- Object3D obj = copy.versionlist[copy.versionindex];
	4525	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4214	4526
4215		- SetUndoStates();
	4527	+ SetVersionStates();
4216	4528
4217	4529	boolean temp = CameraPane.SWITCH;
4218	4530	CameraPane.SWITCH = false;
4219	4531
4220		- copy.ExtractBigData(versiontable);
	4532	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4221	4533
4222	4534	copy.clear();
4223	4535
..	..	@@ -4229,7 +4541,7 @@
4229	4541	copy.add(obj.get(i));
4230	4542	}
4231	4543
4232		- copy.RestoreBigData(versiontable);
	4544	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4233	4545
4234	4546	CameraPane.SWITCH = temp;
4235	4547
..	..	@@ -4279,23 +4591,45 @@
4279	4591	return count;
4280	4592	}
4281	4593
4282		- void SetUndoStates()
	4594	+ public cGridBag versionSliderPane;
	4595	+
	4596	+ void SetVersionStates()
4283	4597	{
4284		- cRadio tab = GetCurrentTab();
	4598	+ //if (true)
	4599	+ // return;
	4600	+
	4601	+ //cRadio tab = GetCurrentTab();
4285	4602
4286		- restoreButton.setEnabled(true); // copy.versionindex != -1);
4287		- replaceButton.setEnabled(true); // copy.versionindex != -1);
4288		-
4289		- previousVersionButton.setEnabled(copy.versionindex > 0);
4290		- nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4291		-
4292		- deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4293		- copy.versionlist[copy.versionindex + 1] != null);
4294		-
4295		- muteSlider = true;
4296		- versionSlider.setMaximum(VersionCount() - 1);
4297		- versionSlider.setInteger(copy.versionindex);
4298		- muteSlider = false;
	4603	+ if (copy.versionlist == null)
	4604	+ {
	4605	+ saveVersionButton.setEnabled(false);
	4606	+ restoreButton.setEnabled(false);
	4607	+ replaceButton.setEnabled(false);
	4608	+ previousVersionButton.setEnabled(false);
	4609	+ nextVersionButton.setEnabled(false);
	4610	+ deleteVersionButton.setEnabled(false);
	4611	+ versionSliderPane.setVisible(false);
	4612	+ }
	4613	+ else
	4614	+ {
	4615	+ restoreButton.setEnabled(copy.versionindex != -1);
	4616	+ replaceButton.setEnabled(copy.versionindex != -1);
	4617	+
	4618	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4619	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4620	+
	4621	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4622	+ //copy.versionlist[copy.versionindex + 1] != null);
	4623	+
	4624	+ muteSlider = true;
	4625	+ versionSlider.setMinimum(0);
	4626	+ versionSlider.setMaximum(VersionCount() - 1);
	4627	+ versionSlider.setInteger(copy.versionindex);
	4628	+ versionSlider.setEnabled(copy.versionindex != -1);
	4629	+ muteSlider = false;
	4630	+
	4631	+ versionSliderPane.setVisible(true);
	4632	+ }
4299	4633	}
4300	4634
4301	4635	public boolean PreviousVersion()
..	..	@@ -4305,7 +4639,7 @@
4305	4639
4306	4640	System.err.println("Undo");
4307	4641
4308		- cRadio tab = GetCurrentTab();
	4642	+ //cRadio tab = GetCurrentTab();
4309	4643
4310	4644	if (copy.versionindex == 0)
4311	4645	{
..	..	@@ -4337,7 +4671,7 @@
4337	4671	{
4338	4672	System.err.println("Restore");
4339	4673
4340		- cRadio tab = GetCurrentTab();
	4674	+ //cRadio tab = GetCurrentTab();
4341	4675
4342	4676	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4343	4677	{
..	..	@@ -4353,9 +4687,9 @@
4353	4687
4354	4688	public boolean Replace()
4355	4689	{
4356		- System.err.println("Replace");
	4690	+ //System.err.println("Replace");
4357	4691
4358		- cRadio tab = GetCurrentTab();
	4692	+ //cRadio tab = GetCurrentTab();
4359	4693
4360	4694	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4361	4695	{
..	..	@@ -4363,7 +4697,7 @@
4363	4697	return false;
4364	4698	}
4365	4699
4366		- copy.versionlist[copy.versionindex] = CompressCopy();
	4700	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
4367	4701
4368	4702	return true;
4369	4703	}
..	..	@@ -4373,7 +4707,7 @@
4373	4707	// Option?
4374	4708	Replace();
4375	4709
4376		- cRadio tab = GetCurrentTab();
	4710	+ //cRadio tab = GetCurrentTab();
4377	4711
4378	4712	if (copy.versionlist[copy.versionindex + 1] == null)
4379	4713	{
..	..	@@ -4580,6 +4914,12 @@
4580	4914	// else
4581	4915	// applySelf(true);
4582	4916	// }
	4917	+
	4918	+ boolean Equal(double a, double b)
	4919	+ {
	4920	+ return Math.abs(a - b) < 0.001;
	4921	+ }
	4922	+
4583	4923	void applySelf0(boolean name)
4584	4924	{
4585	4925	if (name)
..	..	@@ -4629,29 +4969,52 @@
4629	4969	{
4630	4970	cMaterial mat = copy.material;
4631	4971
4632		- colorField.SetToolTipValue((mat.color));
4633		- saturationField.SetToolTipValue((mat.modulation));
4634		- metalnessField.SetToolTipValue((mat.metalness));
4635		- diffuseField.SetToolTipValue((mat.diffuse));
4636		- specularField.SetToolTipValue((mat.specular));
4637		- shininessField.SetToolTipValue((mat.shininess));
4638		- shiftField.SetToolTipValue((mat.shift));
4639		- ambientField.SetToolTipValue((mat.ambient));
4640		- lightareaField.SetToolTipValue((mat.lightarea));
4641		- diffusenessField.SetToolTipValue((mat.factor));
4642		- velvetField.SetToolTipValue((mat.velvet));
4643		- sheenField.SetToolTipValue((mat.sheen));
4644		- subsurfaceField.SetToolTipValue((mat.subsurface));
4645		- backlitField.SetToolTipValue((mat.bump));
4646		- anisoField.SetToolTipValue((mat.aniso));
4647		- anisoVField.SetToolTipValue((mat.anisoV));
4648		- cameraField.SetToolTipValue((mat.cameralight));
4649		- selfshadowField.SetToolTipValue((mat.diffuseness));
4650		- shadowField.SetToolTipValue((mat.shadow));
4651		- textureField.SetToolTipValue((mat.texture));
4652		- opacityField.SetToolTipValue((mat.opacity));
4653		- fakedepthField.SetToolTipValue((mat.fakedepth));
4654		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	4972	+ if (!Equal(colorField.getFloat(), mat.color))
	4973	+ colorField.SetToolTipValue((mat.color));
	4974	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4975	+ saturationField.SetToolTipValue((mat.modulation));
	4976	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4977	+ metalnessField.SetToolTipValue((mat.metalness));
	4978	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4979	+ diffuseField.SetToolTipValue((mat.diffuse));
	4980	+ if (!Equal(specularField.getFloat(), mat.specular))
	4981	+ specularField.SetToolTipValue((mat.specular));
	4982	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4983	+ shininessField.SetToolTipValue((mat.shininess));
	4984	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4985	+ shiftField.SetToolTipValue((mat.shift));
	4986	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4987	+ ambientField.SetToolTipValue((mat.ambient));
	4988	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4989	+ lightareaField.SetToolTipValue((mat.lightarea));
	4990	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4991	+ diffusenessField.SetToolTipValue((mat.factor));
	4992	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4993	+ velvetField.SetToolTipValue((mat.velvet));
	4994	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4995	+ sheenField.SetToolTipValue((mat.sheen));
	4996	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4997	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4998	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4999	+ backlitField.SetToolTipValue((mat.bump));
	5000	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5001	+ anisoField.SetToolTipValue((mat.aniso));
	5002	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5003	+ anisoVField.SetToolTipValue((mat.anisoV));
	5004	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5005	+ cameraField.SetToolTipValue((mat.cameralight));
	5006	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5007	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5008	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5009	+ shadowField.SetToolTipValue((mat.shadow));
	5010	+ if (!Equal(textureField.getFloat(), mat.texture))
	5011	+ textureField.SetToolTipValue((mat.texture));
	5012	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5013	+ opacityField.SetToolTipValue((mat.opacity));
	5014	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5015	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5016	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5017	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4655	5018	}
4656	5019
4657	5020	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4686,15 +5049,17 @@
4686	5049
4687	5050	public void stateChanged(ChangeEvent e)
4688	5051	{
4689		- // assert(false);
	5052	+ // assert(false);
4690	5053	if (e.getSource() == versionSlider)
4691	5054	{
4692	5055	if (muteSlider)
4693	5056	return;
4694	5057
	5058	+ Replace();
	5059	+
4695	5060	int version = versionSlider.getInteger();
4696	5061
4697		- if (copy.versionlist[version] != null)
	5062	+ if (version != -1 && copy.versionlist[version] != null)
4698	5063	{
4699	5064	copy.versionindex = version;
4700	5065	CopyChanged();
..	..	@@ -4738,7 +5103,7 @@
4738	5103	//System.out.println("stateChanged = " + this);
4739	5104	materialtouched = true;
4740	5105
4741		- if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5106	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
4742	5107	{
4743	5108	saturationField.setFloat(1);
4744	5109	}
..	..	@@ -5053,7 +5418,9 @@
5053	5418	}
5054	5419
5055	5420	if (previousVersionButton != null && copy.versionlist != null)
5056		- SetUndoStates();
	5421	+ SetVersionStates();
	5422	+
	5423	+ cameraView.requestFocusInWindow();
5057	5424	}
5058	5425
5059	5426	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5085,7 +5452,7 @@
5085	5452	// group = (Composite) group.get(0);
5086	5453	// }
5087	5454
5088		- System.out.println("makeSomething of " + thing);
	5455	+ //System.out.println("makeSomething of " + thing);
5089	5456
5090	5457	/*
5091	5458	if (deselect && jList != null)
..	..	@@ -5439,11 +5806,15 @@
5439	5806
5440	5807	copy.versionlist = readobj.versionlist;
5441	5808	copy.versionindex = readobj.versionindex;
	5809	+ copy.versiontable = readobj.versiontable;
5442	5810
5443	5811	if (copy.versionlist == null)
5444	5812	{
	5813	+ // Backward compatibility
5445	5814	copy.versionlist = new Object3D[100];
5446	5815	copy.versionindex = -1;
	5816	+
	5817	+ //Save(true);
5447	5818	}
5448	5819
5449	5820	//? SetUndoStates();
..	..	@@ -5535,6 +5906,8 @@
5535	5906
5536	5907	void save()
5537	5908	{
	5909	+ Replace();
	5910	+
5538	5911	if (lastname == null)
5539	5912	{
5540	5913	return;
..	..	@@ -5789,6 +6162,7 @@
5789	6162	boolean materialFlushed;
5790	6163	Object3D latestObject;
5791	6164
	6165	+ cGridBag transformPanel;
5792	6166	cGridBag XYZPanel;
5793	6167
5794	6168	JSplitPane gridPanel;
..	..	@@ -5882,6 +6256,7 @@
5882	6256	cNumberSlider anisoField;
5883	6257	JLabel anisoVLabel;
5884	6258	cNumberSlider anisoVField;
	6259	+
5885	6260	JLabel cameraLabel;
5886	6261	cNumberSlider cameraField;
5887	6262	JLabel selfshadowLabel;
..	..	@@ -5896,6 +6271,7 @@
5896	6271	cNumberSlider fakedepthField;
5897	6272	JLabel shadowbiasLabel;
5898	6273	cNumberSlider shadowbiasField;
	6274	+
5899	6275	JLabel bumpLabel;
5900	6276	cNumberSlider bumpField;
5901	6277	JLabel noiseLabel;