~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -34,6 +34,7 @@
34	34	iSendInfo
35	35	//KeyListener
36	36	{
	37	+ public cToggleButton pinButton;
37	38	boolean timeline;
38	39	boolean wasFullScreen;
39	40
..	..	@@ -41,6 +42,35 @@
41	42	JFrame frame;
42	43
43	44	static ObjEditor theFrame;
	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	+ }
44	74
45	75	public cGridBag GetSeparator()
46	76	{
..	..	@@ -53,7 +83,10 @@
53	83	cButton GetButton(String name, boolean border)
54	84	{
55	85	ImageIcon icon = GetIcon(name);
56		- return new cButton(icon, border);
	86	+ if (icon != null)
	87	+ return new cButton(icon, border);
	88	+ else
	89	+ return new cButton(name, border);
57	90	}
58	91
59	92	cLabel GetLabel(String name, boolean border)
..	..	@@ -74,11 +107,19 @@
74	107	return new cCheckBox(icon, border);
75	108	}
76	109
77		- 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)
78	113	{
	114	+ javax.swing.ImageIcon iconCache = icons.get(name);
	115	+ if (iconCache != null)
	116	+ {
	117	+ return iconCache;
	118	+ }
	119	+
79	120	try
80	121	{
81		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	122	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
82	123
83	124	// if (image.getWidth() > 48 && image.getHeight() > 48)
84	125	// {
..	..	@@ -93,10 +134,14 @@
93	134	// }
94	135
95	136	javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	137	+
	138	+ icons.put(name, icon);
	139	+
96	140	return icon;
97	141	}
98	142	catch (Exception e)
99	143	{
	144	+ //icons.put(name, null);
100	145	return null;
101	146	}
102	147	}
..	..	@@ -296,11 +341,13 @@
296	341	client = inClient;
297	342	copy = client;
298	343
299		- if (copy.versionlist == null)
300		- {
301		- copy.versionlist = new Object3D[100];
302		- copy.versionindex = -1;
303		- }
	344	+// if (copy.versionlist == null)
	345	+// {
	346	+// copy.versionlist = new Object3D[100];
	347	+// copy.versionindex = -1;
	348	+//
	349	+// callee.Save(true);
	350	+// }
304	351
305	352	// "this" is not called: SetupUI2(objEditor);
306	353	}
..	..	@@ -319,6 +366,8 @@
319	366	{
320	367	copy.versionlist = new Object3D[100];
321	368	copy.versionindex = -1;
	369	+
	370	+// Save(true);
322	371	}
323	372
324	373	SetupUI2(callee.GetEditor());
..	..	@@ -342,7 +391,8 @@
342	391	//parent = p;
343	392
344	393	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
345		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	394	+ if (Globals.DEBUG)
	395	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
346	396	//gd.setFullScreenWindow(this);
347	397	//setResizable(false);
348	398	//if (!isDisplayable())
..	..	@@ -353,11 +403,13 @@
353	403	copy = localCopy;
354	404	copy.editWindow = this;
355	405
356		- if (copy.versionlist == null)
357		- {
358		-// copy.versions = new byte[100][];
	406	+// if (copy.versionlist == null)
	407	+// {
	408	+// copy.versionlist = new Object3D[100];
359	409	// copy.versionindex = -1;
360		- }
	410	+//
	411	+// Save(true);
	412	+// }
361	413
362	414	SetupMenu();
363	415
..	..	@@ -377,6 +429,9 @@
377	429
378	430	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
379	431
	432	+ // This is to refresh the UI of the material panel.
	433	+ boolean patchMaterial;
	434	+
380	435	void SetupMenu()
381	436	{
382	437	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -426,6 +481,8 @@
426	481
427	482	ChangeListener changeListener = new ChangeListener()
428	483	{
	484	+ //String name;
	485	+
429	486	public void stateChanged(ChangeEvent changeEvent)
430	487	{
431	488	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -444,7 +501,37 @@
444	501	// EditSelection(false);
445	502	// }
446	503
447		- 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();
448	535	}
449	536	};
450	537	objectPanel.addChangeListener(changeListener);
..	..	@@ -466,6 +553,8 @@
466	553
467	554	toolboxPanel = new cGridBag().setVertical(true);
468	555	//toolboxPanel.setName("Toolbox");
	556	+
	557	+ skyboxPanel = new cGridBag().setVertical(true);
469	558
470	559	materialPanel = new cGridBag().setVertical(false);
471	560	//materialPanel.setName("Material");
..	..	@@ -751,6 +840,7 @@
751	840	boolean maximized;
752	841
753	842	cButton fullscreenLayout;
	843	+ cButton expandedLayout;
754	844
755	845	void Minimize()
756	846	{
..	..	@@ -790,10 +880,12 @@
790	880	cButton minButton;
791	881	cButton maxButton;
792	882	cButton fullButton;
	883	+ cButton collapseButton;
	884	+ cButton maximize3DButton;
793	885
794	886	void ToggleFullScreen()
795	887	{
796		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	888	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797	889
798	890	cameraView.ToggleFullScreen();
799	891
..	..	@@ -814,13 +906,13 @@
814	906	// X frame.getContentPane().remove(/"Center",/bigThree);
815	907	// X framePanel.add(bigThree);
816	908	// X frame.getContentPane().add(/"Center",/framePanel);
817		- framePanel.setDividerLocation(46);
	909	+// framePanel.setDividerLocation(46); // icons are 24x24
818	910
819	911	//frame.setVisible(true);
820		- radio.layout = keepButton;
	912	+// radio.layout = keepButton;
821	913	//theFrame = null;
822	914	keepButton = null;
823		- radio.layout.doClick();
	915	+// radio.layout.doClick();
824	916
825	917	} else
826	918	{
..	..	@@ -841,10 +933,10 @@
841	933	// X frame.getContentPane().remove(/"Center",/framePanel);
842	934	// X framePanel.remove(bigThree);
843	935	// X frame.getContentPane().add(/"Center",/bigThree);
844		- framePanel.setDividerLocation(0);
	936	+// framePanel.setDividerLocation(0);
845	937
846		- radio.layout = fullscreenLayout;
847		- radio.layout.doClick();
	938	+// radio.layout = fullscreenLayout;
	939	+// radio.layout.doClick();
848	940	//frame.setVisible(true);
849	941	}
850	942	frame.validate();
..	..	@@ -852,23 +944,42 @@
852	944	cameraView.requestFocusInWindow();
853	945	}
854	946
855		- 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)
856	956	{
857	957	boolean temp = CameraPane.SWITCH;
858	958	CameraPane.SWITCH = false;
859	959
860		- 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);
861	964	// if (copy == client)
862	965
863		- Object3D versions[] = copy.versionlist;
864		- 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;
865	973
866	974	//byte[] compress = Compress(copy);
867		- Object3D compress = (Object3D)Grafreed.clone(copy);
	975	+ Object3D compress = (Object3D)Grafreed.clone(object);
868	976
869		- copy.versionlist = versions;
	977	+ object.parent = parent;
870	978
871		- copy.RestoreBigData(versiontable);
	979	+ object.versionlist = versions;
	980	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	981	+
	982	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
872	983
873	984	CameraPane.SWITCH = temp;
874	985
..	..	@@ -1205,6 +1316,18 @@
1205	1316
1206	1317	namePanel = new cGridBag();
1207	1318
	1319	+ //if (copy.pinned)
	1320	+ {
	1321	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1322	+ pinButton.setSelected(copy.pinned);
	1323	+ cGridBag t = new cGridBag();
	1324	+ t.preferredWidth = 2;
	1325	+ t.add(pinButton);
	1326	+ namePanel.add(t);
	1327	+
	1328	+ pinButton.addItemListener(this);
	1329	+ }
	1330	+
1208	1331	nameField = AddText(namePanel, copy.GetName());
1209	1332	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1210	1333	oe.ctrlPanel.add(namePanel);
..	..	@@ -1218,14 +1341,14 @@
1218	1341
1219	1342	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1220	1343	liveCB.setToolTipText("Animate object");
	1344	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1345	+ markCB.setToolTipText("Set target transform");
1221	1346	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1222	1347	selectableCB.setToolTipText("Make object selectable");
1223	1348	// Return();
1224	1349
1225	1350	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1226	1351	hideCB.setToolTipText("Hide object");
1227		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1228		- markCB.setToolTipText("As animation target transform");
1229	1352
1230	1353	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1231	1354
..	..	@@ -1427,6 +1550,7 @@
1427	1550
1428	1551	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1429	1552	{
	1553	+ if (Globals.DEBUG)
1430	1554	System.out.println("CREATE CAMERAS");
1431	1555	cams = new cTemplate();
1432	1556	cams.name = "Cameras";
..	..	@@ -1508,6 +1632,42 @@
1508	1632	//frontView.object = copy;
1509	1633	//sideView.object = copy;
1510	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	+
1511	1671	XYZPanel = new cGridBag().setVertical(true);
1512	1672	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1513	1673
..	..	@@ -1517,6 +1677,9 @@
1517	1677	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1518	1678	//XYZPanel.setName("XYZ");
1519	1679
	1680	+ transformPanel.add(resetTransformPanel);
	1681	+ transformPanel.add(XYZPanel);
	1682	+
1520	1683	/*
1521	1684	gridPanel = new JPanel(); //new BorderLayout());
1522	1685	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1524,12 +1687,12 @@
1524	1687	gridPanel.add(cameraView);
1525	1688	gridPanel.add(XYZPanel);
1526	1689	*/
1527		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1528		- gridPanel.setContinuousLayout(true);
1529		- gridPanel.setOneTouchExpandable(true);
1530		- gridPanel.setDividerLocation(1.0);
1531		- gridPanel.setDividerSize(9);
1532		- 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);
1533	1696
1534	1697	// aConstraints.weighty = 0;
1535	1698	//System.out.println("THIS = " + this);
..	..	@@ -1552,31 +1715,34 @@
1552	1715
1553	1716	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1554	1717	//tmp.setName("Edit");
1555		- objectPanel.add(materialPanel);
1556		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1557		- objectPanel.setToolTipTextAt(0, "Material");
1558		-
1559	1718	objectPanel.add(toolboxPanel);
1560		- objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1561		- objectPanel.setToolTipTextAt(1, "Objects & backgrounds");
	1719	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1720	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
1562	1721
	1722	+ objectPanel.add(materialPanel);
	1723	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1724	+ objectPanel.setToolTipTextAt(1, "Material");
	1725	+
	1726	+ objectPanel.add(skyboxPanel);
	1727	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1728	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1729	+
1563	1730	// JPanel north = new JPanel(new BorderLayout());
1564	1731	// north.setName("Edit");
1565	1732	// north.add(ctrlPanel, BorderLayout.NORTH);
1566	1733	// objectPanel.add(north);
1567	1734	objectPanel.add(editPanel);
1568		- objectPanel.setIconAt(2, GetIcon("icons/write.png"));
1569		- objectPanel.setToolTipTextAt(2, "Edit controls");
	1735	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1736	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1570	1737
1571		- //if (Globals.ADVANCED)
1572		- objectPanel.add(infoPanel);
1573		- objectPanel.setIconAt(3, GetIcon("icons/info.png"));
1574		- objectPanel.setToolTipTextAt(3, "Information");
1575		-
1576		- objectPanel.add(XYZPanel);
	1738	+ objectPanel.add(transformPanel);
1577	1739	objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1578		- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1740	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1579	1741
	1742	+ patchMaterial = true;
	1743	+ cameraView.patchMaterial = this;
	1744	+ objectPanel.setSelectedIndex(1);
	1745	+
1580	1746	/*
1581	1747	aConstraints.gridx = 0;
1582	1748	aConstraints.gridwidth = 1;
..	..	@@ -1596,7 +1762,7 @@
1596	1762	scrollpane.addMouseWheelListener(this); // Default not fast enough
1597	1763
1598	1764	/JTabbedPane/ scenePanel = new cGridBag();
1599		- scenePanel.preferredWidth = 5;
	1765	+ scenePanel.preferredWidth = 6;
1600	1766
1601	1767	JTabbedPane tabbedPane = new JTabbedPane();
1602	1768	tabbedPane.add(scrollpane);
..	..	@@ -1613,6 +1779,11 @@
1613	1779
1614	1780	scenePanel.add(tabbedPane);
1615	1781
	1782	+ //if (Globals.ADVANCED)
	1783	+// tabbedPane.add(infoPanel);
	1784	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1785	+// tabbedPane.setToolTipTextAt(3, "Information");
	1786	+
1616	1787	/*
1617	1788	cTree jTree = new cTree(null);
1618	1789	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1633,13 +1804,13 @@
1633	1804	jtp.add(tree);
1634	1805	*/
1635	1806
1636		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1637		- bigPanel.setContinuousLayout(true);
1638		- bigPanel.setOneTouchExpandable(true);
1639		- bigPanel.setDividerLocation(0.8);
1640		- bigPanel.setDividerSize(15);
1641		- bigPanel.setResizeWeight(0.15);
1642		- 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");
1643	1814
1644	1815	//bigPanel.setLayout(new BorderLayout());
1645	1816	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1683,6 +1854,23 @@
1683	1854	// aConstraints.gridheight = 1;
1684	1855
1685	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	+
1686	1874	framePanel.setContinuousLayout(false);
1687	1875	framePanel.setOneTouchExpandable(false);
1688	1876	//.setDividerLocation(0.8);
..	..	@@ -1692,7 +1880,7 @@
1692	1880
1693	1881	frame.getContentPane().setLayout(new BorderLayout());
1694	1882	/**/
1695		- JTabbedPane worldPane = new JTabbedPane();
	1883	+ //JTabbedPane worldPane = new JTabbedPane();
1696	1884	//worldPane.add(bigPanel);
1697	1885	//worldPane.add(worldPanel);
1698	1886	/**/
..	..	@@ -1706,7 +1894,7 @@
1706	1894
1707	1895	cameraView.requestFocusInWindow();
1708	1896
1709		- gridPanel.setDividerLocation(1.0);
	1897	+// gridPanel.setDividerLocation(1.0);
1710	1898
1711	1899	frame.validate();
1712	1900
..	..	@@ -1752,7 +1940,15 @@
1752	1940
1753	1941	// Skin
1754	1942	colorField.setFloat(material.color);
1755		- 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	+
1756	1952	subsurfaceField.setFloat(material.subsurface);
1757	1953	selfshadowField.setFloat(material.diffuseness);
1758	1954	diffusenessField.setFloat(material.factor);
..	..	@@ -2063,6 +2259,21 @@
2063	2259	});
2064	2260	presetpanel.add(bump0);
2065	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	+
2066	2277	cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2067	2278	halo.setToolTipText("Halo");
2068	2279	halo.addMouseListener(new MouseAdapter()
..	..	@@ -2101,6 +2312,25 @@
2101	2312	}
2102	2313	});
2103	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);
2104	2334
2105	2335	cGridBag panel = new cGridBag().setVertical(true);
2106	2336
..	..	@@ -2151,9 +2381,20 @@
2151	2381
2152	2382	cGridBag huepanel = new cGridBag();
2153	2383	cGridBag huelabel = new cGridBag();
2154		- skin = GetLabel("icons/hue.png", false);
2155		- skin.fit = true;
2156		- 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);
2157	2398	huelabel.preferredWidth = 20;
2158	2399	huepanel.add(new cGridBag()); // Label
2159	2400	huepanel.add(huelabel); // Field/slider
..	..	@@ -3429,32 +3670,8 @@
3429	3670
3430	3671	if (multiplyToggle != null)
3431	3672	multiplyToggle.setSelected(mat.multiply);
3432		-
3433		- assert (object.projectedVertices != null);
3434		-
3435		- if (object.projectedVertices.length <= 2)
3436		- {
3437		- // Side effect...
3438		- Object3D.cVector2[] keep = object.projectedVertices;
3439		- object.projectedVertices = new Object3D.cVector2[3];
3440		- for (int i = 0; i < 3; i++)
3441		- {
3442		- if (i < keep.length)
3443		- {
3444		- object.projectedVertices[i] = keep[i];
3445		- } else
3446		- {
3447		- object.projectedVertices[i] = new Object3D.cVector2();
3448		- }
3449		- /*
3450		- if(keep.length == 0)
3451		- object.projectedVertices[0] = new Object3D.cVector2();
3452		- else
3453		- object.projectedVertices[0] = keep[0];
3454		- object.projectedVertices[1] = new Object3D.cVector2();
3455		- */
3456		- }
3457		- }
	3673	+
	3674	+ AllocProjectedVertices(object);
3458	3675
3459	3676	SetMaterial(mat, object.projectedVertices);
3460	3677	}
..	..	@@ -3574,6 +3791,17 @@
3574	3791	public void itemStateChanged(ItemEvent event)
3575	3792	{
3576	3793	// System.out.println("Propagate = " + propagate);
	3794	+ if (event.getSource() == pinButton)
	3795	+ {
	3796	+ copy.pinned ^= true;
	3797	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3798	+ {
	3799	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3800	+ copy.CloseUI();
	3801	+ //copy.editWindow.refreshContents();
	3802	+ }
	3803	+ }
	3804	+ else
3577	3805	if (event.getSource() == propagateToggle)
3578	3806	{
3579	3807	propagate ^= true;
..	..	@@ -3753,7 +3981,7 @@
3753	3981	//System.out.println("ObjEditor " + event);
3754	3982	applySelf0(true);
3755	3983	//parent.applySelf();
3756		- objEditor.refreshContents();
	3984	+ // conflicts with requestFocus objEditor.refreshContents();
3757	3985	} else if (source == resetButton)
3758	3986	{
3759	3987	CameraPane.fullreset = true;
..	..	@@ -4046,7 +4274,7 @@
4046	4274	{
4047	4275	//Save(true);
4048	4276	Replace();
4049		- SetUndoStates();
	4277	+ SetVersionStates();
4050	4278	}
4051	4279
4052	4280	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -4065,8 +4293,6 @@
4065	4293	return true;
4066	4294	}
4067	4295
4068		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4069		-
4070	4296	void DeleteVersion()
4071	4297	{
4072	4298	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -4074,19 +4300,23 @@
4074	4300	copy.versionlist[i] = copy.versionlist[i+1];
4075	4301	}
4076	4302
4077		- CopyChanged();
	4303	+ if (copy.versionlist[copy.versionindex] == null)
	4304	+ copy.versionindex -= 1;
4078	4305
4079		- SetUndoStates();
	4306	+ if (copy.versionindex != -1)
	4307	+ CopyChanged();
	4308	+
	4309	+ SetVersionStates();
4080	4310	}
4081	4311
4082	4312	public boolean Save(boolean user)
4083	4313	{
4084	4314	System.err.println("Save");
4085		- //Replace();
	4315	+ Replace();
4086	4316
4087		- cRadio tab = GetCurrentTab();
	4317	+ //cRadio tab = GetCurrentTab();
4088	4318
4089		- Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
	4319	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4090	4320
4091	4321	boolean thesame = false;
4092	4322
..	..	@@ -4122,7 +4352,7 @@
4122	4352	// copy.versionlist[i] = null;
4123	4353	// }
4124	4354
4125		- SetUndoStates();
	4355	+ SetVersionStates();
4126	4356
4127	4357	// test save
4128	4358	if (false)
..	..	@@ -4180,14 +4410,14 @@
4180	4410
4181	4411	void CopyChanged()
4182	4412	{
4183		- Object3D obj = copy.versionlist[copy.versionindex];
	4413	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4184	4414
4185		- SetUndoStates();
	4415	+ SetVersionStates();
4186	4416
4187	4417	boolean temp = CameraPane.SWITCH;
4188	4418	CameraPane.SWITCH = false;
4189	4419
4190		- copy.ExtractBigData(versiontable);
	4420	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4191	4421
4192	4422	copy.clear();
4193	4423
..	..	@@ -4199,7 +4429,7 @@
4199	4429	copy.add(obj.get(i));
4200	4430	}
4201	4431
4202		- copy.RestoreBigData(versiontable);
	4432	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4203	4433
4204	4434	CameraPane.SWITCH = temp;
4205	4435
..	..	@@ -4249,23 +4479,45 @@
4249	4479	return count;
4250	4480	}
4251	4481
4252		- void SetUndoStates()
	4482	+ public cGridBag versionSliderPane;
	4483	+
	4484	+ void SetVersionStates()
4253	4485	{
4254		- cRadio tab = GetCurrentTab();
	4486	+ //if (true)
	4487	+ // return;
	4488	+
	4489	+ //cRadio tab = GetCurrentTab();
4255	4490
4256		- restoreButton.setEnabled(true); // copy.versionindex != -1);
4257		- replaceButton.setEnabled(true); // copy.versionindex != -1);
4258		-
4259		- previousVersionButton.setEnabled(copy.versionindex > 0);
4260		- nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4261		-
4262		- deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4263		- copy.versionlist[copy.versionindex + 1] != null);
4264		-
4265		- muteSlider = true;
4266		- versionSlider.setMaximum(VersionCount() - 1);
4267		- versionSlider.setInteger(copy.versionindex);
4268		- 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	+ }
4269	4521	}
4270	4522
4271	4523	public boolean PreviousVersion()
..	..	@@ -4275,7 +4527,7 @@
4275	4527
4276	4528	System.err.println("Undo");
4277	4529
4278		- cRadio tab = GetCurrentTab();
	4530	+ //cRadio tab = GetCurrentTab();
4279	4531
4280	4532	if (copy.versionindex == 0)
4281	4533	{
..	..	@@ -4307,7 +4559,7 @@
4307	4559	{
4308	4560	System.err.println("Restore");
4309	4561
4310		- cRadio tab = GetCurrentTab();
	4562	+ //cRadio tab = GetCurrentTab();
4311	4563
4312	4564	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4313	4565	{
..	..	@@ -4323,9 +4575,9 @@
4323	4575
4324	4576	public boolean Replace()
4325	4577	{
4326		- System.err.println("Replace");
	4578	+ //System.err.println("Replace");
4327	4579
4328		- cRadio tab = GetCurrentTab();
	4580	+ //cRadio tab = GetCurrentTab();
4329	4581
4330	4582	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4331	4583	{
..	..	@@ -4333,7 +4585,7 @@
4333	4585	return false;
4334	4586	}
4335	4587
4336		- copy.versionlist[copy.versionindex] = CompressCopy();
	4588	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
4337	4589
4338	4590	return true;
4339	4591	}
..	..	@@ -4343,7 +4595,7 @@
4343	4595	// Option?
4344	4596	Replace();
4345	4597
4346		- cRadio tab = GetCurrentTab();
	4598	+ //cRadio tab = GetCurrentTab();
4347	4599
4348	4600	if (copy.versionlist[copy.versionindex + 1] == null)
4349	4601	{
..	..	@@ -4550,6 +4802,12 @@
4550	4802	// else
4551	4803	// applySelf(true);
4552	4804	// }
	4805	+
	4806	+ boolean Equal(double a, double b)
	4807	+ {
	4808	+ return Math.abs(a - b) < 0.001;
	4809	+ }
	4810	+
4553	4811	void applySelf0(boolean name)
4554	4812	{
4555	4813	if (name)
..	..	@@ -4599,29 +4857,52 @@
4599	4857	{
4600	4858	cMaterial mat = copy.material;
4601	4859
4602		- colorField.SetToolTipValue((mat.color));
4603		- saturationField.SetToolTipValue((mat.modulation));
4604		- metalnessField.SetToolTipValue((mat.metalness));
4605		- diffuseField.SetToolTipValue((mat.diffuse));
4606		- specularField.SetToolTipValue((mat.specular));
4607		- shininessField.SetToolTipValue((mat.shininess));
4608		- shiftField.SetToolTipValue((mat.shift));
4609		- ambientField.SetToolTipValue((mat.ambient));
4610		- lightareaField.SetToolTipValue((mat.lightarea));
4611		- diffusenessField.SetToolTipValue((mat.factor));
4612		- velvetField.SetToolTipValue((mat.velvet));
4613		- sheenField.SetToolTipValue((mat.sheen));
4614		- subsurfaceField.SetToolTipValue((mat.subsurface));
4615		- backlitField.SetToolTipValue((mat.bump));
4616		- anisoField.SetToolTipValue((mat.aniso));
4617		- anisoVField.SetToolTipValue((mat.anisoV));
4618		- cameraField.SetToolTipValue((mat.cameralight));
4619		- selfshadowField.SetToolTipValue((mat.diffuseness));
4620		- shadowField.SetToolTipValue((mat.shadow));
4621		- textureField.SetToolTipValue((mat.texture));
4622		- opacityField.SetToolTipValue((mat.opacity));
4623		- fakedepthField.SetToolTipValue((mat.fakedepth));
4624		- 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));
4625	4906	}
4626	4907
4627	4908	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4656,15 +4937,17 @@
4656	4937
4657	4938	public void stateChanged(ChangeEvent e)
4658	4939	{
4659		- // assert(false);
	4940	+ // assert(false);
4660	4941	if (e.getSource() == versionSlider)
4661	4942	{
4662	4943	if (muteSlider)
4663	4944	return;
4664	4945
	4946	+ Replace();
	4947	+
4665	4948	int version = versionSlider.getInteger();
4666	4949
4667		- if (copy.versionlist[version] != null)
	4950	+ if (version != -1 && copy.versionlist[version] != null)
4668	4951	{
4669	4952	copy.versionindex = version;
4670	4953	CopyChanged();
..	..	@@ -4708,7 +4991,7 @@
4708	4991	//System.out.println("stateChanged = " + this);
4709	4992	materialtouched = true;
4710	4993
4711		- if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4994	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
4712	4995	{
4713	4996	saturationField.setFloat(1);
4714	4997	}
..	..	@@ -5023,7 +5306,9 @@
5023	5306	}
5024	5307
5025	5308	if (previousVersionButton != null && copy.versionlist != null)
5026		- SetUndoStates();
	5309	+ SetVersionStates();
	5310	+
	5311	+ cameraView.requestFocusInWindow();
5027	5312	}
5028	5313
5029	5314	static TweenManager tweenManager = new TweenManager();
..	..	@@ -5055,7 +5340,7 @@
5055	5340	// group = (Composite) group.get(0);
5056	5341	// }
5057	5342
5058		- System.out.println("makeSomething of " + thing);
	5343	+ //System.out.println("makeSomething of " + thing);
5059	5344
5060	5345	/*
5061	5346	if (deselect && jList != null)
..	..	@@ -5409,11 +5694,15 @@
5409	5694
5410	5695	copy.versionlist = readobj.versionlist;
5411	5696	copy.versionindex = readobj.versionindex;
	5697	+ copy.versiontable = readobj.versiontable;
5412	5698
5413	5699	if (copy.versionlist == null)
5414	5700	{
	5701	+ // Backward compatibility
5415	5702	copy.versionlist = new Object3D[100];
5416	5703	copy.versionindex = -1;
	5704	+
	5705	+ //Save(true);
5417	5706	}
5418	5707
5419	5708	//? SetUndoStates();
..	..	@@ -5505,6 +5794,8 @@
5505	5794
5506	5795	void save()
5507	5796	{
	5797	+ Replace();
	5798	+
5508	5799	if (lastname == null)
5509	5800	{
5510	5801	return;
..	..	@@ -5747,6 +6038,7 @@
5747	6038	ButtonGroup buttonGroup;
5748	6039
5749	6040	cGridBag toolboxPanel;
	6041	+ cGridBag skyboxPanel;
5750	6042	cGridBag materialPanel;
5751	6043	cGridBag ctrlPanel;
5752	6044
..	..	@@ -5758,6 +6050,7 @@
5758	6050	boolean materialFlushed;
5759	6051	Object3D latestObject;
5760	6052
	6053	+ cGridBag transformPanel;
5761	6054	cGridBag XYZPanel;
5762	6055
5763	6056	JSplitPane gridPanel;
..	..	@@ -5851,6 +6144,7 @@
5851	6144	cNumberSlider anisoField;
5852	6145	JLabel anisoVLabel;
5853	6146	cNumberSlider anisoVField;
	6147	+
5854	6148	JLabel cameraLabel;
5855	6149	cNumberSlider cameraField;
5856	6150	JLabel selfshadowLabel;
..	..	@@ -5865,6 +6159,7 @@
5865	6159	cNumberSlider fakedepthField;
5866	6160	JLabel shadowbiasLabel;
5867	6161	cNumberSlider shadowbiasField;
	6162	+
5868	6163	JLabel bumpLabel;
5869	6164	cNumberSlider bumpField;
5870	6165	JLabel noiseLabel;