~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)
..	..	@@ -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
..	..	@@ -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,42 @@
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", !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	+
1574	1671	XYZPanel = new cGridBag().setVertical(true);
1575	1672	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1576	1673
..	..	@@ -1580,6 +1677,9 @@
1580	1677	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1581	1678	//XYZPanel.setName("XYZ");
1582	1679
	1680	+ transformPanel.add(resetTransformPanel);
	1681	+ transformPanel.add(XYZPanel);
	1682	+
1583	1683	/*
1584	1684	gridPanel = new JPanel(); //new BorderLayout());
1585	1685	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1587,12 +1687,12 @@
1587	1687	gridPanel.add(cameraView);
1588	1688	gridPanel.add(XYZPanel);
1589	1689	*/
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);
	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);
1596	1696
1597	1697	// aConstraints.weighty = 0;
1598	1698	//System.out.println("THIS = " + this);
..	..	@@ -1615,14 +1715,14 @@
1615	1715
1616	1716	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1617	1717	//tmp.setName("Edit");
1618		- objectPanel.add(materialPanel);
1619		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1620		- objectPanel.setToolTipTextAt(0, "Material");
1621		-
1622	1718	objectPanel.add(toolboxPanel);
1623		- objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1624		- objectPanel.setToolTipTextAt(1, "Objects & textures");
	1719	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1720	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
1625	1721
	1722	+ objectPanel.add(materialPanel);
	1723	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1724	+ objectPanel.setToolTipTextAt(1, "Material");
	1725	+
1626	1726	objectPanel.add(skyboxPanel);
1627	1727	objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1628	1728	objectPanel.setToolTipTextAt(2, "Backgrounds");
..	..	@@ -1635,10 +1735,14 @@
1635	1735	objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1636	1736	objectPanel.setToolTipTextAt(3, "Edit controls");
1637	1737
1638		- objectPanel.add(XYZPanel);
	1738	+ objectPanel.add(transformPanel);
1639	1739	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1640		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1740	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1641	1741
	1742	+ patchMaterial = true;
	1743	+ cameraView.patchMaterial = this;
	1744	+ objectPanel.setSelectedIndex(1);
	1745	+
1642	1746	/*
1643	1747	aConstraints.gridx = 0;
1644	1748	aConstraints.gridwidth = 1;
..	..	@@ -1658,7 +1762,7 @@
1658	1762	scrollpane.addMouseWheelListener(this); // Default not fast enough
1659	1763
1660	1764	/JTabbedPane/ scenePanel = new cGridBag();
1661		- scenePanel.preferredWidth = 5;
	1765	+ scenePanel.preferredWidth = 6;
1662	1766
1663	1767	JTabbedPane tabbedPane = new JTabbedPane();
1664	1768	tabbedPane.add(scrollpane);
..	..	@@ -1676,9 +1780,9 @@
1676	1780	scenePanel.add(tabbedPane);
1677	1781
1678	1782	//if (Globals.ADVANCED)
1679		- tabbedPane.add(infoPanel);
1680		- tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1681		- tabbedPane.setToolTipTextAt(3, "Information");
	1783	+// tabbedPane.add(infoPanel);
	1784	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1785	+// tabbedPane.setToolTipTextAt(3, "Information");
1682	1786
1683	1787	/*
1684	1788	cTree jTree = new cTree(null);
..	..	@@ -1700,13 +1804,13 @@
1700	1804	jtp.add(tree);
1701	1805	*/
1702	1806
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");
	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");
1710	1814
1711	1815	//bigPanel.setLayout(new BorderLayout());
1712	1816	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1776,7 +1880,7 @@
1776	1880
1777	1881	frame.getContentPane().setLayout(new BorderLayout());
1778	1882	/**/
1779		- JTabbedPane worldPane = new JTabbedPane();
	1883	+ //JTabbedPane worldPane = new JTabbedPane();
1780	1884	//worldPane.add(bigPanel);
1781	1885	//worldPane.add(worldPanel);
1782	1886	/**/
..	..	@@ -1790,7 +1894,7 @@
1790	1894
1791	1895	cameraView.requestFocusInWindow();
1792	1896
1793		- gridPanel.setDividerLocation(1.0);
	1897	+// gridPanel.setDividerLocation(1.0);
1794	1898
1795	1899	frame.validate();
1796	1900
..	..	@@ -1836,7 +1940,15 @@
1836	1940
1837	1941	// Skin
1838	1942	colorField.setFloat(material.color);
1839		- 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	+
1840	1952	subsurfaceField.setFloat(material.subsurface);
1841	1953	selfshadowField.setFloat(material.diffuseness);
1842	1954	diffusenessField.setFloat(material.factor);
..	..	@@ -2147,6 +2259,21 @@
2147	2259	});
2148	2260	presetpanel.add(bump0);
2149	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	+
2150	2277	cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2151	2278	halo.setToolTipText("Halo");
2152	2279	halo.addMouseListener(new MouseAdapter()
..	..	@@ -2254,9 +2381,20 @@
2254	2381
2255	2382	cGridBag huepanel = new cGridBag();
2256	2383	cGridBag huelabel = new cGridBag();
2257		- skin = GetLabel("icons/hue.png", false);
2258		- skin.fit = true;
2259		- 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);
2260	2398	huelabel.preferredWidth = 20;
2261	2399	huepanel.add(new cGridBag()); // Label
2262	2400	huepanel.add(huelabel); // Field/slider
..	..	@@ -3532,32 +3670,8 @@
3532	3670
3533	3671	if (multiplyToggle != null)
3534	3672	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		- }
	3673	+
	3674	+ AllocProjectedVertices(object);
3561	3675
3562	3676	SetMaterial(mat, object.projectedVertices);
3563	3677	}
..	..	@@ -3867,7 +3981,7 @@
3867	3981	//System.out.println("ObjEditor " + event);
3868	3982	applySelf0(true);
3869	3983	//parent.applySelf();
3870		- objEditor.refreshContents();
	3984	+ // conflicts with requestFocus objEditor.refreshContents();
3871	3985	} else if (source == resetButton)
3872	3986	{
3873	3987	CameraPane.fullreset = true;
..	..	@@ -4179,8 +4293,6 @@
4179	4293	return true;
4180	4294	}
4181	4295
4182		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4183		-
4184	4296	void DeleteVersion()
4185	4297	{
4186	4298	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4188,7 +4300,11 @@
4188	4300	copy.versionlist[i] = copy.versionlist[i+1];
4189	4301	}
4190	4302
4191		- CopyChanged();
	4303	+ if (copy.versionlist[copy.versionindex] == null)
	4304	+ copy.versionindex -= 1;
	4305	+
	4306	+ if (copy.versionindex != -1)
	4307	+ CopyChanged();
4192	4308
4193	4309	SetVersionStates();
4194	4310	}
..	..	@@ -4301,7 +4417,7 @@
4301	4417	boolean temp = CameraPane.SWITCH;
4302	4418	CameraPane.SWITCH = false;
4303	4419
4304		- copy.ExtractBigData(versiontable);
	4420	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4305	4421
4306	4422	copy.clear();
4307	4423
..	..	@@ -4313,7 +4429,7 @@
4313	4429	copy.add(obj.get(i));
4314	4430	}
4315	4431
4316		- copy.RestoreBigData(versiontable);
	4432	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4317	4433
4318	4434	CameraPane.SWITCH = temp;
4319	4435
..	..	@@ -4363,6 +4479,8 @@
4363	4479	return count;
4364	4480	}
4365	4481
	4482	+ public cGridBag versionSliderPane;
	4483	+
4366	4484	void SetVersionStates()
4367	4485	{
4368	4486	//if (true)
..	..	@@ -4370,21 +4488,36 @@
4370	4488
4371	4489	//cRadio tab = GetCurrentTab();
4372	4490
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;
	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	+ }
4388	4521	}
4389	4522
4390	4523	public boolean PreviousVersion()
..	..	@@ -4442,7 +4575,7 @@
4442	4575
4443	4576	public boolean Replace()
4444	4577	{
4445		- System.err.println("Replace");
	4578	+ //System.err.println("Replace");
4446	4579
4447	4580	//cRadio tab = GetCurrentTab();
4448	4581
..	..	@@ -4669,6 +4802,12 @@
4669	4802	// else
4670	4803	// applySelf(true);
4671	4804	// }
	4805	+
	4806	+ boolean Equal(double a, double b)
	4807	+ {
	4808	+ return Math.abs(a - b) < 0.001;
	4809	+ }
	4810	+
4672	4811	void applySelf0(boolean name)
4673	4812	{
4674	4813	if (name)
..	..	@@ -4718,29 +4857,52 @@
4718	4857	{
4719	4858	cMaterial mat = copy.material;
4720	4859
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));
	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));
4744	4906	}
4745	4907
4746	4908	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4775,11 +4937,13 @@
4775	4937
4776	4938	public void stateChanged(ChangeEvent e)
4777	4939	{
4778		- // assert(false);
	4940	+ // assert(false);
4779	4941	if (e.getSource() == versionSlider)
4780	4942	{
4781	4943	if (muteSlider)
4782	4944	return;
	4945	+
	4946	+ Replace();
4783	4947
4784	4948	int version = versionSlider.getInteger();
4785	4949
..	..	@@ -5143,6 +5307,8 @@
5143	5307
5144	5308	if (previousVersionButton != null && copy.versionlist != null)
5145	5309	SetVersionStates();
	5310	+
	5311	+ cameraView.requestFocusInWindow();
5146	5312	}
5147	5313
5148	5314	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5174,7 +5340,7 @@
5174	5340	// group = (Composite) group.get(0);
5175	5341	// }
5176	5342
5177		- System.out.println("makeSomething of " + thing);
	5343	+ //System.out.println("makeSomething of " + thing);
5178	5344
5179	5345	/*
5180	5346	if (deselect && jList != null)
..	..	@@ -5528,6 +5694,7 @@
5528	5694
5529	5695	copy.versionlist = readobj.versionlist;
5530	5696	copy.versionindex = readobj.versionindex;
	5697	+ copy.versiontable = readobj.versiontable;
5531	5698
5532	5699	if (copy.versionlist == null)
5533	5700	{
..	..	@@ -5535,7 +5702,7 @@
5535	5702	copy.versionlist = new Object3D[100];
5536	5703	copy.versionindex = -1;
5537	5704
5538		- Save(true);
	5705	+ //Save(true);
5539	5706	}
5540	5707
5541	5708	//? SetUndoStates();
..	..	@@ -5883,6 +6050,7 @@
5883	6050	boolean materialFlushed;
5884	6051	Object3D latestObject;
5885	6052
	6053	+ cGridBag transformPanel;
5886	6054	cGridBag XYZPanel;
5887	6055
5888	6056	JSplitPane gridPanel;