~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)
	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)
..	..	@@ -77,7 +109,7 @@
77	109
78	110	static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
79	111
80		- ImageIcon GetIcon(String name)
	112	+ static ImageIcon GetIcon(String name)
81	113	{
82	114	javax.swing.ImageIcon iconCache = icons.get(name);
83	115	if (iconCache != null)
..	..	@@ -87,7 +119,7 @@
87	119
88	120	try
89	121	{
90		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	122	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
91	123
92	124	// if (image.getWidth() > 48 && image.getHeight() > 48)
93	125	// {
..	..	@@ -359,7 +391,8 @@
359	391	//parent = p;
360	392
361	393	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
362		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	394	+ if (Globals.DEBUG)
	395	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
363	396	//gd.setFullScreenWindow(this);
364	397	//setResizable(false);
365	398	//if (!isDisplayable())
..	..	@@ -396,6 +429,9 @@
396	429
397	430	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
398	431
	432	+ // This is to refresh the UI of the material panel.
	433	+ boolean patchMaterial;
	434	+
399	435	void SetupMenu()
400	436	{
401	437	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -921,18 +957,29 @@
921	957	boolean temp = CameraPane.SWITCH;
922	958	CameraPane.SWITCH = false;
923	959
924		- 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);
925	964	// if (copy == client)
926	965
927	966	Object3D versions[] = object.versionlist;
	967	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
928	968	object.versionlist = null;
	969	+ object.versiontable = null;
	970	+
	971	+ Object3D parent = object.parent;
	972	+ object.parent = null;
929	973
930	974	//byte[] compress = Compress(copy);
931	975	Object3D compress = (Object3D)Grafreed.clone(object);
932	976
933		- object.versionlist = versions;
	977	+ object.parent = parent;
934	978
935		- object.RestoreBigData(versiontable);
	979	+ object.versionlist = versions;
	980	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	981	+
	982	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
936	983
937	984	CameraPane.SWITCH = temp;
938	985
..	..	@@ -1294,14 +1341,14 @@
1294	1341
1295	1342	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1296	1343	liveCB.setToolTipText("Animate object");
	1344	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1345	+ markCB.setToolTipText("Set target transform");
1297	1346	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1298	1347	selectableCB.setToolTipText("Make object selectable");
1299	1348	// Return();
1300	1349
1301	1350	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1302	1351	hideCB.setToolTipText("Hide object");
1303		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1304		- markCB.setToolTipText("As animation target transform");
1305	1352
1306	1353	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1307	1354
..	..	@@ -1503,6 +1550,7 @@
1503	1550
1504	1551	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1505	1552	{
	1553	+ if (Globals.DEBUG)
1506	1554	System.out.println("CREATE CAMERAS");
1507	1555	cams = new cTemplate();
1508	1556	cams.name = "Cameras";
..	..	@@ -1584,6 +1632,42 @@
1584	1632	//frontView.object = copy;
1585	1633	//sideView.object = copy;
1586	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", !Grafreed.NIMBUSLAF);
	1642	+ resetTransform.addMouseListener(new MouseAdapter()
	1643	+ {
	1644	+ public void mouseClicked(MouseEvent e)
	1645	+ {
	1646	+ ResetTransform();
	1647	+ }
	1648	+ });
	1649	+ resetTransformPanel.add(resetTransform);
	1650	+
	1651	+ resetTransform = GetButton("T only", !Grafreed.NIMBUSLAF);
	1652	+ resetTransform.addMouseListener(new MouseAdapter()
	1653	+ {
	1654	+ public void mouseClicked(MouseEvent e)
	1655	+ {
	1656	+ ResetTransform(1);
	1657	+ }
	1658	+ });
	1659	+ resetTransformPanel.add(resetTransform);
	1660	+
	1661	+ resetTransform = GetButton("RS only", !Grafreed.NIMBUSLAF);
	1662	+ resetTransform.addMouseListener(new MouseAdapter()
	1663	+ {
	1664	+ public void mouseClicked(MouseEvent e)
	1665	+ {
	1666	+ ResetTransform(2);
	1667	+ }
	1668	+ });
	1669	+ resetTransformPanel.add(resetTransform);
	1670	+
1587	1671	XYZPanel = new cGridBag().setVertical(true);
1588	1672	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1589	1673
..	..	@@ -1593,6 +1677,9 @@
1593	1677	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1594	1678	//XYZPanel.setName("XYZ");
1595	1679
	1680	+ transformPanel.add(resetTransformPanel);
	1681	+ transformPanel.add(XYZPanel);
	1682	+
1596	1683	/*
1597	1684	gridPanel = new JPanel(); //new BorderLayout());
1598	1685	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1600,12 +1687,12 @@
1600	1687	gridPanel.add(cameraView);
1601	1688	gridPanel.add(XYZPanel);
1602	1689	*/
1603		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1604		- gridPanel.setContinuousLayout(true);
1605		- gridPanel.setOneTouchExpandable(true);
1606		- gridPanel.setDividerLocation(1.0);
1607		- gridPanel.setDividerSize(9);
1608		- gridPanel.setResizeWeight(0.85);
	1690	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1691	+// gridPanel.setContinuousLayout(true);
	1692	+// gridPanel.setOneTouchExpandable(true);
	1693	+// gridPanel.setDividerLocation(1.0);
	1694	+// gridPanel.setDividerSize(9);
	1695	+// gridPanel.setResizeWeight(0.85);
1609	1696
1610	1697	// aConstraints.weighty = 0;
1611	1698	//System.out.println("THIS = " + this);
..	..	@@ -1628,14 +1715,14 @@
1628	1715
1629	1716	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1630	1717	//tmp.setName("Edit");
1631		- objectPanel.add(materialPanel);
1632		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1633		- objectPanel.setToolTipTextAt(0, "Material");
1634		-
1635	1718	objectPanel.add(toolboxPanel);
1636		- objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1637		- objectPanel.setToolTipTextAt(1, "Objects & textures");
	1719	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1720	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
1638	1721
	1722	+ objectPanel.add(materialPanel);
	1723	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1724	+ objectPanel.setToolTipTextAt(1, "Material");
	1725	+
1639	1726	objectPanel.add(skyboxPanel);
1640	1727	objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1641	1728	objectPanel.setToolTipTextAt(2, "Backgrounds");
..	..	@@ -1648,10 +1735,14 @@
1648	1735	objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1649	1736	objectPanel.setToolTipTextAt(3, "Edit controls");
1650	1737
1651		- objectPanel.add(XYZPanel);
	1738	+ objectPanel.add(transformPanel);
1652	1739	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1653		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1740	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1654	1741
	1742	+ patchMaterial = true;
	1743	+ cameraView.patchMaterial = this;
	1744	+ objectPanel.setSelectedIndex(1);
	1745	+
1655	1746	/*
1656	1747	aConstraints.gridx = 0;
1657	1748	aConstraints.gridwidth = 1;
..	..	@@ -1671,7 +1762,7 @@
1671	1762	scrollpane.addMouseWheelListener(this); // Default not fast enough
1672	1763
1673	1764	/JTabbedPane/ scenePanel = new cGridBag();
1674		- scenePanel.preferredWidth = 5;
	1765	+ scenePanel.preferredWidth = 6;
1675	1766
1676	1767	JTabbedPane tabbedPane = new JTabbedPane();
1677	1768	tabbedPane.add(scrollpane);
..	..	@@ -1713,13 +1804,13 @@
1713	1804	jtp.add(tree);
1714	1805	*/
1715	1806
1716		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1717		- bigPanel.setContinuousLayout(true);
1718		- bigPanel.setOneTouchExpandable(true);
1719		- bigPanel.setDividerLocation(0.8);
1720		- bigPanel.setDividerSize(15);
1721		- bigPanel.setResizeWeight(0.15);
1722		- bigPanel.setName("Scene");
	1807	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1808	+// bigPanel.setContinuousLayout(true);
	1809	+// bigPanel.setOneTouchExpandable(true);
	1810	+// bigPanel.setDividerLocation(0.8);
	1811	+// bigPanel.setDividerSize(15);
	1812	+// bigPanel.setResizeWeight(0.15);
	1813	+// bigPanel.setName("Scene");
1723	1814
1724	1815	//bigPanel.setLayout(new BorderLayout());
1725	1816	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1789,7 +1880,7 @@
1789	1880
1790	1881	frame.getContentPane().setLayout(new BorderLayout());
1791	1882	/**/
1792		- JTabbedPane worldPane = new JTabbedPane();
	1883	+ //JTabbedPane worldPane = new JTabbedPane();
1793	1884	//worldPane.add(bigPanel);
1794	1885	//worldPane.add(worldPanel);
1795	1886	/**/
..	..	@@ -1803,7 +1894,7 @@
1803	1894
1804	1895	cameraView.requestFocusInWindow();
1805	1896
1806		- gridPanel.setDividerLocation(1.0);
	1897	+// gridPanel.setDividerLocation(1.0);
1807	1898
1808	1899	frame.validate();
1809	1900
..	..	@@ -1849,7 +1940,15 @@
1849	1940
1850	1941	// Skin
1851	1942	colorField.setFloat(material.color);
1852		- saturationField.setFloat(material.modulation);
	1943	+ float saturation = material.modulation;
	1944	+
	1945	+ if (!cameraView.Skinshader)
	1946	+ {
	1947	+ saturation /= 1.5;
	1948	+ }
	1949	+
	1950	+ saturationField.setFloat(saturation);
	1951	+
1853	1952	subsurfaceField.setFloat(material.subsurface);
1854	1953	selfshadowField.setFloat(material.diffuseness);
1855	1954	diffusenessField.setFloat(material.factor);
..	..	@@ -2160,6 +2259,21 @@
2160	2259	});
2161	2260	presetpanel.add(bump0);
2162	2261
	2262	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2263	+ borderShader.setToolTipText("Border fade");
	2264	+ borderShader.addMouseListener(new MouseAdapter()
	2265	+ {
	2266	+ public void mouseClicked(MouseEvent e)
	2267	+ {
	2268	+ borderfadeField.setFloat(0.5);
	2269	+ opacityField.setFloat(0.75);
	2270	+
	2271	+ materialtouched = true;
	2272	+ applySelf();
	2273	+ }
	2274	+ });
	2275	+ presetpanel.add(borderShader);
	2276	+
2163	2277	cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2164	2278	halo.setToolTipText("Halo");
2165	2279	halo.addMouseListener(new MouseAdapter()
..	..	@@ -2267,9 +2381,20 @@
2267	2381
2268	2382	cGridBag huepanel = new cGridBag();
2269	2383	cGridBag huelabel = new cGridBag();
2270		- skin = GetLabel("icons/hue.png", false);
2271		- skin.fit = true;
2272		- huelabel.add(skin);
	2384	+ cLabel hue = GetLabel("icons/hue.png", false);
	2385	+ hue.fit = true;
	2386	+
	2387	+ hue.addMouseListener(new MouseAdapter()
	2388	+ {
	2389	+ public void mousePressed(MouseEvent e)
	2390	+ {
	2391	+ int x = e.getX();
	2392	+
	2393	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2394	+ }
	2395	+ });
	2396	+
	2397	+ huelabel.add(hue);
2273	2398	huelabel.preferredWidth = 20;
2274	2399	huepanel.add(new cGridBag()); // Label
2275	2400	huepanel.add(huelabel); // Field/slider
..	..	@@ -3545,32 +3670,8 @@
3545	3670
3546	3671	if (multiplyToggle != null)
3547	3672	multiplyToggle.setSelected(mat.multiply);
3548		-
3549		- assert (object.projectedVertices != null);
3550		-
3551		- if (object.projectedVertices.length <= 2)
3552		- {
3553		- // Side effect...
3554		- Object3D.cVector2[] keep = object.projectedVertices;
3555		- object.projectedVertices = new Object3D.cVector2[3];
3556		- for (int i = 0; i < 3; i++)
3557		- {
3558		- if (i < keep.length)
3559		- {
3560		- object.projectedVertices[i] = keep[i];
3561		- } else
3562		- {
3563		- object.projectedVertices[i] = new Object3D.cVector2();
3564		- }
3565		- /*
3566		- if(keep.length == 0)
3567		- object.projectedVertices[0] = new Object3D.cVector2();
3568		- else
3569		- object.projectedVertices[0] = keep[0];
3570		- object.projectedVertices[1] = new Object3D.cVector2();
3571		- */
3572		- }
3573		- }
	3673	+
	3674	+ AllocProjectedVertices(object);
3574	3675
3575	3676	SetMaterial(mat, object.projectedVertices);
3576	3677	}
..	..	@@ -3880,7 +3981,7 @@
3880	3981	//System.out.println("ObjEditor " + event);
3881	3982	applySelf0(true);
3882	3983	//parent.applySelf();
3883		- objEditor.refreshContents();
	3984	+ // conflicts with requestFocus objEditor.refreshContents();
3884	3985	} else if (source == resetButton)
3885	3986	{
3886	3987	CameraPane.fullreset = true;
..	..	@@ -4192,8 +4293,6 @@
4192	4293	return true;
4193	4294	}
4194	4295
4195		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4196		-
4197	4296	void DeleteVersion()
4198	4297	{
4199	4298	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4201,7 +4300,11 @@
4201	4300	copy.versionlist[i] = copy.versionlist[i+1];
4202	4301	}
4203	4302
4204		- CopyChanged();
	4303	+ if (copy.versionlist[copy.versionindex] == null)
	4304	+ copy.versionindex -= 1;
	4305	+
	4306	+ if (copy.versionindex != -1)
	4307	+ CopyChanged();
4205	4308
4206	4309	SetVersionStates();
4207	4310	}
..	..	@@ -4314,7 +4417,7 @@
4314	4417	boolean temp = CameraPane.SWITCH;
4315	4418	CameraPane.SWITCH = false;
4316	4419
4317		- copy.ExtractBigData(versiontable);
	4420	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4318	4421
4319	4422	copy.clear();
4320	4423
..	..	@@ -4326,7 +4429,7 @@
4326	4429	copy.add(obj.get(i));
4327	4430	}
4328	4431
4329		- copy.RestoreBigData(versiontable);
	4432	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4330	4433
4331	4434	CameraPane.SWITCH = temp;
4332	4435
..	..	@@ -4376,6 +4479,8 @@
4376	4479	return count;
4377	4480	}
4378	4481
	4482	+ public cGridBag versionSliderPane;
	4483	+
4379	4484	void SetVersionStates()
4380	4485	{
4381	4486	//if (true)
..	..	@@ -4383,21 +4488,36 @@
4383	4488
4384	4489	//cRadio tab = GetCurrentTab();
4385	4490
4386		- restoreButton.setEnabled(copy.versionindex != -1);
4387		- replaceButton.setEnabled(copy.versionindex != -1);
4388		-
4389		- previousVersionButton.setEnabled(copy.versionindex > 0);
4390		- nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4391		-
4392		- deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4393		- copy.versionlist[copy.versionindex + 1] != null);
4394		-
4395		- muteSlider = true;
4396		- versionSlider.setMinimum(0);
4397		- versionSlider.setMaximum(VersionCount() - 1);
4398		- versionSlider.setInteger(copy.versionindex);
4399		- versionSlider.setEnabled(copy.versionindex != -1);
4400		- muteSlider = false;
	4491	+ if (copy.versionlist == null)
	4492	+ {
	4493	+ saveVersionButton.setEnabled(false);
	4494	+ restoreButton.setEnabled(false);
	4495	+ replaceButton.setEnabled(false);
	4496	+ previousVersionButton.setEnabled(false);
	4497	+ nextVersionButton.setEnabled(false);
	4498	+ deleteVersionButton.setEnabled(false);
	4499	+ versionSliderPane.setVisible(false);
	4500	+ }
	4501	+ else
	4502	+ {
	4503	+ restoreButton.setEnabled(copy.versionindex != -1);
	4504	+ replaceButton.setEnabled(copy.versionindex != -1);
	4505	+
	4506	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4507	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4508	+
	4509	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4510	+ //copy.versionlist[copy.versionindex + 1] != null);
	4511	+
	4512	+ muteSlider = true;
	4513	+ versionSlider.setMinimum(0);
	4514	+ versionSlider.setMaximum(VersionCount() - 1);
	4515	+ versionSlider.setInteger(copy.versionindex);
	4516	+ versionSlider.setEnabled(copy.versionindex != -1);
	4517	+ muteSlider = false;
	4518	+
	4519	+ versionSliderPane.setVisible(true);
	4520	+ }
4401	4521	}
4402	4522
4403	4523	public boolean PreviousVersion()
..	..	@@ -4455,7 +4575,7 @@
4455	4575
4456	4576	public boolean Replace()
4457	4577	{
4458		- System.err.println("Replace");
	4578	+ //System.err.println("Replace");
4459	4579
4460	4580	//cRadio tab = GetCurrentTab();
4461	4581
..	..	@@ -4682,6 +4802,12 @@
4682	4802	// else
4683	4803	// applySelf(true);
4684	4804	// }
	4805	+
	4806	+ boolean Equal(double a, double b)
	4807	+ {
	4808	+ return Math.abs(a - b) < 0.001;
	4809	+ }
	4810	+
4685	4811	void applySelf0(boolean name)
4686	4812	{
4687	4813	if (name)
..	..	@@ -4731,29 +4857,52 @@
4731	4857	{
4732	4858	cMaterial mat = copy.material;
4733	4859
4734		- colorField.SetToolTipValue((mat.color));
4735		- saturationField.SetToolTipValue((mat.modulation));
4736		- metalnessField.SetToolTipValue((mat.metalness));
4737		- diffuseField.SetToolTipValue((mat.diffuse));
4738		- specularField.SetToolTipValue((mat.specular));
4739		- shininessField.SetToolTipValue((mat.shininess));
4740		- shiftField.SetToolTipValue((mat.shift));
4741		- ambientField.SetToolTipValue((mat.ambient));
4742		- lightareaField.SetToolTipValue((mat.lightarea));
4743		- diffusenessField.SetToolTipValue((mat.factor));
4744		- velvetField.SetToolTipValue((mat.velvet));
4745		- sheenField.SetToolTipValue((mat.sheen));
4746		- subsurfaceField.SetToolTipValue((mat.subsurface));
4747		- backlitField.SetToolTipValue((mat.bump));
4748		- anisoField.SetToolTipValue((mat.aniso));
4749		- anisoVField.SetToolTipValue((mat.anisoV));
4750		- cameraField.SetToolTipValue((mat.cameralight));
4751		- selfshadowField.SetToolTipValue((mat.diffuseness));
4752		- shadowField.SetToolTipValue((mat.shadow));
4753		- textureField.SetToolTipValue((mat.texture));
4754		- opacityField.SetToolTipValue((mat.opacity));
4755		- fakedepthField.SetToolTipValue((mat.fakedepth));
4756		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	4860	+ if (!Equal(colorField.getFloat(), mat.color))
	4861	+ colorField.SetToolTipValue((mat.color));
	4862	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4863	+ saturationField.SetToolTipValue((mat.modulation));
	4864	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4865	+ metalnessField.SetToolTipValue((mat.metalness));
	4866	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4867	+ diffuseField.SetToolTipValue((mat.diffuse));
	4868	+ if (!Equal(specularField.getFloat(), mat.specular))
	4869	+ specularField.SetToolTipValue((mat.specular));
	4870	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4871	+ shininessField.SetToolTipValue((mat.shininess));
	4872	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4873	+ shiftField.SetToolTipValue((mat.shift));
	4874	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4875	+ ambientField.SetToolTipValue((mat.ambient));
	4876	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4877	+ lightareaField.SetToolTipValue((mat.lightarea));
	4878	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4879	+ diffusenessField.SetToolTipValue((mat.factor));
	4880	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4881	+ velvetField.SetToolTipValue((mat.velvet));
	4882	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4883	+ sheenField.SetToolTipValue((mat.sheen));
	4884	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4885	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4886	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4887	+ backlitField.SetToolTipValue((mat.bump));
	4888	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4889	+ anisoField.SetToolTipValue((mat.aniso));
	4890	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4891	+ anisoVField.SetToolTipValue((mat.anisoV));
	4892	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4893	+ cameraField.SetToolTipValue((mat.cameralight));
	4894	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	4895	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4896	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	4897	+ shadowField.SetToolTipValue((mat.shadow));
	4898	+ if (!Equal(textureField.getFloat(), mat.texture))
	4899	+ textureField.SetToolTipValue((mat.texture));
	4900	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	4901	+ opacityField.SetToolTipValue((mat.opacity));
	4902	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	4903	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4904	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	4905	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4757	4906	}
4758	4907
4759	4908	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4788,7 +4937,7 @@
4788	4937
4789	4938	public void stateChanged(ChangeEvent e)
4790	4939	{
4791		- // assert(false);
	4940	+ // assert(false);
4792	4941	if (e.getSource() == versionSlider)
4793	4942	{
4794	4943	if (muteSlider)
..	..	@@ -5158,6 +5307,8 @@
5158	5307
5159	5308	if (previousVersionButton != null && copy.versionlist != null)
5160	5309	SetVersionStates();
	5310	+
	5311	+ cameraView.requestFocusInWindow();
5161	5312	}
5162	5313
5163	5314	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5189,7 +5340,7 @@
5189	5340	// group = (Composite) group.get(0);
5190	5341	// }
5191	5342
5192		- System.out.println("makeSomething of " + thing);
	5343	+ //System.out.println("makeSomething of " + thing);
5193	5344
5194	5345	/*
5195	5346	if (deselect && jList != null)
..	..	@@ -5543,6 +5694,7 @@
5543	5694
5544	5695	copy.versionlist = readobj.versionlist;
5545	5696	copy.versionindex = readobj.versionindex;
	5697	+ copy.versiontable = readobj.versiontable;
5546	5698
5547	5699	if (copy.versionlist == null)
5548	5700	{
..	..	@@ -5550,7 +5702,7 @@
5550	5702	copy.versionlist = new Object3D[100];
5551	5703	copy.versionindex = -1;
5552	5704
5553		- Save(true);
	5705	+ //Save(true);
5554	5706	}
5555	5707
5556	5708	//? SetUndoStates();
..	..	@@ -5898,6 +6050,7 @@
5898	6050	boolean materialFlushed;
5899	6051	Object3D latestObject;
5900	6052
	6053	+ cGridBag transformPanel;
5901	6054	cGridBag XYZPanel;
5902	6055
5903	6056	JSplitPane gridPanel;