~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -43,6 +43,35 @@
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	+
46	75	public cGridBag GetSeparator()
47	76	{
48	77	cGridBag separator = new cGridBag();
..	..	@@ -54,7 +83,10 @@
54	83	cButton GetButton(String name, boolean border)
55	84	{
56	85	ImageIcon icon = GetIcon(name);
57		- return new cButton(icon, border);
	86	+ if (icon != null \|\| name.contains("/"))
	87	+ return new cButton(icon, border);
	88	+ else
	89	+ return new cButton(name, border);
58	90	}
59	91
60	92	cLabel GetLabel(String name, boolean border)
..	..	@@ -75,11 +107,19 @@
75	107	return new cCheckBox(icon, border);
76	108	}
77	109
78		- ImageIcon GetIcon(String name)
	110	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	111	+
	112	+ static ImageIcon GetIcon(String name)
79	113	{
	114	+ javax.swing.ImageIcon iconCache = icons.get(name);
	115	+ if (iconCache != null)
	116	+ {
	117	+ return iconCache;
	118	+ }
	119	+
80	120	try
81	121	{
82		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	122	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
83	123
84	124	// if (image.getWidth() > 48 && image.getHeight() > 48)
85	125	// {
..	..	@@ -94,10 +134,14 @@
94	134	// }
95	135
96	136	javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	137	+
	138	+ icons.put(name, icon);
	139	+
97	140	return icon;
98	141	}
99	142	catch (Exception e)
100	143	{
	144	+ //icons.put(name, null);
101	145	return null;
102	146	}
103	147	}
..	..	@@ -347,7 +391,8 @@
347	391	//parent = p;
348	392
349	393	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
350		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	394	+ if (Globals.DEBUG)
	395	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
351	396	//gd.setFullScreenWindow(this);
352	397	//setResizable(false);
353	398	//if (!isDisplayable())
..	..	@@ -384,6 +429,9 @@
384	429
385	430	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
386	431
	432	+ // This is to refresh the UI of the material panel.
	433	+ boolean patchMaterial;
	434	+
387	435	void SetupMenu()
388	436	{
389	437	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -433,7 +481,7 @@
433	481
434	482	ChangeListener changeListener = new ChangeListener()
435	483	{
436		- String name;
	484	+ //String name;
437	485
438	486	public void stateChanged(ChangeEvent changeEvent)
439	487	{
..	..	@@ -453,33 +501,34 @@
453	501	// EditSelection(false);
454	502	// }
455	503
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		- }
	504	+// if (objectPanel.getSelectedIndex() == 4)
	505	+// {
	506	+// name = copy.skyboxname;
	507	+//
	508	+// if (name == null)
	509	+// {
	510	+// name = "";
	511	+// }
	512	+//
	513	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	514	+// copy.skyboxext = "jpg";
	515	+// }
	516	+// else
	517	+// {
	518	+// if (name != null)
	519	+// {
	520	+// if (name.equals(""))
	521	+// {
	522	+// copy.skyboxname = null;
	523	+// copy.skyboxext = null;
	524	+// }
	525	+// else
	526	+// {
	527	+// copy.skyboxname = name;
	528	+// }
	529	+// }
	530	+// }
	531	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
483	532
484	533	// refreshContents(false); // To refresh Info tab
485	534	cameraView.repaint();
..	..	@@ -908,18 +957,29 @@
908	957	boolean temp = CameraPane.SWITCH;
909	958	CameraPane.SWITCH = false;
910	959
911		- object.ExtractBigData(versiontable);
	960	+ if (Grafreed.grafreed.universe.versiontable == null)
	961	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	962	+
	963	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
912	964	// if (copy == client)
913	965
914	966	Object3D versions[] = object.versionlist;
	967	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
915	968	object.versionlist = null;
	969	+ object.versiontable = null;
	970	+
	971	+ Object3D parent = object.parent;
	972	+ object.parent = null;
916	973
917	974	//byte[] compress = Compress(copy);
918	975	Object3D compress = (Object3D)Grafreed.clone(object);
919	976
920		- object.versionlist = versions;
	977	+ object.parent = parent;
921	978
922		- object.RestoreBigData(versiontable);
	979	+ object.versionlist = versions;
	980	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	981	+
	982	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
923	983
924	984	CameraPane.SWITCH = temp;
925	985
..	..	@@ -1258,7 +1318,7 @@
1258	1318
1259	1319	//if (copy.pinned)
1260	1320	{
1261		- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1321	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1262	1322	pinButton.setSelected(copy.pinned);
1263	1323	cGridBag t = new cGridBag();
1264	1324	t.preferredWidth = 2;
..	..	@@ -1281,14 +1341,14 @@
1281	1341
1282	1342	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1283	1343	liveCB.setToolTipText("Animate object");
	1344	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1345	+ markCB.setToolTipText("Set target transform");
1284	1346	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1285	1347	selectableCB.setToolTipText("Make object selectable");
1286	1348	// Return();
1287	1349
1288	1350	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1289	1351	hideCB.setToolTipText("Hide object");
1290		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1291		- markCB.setToolTipText("As animation target transform");
1292	1352
1293	1353	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1294	1354
..	..	@@ -1490,6 +1550,7 @@
1490	1550
1491	1551	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1492	1552	{
	1553	+ if (Globals.DEBUG)
1493	1554	System.out.println("CREATE CAMERAS");
1494	1555	cams = new cTemplate();
1495	1556	cams.name = "Cameras";
..	..	@@ -1571,6 +1632,45 @@
1571	1632	//frontView.object = copy;
1572	1633	//sideView.object = copy;
1573	1634
	1635	+ transformPanel = new cGridBag().setVertical(true);
	1636	+
	1637	+ cGridBag resetTransformPanel = new cGridBag();
	1638	+
	1639	+ resetTransformPanel.preferredHeight = 2;
	1640	+
	1641	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1642	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1643	+ resetTransform.addMouseListener(new MouseAdapter()
	1644	+ {
	1645	+ public void mouseClicked(MouseEvent e)
	1646	+ {
	1647	+ ResetTransform();
	1648	+ }
	1649	+ });
	1650	+ resetTransformPanel.add(resetTransform);
	1651	+
	1652	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1653	+ resetTransform.setToolTipText("Reset Translation only");
	1654	+ resetTransform.addMouseListener(new MouseAdapter()
	1655	+ {
	1656	+ public void mouseClicked(MouseEvent e)
	1657	+ {
	1658	+ ResetTransform(1);
	1659	+ }
	1660	+ });
	1661	+ resetTransformPanel.add(resetTransform);
	1662	+
	1663	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1664	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1665	+ resetTransform.addMouseListener(new MouseAdapter()
	1666	+ {
	1667	+ public void mouseClicked(MouseEvent e)
	1668	+ {
	1669	+ ResetTransform(2);
	1670	+ }
	1671	+ });
	1672	+ resetTransformPanel.add(resetTransform);
	1673	+
1574	1674	XYZPanel = new cGridBag().setVertical(true);
1575	1675	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1576	1676
..	..	@@ -1580,6 +1680,9 @@
1580	1680	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1581	1681	//XYZPanel.setName("XYZ");
1582	1682
	1683	+ transformPanel.add(resetTransformPanel);
	1684	+ transformPanel.add(XYZPanel);
	1685	+
1583	1686	/*
1584	1687	gridPanel = new JPanel(); //new BorderLayout());
1585	1688	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1587,12 +1690,12 @@
1587	1690	gridPanel.add(cameraView);
1588	1691	gridPanel.add(XYZPanel);
1589	1692	*/
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);
	1693	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1694	+// gridPanel.setContinuousLayout(true);
	1695	+// gridPanel.setOneTouchExpandable(true);
	1696	+// gridPanel.setDividerLocation(1.0);
	1697	+// gridPanel.setDividerSize(9);
	1698	+// gridPanel.setResizeWeight(0.85);
1596	1699
1597	1700	// aConstraints.weighty = 0;
1598	1701	//System.out.println("THIS = " + this);
..	..	@@ -1615,14 +1718,14 @@
1615	1718
1616	1719	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1617	1720	//tmp.setName("Edit");
1618		- objectPanel.add(materialPanel);
1619		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1620		- objectPanel.setToolTipTextAt(0, "Material");
1621		-
1622	1721	objectPanel.add(toolboxPanel);
1623		- objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1624		- objectPanel.setToolTipTextAt(1, "Objects & textures");
	1722	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1723	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
1625	1724
	1725	+ objectPanel.add(materialPanel);
	1726	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1727	+ objectPanel.setToolTipTextAt(1, "Material");
	1728	+
1626	1729	objectPanel.add(skyboxPanel);
1627	1730	objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1628	1731	objectPanel.setToolTipTextAt(2, "Backgrounds");
..	..	@@ -1635,10 +1738,14 @@
1635	1738	objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1636	1739	objectPanel.setToolTipTextAt(3, "Edit controls");
1637	1740
1638		- objectPanel.add(XYZPanel);
	1741	+ objectPanel.add(transformPanel);
1639	1742	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1640		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1743	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1641	1744
	1745	+ patchMaterial = true;
	1746	+ cameraView.patchMaterial = this;
	1747	+ objectPanel.setSelectedIndex(1);
	1748	+
1642	1749	/*
1643	1750	aConstraints.gridx = 0;
1644	1751	aConstraints.gridwidth = 1;
..	..	@@ -1658,7 +1765,7 @@
1658	1765	scrollpane.addMouseWheelListener(this); // Default not fast enough
1659	1766
1660	1767	/JTabbedPane/ scenePanel = new cGridBag();
1661		- scenePanel.preferredWidth = 5;
	1768	+ scenePanel.preferredWidth = 6;
1662	1769
1663	1770	JTabbedPane tabbedPane = new JTabbedPane();
1664	1771	tabbedPane.add(scrollpane);
..	..	@@ -1669,17 +1776,52 @@
1669	1776
1670	1777	AddOptions(optionsPanel); //, aConstraints);
1671	1778
1672		- tabbedPane.add(optionsPanel);
1673		-
1674	1779	tabbedPane.add(FSPane = new cFileSystemPane(this));
1675	1780
	1781	+ tabbedPane.add(optionsPanel);
	1782	+
1676	1783	scenePanel.add(tabbedPane);
1677	1784
1678		- //if (Globals.ADVANCED)
1679		- tabbedPane.add(infoPanel);
1680		- tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1681		- tabbedPane.setToolTipTextAt(3, "Information");
	1785	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1786	+ creditsPanel.setName("Credits");
1682	1787
	1788	+ cLabel ogaLabel = new cLabel(" Most Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1789	+ creditsPanel.add(ogaLabel);
	1790	+
	1791	+ cButton opengameartButton;
	1792	+ creditsPanel.add(opengameartButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1793	+ opengameartButton.setToolTipText("https://opengameart.org");
	1794	+
	1795	+ opengameartButton.addMouseListener(new MouseAdapter()
	1796	+ {
	1797	+ public void mouseClicked(MouseEvent e)
	1798	+ {
	1799	+ try
	1800	+ {
	1801	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1802	+ } catch (Exception e1)
	1803	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1804	+ {
	1805	+ e1.printStackTrace();
	1806	+ }
	1807	+ }
	1808	+ });
	1809	+
	1810	+ for (int i=10; --i>=0;)
	1811	+ {
	1812	+ creditsPanel.add(new cGridBag());
	1813	+ }
	1814	+
	1815	+ tabbedPane.add(creditsPanel);
	1816	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1817	+
	1818	+ if (Globals.ADVANCED)
	1819	+ {
	1820	+ tabbedPane.add(infoPanel);
	1821	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1822	+ tabbedPane.setToolTipTextAt(4, "Information");
	1823	+ }
	1824	+
1683	1825	/*
1684	1826	cTree jTree = new cTree(null);
1685	1827	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1700,13 +1842,13 @@
1700	1842	jtp.add(tree);
1701	1843	*/
1702	1844
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");
	1845	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1846	+// bigPanel.setContinuousLayout(true);
	1847	+// bigPanel.setOneTouchExpandable(true);
	1848	+// bigPanel.setDividerLocation(0.8);
	1849	+// bigPanel.setDividerSize(15);
	1850	+// bigPanel.setResizeWeight(0.15);
	1851	+// bigPanel.setName("Scene");
1710	1852
1711	1853	//bigPanel.setLayout(new BorderLayout());
1712	1854	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1776,7 +1918,7 @@
1776	1918
1777	1919	frame.getContentPane().setLayout(new BorderLayout());
1778	1920	/**/
1779		- JTabbedPane worldPane = new JTabbedPane();
	1921	+ //JTabbedPane worldPane = new JTabbedPane();
1780	1922	//worldPane.add(bigPanel);
1781	1923	//worldPane.add(worldPanel);
1782	1924	/**/
..	..	@@ -1790,7 +1932,7 @@
1790	1932
1791	1933	cameraView.requestFocusInWindow();
1792	1934
1793		- gridPanel.setDividerLocation(1.0);
	1935	+// gridPanel.setDividerLocation(1.0);
1794	1936
1795	1937	frame.validate();
1796	1938
..	..	@@ -1825,7 +1967,7 @@
1825	1967	{
1826	1968	cGridBag presetpanel = new cGridBag().setVertical(true);
1827	1969
1828		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1970	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1829	1971	skin.setToolTipText("Skin");
1830	1972	skin.addMouseListener(new MouseAdapter()
1831	1973	{
..	..	@@ -1836,7 +1978,15 @@
1836	1978
1837	1979	// Skin
1838	1980	colorField.setFloat(material.color);
1839		- saturationField.setFloat(material.modulation);
	1981	+ float saturation = material.modulation;
	1982	+
	1983	+ if (!cameraView.Skinshader)
	1984	+ {
	1985	+ saturation /= 1.5;
	1986	+ }
	1987	+
	1988	+ saturationField.setFloat(saturation);
	1989	+
1840	1990	subsurfaceField.setFloat(material.subsurface);
1841	1991	selfshadowField.setFloat(material.diffuseness);
1842	1992	diffusenessField.setFloat(material.factor);
..	..	@@ -1855,7 +2005,7 @@
1855	2005	});
1856	2006	presetpanel.add(skin);
1857	2007
1858		- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	2008	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
1859	2009	lambert.setToolTipText("Diffuse");
1860	2010	lambert.addMouseListener(new MouseAdapter()
1861	2011	{
..	..	@@ -1873,7 +2023,7 @@
1873	2023	});
1874	2024	presetpanel.add(lambert);
1875	2025
1876		- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	2026	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
1877	2027	diffuse2.setToolTipText("Diffuse2");
1878	2028	diffuse2.addMouseListener(new MouseAdapter()
1879	2029	{
..	..	@@ -1891,7 +2041,7 @@
1891	2041	});
1892	2042	presetpanel.add(diffuse2);
1893	2043
1894		- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2044	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
1895	2045	diffusemoon.setToolTipText("Moon");
1896	2046	diffusemoon.addMouseListener(new MouseAdapter()
1897	2047	{
..	..	@@ -1909,7 +2059,7 @@
1909	2059	});
1910	2060	presetpanel.add(diffusemoon);
1911	2061
1912		- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2062	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
1913	2063	diffusemoon2.setToolTipText("Moon2");
1914	2064	diffusemoon2.addMouseListener(new MouseAdapter()
1915	2065	{
..	..	@@ -1927,7 +2077,7 @@
1927	2077	});
1928	2078	presetpanel.add(diffusemoon2);
1929	2079
1930		- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2080	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
1931	2081	diffusemoon3.setToolTipText("Moon3");
1932	2082	diffusemoon3.addMouseListener(new MouseAdapter()
1933	2083	{
..	..	@@ -1945,7 +2095,7 @@
1945	2095	});
1946	2096	presetpanel.add(diffusemoon3);
1947	2097
1948		- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2098	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
1949	2099	diffusesheen.setToolTipText("Sheen");
1950	2100	diffusesheen.addMouseListener(new MouseAdapter()
1951	2101	{
..	..	@@ -1962,7 +2112,7 @@
1962	2112	});
1963	2113	presetpanel.add(diffusesheen);
1964	2114
1965		- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2115	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
1966	2116	rough.setToolTipText("Rough metal");
1967	2117	rough.addMouseListener(new MouseAdapter()
1968	2118	{
..	..	@@ -1980,7 +2130,7 @@
1980	2130	});
1981	2131	presetpanel.add(rough);
1982	2132
1983		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2133	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
1984	2134	rough2.setToolTipText("Medium metal");
1985	2135	rough2.addMouseListener(new MouseAdapter()
1986	2136	{
..	..	@@ -1998,7 +2148,7 @@
1998	2148	});
1999	2149	presetpanel.add(rough2);
2000	2150
2001		- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2151	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
2002	2152	shini0.setToolTipText("Shiny");
2003	2153	shini0.addMouseListener(new MouseAdapter()
2004	2154	{
..	..	@@ -2016,7 +2166,7 @@
2016	2166	});
2017	2167	presetpanel.add(shini0);
2018	2168
2019		- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2169	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
2020	2170	shini1.setToolTipText("Shiny2");
2021	2171	shini1.addMouseListener(new MouseAdapter()
2022	2172	{
..	..	@@ -2034,7 +2184,7 @@
2034	2184	});
2035	2185	presetpanel.add(shini1);
2036	2186
2037		- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2187	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2038	2188	shini2.setToolTipText("Shiny3");
2039	2189	shini2.addMouseListener(new MouseAdapter()
2040	2190	{
..	..	@@ -2052,7 +2202,7 @@
2052	2202	});
2053	2203	presetpanel.add(shini2);
2054	2204
2055		- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2205	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2056	2206	aniso.setToolTipText("AnisoU");
2057	2207	aniso.addMouseListener(new MouseAdapter()
2058	2208	{
..	..	@@ -2070,7 +2220,7 @@
2070	2220	});
2071	2221	presetpanel.add(aniso);
2072	2222
2073		- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2223	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2074	2224	aniso2.setToolTipText("AnisoV");
2075	2225	aniso2.addMouseListener(new MouseAdapter()
2076	2226	{
..	..	@@ -2088,7 +2238,7 @@
2088	2238	});
2089	2239	presetpanel.add(aniso2);
2090	2240
2091		- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2241	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2092	2242	aniso3.setToolTipText("AnisoUV");
2093	2243	aniso3.addMouseListener(new MouseAdapter()
2094	2244	{
..	..	@@ -2106,7 +2256,7 @@
2106	2256	});
2107	2257	presetpanel.add(aniso3);
2108	2258
2109		- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2259	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2110	2260	velvet0.setToolTipText("Velvet");
2111	2261	velvet0.addMouseListener(new MouseAdapter()
2112	2262	{
..	..	@@ -2128,7 +2278,7 @@
2128	2278	});
2129	2279	presetpanel.add(velvet0);
2130	2280
2131		- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2281	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2132	2282	bump0.setToolTipText("Bump texture");
2133	2283	bump0.addMouseListener(new MouseAdapter()
2134	2284	{
..	..	@@ -2147,7 +2297,22 @@
2147	2297	});
2148	2298	presetpanel.add(bump0);
2149	2299
2150		- cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2300	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2301	+ borderShader.setToolTipText("Border fade");
	2302	+ borderShader.addMouseListener(new MouseAdapter()
	2303	+ {
	2304	+ public void mouseClicked(MouseEvent e)
	2305	+ {
	2306	+ borderfadeField.setFloat(0.5);
	2307	+ opacityField.setFloat(0.75);
	2308	+
	2309	+ materialtouched = true;
	2310	+ applySelf();
	2311	+ }
	2312	+ });
	2313	+ presetpanel.add(borderShader);
	2314	+
	2315	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2151	2316	halo.setToolTipText("Halo");
2152	2317	halo.addMouseListener(new MouseAdapter()
2153	2318	{
..	..	@@ -2164,7 +2329,7 @@
2164	2329	});
2165	2330	presetpanel.add(halo);
2166	2331
2167		- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2332	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2168	2333	candle.setToolTipText("Candle");
2169	2334	candle.addMouseListener(new MouseAdapter()
2170	2335	{
..	..	@@ -2186,7 +2351,7 @@
2186	2351	});
2187	2352	presetpanel.add(candle);
2188	2353
2189		- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2354	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2190	2355	shadowShader.setToolTipText("Shadow");
2191	2356	shadowShader.addMouseListener(new MouseAdapter()
2192	2357	{
..	..	@@ -2221,19 +2386,19 @@
2221	2386
2222	2387	cGridBag editBar = new cGridBag().setVertical(false);
2223	2388
2224		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2389	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
2225	2390	createMaterialButton.setToolTipText("Create material");
2226	2391
2227	2392	/*
2228	2393	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
2229	2394	*/
2230	2395
2231		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2396	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
2232	2397	clearMaterialButton.setToolTipText("Clear material");
2233	2398
2234	2399	if (Globals.ADVANCED)
2235	2400	{
2236		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2401	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
2237	2402	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2238	2403	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2239	2404	}
..	..	@@ -2254,9 +2419,20 @@
2254	2419
2255	2420	cGridBag huepanel = new cGridBag();
2256	2421	cGridBag huelabel = new cGridBag();
2257		- skin = GetLabel("icons/hue.png", false);
2258		- skin.fit = true;
2259		- huelabel.add(skin);
	2422	+ cLabel hue = GetLabel("icons/hue.png", false);
	2423	+ hue.fit = true;
	2424	+
	2425	+ hue.addMouseListener(new MouseAdapter()
	2426	+ {
	2427	+ public void mousePressed(MouseEvent e)
	2428	+ {
	2429	+ int x = e.getX();
	2430	+
	2431	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2432	+ }
	2433	+ });
	2434	+
	2435	+ huelabel.add(hue);
2260	2436	huelabel.preferredWidth = 20;
2261	2437	huepanel.add(new cGridBag()); // Label
2262	2438	huepanel.add(huelabel); // Field/slider
..	..	@@ -3532,32 +3708,8 @@
3532	3708
3533	3709	if (multiplyToggle != null)
3534	3710	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		- }
	3711	+
	3712	+ AllocProjectedVertices(object);
3561	3713
3562	3714	SetMaterial(mat, object.projectedVertices);
3563	3715	}
..	..	@@ -3867,7 +4019,7 @@
3867	4019	//System.out.println("ObjEditor " + event);
3868	4020	applySelf0(true);
3869	4021	//parent.applySelf();
3870		- objEditor.refreshContents();
	4022	+ // conflicts with requestFocus objEditor.refreshContents();
3871	4023	} else if (source == resetButton)
3872	4024	{
3873	4025	CameraPane.fullreset = true;
..	..	@@ -4047,12 +4199,15 @@
4047	4199
4048	4200	void New()
4049	4201	{
4050		- while (copy.Size() > 1)
	4202	+ while (copy.Size() > 0)
4051	4203	{
4052		- copy.remove(1);
	4204	+ copy.remove(0);
4053	4205	}
4054	4206
	4207	+ copy.selection.clear();
	4208	+
4055	4209	ResetModel();
	4210	+ SetupViews();
4056	4211	objEditor.refreshContents();
4057	4212	}
4058	4213
..	..	@@ -4179,8 +4334,6 @@
4179	4334	return true;
4180	4335	}
4181	4336
4182		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4183		-
4184	4337	void DeleteVersion()
4185	4338	{
4186	4339	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4188,7 +4341,11 @@
4188	4341	copy.versionlist[i] = copy.versionlist[i+1];
4189	4342	}
4190	4343
4191		- CopyChanged();
	4344	+ if (copy.versionlist[copy.versionindex] == null)
	4345	+ copy.versionindex -= 1;
	4346	+
	4347	+ if (copy.versionindex != -1)
	4348	+ CopyChanged();
4192	4349
4193	4350	SetVersionStates();
4194	4351	}
..	..	@@ -4301,7 +4458,7 @@
4301	4458	boolean temp = CameraPane.SWITCH;
4302	4459	CameraPane.SWITCH = false;
4303	4460
4304		- copy.ExtractBigData(versiontable);
	4461	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4305	4462
4306	4463	copy.clear();
4307	4464
..	..	@@ -4313,7 +4470,7 @@
4313	4470	copy.add(obj.get(i));
4314	4471	}
4315	4472
4316		- copy.RestoreBigData(versiontable);
	4473	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4317	4474
4318	4475	CameraPane.SWITCH = temp;
4319	4476
..	..	@@ -4363,6 +4520,8 @@
4363	4520	return count;
4364	4521	}
4365	4522
	4523	+ public cGridBag versionSliderPane;
	4524	+
4366	4525	void SetVersionStates()
4367	4526	{
4368	4527	//if (true)
..	..	@@ -4370,21 +4529,36 @@
4370	4529
4371	4530	//cRadio tab = GetCurrentTab();
4372	4531
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;
	4532	+ if (copy.versionlist == null)
	4533	+ {
	4534	+ saveVersionButton.setEnabled(false);
	4535	+ restoreButton.setEnabled(false);
	4536	+ replaceButton.setEnabled(false);
	4537	+ previousVersionButton.setEnabled(false);
	4538	+ nextVersionButton.setEnabled(false);
	4539	+ deleteVersionButton.setEnabled(false);
	4540	+ versionSliderPane.setVisible(false);
	4541	+ }
	4542	+ else
	4543	+ {
	4544	+ restoreButton.setEnabled(copy.versionindex != -1);
	4545	+ replaceButton.setEnabled(copy.versionindex != -1);
	4546	+
	4547	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4548	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4549	+
	4550	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4551	+ //copy.versionlist[copy.versionindex + 1] != null);
	4552	+
	4553	+ muteSlider = true;
	4554	+ versionSlider.setMinimum(0);
	4555	+ versionSlider.setMaximum(VersionCount() - 1);
	4556	+ versionSlider.setInteger(copy.versionindex);
	4557	+ versionSlider.setEnabled(copy.versionindex != -1);
	4558	+ muteSlider = false;
	4559	+
	4560	+ versionSliderPane.setVisible(true);
	4561	+ }
4388	4562	}
4389	4563
4390	4564	public boolean PreviousVersion()
..	..	@@ -4442,7 +4616,7 @@
4442	4616
4443	4617	public boolean Replace()
4444	4618	{
4445		- System.err.println("Replace");
	4619	+ //System.err.println("Replace");
4446	4620
4447	4621	//cRadio tab = GetCurrentTab();
4448	4622
..	..	@@ -4669,6 +4843,12 @@
4669	4843	// else
4670	4844	// applySelf(true);
4671	4845	// }
	4846	+
	4847	+ boolean Equal(double a, double b)
	4848	+ {
	4849	+ return Math.abs(a - b) < 0.001;
	4850	+ }
	4851	+
4672	4852	void applySelf0(boolean name)
4673	4853	{
4674	4854	if (name)
..	..	@@ -4718,29 +4898,52 @@
4718	4898	{
4719	4899	cMaterial mat = copy.material;
4720	4900
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));
	4901	+ if (!Equal(colorField.getFloat(), mat.color))
	4902	+ colorField.SetToolTipValue((mat.color));
	4903	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4904	+ saturationField.SetToolTipValue((mat.modulation));
	4905	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4906	+ metalnessField.SetToolTipValue((mat.metalness));
	4907	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4908	+ diffuseField.SetToolTipValue((mat.diffuse));
	4909	+ if (!Equal(specularField.getFloat(), mat.specular))
	4910	+ specularField.SetToolTipValue((mat.specular));
	4911	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4912	+ shininessField.SetToolTipValue((mat.shininess));
	4913	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4914	+ shiftField.SetToolTipValue((mat.shift));
	4915	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4916	+ ambientField.SetToolTipValue((mat.ambient));
	4917	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4918	+ lightareaField.SetToolTipValue((mat.lightarea));
	4919	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4920	+ diffusenessField.SetToolTipValue((mat.factor));
	4921	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4922	+ velvetField.SetToolTipValue((mat.velvet));
	4923	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4924	+ sheenField.SetToolTipValue((mat.sheen));
	4925	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4926	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4927	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4928	+ backlitField.SetToolTipValue((mat.bump));
	4929	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4930	+ anisoField.SetToolTipValue((mat.aniso));
	4931	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4932	+ anisoVField.SetToolTipValue((mat.anisoV));
	4933	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4934	+ cameraField.SetToolTipValue((mat.cameralight));
	4935	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	4936	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4937	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	4938	+ shadowField.SetToolTipValue((mat.shadow));
	4939	+ if (!Equal(textureField.getFloat(), mat.texture))
	4940	+ textureField.SetToolTipValue((mat.texture));
	4941	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	4942	+ opacityField.SetToolTipValue((mat.opacity));
	4943	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	4944	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4945	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	4946	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4744	4947	}
4745	4948
4746	4949	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4775,11 +4978,13 @@
4775	4978
4776	4979	public void stateChanged(ChangeEvent e)
4777	4980	{
4778		- // assert(false);
	4981	+ // assert(false);
4779	4982	if (e.getSource() == versionSlider)
4780	4983	{
4781	4984	if (muteSlider)
4782	4985	return;
	4986	+
	4987	+ Replace();
4783	4988
4784	4989	int version = versionSlider.getInteger();
4785	4990
..	..	@@ -5143,6 +5348,8 @@
5143	5348
5144	5349	if (previousVersionButton != null && copy.versionlist != null)
5145	5350	SetVersionStates();
	5351	+
	5352	+ cameraView.requestFocusInWindow();
5146	5353	}
5147	5354
5148	5355	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5174,7 +5381,7 @@
5174	5381	// group = (Composite) group.get(0);
5175	5382	// }
5176	5383
5177		- System.out.println("makeSomething of " + thing);
	5384	+ //System.out.println("makeSomething of " + thing);
5178	5385
5179	5386	/*
5180	5387	if (deselect && jList != null)
..	..	@@ -5528,6 +5735,7 @@
5528	5735
5529	5736	copy.versionlist = readobj.versionlist;
5530	5737	copy.versionindex = readobj.versionindex;
	5738	+ copy.versiontable = readobj.versiontable;
5531	5739
5532	5740	if (copy.versionlist == null)
5533	5741	{
..	..	@@ -5535,7 +5743,7 @@
5535	5743	copy.versionlist = new Object3D[100];
5536	5744	copy.versionindex = -1;
5537	5745
5538		- Save(true);
	5746	+ //Save(true);
5539	5747	}
5540	5748
5541	5749	//? SetUndoStates();
..	..	@@ -5883,6 +6091,7 @@
5883	6091	boolean materialFlushed;
5884	6092	Object3D latestObject;
5885	6093
	6094	+ cGridBag transformPanel;
5886	6095	cGridBag XYZPanel;
5887	6096
5888	6097	JSplitPane gridPanel;