~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	}
..	..	@@ -251,6 +316,8 @@
251	316	objEditor.ctrlPanel.remove(setupPanel2);
252	317	objEditor.ctrlPanel.remove(objectCommandsPanel);
253	318	objEditor.ctrlPanel.remove(pushPanel);
	319	+ if (versionPanel != null)
	320	+ objEditor.ctrlPanel.remove(versionPanel);
254	321	//objEditor.ctrlPanel.remove(fillPanel);
255	322
256	323	//Remove(normalpushField);
..	..	@@ -318,14 +385,6 @@
318	385	client = inClient;
319	386	copy = client;
320	387
321		- if (copy.versionlist == null)
322		- {
323		- copy.versionlist = new Object3D[100];
324		- copy.versionindex = -1;
325		-
326		-// Save(true);
327		- }
328		-
329	388	SetupUI2(callee.GetEditor());
330	389	}
331	390
..	..	@@ -347,7 +406,8 @@
347	406	//parent = p;
348	407
349	408	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
350		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	409	+ if (Globals.DEBUG)
	410	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
351	411	//gd.setFullScreenWindow(this);
352	412	//setResizable(false);
353	413	//if (!isDisplayable())
..	..	@@ -384,6 +444,9 @@
384	444
385	445	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
386	446
	447	+ // This is to refresh the UI of the material panel.
	448	+ boolean patchMaterial;
	449	+
387	450	void SetupMenu()
388	451	{
389	452	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -397,8 +460,11 @@
397	460	importOBJItem.addActionListener(this);
398	461	import3DSItem = menu.add(new MenuItem("3DS file..."));
399	462	import3DSItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
400	465	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
401	466	importVRMLX3DItem.addActionListener(this);
	467	+ }
402	468	menu.add("-");
403	469	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
404	470	importGFDItem.addActionListener(this);
..	..	@@ -433,7 +499,7 @@
433	499
434	500	ChangeListener changeListener = new ChangeListener()
435	501	{
436		- String name;
	502	+ //String name;
437	503
438	504	public void stateChanged(ChangeEvent changeEvent)
439	505	{
..	..	@@ -453,33 +519,34 @@
453	519	// EditSelection(false);
454	520	// }
455	521
456		- if (objectPanel.getSelectedIndex() == 4)
457		- {
458		- name = copy.skyboxname;
459		-
460		- if (name == null)
461		- {
462		- name = "";
463		- }
464		-
465		- copy.skyboxname = "cubemaps/default-skyboxes/rgb";
466		- copy.skyboxext = "jpg";
467		- }
468		- else
469		- {
470		- if (name != null)
471		- {
472		- if (name.equals(""))
473		- {
474		- copy.skyboxname = null;
475		- copy.skyboxext = null;
476		- }
477		- else
478		- {
479		- copy.skyboxname = name;
480		- }
481		- }
482		- }
	522	+// if (objectPanel.getSelectedIndex() == 4)
	523	+// {
	524	+// name = copy.skyboxname;
	525	+//
	526	+// if (name == null)
	527	+// {
	528	+// name = "";
	529	+// }
	530	+//
	531	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	532	+// copy.skyboxext = "jpg";
	533	+// }
	534	+// else
	535	+// {
	536	+// if (name != null)
	537	+// {
	538	+// if (name.equals(""))
	539	+// {
	540	+// copy.skyboxname = null;
	541	+// copy.skyboxext = null;
	542	+// }
	543	+// else
	544	+// {
	545	+// copy.skyboxname = name;
	546	+// }
	547	+// }
	548	+// }
	549	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
483	550
484	551	// refreshContents(false); // To refresh Info tab
485	552	cameraView.repaint();
..	..	@@ -908,18 +975,29 @@
908	975	boolean temp = CameraPane.SWITCH;
909	976	CameraPane.SWITCH = false;
910	977
911		- object.ExtractBigData(versiontable);
	978	+ if (Grafreed.grafreed.universe.versiontable == null)
	979	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	980	+
	981	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
912	982	// if (copy == client)
913	983
914	984	Object3D versions[] = object.versionlist;
	985	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
915	986	object.versionlist = null;
	987	+ object.versiontable = null;
	988	+
	989	+ Object3D parent = object.parent;
	990	+ object.parent = null;
916	991
917	992	//byte[] compress = Compress(copy);
918	993	Object3D compress = (Object3D)Grafreed.clone(object);
919	994
920		- object.versionlist = versions;
	995	+ object.parent = parent;
921	996
922		- object.RestoreBigData(versiontable);
	997	+ object.versionlist = versions;
	998	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	999	+
	1000	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
923	1001
924	1002	CameraPane.SWITCH = temp;
925	1003
..	..	@@ -1087,6 +1165,7 @@
1087	1165	cGridBag setupPanel2;
1088	1166	cGridBag objectCommandsPanel;
1089	1167	cGridBag pushPanel;
	1168	+ cGridBag versionPanel;
1090	1169	cGridBag fillPanel;
1091	1170
1092	1171	JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
..	..	@@ -1258,7 +1337,7 @@
1258	1337
1259	1338	//if (copy.pinned)
1260	1339	{
1261		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1340	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1262	1341	pinButton.setSelected(copy.pinned);
1263	1342	cGridBag t = new cGridBag();
1264	1343	t.preferredWidth = 2;
..	..	@@ -1281,14 +1360,14 @@
1281	1360
1282	1361	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1283	1362	liveCB.setToolTipText("Animate object");
	1363	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1364	+ markCB.setToolTipText("Set target transform");
1284	1365	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1285	1366	selectableCB.setToolTipText("Make object selectable");
1286	1367	// Return();
1287	1368
1288	1369	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1289	1370	hideCB.setToolTipText("Hide object");
1290		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1291		- markCB.setToolTipText("As animation target transform");
1292	1371
1293	1372	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1294	1373
..	..	@@ -1333,9 +1412,14 @@
1333	1412	oe.ctrlPanel.add(objectCommandsPanel);
1334	1413	oe.ctrlPanel.Return();
1335	1414
1336		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1415	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH * 100, 1.1); // To have the buttons
1337	1416	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1338		- //Return();
	1417	+ if (false && copy.versionlist != null && copy.versionindex != -1)
	1418	+ {
	1419	+ oe.ctrlPanel.Return();
	1420	+ versionPanel = AddSlider(oe.ctrlPanel, "Version", 0, copy.VersionCount() - 1, copy.versionindex);
	1421	+ versionField = (cNumberSlider)versionPanel.getComponent(1);
	1422	+ }
1339	1423
1340	1424	oe.ctrlPanel.Return();
1341	1425
..	..	@@ -1490,22 +1574,9 @@
1490	1574
1491	1575	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1492	1576	{
1493		- System.out.println("CREATE CAMERAS");
1494		- cams = new cTemplate();
1495		- cams.name = "Cameras";
1496		- copy.insertElementAt(cams, 0);
1497		- //cams.parent = copy;
1498		-
1499		- cam = new Camera(); // LA.newVector(3, 2, 1));
1500		- cams.addChild(cam);
1501		- cam = new Camera(1);
1502		- cams.addChild(cam);
1503		- cam = new Camera(2);
1504		- cams.addChild(cam);
1505		- cam = new Camera(3);
1506		- cams.addChild(cam);
1507		- cam = new Camera(4); // Light
1508		- cams.addChild(cam);
	1577	+ if (Globals.DEBUG)
	1578	+ System.out.println("CREATE CAMERAS");
	1579	+ cams = CreateCameras();
1509	1580	} else
1510	1581	{
1511	1582	cams = (cGroup) copy.get(0);
..	..	@@ -1571,6 +1642,45 @@
1571	1642	//frontView.object = copy;
1572	1643	//sideView.object = copy;
1573	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	+
1574	1684	XYZPanel = new cGridBag().setVertical(true);
1575	1685	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1576	1686
..	..	@@ -1580,6 +1690,9 @@
1580	1690	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1581	1691	//XYZPanel.setName("XYZ");
1582	1692
	1693	+ transformPanel.add(resetTransformPanel);
	1694	+ transformPanel.add(XYZPanel);
	1695	+
1583	1696	/*
1584	1697	gridPanel = new JPanel(); //new BorderLayout());
1585	1698	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1587,12 +1700,12 @@
1587	1700	gridPanel.add(cameraView);
1588	1701	gridPanel.add(XYZPanel);
1589	1702	*/
1590		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1591		- gridPanel.setContinuousLayout(true);
1592		- gridPanel.setOneTouchExpandable(true);
1593		- gridPanel.setDividerLocation(1.0);
1594		- gridPanel.setDividerSize(9);
1595		- 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);
1596	1709
1597	1710	// aConstraints.weighty = 0;
1598	1711	//System.out.println("THIS = " + this);
..	..	@@ -1615,30 +1728,34 @@
1615	1728
1616	1729	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1617	1730	//tmp.setName("Edit");
1618		- objectPanel.add(materialPanel);
1619		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1620		- objectPanel.setToolTipTextAt(0, "Material");
1621		-
	1731	+ objectPanel.add(skyboxPanel);
	1732	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1733	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1734	+
1622	1735	objectPanel.add(toolboxPanel);
1623	1736	objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1624	1737	objectPanel.setToolTipTextAt(1, "Objects & textures");
1625	1738
1626		- objectPanel.add(skyboxPanel);
1627		- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1628		- objectPanel.setToolTipTextAt(2, "Backgrounds");
1629		-
	1739	+ objectPanel.add(materialPanel);
	1740	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1741	+ objectPanel.setToolTipTextAt(2, "Material");
	1742	+
1630	1743	// JPanel north = new JPanel(new BorderLayout());
1631	1744	// north.setName("Edit");
1632	1745	// north.add(ctrlPanel, BorderLayout.NORTH);
1633	1746	// objectPanel.add(north);
1634	1747	objectPanel.add(editPanel);
1635		- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1748	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1636	1749	objectPanel.setToolTipTextAt(3, "Edit controls");
1637	1750
1638		- objectPanel.add(XYZPanel);
	1751	+ objectPanel.add(transformPanel);
1639	1752	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1640		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1753	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1641	1754
	1755	+ patchMaterial = true;
	1756	+ cameraView.patchMaterial = this;
	1757	+ objectPanel.setSelectedIndex(2);
	1758	+
1642	1759	/*
1643	1760	aConstraints.gridx = 0;
1644	1761	aConstraints.gridwidth = 1;
..	..	@@ -1669,17 +1786,109 @@
1669	1786
1670	1787	AddOptions(optionsPanel); //, aConstraints);
1671	1788
1672		- tabbedPane.add(optionsPanel);
1673		-
1674	1789	tabbedPane.add(FSPane = new cFileSystemPane(this));
1675	1790
	1791	+ tabbedPane.add(optionsPanel);
	1792	+
1676	1793	scenePanel.add(tabbedPane);
1677	1794
1678		- //if (Globals.ADVANCED)
1679		- tabbedPane.add(infoPanel);
1680		- tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1681		- tabbedPane.setToolTipTextAt(3, "Information");
	1795	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1796	+ creditsPanel.setName("Credits");
1682	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	+ objectPanel.add(infoPanel);
	1888	+ objectPanel.setIconAt(5, GetIcon("icons/info.png"));
	1889	+ objectPanel.setToolTipTextAt(4, "Information");
	1890	+ }
	1891	+
1683	1892	/*
1684	1893	cTree jTree = new cTree(null);
1685	1894	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1700,13 +1909,13 @@
1700	1909	jtp.add(tree);
1701	1910	*/
1702	1911
1703		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1704		- bigPanel.setContinuousLayout(true);
1705		- bigPanel.setOneTouchExpandable(true);
1706		- bigPanel.setDividerLocation(0.8);
1707		- bigPanel.setDividerSize(15);
1708		- bigPanel.setResizeWeight(0.15);
1709		- 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");
1710	1919
1711	1920	//bigPanel.setLayout(new BorderLayout());
1712	1921	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1776,7 +1985,7 @@
1776	1985
1777	1986	frame.getContentPane().setLayout(new BorderLayout());
1778	1987	/**/
1779		- JTabbedPane worldPane = new JTabbedPane();
	1988	+ //JTabbedPane worldPane = new JTabbedPane();
1780	1989	//worldPane.add(bigPanel);
1781	1990	//worldPane.add(worldPanel);
1782	1991	/**/
..	..	@@ -1790,7 +1999,7 @@
1790	1999
1791	2000	cameraView.requestFocusInWindow();
1792	2001
1793		- gridPanel.setDividerLocation(1.0);
	2002	+// gridPanel.setDividerLocation(1.0);
1794	2003
1795	2004	frame.validate();
1796	2005
..	..	@@ -1825,7 +2034,7 @@
1825	2034	{
1826	2035	cGridBag presetpanel = new cGridBag().setVertical(true);
1827	2036
1828		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	2037	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1829	2038	skin.setToolTipText("Skin");
1830	2039	skin.addMouseListener(new MouseAdapter()
1831	2040	{
..	..	@@ -1836,7 +2045,15 @@
1836	2045
1837	2046	// Skin
1838	2047	colorField.setFloat(material.color);
1839		- 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	+
1840	2057	subsurfaceField.setFloat(material.subsurface);
1841	2058	selfshadowField.setFloat(material.diffuseness);
1842	2059	diffusenessField.setFloat(material.factor);
..	..	@@ -1855,7 +2072,7 @@
1855	2072	});
1856	2073	presetpanel.add(skin);
1857	2074
1858		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2075	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1859	2076	lambert.setToolTipText("Diffuse");
1860	2077	lambert.addMouseListener(new MouseAdapter()
1861	2078	{
..	..	@@ -1873,7 +2090,7 @@
1873	2090	});
1874	2091	presetpanel.add(lambert);
1875	2092
1876		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2093	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1877	2094	diffuse2.setToolTipText("Diffuse2");
1878	2095	diffuse2.addMouseListener(new MouseAdapter()
1879	2096	{
..	..	@@ -1891,7 +2108,7 @@
1891	2108	});
1892	2109	presetpanel.add(diffuse2);
1893	2110
1894		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2111	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1895	2112	diffusemoon.setToolTipText("Moon");
1896	2113	diffusemoon.addMouseListener(new MouseAdapter()
1897	2114	{
..	..	@@ -1909,7 +2126,7 @@
1909	2126	});
1910	2127	presetpanel.add(diffusemoon);
1911	2128
1912		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2129	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1913	2130	diffusemoon2.setToolTipText("Moon2");
1914	2131	diffusemoon2.addMouseListener(new MouseAdapter()
1915	2132	{
..	..	@@ -1927,7 +2144,7 @@
1927	2144	});
1928	2145	presetpanel.add(diffusemoon2);
1929	2146
1930		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2147	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1931	2148	diffusemoon3.setToolTipText("Moon3");
1932	2149	diffusemoon3.addMouseListener(new MouseAdapter()
1933	2150	{
..	..	@@ -1945,7 +2162,7 @@
1945	2162	});
1946	2163	presetpanel.add(diffusemoon3);
1947	2164
1948		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2165	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1949	2166	diffusesheen.setToolTipText("Sheen");
1950	2167	diffusesheen.addMouseListener(new MouseAdapter()
1951	2168	{
..	..	@@ -1962,7 +2179,7 @@
1962	2179	});
1963	2180	presetpanel.add(diffusesheen);
1964	2181
1965		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2182	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
1966	2183	rough.setToolTipText("Rough metal");
1967	2184	rough.addMouseListener(new MouseAdapter()
1968	2185	{
..	..	@@ -1980,7 +2197,7 @@
1980	2197	});
1981	2198	presetpanel.add(rough);
1982	2199
1983		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2200	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
1984	2201	rough2.setToolTipText("Medium metal");
1985	2202	rough2.addMouseListener(new MouseAdapter()
1986	2203	{
..	..	@@ -1998,7 +2215,7 @@
1998	2215	});
1999	2216	presetpanel.add(rough2);
2000	2217
2001		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2218	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
2002	2219	shini0.setToolTipText("Shiny");
2003	2220	shini0.addMouseListener(new MouseAdapter()
2004	2221	{
..	..	@@ -2016,7 +2233,7 @@
2016	2233	});
2017	2234	presetpanel.add(shini0);
2018	2235
2019		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2236	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
2020	2237	shini1.setToolTipText("Shiny2");
2021	2238	shini1.addMouseListener(new MouseAdapter()
2022	2239	{
..	..	@@ -2034,7 +2251,7 @@
2034	2251	});
2035	2252	presetpanel.add(shini1);
2036	2253
2037		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2254	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2038	2255	shini2.setToolTipText("Shiny3");
2039	2256	shini2.addMouseListener(new MouseAdapter()
2040	2257	{
..	..	@@ -2052,7 +2269,7 @@
2052	2269	});
2053	2270	presetpanel.add(shini2);
2054	2271
2055		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2272	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2056	2273	aniso.setToolTipText("AnisoU");
2057	2274	aniso.addMouseListener(new MouseAdapter()
2058	2275	{
..	..	@@ -2070,7 +2287,7 @@
2070	2287	});
2071	2288	presetpanel.add(aniso);
2072	2289
2073		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2290	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2074	2291	aniso2.setToolTipText("AnisoV");
2075	2292	aniso2.addMouseListener(new MouseAdapter()
2076	2293	{
..	..	@@ -2088,7 +2305,7 @@
2088	2305	});
2089	2306	presetpanel.add(aniso2);
2090	2307
2091		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2308	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2092	2309	aniso3.setToolTipText("AnisoUV");
2093	2310	aniso3.addMouseListener(new MouseAdapter()
2094	2311	{
..	..	@@ -2106,7 +2323,7 @@
2106	2323	});
2107	2324	presetpanel.add(aniso3);
2108	2325
2109		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2326	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2110	2327	velvet0.setToolTipText("Velvet");
2111	2328	velvet0.addMouseListener(new MouseAdapter()
2112	2329	{
..	..	@@ -2128,7 +2345,7 @@
2128	2345	});
2129	2346	presetpanel.add(velvet0);
2130	2347
2131		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2348	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2132	2349	bump0.setToolTipText("Bump texture");
2133	2350	bump0.addMouseListener(new MouseAdapter()
2134	2351	{
..	..	@@ -2147,7 +2364,22 @@
2147	2364	});
2148	2365	presetpanel.add(bump0);
2149	2366
2150		- 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.4);
	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);
2151	2383	halo.setToolTipText("Halo");
2152	2384	halo.addMouseListener(new MouseAdapter()
2153	2385	{
..	..	@@ -2164,7 +2396,7 @@
2164	2396	});
2165	2397	presetpanel.add(halo);
2166	2398
2167		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2399	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2168	2400	candle.setToolTipText("Candle");
2169	2401	candle.addMouseListener(new MouseAdapter()
2170	2402	{
..	..	@@ -2186,7 +2418,7 @@
2186	2418	});
2187	2419	presetpanel.add(candle);
2188	2420
2189		- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2421	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2190	2422	shadowShader.setToolTipText("Shadow");
2191	2423	shadowShader.addMouseListener(new MouseAdapter()
2192	2424	{
..	..	@@ -2197,13 +2429,55 @@
2197	2429	cameraField.setFloat(0.001);
2198	2430	specularField.setFloat(0.001);
2199	2431	fakedepthField.setFloat(0.001);
2200		- opacityField.setFloat(0.6);
	2432	+ opacityField.setFloat(0.4);
2201	2433
2202	2434	materialtouched = true;
2203	2435	applySelf();
2204	2436	}
2205	2437	});
2206	2438	presetpanel.add(shadowShader);
	2439	+
	2440	+ cLabel para0 = GetLabel("icons/shadericons/parallax0.png", !Globals.NIMBUSLAF);
	2441	+ para0.setToolTipText("No parallax");
	2442	+ para0.addMouseListener(new MouseAdapter()
	2443	+ {
	2444	+ public void mouseClicked(MouseEvent e)
	2445	+ {
	2446	+ parallaxField.setFloat(0.125);
	2447	+
	2448	+ materialtouched = true;
	2449	+ applySelf();
	2450	+ }
	2451	+ });
	2452	+ presetpanel.add(para0);
	2453	+
	2454	+ cLabel para1 = GetLabel("icons/shadericons/parallax1.png", !Globals.NIMBUSLAF);
	2455	+ para1.setToolTipText("With parallax");
	2456	+ para1.addMouseListener(new MouseAdapter()
	2457	+ {
	2458	+ public void mouseClicked(MouseEvent e)
	2459	+ {
	2460	+ parallaxField.setFloat(0.13);
	2461	+
	2462	+ materialtouched = true;
	2463	+ applySelf();
	2464	+ }
	2465	+ });
	2466	+ presetpanel.add(para1);
	2467	+
	2468	+ cLabel para2 = GetLabel("icons/shadericons/parallax2.png", !Globals.NIMBUSLAF);
	2469	+ para2.setToolTipText("Reset parallax");
	2470	+ para2.addMouseListener(new MouseAdapter()
	2471	+ {
	2472	+ public void mouseClicked(MouseEvent e)
	2473	+ {
	2474	+ parallaxField.setFloat(0.14);
	2475	+
	2476	+ materialtouched = true;
	2477	+ applySelf();
	2478	+ }
	2479	+ });
	2480	+ presetpanel.add(para2);
2207	2481
2208	2482	cGridBag panel = new cGridBag().setVertical(true);
2209	2483
..	..	@@ -2221,19 +2495,19 @@
2221	2495
2222	2496	cGridBag editBar = new cGridBag().setVertical(false);
2223	2497
2224		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2498	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2225	2499	createMaterialButton.setToolTipText("Create material");
2226	2500
2227	2501	/*
2228	2502	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2229	2503	*/
2230	2504
2231		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2505	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2232	2506	clearMaterialButton.setToolTipText("Clear material");
2233	2507
2234	2508	if (Globals.ADVANCED)
2235	2509	{
2236		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2510	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2237	2511	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2238	2512	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2239	2513	}
..	..	@@ -2254,9 +2528,20 @@
2254	2528
2255	2529	cGridBag huepanel = new cGridBag();
2256	2530	cGridBag huelabel = new cGridBag();
2257		- skin = GetLabel("icons/hue.png", false);
2258		- skin.fit = true;
2259		- huelabel.add(skin);
	2531	+ cLabel hue = GetLabel("icons/hue.png", false);
	2532	+ hue.fit = true;
	2533	+
	2534	+ hue.addMouseListener(new MouseAdapter()
	2535	+ {
	2536	+ public void mousePressed(MouseEvent e)
	2537	+ {
	2538	+ int x = e.getX();
	2539	+
	2540	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2541	+ }
	2542	+ });
	2543	+
	2544	+ huelabel.add(hue);
2260	2545	huelabel.preferredWidth = 20;
2261	2546	huepanel.add(new cGridBag()); // Label
2262	2547	huepanel.add(huelabel); // Field/slider
..	..	@@ -2439,6 +2724,12 @@
2439	2724	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
2440	2725	colorSection.add(backlit);
2441	2726
	2727	+ cGridBag parallax = new cGridBag();
	2728	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2729	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2730	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.25, -0.125)); // , aConstraints);
	2731	+ colorSection.add(parallax);
	2732	+
2442	2733	//panel.add(new JSeparator());
2443	2734
2444	2735	//panel.add(globalSection);
..	..	@@ -3490,6 +3781,7 @@
3490	3781	shadowField.setFloat(mat.shadow);
3491	3782	textureField.setFloat(mat.texture);
3492	3783	opacityField.setFloat(mat.opacity);
	3784	+ parallaxField.setFloat(mat.parallax + 0.125f);
3493	3785	fakedepthField.setFloat(mat.fakedepth);
3494	3786	shadowbiasField.setFloat(mat.shadowbias);
3495	3787	bumpField.setInteger(1); // dec 2013
..	..	@@ -3532,32 +3824,8 @@
3532	3824
3533	3825	if (multiplyToggle != null)
3534	3826	multiplyToggle.setSelected(mat.multiply);
3535		-
3536		- assert (object.projectedVertices != null);
3537		-
3538		- if (object.projectedVertices.length <= 2)
3539		- {
3540		- // Side effect...
3541		- Object3D.cVector2[] keep = object.projectedVertices;
3542		- object.projectedVertices = new Object3D.cVector2[3];
3543		- for (int i = 0; i < 3; i++)
3544		- {
3545		- if (i < keep.length)
3546		- {
3547		- object.projectedVertices[i] = keep[i];
3548		- } else
3549		- {
3550		- object.projectedVertices[i] = new Object3D.cVector2();
3551		- }
3552		- /*
3553		- if(keep.length == 0)
3554		- object.projectedVertices[0] = new Object3D.cVector2();
3555		- else
3556		- object.projectedVertices[0] = keep[0];
3557		- object.projectedVertices[1] = new Object3D.cVector2();
3558		- */
3559		- }
3560		- }
	3827	+
	3828	+ AllocProjectedVertices(object);
3561	3829
3562	3830	SetMaterial(mat, object.projectedVertices);
3563	3831	}
..	..	@@ -3807,6 +4075,7 @@
3807	4075	} else if (event.getSource() == link2masterCB)
3808	4076	{
3809	4077	copy.link2master ^= true;
	4078	+ objEditor.refreshContents();
3810	4079	return;
3811	4080	}
3812	4081	if (event.getSource() == randomCB)
..	..	@@ -3867,7 +4136,7 @@
3867	4136	//System.out.println("ObjEditor " + event);
3868	4137	applySelf0(true);
3869	4138	//parent.applySelf();
3870		- objEditor.refreshContents();
	4139	+ // conflicts with requestFocus objEditor.refreshContents();
3871	4140	} else if (source == resetButton)
3872	4141	{
3873	4142	CameraPane.fullreset = true;
..	..	@@ -4047,11 +4316,18 @@
4047	4316
4048	4317	void New()
4049	4318	{
4050		- while (copy.Size() > 1)
	4319	+ while (copy.Size() > 0)
4051	4320	{
4052		- copy.remove(1);
	4321	+ copy.remove(0);
4053	4322	}
4054	4323
	4324	+ copy.selection.clear();
	4325	+
	4326	+ if (copy == Grafreed.grafreed.universe)
	4327	+ {
	4328	+ CreateCameras();
	4329	+ cameraView.SetCamera(GetCamera(copy, 0));
	4330	+ }
4055	4331	ResetModel();
4056	4332	objEditor.refreshContents();
4057	4333	}
..	..	@@ -4179,8 +4455,6 @@
4179	4455	return true;
4180	4456	}
4181	4457
4182		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4183		-
4184	4458	void DeleteVersion()
4185	4459	{
4186	4460	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4188,7 +4462,11 @@
4188	4462	copy.versionlist[i] = copy.versionlist[i+1];
4189	4463	}
4190	4464
4191		- CopyChanged();
	4465	+ if (copy.versionlist[copy.versionindex] == null)
	4466	+ copy.versionindex -= 1;
	4467	+
	4468	+ if (copy.versionindex != -1)
	4469	+ CopyChanged(copy);
4192	4470
4193	4471	SetVersionStates();
4194	4472	}
..	..	@@ -4198,7 +4476,11 @@
4198	4476	System.err.println("Save");
4199	4477	Replace();
4200	4478
4201		- //cRadio tab = GetCurrentTab();
	4479	+ if (copy.versionlist == null)
	4480	+ {
	4481	+ copy.versionlist = new Object3D[100];
	4482	+ copy.versionindex = -1;
	4483	+ }
4202	4484
4203	4485	Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4204	4486
..	..	@@ -4266,20 +4548,20 @@
4266	4548	{
4267	4549	Object3D selection = new Object3D();
4268	4550
4269		- for (int i = 0; i < copy.selection.size(); i++)
	4551	+ for (int i = 0; i < objEditor.copy.selection.size(); i++)
4270	4552	{
4271		- Object3D elem = copy.selection.elementAt(i);
	4553	+ Object3D elem = objEditor.copy.selection.elementAt(i);
4272	4554
4273		- Object3D obj = copy.GetObject(elem.GetUUID());
	4555	+ Object3D obj = objEditor.copy.GetObject(elem.GetUUID());
4274	4556
4275	4557	if (obj == null)
4276	4558	{
4277		- copy.selection.remove(i--);
	4559	+ objEditor.copy.selection.remove(i--);
4278	4560	}
4279	4561	else
4280	4562	{
4281	4563	selection.add(obj);
4282		- copy.selection.setElementAt(obj, i);
	4564	+ objEditor.copy.selection.setElementAt(obj, i);
4283	4565	}
4284	4566	}
4285	4567
..	..	@@ -4292,44 +4574,43 @@
4292	4574	//refreshContents(false);
4293	4575	}
4294	4576
4295		- void CopyChanged()
	4577	+ void CopyChanged(Object3D changed)
4296	4578	{
4297		- Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4298		-
4299		- SetVersionStates();
	4579	+ Object3D obj = (Object3D)Grafreed.clone(changed.versionlist[copy.versionindex]);
4300	4580
4301	4581	boolean temp = CameraPane.SWITCH;
4302	4582	CameraPane.SWITCH = false;
4303	4583
4304		- copy.ExtractBigData(versiontable);
	4584	+ changed.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4305	4585
4306		- copy.clear();
	4586	+ changed.clear();
4307	4587
4308		- copy.skyboxname = obj.skyboxname;
4309		- copy.skyboxext = obj.skyboxext;
	4588	+ changed.skyboxname = obj.skyboxname;
	4589	+ changed.skyboxext = obj.skyboxext;
4310	4590
4311	4591	for (int i=0; i<obj.Size(); i++)
4312	4592	{
4313		- copy.add(obj.get(i));
	4593	+ changed.add(obj.get(i));
4314	4594	}
4315	4595
4316		- copy.RestoreBigData(versiontable);
	4596	+ changed.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4317	4597
4318	4598	CameraPane.SWITCH = temp;
4319	4599
4320		- RefreshSelection();
	4600	+ if (objEditor == this)
	4601	+ RefreshSelection();
4321	4602	//assert(hashtable.isEmpty());
4322	4603
4323		- copy.Touch();
	4604	+ objEditor.copy.Touch();
4324	4605
4325	4606	ResetModel();
4326		- copy.HardTouch(); // recompile?
	4607	+ objEditor.copy.HardTouch(); // recompile?
4327	4608
4328	4609	cRadio ab;
4329		- for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4610	+ for (java.util.Enumeration e = objEditor.buttonGroup.getElements(); e.hasMoreElements();)
4330	4611	{
4331	4612	ab = (cRadio)e.nextElement();
4332		- Object3D test = copy.GetObject(ab.object.GetUUID());
	4613	+ Object3D test = objEditor.copy.GetObject(ab.object.GetUUID());
4333	4614	//ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
4334	4615	if (test != null)
4335	4616	{
..	..	@@ -4338,7 +4619,7 @@
4338	4619	}
4339	4620	}
4340	4621
4341		- refreshContents(true);
	4622	+ objEditor.refreshContents(true);
4342	4623	}
4343	4624
4344	4625	cButton previousVersionButton;
..	..	@@ -4352,16 +4633,10 @@
4352	4633
4353	4634	int VersionCount()
4354	4635	{
4355		- int count = 0;
4356		-
4357		- for (int i = copy.versionlist.length; --i >= 0;)
4358		- {
4359		- if (copy.versionlist[i] != null)
4360		- count++;
4361		- }
4362		-
4363		- return count;
	4636	+ return copy.VersionCount();
4364	4637	}
	4638	+
	4639	+ public cGridBag versionSliderPane;
4365	4640
4366	4641	void SetVersionStates()
4367	4642	{
..	..	@@ -4370,21 +4645,36 @@
4370	4645
4371	4646	//cRadio tab = GetCurrentTab();
4372	4647
4373		- restoreButton.setEnabled(copy.versionindex != -1);
4374		- replaceButton.setEnabled(copy.versionindex != -1);
4375		-
4376		- previousVersionButton.setEnabled(copy.versionindex > 0);
4377		- nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4378		-
4379		- deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4380		- copy.versionlist[copy.versionindex + 1] != null);
4381		-
4382		- muteSlider = true;
4383		- versionSlider.setMinimum(0);
4384		- versionSlider.setMaximum(VersionCount() - 1);
4385		- versionSlider.setInteger(copy.versionindex);
4386		- versionSlider.setEnabled(copy.versionindex != -1);
4387		- muteSlider = false;
	4648	+ if (copy.versionindex == -2)
	4649	+ {
	4650	+ saveVersionButton.setEnabled(false);
	4651	+ restoreButton.setEnabled(false);
	4652	+ replaceButton.setEnabled(false);
	4653	+ previousVersionButton.setEnabled(false);
	4654	+ nextVersionButton.setEnabled(false);
	4655	+ deleteVersionButton.setEnabled(false);
	4656	+ versionSliderPane.setVisible(false);
	4657	+ }
	4658	+ else
	4659	+ {
	4660	+ restoreButton.setEnabled(copy.versionindex != -1);
	4661	+ replaceButton.setEnabled(copy.versionindex != -1);
	4662	+
	4663	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4664	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4665	+
	4666	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4667	+ //copy.versionlist[copy.versionindex + 1] != null);
	4668	+
	4669	+ muteSlider = true;
	4670	+ versionSlider.setMinimum(0);
	4671	+ versionSlider.setMaximum(VersionCount() - 1);
	4672	+ versionSlider.setInteger(copy.versionindex);
	4673	+ versionSlider.setEnabled(copy.versionindex != -1);
	4674	+ muteSlider = false;
	4675	+
	4676	+ versionSliderPane.setVisible(true);
	4677	+ }
4388	4678	}
4389	4679
4390	4680	public boolean PreviousVersion()
..	..	@@ -4417,7 +4707,9 @@
4417	4707
4418	4708	copy.versionindex -= 1;
4419	4709
4420		- CopyChanged();
	4710	+ CopyChanged(copy);
	4711	+
	4712	+ SetVersionStates();
4421	4713
4422	4714	return true;
4423	4715	}
..	..	@@ -4435,14 +4727,16 @@
4435	4727	}
4436	4728
4437	4729	//CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4438		- CopyChanged();
	4730	+ CopyChanged(copy);
	4731	+
	4732	+ SetVersionStates();
4439	4733
4440	4734	return true;
4441	4735	}
4442	4736
4443	4737	public boolean Replace()
4444	4738	{
4445		- System.err.println("Replace");
	4739	+ //System.err.println("Replace");
4446	4740
4447	4741	//cRadio tab = GetCurrentTab();
4448	4742
..	..	@@ -4472,10 +4766,12 @@
4472	4766
4473	4767	copy.versionindex += 1;
4474	4768
4475		- CopyChanged();
	4769	+ CopyChanged(copy);
4476	4770
4477	4771	//if (!tab.user[tab.versionindex])
4478	4772	// tab.graphs[tab.versionindex] = null;
	4773	+
	4774	+ SetVersionStates();
4479	4775	}
4480	4776
4481	4777	void ImportGFD()
..	..	@@ -4669,6 +4965,12 @@
4669	4965	// else
4670	4966	// applySelf(true);
4671	4967	// }
	4968	+
	4969	+ boolean Equal(double a, double b)
	4970	+ {
	4971	+ return Math.abs(a - b) < 0.001;
	4972	+ }
	4973	+
4672	4974	void applySelf0(boolean name)
4673	4975	{
4674	4976	if (name)
..	..	@@ -4706,6 +5008,7 @@
4706	5008	current.shadow = (float) shadowField.getFloat();
4707	5009	current.texture = (float) textureField.getFloat();
4708	5010	current.opacity = (float) opacityField.getFloat();
	5011	+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
4709	5012	current.fakedepth = (float) fakedepthField.getFloat();
4710	5013	current.shadowbias = (float) shadowbiasField.getFloat();
4711	5014
..	..	@@ -4718,29 +5021,54 @@
4718	5021	{
4719	5022	cMaterial mat = copy.material;
4720	5023
4721		- colorField.SetToolTipValue((mat.color));
4722		- saturationField.SetToolTipValue((mat.modulation));
4723		- metalnessField.SetToolTipValue((mat.metalness));
4724		- diffuseField.SetToolTipValue((mat.diffuse));
4725		- specularField.SetToolTipValue((mat.specular));
4726		- shininessField.SetToolTipValue((mat.shininess));
4727		- shiftField.SetToolTipValue((mat.shift));
4728		- ambientField.SetToolTipValue((mat.ambient));
4729		- lightareaField.SetToolTipValue((mat.lightarea));
4730		- diffusenessField.SetToolTipValue((mat.factor));
4731		- velvetField.SetToolTipValue((mat.velvet));
4732		- sheenField.SetToolTipValue((mat.sheen));
4733		- subsurfaceField.SetToolTipValue((mat.subsurface));
4734		- backlitField.SetToolTipValue((mat.bump));
4735		- anisoField.SetToolTipValue((mat.aniso));
4736		- anisoVField.SetToolTipValue((mat.anisoV));
4737		- cameraField.SetToolTipValue((mat.cameralight));
4738		- selfshadowField.SetToolTipValue((mat.diffuseness));
4739		- shadowField.SetToolTipValue((mat.shadow));
4740		- textureField.SetToolTipValue((mat.texture));
4741		- opacityField.SetToolTipValue((mat.opacity));
4742		- fakedepthField.SetToolTipValue((mat.fakedepth));
4743		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	5024	+ if (!Equal(colorField.getFloat(), mat.color))
	5025	+ colorField.SetToolTipValue((mat.color));
	5026	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	5027	+ saturationField.SetToolTipValue((mat.modulation));
	5028	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	5029	+ metalnessField.SetToolTipValue((mat.metalness));
	5030	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	5031	+ diffuseField.SetToolTipValue((mat.diffuse));
	5032	+ if (!Equal(specularField.getFloat(), mat.specular))
	5033	+ specularField.SetToolTipValue((mat.specular));
	5034	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	5035	+ shininessField.SetToolTipValue((mat.shininess));
	5036	+ if (!Equal(shiftField.getFloat(), mat.shift))
	5037	+ shiftField.SetToolTipValue((mat.shift));
	5038	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	5039	+ ambientField.SetToolTipValue((mat.ambient));
	5040	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	5041	+ lightareaField.SetToolTipValue((mat.lightarea));
	5042	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	5043	+ diffusenessField.SetToolTipValue((mat.factor));
	5044	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	5045	+ velvetField.SetToolTipValue((mat.velvet));
	5046	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	5047	+ sheenField.SetToolTipValue((mat.sheen));
	5048	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	5049	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	5050	+ if (!Equal(backlitField.getFloat(), mat.bump))
	5051	+ backlitField.SetToolTipValue((mat.bump));
	5052	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5053	+ anisoField.SetToolTipValue((mat.aniso));
	5054	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5055	+ anisoVField.SetToolTipValue((mat.anisoV));
	5056	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5057	+ cameraField.SetToolTipValue((mat.cameralight));
	5058	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5059	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5060	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5061	+ shadowField.SetToolTipValue((mat.shadow));
	5062	+ if (!Equal(textureField.getFloat(), mat.texture))
	5063	+ textureField.SetToolTipValue((mat.texture));
	5064	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5065	+ opacityField.SetToolTipValue((mat.opacity));
	5066	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5067	+ parallaxField.SetToolTipValue((mat.parallax));
	5068	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5069	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5070	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5071	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4744	5072	}
4745	5073
4746	5074	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4772,26 +5100,43 @@
4772	5100	}
4773	5101
4774	5102	cNumberSlider versionSlider;
	5103	+ cNumberSlider versionField;
4775	5104
4776	5105	public void stateChanged(ChangeEvent e)
4777	5106	{
4778		- // assert(false);
	5107	+ // assert(false);
4779	5108	if (e.getSource() == versionSlider)
4780	5109	{
4781	5110	if (muteSlider)
4782	5111	return;
	5112	+
	5113	+ Replace();
4783	5114
4784	5115	int version = versionSlider.getInteger();
4785	5116
4786	5117	if (version != -1 && copy.versionlist[version] != null)
4787	5118	{
4788	5119	copy.versionindex = version;
4789		- CopyChanged();
	5120	+ CopyChanged(copy);
	5121	+ SetVersionStates();
4790	5122	}
4791	5123
4792	5124	return;
4793	5125	}
4794	5126
	5127	+ if (e.getSource() == versionField)
	5128	+ {
	5129	+ int version = versionField.getInteger();
	5130	+
	5131	+ if (version != -1 && copy.versionindex != version && copy.versionlist[version] != null)
	5132	+ {
	5133	+ copy.versionindex = version;
	5134	+ CopyChanged(copy);
	5135	+ }
	5136	+
	5137	+ return;
	5138	+ }
	5139	+
4795	5140	if (freezematerial)
4796	5141	{
4797	5142	return;
..	..	@@ -4881,7 +5226,7 @@
4881	5226	}
4882	5227
4883	5228	if (normalpushField != null)
4884		- copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
	5229	+ copy.NORMALPUSH = (float)normalpushField.getFloat() / 100;
4885	5230	}
4886	5231
4887	5232	void SnapObject()
..	..	@@ -5143,6 +5488,8 @@
5143	5488
5144	5489	if (previousVersionButton != null && copy.versionlist != null)
5145	5490	SetVersionStates();
	5491	+
	5492	+ cameraView.requestFocusInWindow();
5146	5493	}
5147	5494
5148	5495	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5174,7 +5521,7 @@
5174	5521	// group = (Composite) group.get(0);
5175	5522	// }
5176	5523
5177		- System.out.println("makeSomething of " + thing);
	5524	+ //System.out.println("makeSomething of " + thing);
5178	5525
5179	5526	/*
5180	5527	if (deselect && jList != null)
..	..	@@ -5253,7 +5600,7 @@
5253	5600	void ResetModel()
5254	5601	{
5255	5602	//assert(copy instanceof Composite);
5256		- Object3D /Composite/ group = (Object3D /Composite/) copy;
	5603	+ Object3D /Composite/ group = (Object3D /Composite/) objEditor.copy;
5257	5604
5258	5605	// necessary? group.selection = new Object3D(); // java.util.Vector();
5259	5606
..	..	@@ -5264,14 +5611,14 @@
5264	5611	//group.refreshEditWindow();
5265	5612	//refreshContents();
5266	5613
5267		- if (copy.selection == null)
	5614	+ if (objEditor.copy.selection == null)
5268	5615	{
5269		- copy.selection = new Object3D();
	5616	+ objEditor.copy.selection = new Object3D();
5270	5617	}
5271	5618
5272		- for (int j = 0; j < copy.selection.size(); j++)
	5619	+ for (int j = 0; j < objEditor.copy.selection.size(); j++)
5273	5620	{
5274		- Object3D item = copy.selection.get(j);
	5621	+ Object3D item = objEditor.copy.selection.get(j);
5275	5622
5276	5623	if (item instanceof cGroup && ((cGroup) item).transientlink)
5277	5624	{
..	..	@@ -5280,15 +5627,15 @@
5280	5627
5281	5628	if (item.count <= 1) // ??? == 0)
5282	5629	{
5283		- copy.selection.remove(item);
	5630	+ objEditor.copy.selection.remove(item);
5284	5631	}
5285	5632	}
5286	5633
5287	5634	boolean first = true;
5288	5635
5289		- for (int i = copy.selection.size(); --i >= 0;)
	5636	+ for (int i = objEditor.copy.selection.size(); --i >= 0;)
5290	5637	{
5291		- Object3D item = copy.selection.get(i);
	5638	+ Object3D item = objEditor.copy.selection.get(i);
5292	5639
5293	5640	if (item instanceof cGroup && ((cGroup) item).transientlink)
5294	5641	{
..	..	@@ -5528,6 +5875,7 @@
5528	5875
5529	5876	copy.versionlist = readobj.versionlist;
5530	5877	copy.versionindex = readobj.versionindex;
	5878	+ copy.versiontable = readobj.versiontable;
5531	5879
5532	5880	if (copy.versionlist == null)
5533	5881	{
..	..	@@ -5535,7 +5883,7 @@
5535	5883	copy.versionlist = new Object3D[100];
5536	5884	copy.versionindex = -1;
5537	5885
5538		- Save(true);
	5886	+ //Save(true);
5539	5887	}
5540	5888
5541	5889	//? SetUndoStates();
..	..	@@ -5883,6 +6231,7 @@
5883	6231	boolean materialFlushed;
5884	6232	Object3D latestObject;
5885	6233
	6234	+ cGridBag transformPanel;
5886	6235	cGridBag XYZPanel;
5887	6236
5888	6237	JSplitPane gridPanel;
..	..	@@ -5987,6 +6336,8 @@
5987	6336	cNumberSlider textureField;
5988	6337	JLabel opacityLabel;
5989	6338	cNumberSlider opacityField;
	6339	+ JLabel parallaxLabel;
	6340	+ cNumberSlider parallaxField;
5990	6341	JLabel fakedepthLabel;
5991	6342	cNumberSlider fakedepthField;
5992	6343	JLabel shadowbiasLabel;