~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -98,9 +98,11 @@
98	98
99	99	cButton GetButton(String name, boolean border)
100	100	{
101		- ImageIcon icon = GetIcon(name);
102		- if (icon != null \|\| name.contains("/"))
103		- return new cButton(icon, border);
	101	+ //ImageIcon icon = GetIcon(name);
	102	+ boolean fit = !name.startsWith("icons");
	103	+ if (//icon != null \|\|
	104	+ name.contains("/"))
	105	+ return new cButton(name, border, fit);
104	106	else
105	107	return new cButton(name, border);
106	108	}
..	..	@@ -797,6 +799,8 @@
797	799	// SendInfo(" delay: " + sel.delay + newline, "regular");
798	800	// live, hide, ...
799	801	//?? SendInfo(" Orig: " + maxima + newline, "regular");
	802	+ if (sel.GetTextures().pigmentdata != null)
	803	+ si.SendInfo(" EMBEDDED ", "regular");
800	804	si.SendInfo((debug ? " Texture: " : " ") + sel.GetTextures(), "bold");
801	805	// SendInfo((debug ? " Material: " : " ") + sel.material + newline, "regular");
802	806	if (sel instanceof cMesh)
..	..	@@ -1167,6 +1171,7 @@
1167	1171	JCheckBox selectableCB;
1168	1172	JCheckBox hideCB;
1169	1173	JCheckBox link2masterCB;
	1174	+ JCheckBox sortCB;
1170	1175	JCheckBox markCB;
1171	1176	JCheckBox randomCB;
1172	1177	JCheckBox speedupCB;
..	..	@@ -1410,11 +1415,14 @@
1410	1415	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1411	1416	rewindCB.setToolTipText("Rewind animation");
1412	1417
	1418	+ sortCB = AddCheckBox(setupPanel2, "Sort", copy.sort);
	1419	+ sortCB.setToolTipText("Display from back to front");
	1420	+
1413	1421	randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1414	1422	randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1415	1423
1416	1424	link2masterCB = AddCheckBox(setupPanel2, GetSupportText(), copy.link2master);
1417		- link2masterCB.setToolTipText("Attach to support");
	1425	+ link2masterCB.setToolTipText("Link to support");
1418	1426
1419	1427	if (Globals.ADVANCED)
1420	1428	{
..	..	@@ -1786,11 +1794,11 @@
1786	1794	objectTabbedPane.setToolTipTextAt(objectTabCount++, "Material");
1787	1795
1788	1796	figurePanel = new cGridBag();
1789		- figurePanel.add(new cButton("FIGURES amd POSES coming soon!"));
	1797	+ figurePanel.add(new cButton("FIGURES and POSES coming soon!"));
1790	1798	objectTabbedPane.add(figurePanel);
1791	1799	objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/figure.png"));
1792	1800	objectTabbedPane.setToolTipTextAt(objectTabCount++, "Figures and poses");
1793		-
	1801	+
1794	1802	// JPanel north = new JPanel(new BorderLayout());
1795	1803	// north.setName("Edit");
1796	1804	// north.add(ctrlPanel, BorderLayout.NORTH);
..	..	@@ -1828,8 +1836,8 @@
1828	1836	/JTabbedPane/ scenePanel = new cGridBag();
1829	1837	scenePanel.preferredWidth = 6;
1830	1838
1831		- JTabbedPane tabbedPane = new JTabbedPane();
1832		- tabbedPane.add(scrollpane);
	1839	+ JTabbedPane sceneTabbedPane = new JTabbedPane();
	1840	+ sceneTabbedPane.add(scrollpane);
1833	1841
1834	1842	optionsPanel = new cGridBag().setVertical(false);
1835	1843
..	..	@@ -1837,11 +1845,207 @@
1837	1845
1838	1846	AddOptions(optionsPanel); //, aConstraints);
1839	1847
1840		- tabbedPane.add(FSPane = new cFileSystemPane(this));
	1848	+ sceneTabbedPane.add(FSPane = new cFileSystemPane(this));
1841	1849
1842		- tabbedPane.add(optionsPanel);
	1850	+ fullscenePanel = new cGridBag();
	1851	+ fullscenePanel.setName("Download");
	1852	+ sceneTabbedPane.add(fullscenePanel);
1843	1853
1844		- scenePanel.add(tabbedPane);
	1854	+ cButton fullsceneButton;
	1855	+
	1856	+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/alsace.png", !Globals.NIMBUSLAF));
	1857	+ fullsceneButton.setToolTipText("Alsace!");
	1858	+ fullsceneButton.addActionListener(new ActionListener()
	1859	+ {
	1860	+ @Override
	1861	+ public void actionPerformed(ActionEvent e)
	1862	+ {
	1863	+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/Alsace.gfd", new iCallBack()
	1864	+ {
	1865	+
	1866	+ public void Callback(Object obj)
	1867	+ {
	1868	+ LoadIt(obj);
	1869	+ }
	1870	+
	1871	+ public void DragGesture()
	1872	+ {
	1873	+ }
	1874	+ });
	1875	+ }
	1876	+ });
	1877	+
	1878	+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/desertmotel.png", !Globals.NIMBUSLAF));
	1879	+ fullsceneButton.setToolTipText("Desert Motel!");
	1880	+ fullsceneButton.addActionListener(new ActionListener()
	1881	+ {
	1882	+ @Override
	1883	+ public void actionPerformed(ActionEvent e)
	1884	+ {
	1885	+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/DesertMotel.gfd", new iCallBack()
	1886	+ {
	1887	+
	1888	+ public void Callback(Object obj)
	1889	+ {
	1890	+ LoadIt(obj);
	1891	+ }
	1892	+
	1893	+ public void DragGesture()
	1894	+ {
	1895	+ }
	1896	+ });
	1897	+ }
	1898	+ });
	1899	+
	1900	+ fullscenePanel.Return();
	1901	+
	1902	+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/london.png", !Globals.NIMBUSLAF));
	1903	+ fullsceneButton.setToolTipText("Old London!");
	1904	+ fullsceneButton.addActionListener(new ActionListener()
	1905	+ {
	1906	+ @Override
	1907	+ public void actionPerformed(ActionEvent e)
	1908	+ {
	1909	+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/oldlondon.gfd", new iCallBack()
	1910	+ {
	1911	+
	1912	+ public void Callback(Object obj)
	1913	+ {
	1914	+ LoadIt(obj);
	1915	+ }
	1916	+
	1917	+ public void DragGesture()
	1918	+ {
	1919	+ }
	1920	+ });
	1921	+ }
	1922	+ });
	1923	+
	1924	+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/skullcove.png", !Globals.NIMBUSLAF));
	1925	+ fullsceneButton.setToolTipText("Skull Cove Island!");
	1926	+ fullsceneButton.addActionListener(new ActionListener()
	1927	+ {
	1928	+ @Override
	1929	+ public void actionPerformed(ActionEvent e)
	1930	+ {
	1931	+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/SkullCoveIsland.gfd", new iCallBack()
	1932	+ {
	1933	+
	1934	+ public void Callback(Object obj)
	1935	+ {
	1936	+ LoadIt(obj);
	1937	+ }
	1938	+
	1939	+ public void DragGesture()
	1940	+ {
	1941	+ }
	1942	+ });
	1943	+ }
	1944	+ });
	1945	+
	1946	+ fullscenePanel.Return();
	1947	+
	1948	+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/tuscany.png", !Globals.NIMBUSLAF));
	1949	+ fullsceneButton.setToolTipText("Tuscany!");
	1950	+ fullsceneButton.addActionListener(new ActionListener()
	1951	+ {
	1952	+ @Override
	1953	+ public void actionPerformed(ActionEvent e)
	1954	+ {
	1955	+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/Tuscany.gfd", new iCallBack()
	1956	+ {
	1957	+
	1958	+ public void Callback(Object obj)
	1959	+ {
	1960	+ LoadIt(obj);
	1961	+ }
	1962	+
	1963	+ public void DragGesture()
	1964	+ {
	1965	+ }
	1966	+ });
	1967	+ }
	1968	+ });
	1969	+
	1970	+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/venice.png", !Globals.NIMBUSLAF));
	1971	+ fullsceneButton.setToolTipText("Venice!");
	1972	+ fullsceneButton.addActionListener(new ActionListener()
	1973	+ {
	1974	+ @Override
	1975	+ public void actionPerformed(ActionEvent e)
	1976	+ {
	1977	+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/Venice.gfd", new iCallBack()
	1978	+ {
	1979	+
	1980	+ public void Callback(Object obj)
	1981	+ {
	1982	+ LoadIt(obj);
	1983	+ }
	1984	+
	1985	+ public void DragGesture()
	1986	+ {
	1987	+ }
	1988	+ });
	1989	+ }
	1990	+ });
	1991	+
	1992	+ fullscenePanel.Return();
	1993	+
	1994	+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/viking.png", !Globals.NIMBUSLAF));
	1995	+ fullsceneButton.setToolTipText("Viking Village!");
	1996	+ fullsceneButton.addActionListener(new ActionListener()
	1997	+ {
	1998	+ @Override
	1999	+ public void actionPerformed(ActionEvent e)
	2000	+ {
	2001	+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/VikingVillage.gfd", new iCallBack()
	2002	+ {
	2003	+
	2004	+ public void Callback(Object obj)
	2005	+ {
	2006	+ LoadIt(obj);
	2007	+ }
	2008	+
	2009	+ public void DragGesture()
	2010	+ {
	2011	+ }
	2012	+ });
	2013	+ }
	2014	+ });
	2015	+
	2016	+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/yvoire.png", !Globals.NIMBUSLAF));
	2017	+ fullsceneButton.setToolTipText("Yvoire!");
	2018	+ fullsceneButton.addActionListener(new ActionListener()
	2019	+ {
	2020	+ @Override
	2021	+ public void actionPerformed(ActionEvent e)
	2022	+ {
	2023	+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/Yvoire.gfd", new iCallBack()
	2024	+ {
	2025	+
	2026	+ public void Callback(Object obj)
	2027	+ {
	2028	+ LoadIt(obj);
	2029	+ }
	2030	+
	2031	+ public void DragGesture()
	2032	+ {
	2033	+ }
	2034	+ });
	2035	+ }
	2036	+ });
	2037	+
	2038	+ fullscenePanel.Return();
	2039	+
	2040	+ fullscenePanel.add(new cGridBag());
	2041	+ fullscenePanel.add(new cGridBag());
	2042	+ fullscenePanel.Return();
	2043	+ fullscenePanel.add(new cGridBag());
	2044	+ fullscenePanel.add(new cGridBag());
	2045	+
	2046	+ sceneTabbedPane.add(optionsPanel);
	2047	+
	2048	+ scenePanel.add(sceneTabbedPane);
1845	2049
1846	2050	cGridBag creditsPanel = new cGridBag().setVertical(true);
1847	2051	creditsPanel.setName("Credits");
..	..	@@ -1930,8 +2134,8 @@
1930	2134	creditsPanel.add(new cGridBag());
1931	2135	}
1932	2136
1933		- tabbedPane.add(creditsPanel);
1934		- tabbedPane.setToolTipTextAt(3, "Credits");
	2137	+ sceneTabbedPane.add(creditsPanel);
	2138	+ sceneTabbedPane.setToolTipTextAt(3, "Credits");
1935	2139
1936	2140	if (Globals.SHOWINFO)
1937	2141	{
..	..	@@ -4128,6 +4332,11 @@
4128	4332	copy.Touch(); // display list issue
4129	4333	objEditor.refreshContents(true); // To show item colors
4130	4334	return;
	4335	+ } else if (event.getSource() == sortCB)
	4336	+ {
	4337	+ copy.sort ^= true;
	4338	+ objEditor.refreshContents();
	4339	+ return;
4131	4340	} else if (event.getSource() == link2masterCB)
4132	4341	{
4133	4342	copy.link2master ^= true;
..	..	@@ -4402,13 +4611,13 @@
4402	4611	if (copy == Grafreed.grafreed.universe)
4403	4612	{
4404	4613	CreateCameras();
4405		- cameraView.SetCamera(GetCamera(copy, 0));
	4614	+ cameraView.SetCamera(GetCamera(copy, 0), true);
4406	4615	cameraView.SetLight(GetCamera(copy, 4));
4407	4616	}
4408	4617
4409	4618	ResetModel();
4410	4619
4411		- DuplicateVersion();
	4620	+ //DuplicateVersion();
4412	4621
4413	4622	this.SetVersionStates();
4414	4623	objEditor.refreshContents();
..	..	@@ -4552,7 +4761,7 @@
4552	4761
4553	4762	SetVersionStates();
4554	4763
4555		- SetCameras();
	4764	+ SetCameras(false);
4556	4765	}
4557	4766
4558	4767	public boolean DuplicateVersion() // boolean user)
..	..	@@ -4801,7 +5010,7 @@
4801	5010
4802	5011	SetVersionStates();
4803	5012
4804		- SetCameras();
	5013	+ SetCameras(false);
4805	5014
4806	5015	return true;
4807	5016	}
..	..	@@ -4823,7 +5032,7 @@
4823	5032
4824	5033	SetVersionStates();
4825	5034
4826		- SetCameras();
	5035	+ SetCameras(false);
4827	5036
4828	5037	return true;
4829	5038	}
..	..	@@ -4834,7 +5043,8 @@
4834	5043
4835	5044	//cRadio tab = GetCurrentTab();
4836	5045
4837		- if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	5046	+ // < 0 means == -2 \|\| == -1
	5047	+ if (copy.versionindex < 0 \|\| copy.versionlist[copy.versionindex] == null)
4838	5048	{
4839	5049	// No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
4840	5050	return false;
..	..	@@ -4867,33 +5077,39 @@
4867	5077
4868	5078	SetVersionStates();
4869	5079
4870		- SetCameras();
	5080	+ SetCameras(false);
4871	5081	}
4872	5082
4873		- void SetCameras()
	5083	+ void SetCameras(boolean set)
4874	5084	{
4875	5085	if (copy == Grafreed.grafreed.universe)
4876	5086	{
4877	5087	Camera neweye = (Camera)copy.GetObject(cameraView.cameras[cameraView.cameracount^1].GetUUID());
4878	5088	Camera newlight = (Camera)copy.GetObject(cameraView.LightCamera().GetUUID());
4879	5089
4880		- cameraView.SetCamera(neweye);
	5090	+ cameraView.SetCamera(neweye, set);
4881	5091	cameraView.SetLight(newlight);
4882	5092	}
4883	5093	}
4884		-
	5094	+
	5095	+ void ImportGFD(String url)
	5096	+ {
	5097	+ objEditor.ReadGFD(url, objEditor);
	5098	+ }
	5099	+
4885	5100	void ImportGFD()
4886	5101	{
4887	5102	FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4888		- browser.show();
	5103	+ browser.setVisible(true);
4889	5104	String filename = browser.getFile();
4890	5105	if (filename != null && filename.length() > 0)
4891	5106	{
4892	5107	String fullname = browser.getDirectory() + filename;
4893	5108
4894	5109	//Object3D readobj =
4895		- objEditor.ReadGFD(fullname, objEditor);
	5110	+ // objEditor.ReadGFD(fullname, objEditor);
4896	5111	//makeSomething(readobj);
	5112	+ ImportGFD(fullname);
4897	5113	}
4898	5114	}
4899	5115
..	..	@@ -5234,7 +5450,7 @@
5234	5450	copy.versionindex = version;
5235	5451	CopyChanged(copy);
5236	5452	SetVersionStates();
5237		- SetCameras();
	5453	+ SetCameras(false);
5238	5454	}
5239	5455
5240	5456	return;
..	..	@@ -5499,7 +5715,7 @@
5499	5715	interest.y = k * interest.y + (1 - k) * height;
5500	5716	}
5501	5717
5502		- CameraPane.zoomonce = true;
	5718	+ // CameraPane.zoomonce = true;
5503	5719
5504	5720	// june 2014
5505	5721	Camera parentcam = cameraView.manipCamera;
..	..	@@ -5573,7 +5789,7 @@
5573	5789
5574	5790	objEditor.ScreenFit(obj, false);
5575	5791
5576		- cameraView.pingthread.StepToTarget(true); // aout 2013
	5792	+ cameraView.pingthread.StepToTarget(); //true); // aout 2013
5577	5793	refreshContents();
5578	5794	}
5579	5795
..	..	@@ -5850,10 +6066,27 @@
5850	6066	{
5851	6067	Object3D readobj = null;
5852	6068
	6069	+ java.net.URL url = null;
	6070	+
	6071	+ try
	6072	+ {
	6073	+ url = new java.net.URL(fullname);
	6074	+ } catch (Exception e)
	6075	+ {
	6076	+ try
	6077	+ {
	6078	+ url = new java.net.URL("file:///" + fullname);
	6079	+ } catch (Exception e2)
	6080	+ {
	6081	+ e2.printStackTrace();
	6082	+ }
	6083	+ }
	6084	+
5853	6085	try
5854	6086	{
5855	6087	// Try compressed version first.
5856		- java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	6088	+ java.io.InputStream istream //= new java.io.FileInputStream(fullname);
	6089	+ = url.openStream();
5857	6090	java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
5858	6091	java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
5859	6092
..	..	@@ -5868,7 +6101,8 @@
5868	6101
5869	6102	try
5870	6103	{
5871		- java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	6104	+ java.io.InputStream istream //= new java.io.FileInputStream(fullname);
	6105	+ = url.openStream();
5872	6106	java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
5873	6107
5874	6108	readobj = (Object3D) p.readObject();
..	..	@@ -5966,12 +6200,11 @@
5966	6200	// // oct 2012 if(cam.parent == null)
5967	6201	// cam.parent = copy.get(0); // cams;
5968	6202	// }
5969		- cameraView.SetCamera((Camera) cams.get(0));
5970		- // MAJOR CRASH!!
5971		- cameraView.SetLight((Camera) cams.get(4));
5972		- topView.SetCamera((Camera) cams.get(1));
5973		- frontView.SetCamera((Camera) cams.get(2));
5974		- sideView.SetCamera((Camera) cams.get(3));
	6203	+ cameraView.SetCamera((Camera) cams.get(0), true);
	6204	+ cameraView.SetLight((Camera) cams.get(4)); // MAJOR CRASH!!
	6205	+ topView.SetCamera((Camera) cams.get(1), true);
	6206	+ frontView.SetCamera((Camera) cams.get(2), true);
	6207	+ sideView.SetCamera((Camera) cams.get(3), true);
5975	6208
5976	6209	// copy.get(0).clear();
5977	6210	// copy.get(0).addAll(cams);
..	..	@@ -6026,7 +6259,7 @@
6026	6259	if (Grafreed.standAlone)
6027	6260	{
6028	6261	FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
6029		- browser.show();
	6262	+ browser.setVisible(true);
6030	6263	String filename = browser.getFile();
6031	6264	if (filename != null && filename.length() > 0)
6032	6265	{
..	..	@@ -6350,6 +6583,7 @@
6350	6583	cGridBag materialPanel;
6351	6584	cGridBag ctrlPanel;
6352	6585	cGridBag figurePanel;
	6586	+ cGridBag fullscenePanel;
6353	6587
6354	6588	JScrollPane infoPanel;
6355	6589