~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -72,6 +72,21 @@
72	72	}
73	73	}
74	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	+
75	90	public cGridBag GetSeparator()
76	91	{
77	92	cGridBag separator = new cGridBag();
..	..	@@ -119,8 +134,14 @@
119	134
120	135	try
121	136	{
122		- BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
123		-
	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	+
124	145	// if (image.getWidth() > 48 && image.getHeight() > 48)
125	146	// {
126	147	// BufferedImage resized = new BufferedImage(48, 48, image.getType());
..	..	@@ -295,6 +316,8 @@
295	316	objEditor.ctrlPanel.remove(setupPanel2);
296	317	objEditor.ctrlPanel.remove(objectCommandsPanel);
297	318	objEditor.ctrlPanel.remove(pushPanel);
	319	+ if (versionPanel != null)
	320	+ objEditor.ctrlPanel.remove(versionPanel);
298	321	//objEditor.ctrlPanel.remove(fillPanel);
299	322
300	323	//Remove(normalpushField);
..	..	@@ -362,14 +385,6 @@
362	385	client = inClient;
363	386	copy = client;
364	387
365		- if (copy.versionlist == null)
366		- {
367		- copy.versionlist = new Object3D[100];
368		- copy.versionindex = -1;
369		-
370		-// Save(true);
371		- }
372		-
373	388	SetupUI2(callee.GetEditor());
374	389	}
375	390
..	..	@@ -445,8 +460,11 @@
445	460	importOBJItem.addActionListener(this);
446	461	import3DSItem = menu.add(new MenuItem("3DS file..."));
447	462	import3DSItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
448	465	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449	466	importVRMLX3DItem.addActionListener(this);
	467	+ }
450	468	menu.add("-");
451	469	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
452	470	importGFDItem.addActionListener(this);
..	..	@@ -1147,6 +1165,7 @@
1147	1165	cGridBag setupPanel2;
1148	1166	cGridBag objectCommandsPanel;
1149	1167	cGridBag pushPanel;
	1168	+ cGridBag versionPanel;
1150	1169	cGridBag fillPanel;
1151	1170
1152	1171	JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
..	..	@@ -1393,9 +1412,14 @@
1393	1412	oe.ctrlPanel.add(objectCommandsPanel);
1394	1413	oe.ctrlPanel.Return();
1395	1414
1396		- 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
1397	1416	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1398		- //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	+ }
1399	1423
1400	1424	oe.ctrlPanel.Return();
1401	1425
..	..	@@ -1550,23 +1574,9 @@
1550	1574
1551	1575	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1552	1576	{
1553		- if (Globals.DEBUG)
1554		- System.out.println("CREATE CAMERAS");
1555		- cams = new cTemplate();
1556		- cams.name = "Cameras";
1557		- copy.insertElementAt(cams, 0);
1558		- //cams.parent = copy;
1559		-
1560		- cam = new Camera(); // LA.newVector(3, 2, 1));
1561		- cams.addChild(cam);
1562		- cam = new Camera(1);
1563		- cams.addChild(cam);
1564		- cam = new Camera(2);
1565		- cams.addChild(cam);
1566		- cam = new Camera(3);
1567		- cams.addChild(cam);
1568		- cam = new Camera(4); // Light
1569		- cams.addChild(cam);
	1577	+ if (Globals.DEBUG)
	1578	+ System.out.println("CREATE CAMERAS");
	1579	+ cams = CreateCameras();
1570	1580	} else
1571	1581	{
1572	1582	cams = (cGroup) copy.get(0);
..	..	@@ -1718,24 +1728,24 @@
1718	1728
1719	1729	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1720	1730	//tmp.setName("Edit");
	1731	+ objectPanel.add(skyboxPanel);
	1732	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1733	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1734	+
1721	1735	objectPanel.add(toolboxPanel);
1722		- objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1723		- objectPanel.setToolTipTextAt(0, "Objects & textures");
	1736	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1737	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1724	1738
1725	1739	objectPanel.add(materialPanel);
1726		- objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1727		- objectPanel.setToolTipTextAt(1, "Material");
	1740	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1741	+ objectPanel.setToolTipTextAt(2, "Material");
1728	1742
1729		- objectPanel.add(skyboxPanel);
1730		- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1731		- objectPanel.setToolTipTextAt(2, "Backgrounds");
1732		-
1733	1743	// JPanel north = new JPanel(new BorderLayout());
1734	1744	// north.setName("Edit");
1735	1745	// north.add(ctrlPanel, BorderLayout.NORTH);
1736	1746	// objectPanel.add(north);
1737	1747	objectPanel.add(editPanel);
1738		- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1748	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1739	1749	objectPanel.setToolTipTextAt(3, "Edit controls");
1740	1750
1741	1751	objectPanel.add(transformPanel);
..	..	@@ -1744,7 +1754,7 @@
1744	1754
1745	1755	patchMaterial = true;
1746	1756	cameraView.patchMaterial = this;
1747		- objectPanel.setSelectedIndex(1);
	1757	+ objectPanel.setSelectedIndex(2);
1748	1758
1749	1759	/*
1750	1760	aConstraints.gridx = 0;
..	..	@@ -1765,7 +1775,7 @@
1765	1775	scrollpane.addMouseWheelListener(this); // Default not fast enough
1766	1776
1767	1777	/JTabbedPane/ scenePanel = new cGridBag();
1768		- scenePanel.preferredWidth = 6;
	1778	+ scenePanel.preferredWidth = 5;
1769	1779
1770	1780	JTabbedPane tabbedPane = new JTabbedPane();
1771	1781	tabbedPane.add(scrollpane);
..	..	@@ -1785,14 +1795,14 @@
1785	1795	cGridBag creditsPanel = new cGridBag().setVertical(true);
1786	1796	creditsPanel.setName("Credits");
1787	1797
1788		- cLabel ogaLabel = new cLabel(" Most Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1798	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
1789	1799	creditsPanel.add(ogaLabel);
1790	1800
1791		- cButton opengameartButton;
1792		- creditsPanel.add(opengameartButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
1793		- opengameartButton.setToolTipText("https://opengameart.org");
	1801	+ cButton creditButton;
	1802	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1803	+ creditButton.setToolTipText("https://opengameart.org");
1794	1804
1795		- opengameartButton.addMouseListener(new MouseAdapter()
	1805	+ creditButton.addMouseListener(new MouseAdapter()
1796	1806	{
1797	1807	public void mouseClicked(MouseEvent e)
1798	1808	{
..	..	@@ -1807,7 +1817,64 @@
1807	1817	}
1808	1818	});
1809	1819
1810		- for (int i=10; --i>=0;)
	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;)
1811	1878	{
1812	1879	creditsPanel.add(new cGridBag());
1813	1880	}
..	..	@@ -1817,9 +1884,9 @@
1817	1884
1818	1885	if (Globals.ADVANCED)
1819	1886	{
1820		- tabbedPane.add(infoPanel);
1821		- tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
1822		- tabbedPane.setToolTipTextAt(4, "Information");
	1887	+ objectPanel.add(infoPanel);
	1888	+ objectPanel.setIconAt(5, GetIcon("icons/info.png"));
	1889	+ objectPanel.setToolTipTextAt(4, "Information");
1823	1890	}
1824	1891
1825	1892	/*
..	..	@@ -2303,7 +2370,7 @@
2303	2370	{
2304	2371	public void mouseClicked(MouseEvent e)
2305	2372	{
2306		- borderfadeField.setFloat(0.5);
	2373	+ borderfadeField.setFloat(0.4);
2307	2374	opacityField.setFloat(0.75);
2308	2375
2309	2376	materialtouched = true;
..	..	@@ -2362,13 +2429,55 @@
2362	2429	cameraField.setFloat(0.001);
2363	2430	specularField.setFloat(0.001);
2364	2431	fakedepthField.setFloat(0.001);
2365		- opacityField.setFloat(0.6);
	2432	+ opacityField.setFloat(0.4);
2366	2433
2367	2434	materialtouched = true;
2368	2435	applySelf();
2369	2436	}
2370	2437	});
2371	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);
2372	2481
2373	2482	cGridBag panel = new cGridBag().setVertical(true);
2374	2483
..	..	@@ -2615,6 +2724,12 @@
2615	2724	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
2616	2725	colorSection.add(backlit);
2617	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	+
2618	2733	//panel.add(new JSeparator());
2619	2734
2620	2735	//panel.add(globalSection);
..	..	@@ -3666,6 +3781,7 @@
3666	3781	shadowField.setFloat(mat.shadow);
3667	3782	textureField.setFloat(mat.texture);
3668	3783	opacityField.setFloat(mat.opacity);
	3784	+ parallaxField.setFloat(mat.parallax + 0.125f);
3669	3785	fakedepthField.setFloat(mat.fakedepth);
3670	3786	shadowbiasField.setFloat(mat.shadowbias);
3671	3787	bumpField.setInteger(1); // dec 2013
..	..	@@ -3959,6 +4075,7 @@
3959	4075	} else if (event.getSource() == link2masterCB)
3960	4076	{
3961	4077	copy.link2master ^= true;
	4078	+ objEditor.refreshContents();
3962	4079	return;
3963	4080	}
3964	4081	if (event.getSource() == randomCB)
..	..	@@ -4206,8 +4323,12 @@
4206	4323
4207	4324	copy.selection.clear();
4208	4325
	4326	+ if (copy == Grafreed.grafreed.universe)
	4327	+ {
	4328	+ CreateCameras();
	4329	+ cameraView.SetCamera(GetCamera(copy, 0));
	4330	+ }
4209	4331	ResetModel();
4210		- SetupViews();
4211	4332	objEditor.refreshContents();
4212	4333	}
4213	4334
..	..	@@ -4345,7 +4466,7 @@
4345	4466	copy.versionindex -= 1;
4346	4467
4347	4468	if (copy.versionindex != -1)
4348		- CopyChanged();
	4469	+ CopyChanged(copy);
4349	4470
4350	4471	SetVersionStates();
4351	4472	}
..	..	@@ -4355,7 +4476,11 @@
4355	4476	System.err.println("Save");
4356	4477	Replace();
4357	4478
4358		- //cRadio tab = GetCurrentTab();
	4479	+ if (copy.versionlist == null)
	4480	+ {
	4481	+ copy.versionlist = new Object3D[100];
	4482	+ copy.versionindex = -1;
	4483	+ }
4359	4484
4360	4485	Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4361	4486
..	..	@@ -4423,20 +4548,20 @@
4423	4548	{
4424	4549	Object3D selection = new Object3D();
4425	4550
4426		- for (int i = 0; i < copy.selection.size(); i++)
	4551	+ for (int i = 0; i < objEditor.copy.selection.size(); i++)
4427	4552	{
4428		- Object3D elem = copy.selection.elementAt(i);
	4553	+ Object3D elem = objEditor.copy.selection.elementAt(i);
4429	4554
4430		- Object3D obj = copy.GetObject(elem.GetUUID());
	4555	+ Object3D obj = objEditor.copy.GetObject(elem.GetUUID());
4431	4556
4432	4557	if (obj == null)
4433	4558	{
4434		- copy.selection.remove(i--);
	4559	+ objEditor.copy.selection.remove(i--);
4435	4560	}
4436	4561	else
4437	4562	{
4438	4563	selection.add(obj);
4439		- copy.selection.setElementAt(obj, i);
	4564	+ objEditor.copy.selection.setElementAt(obj, i);
4440	4565	}
4441	4566	}
4442	4567
..	..	@@ -4449,44 +4574,43 @@
4449	4574	//refreshContents(false);
4450	4575	}
4451	4576
4452		- void CopyChanged()
	4577	+ void CopyChanged(Object3D changed)
4453	4578	{
4454		- Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4455		-
4456		- SetVersionStates();
	4579	+ Object3D obj = (Object3D)Grafreed.clone(changed.versionlist[copy.versionindex]);
4457	4580
4458	4581	boolean temp = CameraPane.SWITCH;
4459	4582	CameraPane.SWITCH = false;
4460	4583
4461		- copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	4584	+ changed.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4462	4585
4463		- copy.clear();
	4586	+ changed.clear();
4464	4587
4465		- copy.skyboxname = obj.skyboxname;
4466		- copy.skyboxext = obj.skyboxext;
	4588	+ changed.skyboxname = obj.skyboxname;
	4589	+ changed.skyboxext = obj.skyboxext;
4467	4590
4468	4591	for (int i=0; i<obj.Size(); i++)
4469	4592	{
4470		- copy.add(obj.get(i));
	4593	+ changed.add(obj.get(i));
4471	4594	}
4472	4595
4473		- copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	4596	+ changed.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4474	4597
4475	4598	CameraPane.SWITCH = temp;
4476	4599
4477		- RefreshSelection();
	4600	+ if (objEditor == this)
	4601	+ RefreshSelection();
4478	4602	//assert(hashtable.isEmpty());
4479	4603
4480		- copy.Touch();
	4604	+ objEditor.copy.Touch();
4481	4605
4482	4606	ResetModel();
4483		- copy.HardTouch(); // recompile?
	4607	+ objEditor.copy.HardTouch(); // recompile?
4484	4608
4485	4609	cRadio ab;
4486		- for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4610	+ for (java.util.Enumeration e = objEditor.buttonGroup.getElements(); e.hasMoreElements();)
4487	4611	{
4488	4612	ab = (cRadio)e.nextElement();
4489		- Object3D test = copy.GetObject(ab.object.GetUUID());
	4613	+ Object3D test = objEditor.copy.GetObject(ab.object.GetUUID());
4490	4614	//ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
4491	4615	if (test != null)
4492	4616	{
..	..	@@ -4495,7 +4619,7 @@
4495	4619	}
4496	4620	}
4497	4621
4498		- refreshContents(true);
	4622	+ objEditor.refreshContents(true);
4499	4623	}
4500	4624
4501	4625	cButton previousVersionButton;
..	..	@@ -4509,15 +4633,7 @@
4509	4633
4510	4634	int VersionCount()
4511	4635	{
4512		- int count = 0;
4513		-
4514		- for (int i = copy.versionlist.length; --i >= 0;)
4515		- {
4516		- if (copy.versionlist[i] != null)
4517		- count++;
4518		- }
4519		-
4520		- return count;
	4636	+ return copy.VersionCount();
4521	4637	}
4522	4638
4523	4639	public cGridBag versionSliderPane;
..	..	@@ -4529,7 +4645,7 @@
4529	4645
4530	4646	//cRadio tab = GetCurrentTab();
4531	4647
4532		- if (copy.versionlist == null)
	4648	+ if (copy.versionindex == -2)
4533	4649	{
4534	4650	saveVersionButton.setEnabled(false);
4535	4651	restoreButton.setEnabled(false);
..	..	@@ -4591,7 +4707,9 @@
4591	4707
4592	4708	copy.versionindex -= 1;
4593	4709
4594		- CopyChanged();
	4710	+ CopyChanged(copy);
	4711	+
	4712	+ SetVersionStates();
4595	4713
4596	4714	return true;
4597	4715	}
..	..	@@ -4609,7 +4727,9 @@
4609	4727	}
4610	4728
4611	4729	//CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4612		- CopyChanged();
	4730	+ CopyChanged(copy);
	4731	+
	4732	+ SetVersionStates();
4613	4733
4614	4734	return true;
4615	4735	}
..	..	@@ -4646,10 +4766,12 @@
4646	4766
4647	4767	copy.versionindex += 1;
4648	4768
4649		- CopyChanged();
	4769	+ CopyChanged(copy);
4650	4770
4651	4771	//if (!tab.user[tab.versionindex])
4652	4772	// tab.graphs[tab.versionindex] = null;
	4773	+
	4774	+ SetVersionStates();
4653	4775	}
4654	4776
4655	4777	void ImportGFD()
..	..	@@ -4886,6 +5008,7 @@
4886	5008	current.shadow = (float) shadowField.getFloat();
4887	5009	current.texture = (float) textureField.getFloat();
4888	5010	current.opacity = (float) opacityField.getFloat();
	5011	+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
4889	5012	current.fakedepth = (float) fakedepthField.getFloat();
4890	5013	current.shadowbias = (float) shadowbiasField.getFloat();
4891	5014
..	..	@@ -4940,6 +5063,8 @@
4940	5063	textureField.SetToolTipValue((mat.texture));
4941	5064	if (!Equal(opacityField.getFloat(), mat.opacity))
4942	5065	opacityField.SetToolTipValue((mat.opacity));
	5066	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5067	+ parallaxField.SetToolTipValue((mat.parallax));
4943	5068	if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
4944	5069	fakedepthField.SetToolTipValue((mat.fakedepth));
4945	5070	if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
..	..	@@ -4975,6 +5100,7 @@
4975	5100	}
4976	5101
4977	5102	cNumberSlider versionSlider;
	5103	+ cNumberSlider versionField;
4978	5104
4979	5105	public void stateChanged(ChangeEvent e)
4980	5106	{
..	..	@@ -4991,12 +5117,26 @@
4991	5117	if (version != -1 && copy.versionlist[version] != null)
4992	5118	{
4993	5119	copy.versionindex = version;
4994		- CopyChanged();
	5120	+ CopyChanged(copy);
	5121	+ SetVersionStates();
4995	5122	}
4996	5123
4997	5124	return;
4998	5125	}
4999	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	+
5000	5140	if (freezematerial)
5001	5141	{
5002	5142	return;
..	..	@@ -5086,7 +5226,7 @@
5086	5226	}
5087	5227
5088	5228	if (normalpushField != null)
5089		- copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
	5229	+ copy.NORMALPUSH = (float)normalpushField.getFloat() / 100;
5090	5230	}
5091	5231
5092	5232	void SnapObject()
..	..	@@ -5460,7 +5600,7 @@
5460	5600	void ResetModel()
5461	5601	{
5462	5602	//assert(copy instanceof Composite);
5463		- Object3D /Composite/ group = (Object3D /Composite/) copy;
	5603	+ Object3D /Composite/ group = (Object3D /Composite/) objEditor.copy;
5464	5604
5465	5605	// necessary? group.selection = new Object3D(); // java.util.Vector();
5466	5606
..	..	@@ -5471,14 +5611,14 @@
5471	5611	//group.refreshEditWindow();
5472	5612	//refreshContents();
5473	5613
5474		- if (copy.selection == null)
	5614	+ if (objEditor.copy.selection == null)
5475	5615	{
5476		- copy.selection = new Object3D();
	5616	+ objEditor.copy.selection = new Object3D();
5477	5617	}
5478	5618
5479		- for (int j = 0; j < copy.selection.size(); j++)
	5619	+ for (int j = 0; j < objEditor.copy.selection.size(); j++)
5480	5620	{
5481		- Object3D item = copy.selection.get(j);
	5621	+ Object3D item = objEditor.copy.selection.get(j);
5482	5622
5483	5623	if (item instanceof cGroup && ((cGroup) item).transientlink)
5484	5624	{
..	..	@@ -5487,15 +5627,15 @@
5487	5627
5488	5628	if (item.count <= 1) // ??? == 0)
5489	5629	{
5490		- copy.selection.remove(item);
	5630	+ objEditor.copy.selection.remove(item);
5491	5631	}
5492	5632	}
5493	5633
5494	5634	boolean first = true;
5495	5635
5496		- for (int i = copy.selection.size(); --i >= 0;)
	5636	+ for (int i = objEditor.copy.selection.size(); --i >= 0;)
5497	5637	{
5498		- Object3D item = copy.selection.get(i);
	5638	+ Object3D item = objEditor.copy.selection.get(i);
5499	5639
5500	5640	if (item instanceof cGroup && ((cGroup) item).transientlink)
5501	5641	{
..	..	@@ -6196,6 +6336,8 @@
6196	6336	cNumberSlider textureField;
6197	6337	JLabel opacityLabel;
6198	6338	cNumberSlider opacityField;
	6339	+ JLabel parallaxLabel;
	6340	+ cNumberSlider parallaxField;
6199	6341	JLabel fakedepthLabel;
6200	6342	cNumberSlider fakedepthField;
6201	6343	JLabel shadowbiasLabel;