~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	}
..	..	@@ -297,11 +341,13 @@
297	341	client = inClient;
298	342	copy = client;
299	343
300		- if (copy.versionlist == null)
301		- {
302		- copy.versionlist = new Object3D[100];
303		- copy.versionindex = -1;
304		- }
	344	+// if (copy.versionlist == null)
	345	+// {
	346	+// copy.versionlist = new Object3D[100];
	347	+// copy.versionindex = -1;
	348	+//
	349	+// callee.Save(true);
	350	+// }
305	351
306	352	// "this" is not called: SetupUI2(objEditor);
307	353	}
..	..	@@ -320,6 +366,8 @@
320	366	{
321	367	copy.versionlist = new Object3D[100];
322	368	copy.versionindex = -1;
	369	+
	370	+// Save(true);
323	371	}
324	372
325	373	SetupUI2(callee.GetEditor());
..	..	@@ -343,7 +391,8 @@
343	391	//parent = p;
344	392
345	393	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
346		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	394	+ if (Globals.DEBUG)
	395	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
347	396	//gd.setFullScreenWindow(this);
348	397	//setResizable(false);
349	398	//if (!isDisplayable())
..	..	@@ -354,11 +403,13 @@
354	403	copy = localCopy;
355	404	copy.editWindow = this;
356	405
357		- if (copy.versionlist == null)
358		- {
359		-// copy.versions = new byte[100][];
	406	+// if (copy.versionlist == null)
	407	+// {
	408	+// copy.versionlist = new Object3D[100];
360	409	// copy.versionindex = -1;
361		- }
	410	+//
	411	+// Save(true);
	412	+// }
362	413
363	414	SetupMenu();
364	415
..	..	@@ -378,6 +429,9 @@
378	429
379	430	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
380	431
	432	+ // This is to refresh the UI of the material panel.
	433	+ boolean patchMaterial;
	434	+
381	435	void SetupMenu()
382	436	{
383	437	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -427,6 +481,8 @@
427	481
428	482	ChangeListener changeListener = new ChangeListener()
429	483	{
	484	+ //String name;
	485	+
430	486	public void stateChanged(ChangeEvent changeEvent)
431	487	{
432	488	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -445,7 +501,37 @@
445	501	// EditSelection(false);
446	502	// }
447	503
448		- refreshContents(false); // To refresh Info tab
	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;
	532	+
	533	+// refreshContents(false); // To refresh Info tab
	534	+ cameraView.repaint();
449	535	}
450	536	};
451	537	objectPanel.addChangeListener(changeListener);
..	..	@@ -754,6 +840,7 @@
754	840	boolean maximized;
755	841
756	842	cButton fullscreenLayout;
	843	+ cButton expandedLayout;
757	844
758	845	void Minimize()
759	846	{
..	..	@@ -793,10 +880,12 @@
793	880	cButton minButton;
794	881	cButton maxButton;
795	882	cButton fullButton;
	883	+ cButton collapseButton;
	884	+ cButton maximize3DButton;
796	885
797	886	void ToggleFullScreen()
798	887	{
799		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	888	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
800	889
801	890	cameraView.ToggleFullScreen();
802	891
..	..	@@ -817,13 +906,13 @@
817	906	// X frame.getContentPane().remove(/"Center",/bigThree);
818	907	// X framePanel.add(bigThree);
819	908	// X frame.getContentPane().add(/"Center",/framePanel);
820		- framePanel.setDividerLocation(46);
	909	+// framePanel.setDividerLocation(46); // icons are 24x24
821	910
822	911	//frame.setVisible(true);
823		- radio.layout = keepButton;
	912	+// radio.layout = keepButton;
824	913	//theFrame = null;
825	914	keepButton = null;
826		- radio.layout.doClick();
	915	+// radio.layout.doClick();
827	916
828	917	} else
829	918	{
..	..	@@ -844,10 +933,10 @@
844	933	// X frame.getContentPane().remove(/"Center",/framePanel);
845	934	// X framePanel.remove(bigThree);
846	935	// X frame.getContentPane().add(/"Center",/bigThree);
847		- framePanel.setDividerLocation(0);
	936	+// framePanel.setDividerLocation(0);
848	937
849		- radio.layout = fullscreenLayout;
850		- radio.layout.doClick();
	938	+// radio.layout = fullscreenLayout;
	939	+// radio.layout.doClick();
851	940	//frame.setVisible(true);
852	941	}
853	942	frame.validate();
..	..	@@ -855,23 +944,42 @@
855	944	cameraView.requestFocusInWindow();
856	945	}
857	946
858		- private Object3D CompressCopy()
	947	+ void CollapseToolbar()
	948	+ {
	949	+ framePanel.setDividerLocation(0);
	950	+ //frame.validate();
	951	+
	952	+ cameraView.requestFocusInWindow();
	953	+ }
	954	+
	955	+ private Object3D Duplicate(Object3D object)
859	956	{
860	957	boolean temp = CameraPane.SWITCH;
861	958	CameraPane.SWITCH = false;
862	959
863		- copy.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);
864	964	// if (copy == client)
865	965
866		- Object3D versions[] = copy.versionlist;
867		- copy.versionlist = null;
	966	+ Object3D versions[] = object.versionlist;
	967	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	968	+ object.versionlist = null;
	969	+ object.versiontable = null;
	970	+
	971	+ Object3D parent = object.parent;
	972	+ object.parent = null;
868	973
869	974	//byte[] compress = Compress(copy);
870		- Object3D compress = (Object3D)Grafreed.clone(copy);
	975	+ Object3D compress = (Object3D)Grafreed.clone(object);
871	976
872		- copy.versionlist = versions;
	977	+ object.parent = parent;
873	978
874		- copy.RestoreBigData(versiontable);
	979	+ object.versionlist = versions;
	980	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	981	+
	982	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
875	983
876	984	CameraPane.SWITCH = temp;
877	985
..	..	@@ -1233,14 +1341,14 @@
1233	1341
1234	1342	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1235	1343	liveCB.setToolTipText("Animate object");
	1344	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1345	+ markCB.setToolTipText("Set target transform");
1236	1346	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1237	1347	selectableCB.setToolTipText("Make object selectable");
1238	1348	// Return();
1239	1349
1240	1350	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1241	1351	hideCB.setToolTipText("Hide object");
1242		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1243		- markCB.setToolTipText("As animation target transform");
1244	1352
1245	1353	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1246	1354
..	..	@@ -1442,6 +1550,7 @@
1442	1550
1443	1551	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1444	1552	{
	1553	+ if (Globals.DEBUG)
1445	1554	System.out.println("CREATE CAMERAS");
1446	1555	cams = new cTemplate();
1447	1556	cams.name = "Cameras";
..	..	@@ -1523,6 +1632,42 @@
1523	1632	//frontView.object = copy;
1524	1633	//sideView.object = copy;
1525	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	+
1526	1671	XYZPanel = new cGridBag().setVertical(true);
1527	1672	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1528	1673
..	..	@@ -1532,6 +1677,9 @@
1532	1677	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1533	1678	//XYZPanel.setName("XYZ");
1534	1679
	1680	+ transformPanel.add(resetTransformPanel);
	1681	+ transformPanel.add(XYZPanel);
	1682	+
1535	1683	/*
1536	1684	gridPanel = new JPanel(); //new BorderLayout());
1537	1685	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1539,12 +1687,12 @@
1539	1687	gridPanel.add(cameraView);
1540	1688	gridPanel.add(XYZPanel);
1541	1689	*/
1542		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1543		- gridPanel.setContinuousLayout(true);
1544		- gridPanel.setOneTouchExpandable(true);
1545		- gridPanel.setDividerLocation(1.0);
1546		- gridPanel.setDividerSize(9);
1547		- 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);
1548	1696
1549	1697	// aConstraints.weighty = 0;
1550	1698	//System.out.println("THIS = " + this);
..	..	@@ -1567,14 +1715,14 @@
1567	1715
1568	1716	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1569	1717	//tmp.setName("Edit");
1570		- objectPanel.add(materialPanel);
1571		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1572		- objectPanel.setToolTipTextAt(0, "Material");
1573		-
1574	1718	objectPanel.add(toolboxPanel);
1575		- objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1576		- objectPanel.setToolTipTextAt(1, "Objects & textures");
	1719	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1720	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
1577	1721
	1722	+ objectPanel.add(materialPanel);
	1723	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1724	+ objectPanel.setToolTipTextAt(1, "Material");
	1725	+
1578	1726	objectPanel.add(skyboxPanel);
1579	1727	objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1580	1728	objectPanel.setToolTipTextAt(2, "Backgrounds");
..	..	@@ -1587,10 +1735,14 @@
1587	1735	objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1588	1736	objectPanel.setToolTipTextAt(3, "Edit controls");
1589	1737
1590		- objectPanel.add(XYZPanel);
	1738	+ objectPanel.add(transformPanel);
1591	1739	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1592		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1740	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1593	1741
	1742	+ patchMaterial = true;
	1743	+ cameraView.patchMaterial = this;
	1744	+ objectPanel.setSelectedIndex(1);
	1745	+
1594	1746	/*
1595	1747	aConstraints.gridx = 0;
1596	1748	aConstraints.gridwidth = 1;
..	..	@@ -1610,7 +1762,7 @@
1610	1762	scrollpane.addMouseWheelListener(this); // Default not fast enough
1611	1763
1612	1764	/JTabbedPane/ scenePanel = new cGridBag();
1613		- scenePanel.preferredWidth = 5;
	1765	+ scenePanel.preferredWidth = 6;
1614	1766
1615	1767	JTabbedPane tabbedPane = new JTabbedPane();
1616	1768	tabbedPane.add(scrollpane);
..	..	@@ -1628,9 +1780,9 @@
1628	1780	scenePanel.add(tabbedPane);
1629	1781
1630	1782	//if (Globals.ADVANCED)
1631		- tabbedPane.add(infoPanel);
1632		- tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1633		- tabbedPane.setToolTipTextAt(3, "Information");
	1783	+// tabbedPane.add(infoPanel);
	1784	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1785	+// tabbedPane.setToolTipTextAt(3, "Information");
1634	1786
1635	1787	/*
1636	1788	cTree jTree = new cTree(null);
..	..	@@ -1652,13 +1804,13 @@
1652	1804	jtp.add(tree);
1653	1805	*/
1654	1806
1655		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1656		- bigPanel.setContinuousLayout(true);
1657		- bigPanel.setOneTouchExpandable(true);
1658		- bigPanel.setDividerLocation(0.8);
1659		- bigPanel.setDividerSize(15);
1660		- bigPanel.setResizeWeight(0.15);
1661		- 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");
1662	1814
1663	1815	//bigPanel.setLayout(new BorderLayout());
1664	1816	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1702,6 +1854,23 @@
1702	1854	// aConstraints.gridheight = 1;
1703	1855
1704	1856	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1857	+
	1858	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1859	+ new java.beans.PropertyChangeListener()
	1860	+ {
	1861	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1862	+ {
	1863	+ if ((Integer)pce.getOldValue() == 1)
	1864	+ {
	1865	+ if (radio.layout != expandedLayout)
	1866	+ {
	1867	+ radio.layout = expandedLayout;
	1868	+ radio.layout.doClick();
	1869	+ }
	1870	+ }
	1871	+ }
	1872	+ });
	1873	+
1705	1874	framePanel.setContinuousLayout(false);
1706	1875	framePanel.setOneTouchExpandable(false);
1707	1876	//.setDividerLocation(0.8);
..	..	@@ -1711,7 +1880,7 @@
1711	1880
1712	1881	frame.getContentPane().setLayout(new BorderLayout());
1713	1882	/**/
1714		- JTabbedPane worldPane = new JTabbedPane();
	1883	+ //JTabbedPane worldPane = new JTabbedPane();
1715	1884	//worldPane.add(bigPanel);
1716	1885	//worldPane.add(worldPanel);
1717	1886	/**/
..	..	@@ -1725,7 +1894,7 @@
1725	1894
1726	1895	cameraView.requestFocusInWindow();
1727	1896
1728		- gridPanel.setDividerLocation(1.0);
	1897	+// gridPanel.setDividerLocation(1.0);
1729	1898
1730	1899	frame.validate();
1731	1900
..	..	@@ -1771,7 +1940,15 @@
1771	1940
1772	1941	// Skin
1773	1942	colorField.setFloat(material.color);
1774		- 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	+
1775	1952	subsurfaceField.setFloat(material.subsurface);
1776	1953	selfshadowField.setFloat(material.diffuseness);
1777	1954	diffusenessField.setFloat(material.factor);
..	..	@@ -2082,6 +2259,21 @@
2082	2259	});
2083	2260	presetpanel.add(bump0);
2084	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	+
2085	2277	cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2086	2278	halo.setToolTipText("Halo");
2087	2279	halo.addMouseListener(new MouseAdapter()
..	..	@@ -2120,6 +2312,25 @@
2120	2312	}
2121	2313	});
2122	2314	presetpanel.add(candle);
	2315	+
	2316	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2317	+ shadowShader.setToolTipText("Shadow");
	2318	+ shadowShader.addMouseListener(new MouseAdapter()
	2319	+ {
	2320	+ public void mouseClicked(MouseEvent e)
	2321	+ {
	2322	+ diffuseField.setFloat(0.001);
	2323	+ ambientField.setFloat(0.001);
	2324	+ cameraField.setFloat(0.001);
	2325	+ specularField.setFloat(0.001);
	2326	+ fakedepthField.setFloat(0.001);
	2327	+ opacityField.setFloat(0.6);
	2328	+
	2329	+ materialtouched = true;
	2330	+ applySelf();
	2331	+ }
	2332	+ });
	2333	+ presetpanel.add(shadowShader);
2123	2334
2124	2335	cGridBag panel = new cGridBag().setVertical(true);
2125	2336
..	..	@@ -2170,9 +2381,20 @@
2170	2381
2171	2382	cGridBag huepanel = new cGridBag();
2172	2383	cGridBag huelabel = new cGridBag();
2173		- skin = GetLabel("icons/hue.png", false);
2174		- skin.fit = true;
2175		- 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);
2176	2398	huelabel.preferredWidth = 20;
2177	2399	huepanel.add(new cGridBag()); // Label
2178	2400	huepanel.add(huelabel); // Field/slider
..	..	@@ -3448,32 +3670,8 @@
3448	3670
3449	3671	if (multiplyToggle != null)
3450	3672	multiplyToggle.setSelected(mat.multiply);
3451		-
3452		- assert (object.projectedVertices != null);
3453		-
3454		- if (object.projectedVertices.length <= 2)
3455		- {
3456		- // Side effect...
3457		- Object3D.cVector2[] keep = object.projectedVertices;
3458		- object.projectedVertices = new Object3D.cVector2[3];
3459		- for (int i = 0; i < 3; i++)
3460		- {
3461		- if (i < keep.length)
3462		- {
3463		- object.projectedVertices[i] = keep[i];
3464		- } else
3465		- {
3466		- object.projectedVertices[i] = new Object3D.cVector2();
3467		- }
3468		- /*
3469		- if(keep.length == 0)
3470		- object.projectedVertices[0] = new Object3D.cVector2();
3471		- else
3472		- object.projectedVertices[0] = keep[0];
3473		- object.projectedVertices[1] = new Object3D.cVector2();
3474		- */
3475		- }
3476		- }
	3673	+
	3674	+ AllocProjectedVertices(object);
3477	3675
3478	3676	SetMaterial(mat, object.projectedVertices);
3479	3677	}
..	..	@@ -3783,7 +3981,7 @@
3783	3981	//System.out.println("ObjEditor " + event);
3784	3982	applySelf0(true);
3785	3983	//parent.applySelf();
3786		- objEditor.refreshContents();
	3984	+ // conflicts with requestFocus objEditor.refreshContents();
3787	3985	} else if (source == resetButton)
3788	3986	{
3789	3987	CameraPane.fullreset = true;
..	..	@@ -4076,7 +4274,7 @@
4076	4274	{
4077	4275	//Save(true);
4078	4276	Replace();
4079		- SetUndoStates();
	4277	+ SetVersionStates();
4080	4278	}
4081	4279
4082	4280	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -4095,8 +4293,6 @@
4095	4293	return true;
4096	4294	}
4097	4295
4098		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4099		-
4100	4296	void DeleteVersion()
4101	4297	{
4102	4298	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4104,19 +4300,23 @@
4104	4300	copy.versionlist[i] = copy.versionlist[i+1];
4105	4301	}
4106	4302
4107		- CopyChanged();
	4303	+ if (copy.versionlist[copy.versionindex] == null)
	4304	+ copy.versionindex -= 1;
4108	4305
4109		- SetUndoStates();
	4306	+ if (copy.versionindex != -1)
	4307	+ CopyChanged();
	4308	+
	4309	+ SetVersionStates();
4110	4310	}
4111	4311
4112	4312	public boolean Save(boolean user)
4113	4313	{
4114	4314	System.err.println("Save");
4115		- //Replace();
	4315	+ Replace();
4116	4316
4117		- cRadio tab = GetCurrentTab();
	4317	+ //cRadio tab = GetCurrentTab();
4118	4318
4119		- Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
	4319	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4120	4320
4121	4321	boolean thesame = false;
4122	4322
..	..	@@ -4152,7 +4352,7 @@
4152	4352	// copy.versionlist[i] = null;
4153	4353	// }
4154	4354
4155		- SetUndoStates();
	4355	+ SetVersionStates();
4156	4356
4157	4357	// test save
4158	4358	if (false)
..	..	@@ -4210,14 +4410,14 @@
4210	4410
4211	4411	void CopyChanged()
4212	4412	{
4213		- Object3D obj = copy.versionlist[copy.versionindex];
	4413	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4214	4414
4215		- SetUndoStates();
	4415	+ SetVersionStates();
4216	4416
4217	4417	boolean temp = CameraPane.SWITCH;
4218	4418	CameraPane.SWITCH = false;
4219	4419
4220		- copy.ExtractBigData(versiontable);
	4420	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4221	4421
4222	4422	copy.clear();
4223	4423
..	..	@@ -4229,7 +4429,7 @@
4229	4429	copy.add(obj.get(i));
4230	4430	}
4231	4431
4232		- copy.RestoreBigData(versiontable);
	4432	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4233	4433
4234	4434	CameraPane.SWITCH = temp;
4235	4435
..	..	@@ -4279,23 +4479,45 @@
4279	4479	return count;
4280	4480	}
4281	4481
4282		- void SetUndoStates()
	4482	+ public cGridBag versionSliderPane;
	4483	+
	4484	+ void SetVersionStates()
4283	4485	{
4284		- cRadio tab = GetCurrentTab();
	4486	+ //if (true)
	4487	+ // return;
	4488	+
	4489	+ //cRadio tab = GetCurrentTab();
4285	4490
4286		- restoreButton.setEnabled(true); // copy.versionindex != -1);
4287		- replaceButton.setEnabled(true); // copy.versionindex != -1);
4288		-
4289		- previousVersionButton.setEnabled(copy.versionindex > 0);
4290		- nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4291		-
4292		- deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4293		- copy.versionlist[copy.versionindex + 1] != null);
4294		-
4295		- muteSlider = true;
4296		- versionSlider.setMaximum(VersionCount() - 1);
4297		- versionSlider.setInteger(copy.versionindex);
4298		- 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	+ }
4299	4521	}
4300	4522
4301	4523	public boolean PreviousVersion()
..	..	@@ -4305,7 +4527,7 @@
4305	4527
4306	4528	System.err.println("Undo");
4307	4529
4308		- cRadio tab = GetCurrentTab();
	4530	+ //cRadio tab = GetCurrentTab();
4309	4531
4310	4532	if (copy.versionindex == 0)
4311	4533	{
..	..	@@ -4337,7 +4559,7 @@
4337	4559	{
4338	4560	System.err.println("Restore");
4339	4561
4340		- cRadio tab = GetCurrentTab();
	4562	+ //cRadio tab = GetCurrentTab();
4341	4563
4342	4564	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4343	4565	{
..	..	@@ -4353,9 +4575,9 @@
4353	4575
4354	4576	public boolean Replace()
4355	4577	{
4356		- System.err.println("Replace");
	4578	+ //System.err.println("Replace");
4357	4579
4358		- cRadio tab = GetCurrentTab();
	4580	+ //cRadio tab = GetCurrentTab();
4359	4581
4360	4582	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4361	4583	{
..	..	@@ -4363,7 +4585,7 @@
4363	4585	return false;
4364	4586	}
4365	4587
4366		- copy.versionlist[copy.versionindex] = CompressCopy();
	4588	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
4367	4589
4368	4590	return true;
4369	4591	}
..	..	@@ -4373,7 +4595,7 @@
4373	4595	// Option?
4374	4596	Replace();
4375	4597
4376		- cRadio tab = GetCurrentTab();
	4598	+ //cRadio tab = GetCurrentTab();
4377	4599
4378	4600	if (copy.versionlist[copy.versionindex + 1] == null)
4379	4601	{
..	..	@@ -4580,6 +4802,12 @@
4580	4802	// else
4581	4803	// applySelf(true);
4582	4804	// }
	4805	+
	4806	+ boolean Equal(double a, double b)
	4807	+ {
	4808	+ return Math.abs(a - b) < 0.001;
	4809	+ }
	4810	+
4583	4811	void applySelf0(boolean name)
4584	4812	{
4585	4813	if (name)
..	..	@@ -4629,29 +4857,52 @@
4629	4857	{
4630	4858	cMaterial mat = copy.material;
4631	4859
4632		- colorField.SetToolTipValue((mat.color));
4633		- saturationField.SetToolTipValue((mat.modulation));
4634		- metalnessField.SetToolTipValue((mat.metalness));
4635		- diffuseField.SetToolTipValue((mat.diffuse));
4636		- specularField.SetToolTipValue((mat.specular));
4637		- shininessField.SetToolTipValue((mat.shininess));
4638		- shiftField.SetToolTipValue((mat.shift));
4639		- ambientField.SetToolTipValue((mat.ambient));
4640		- lightareaField.SetToolTipValue((mat.lightarea));
4641		- diffusenessField.SetToolTipValue((mat.factor));
4642		- velvetField.SetToolTipValue((mat.velvet));
4643		- sheenField.SetToolTipValue((mat.sheen));
4644		- subsurfaceField.SetToolTipValue((mat.subsurface));
4645		- backlitField.SetToolTipValue((mat.bump));
4646		- anisoField.SetToolTipValue((mat.aniso));
4647		- anisoVField.SetToolTipValue((mat.anisoV));
4648		- cameraField.SetToolTipValue((mat.cameralight));
4649		- selfshadowField.SetToolTipValue((mat.diffuseness));
4650		- shadowField.SetToolTipValue((mat.shadow));
4651		- textureField.SetToolTipValue((mat.texture));
4652		- opacityField.SetToolTipValue((mat.opacity));
4653		- fakedepthField.SetToolTipValue((mat.fakedepth));
4654		- 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));
4655	4906	}
4656	4907
4657	4908	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4686,15 +4937,17 @@
4686	4937
4687	4938	public void stateChanged(ChangeEvent e)
4688	4939	{
4689		- // assert(false);
	4940	+ // assert(false);
4690	4941	if (e.getSource() == versionSlider)
4691	4942	{
4692	4943	if (muteSlider)
4693	4944	return;
4694	4945
	4946	+ Replace();
	4947	+
4695	4948	int version = versionSlider.getInteger();
4696	4949
4697		- if (copy.versionlist[version] != null)
	4950	+ if (version != -1 && copy.versionlist[version] != null)
4698	4951	{
4699	4952	copy.versionindex = version;
4700	4953	CopyChanged();
..	..	@@ -4738,7 +4991,7 @@
4738	4991	//System.out.println("stateChanged = " + this);
4739	4992	materialtouched = true;
4740	4993
4741		- if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4994	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
4742	4995	{
4743	4996	saturationField.setFloat(1);
4744	4997	}
..	..	@@ -5053,7 +5306,9 @@
5053	5306	}
5054	5307
5055	5308	if (previousVersionButton != null && copy.versionlist != null)
5056		- SetUndoStates();
	5309	+ SetVersionStates();
	5310	+
	5311	+ cameraView.requestFocusInWindow();
5057	5312	}
5058	5313
5059	5314	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5085,7 +5340,7 @@
5085	5340	// group = (Composite) group.get(0);
5086	5341	// }
5087	5342
5088		- System.out.println("makeSomething of " + thing);
	5343	+ //System.out.println("makeSomething of " + thing);
5089	5344
5090	5345	/*
5091	5346	if (deselect && jList != null)
..	..	@@ -5439,11 +5694,15 @@
5439	5694
5440	5695	copy.versionlist = readobj.versionlist;
5441	5696	copy.versionindex = readobj.versionindex;
	5697	+ copy.versiontable = readobj.versiontable;
5442	5698
5443	5699	if (copy.versionlist == null)
5444	5700	{
	5701	+ // Backward compatibility
5445	5702	copy.versionlist = new Object3D[100];
5446	5703	copy.versionindex = -1;
	5704	+
	5705	+ //Save(true);
5447	5706	}
5448	5707
5449	5708	//? SetUndoStates();
..	..	@@ -5535,6 +5794,8 @@
5535	5794
5536	5795	void save()
5537	5796	{
	5797	+ Replace();
	5798	+
5538	5799	if (lastname == null)
5539	5800	{
5540	5801	return;
..	..	@@ -5789,6 +6050,7 @@
5789	6050	boolean materialFlushed;
5790	6051	Object3D latestObject;
5791	6052
	6053	+ cGridBag transformPanel;
5792	6054	cGridBag XYZPanel;
5793	6055
5794	6056	JSplitPane gridPanel;
..	..	@@ -5882,6 +6144,7 @@
5882	6144	cNumberSlider anisoField;
5883	6145	JLabel anisoVLabel;
5884	6146	cNumberSlider anisoVField;
	6147	+
5885	6148	JLabel cameraLabel;
5886	6149	cNumberSlider cameraField;
5887	6150	JLabel selfshadowLabel;
..	..	@@ -5896,6 +6159,7 @@
5896	6159	cNumberSlider fakedepthField;
5897	6160	JLabel shadowbiasLabel;
5898	6161	cNumberSlider shadowbiasField;
	6162	+
5899	6163	JLabel bumpLabel;
5900	6164	cNumberSlider bumpField;
5901	6165	JLabel noiseLabel;