~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,50 @@
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	+ }
	74	+
	75	+ public Composite CreateCameras()
	76	+ {
	77	+ Composite cams = new cTemplate();
	78	+ cams.name = "Cameras";
	79	+ copy.insertElementAt(cams, 0);
	80	+
	81	+ cams.addChild(new Camera());
	82	+ cams.addChild(new Camera(1));
	83	+ cams.addChild(new Camera(2));
	84	+ cams.addChild(new Camera(3));
	85	+ cams.addChild(new Camera(4));
	86	+
	87	+ return cams;
	88	+ }
44	89
45	90	public cGridBag GetSeparator()
46	91	{
..	..	@@ -53,7 +98,10 @@
53	98	cButton GetButton(String name, boolean border)
54	99	{
55	100	ImageIcon icon = GetIcon(name);
56		- return new cButton(icon, border);
	101	+ if (icon != null \|\| name.contains("/"))
	102	+ return new cButton(icon, border);
	103	+ else
	104	+ return new cButton(name, border);
57	105	}
58	106
59	107	cLabel GetLabel(String name, boolean border)
..	..	@@ -74,11 +122,19 @@
74	122	return new cCheckBox(icon, border);
75	123	}
76	124
77		- ImageIcon GetIcon(String name)
	125	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	126	+
	127	+ static ImageIcon GetIcon(String name)
78	128	{
	129	+ javax.swing.ImageIcon iconCache = icons.get(name);
	130	+ if (iconCache != null)
	131	+ {
	132	+ return iconCache;
	133	+ }
	134	+
79	135	try
80	136	{
81		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	137	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
82	138
83	139	// if (image.getWidth() > 48 && image.getHeight() > 48)
84	140	// {
..	..	@@ -93,10 +149,14 @@
93	149	// }
94	150
95	151	javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	152	+
	153	+ icons.put(name, icon);
	154	+
96	155	return icon;
97	156	}
98	157	catch (Exception e)
99	158	{
	159	+ //icons.put(name, null);
100	160	return null;
101	161	}
102	162	}
..	..	@@ -296,11 +356,13 @@
296	356	client = inClient;
297	357	copy = client;
298	358
299		- if (copy.versionlist == null)
300		- {
301		- copy.versionlist = new Object3D[100];
302		- copy.versionindex = -1;
303		- }
	359	+// if (copy.versionlist == null)
	360	+// {
	361	+// copy.versionlist = new Object3D[100];
	362	+// copy.versionindex = -1;
	363	+//
	364	+// callee.Save(true);
	365	+// }
304	366
305	367	// "this" is not called: SetupUI2(objEditor);
306	368	}
..	..	@@ -319,6 +381,8 @@
319	381	{
320	382	copy.versionlist = new Object3D[100];
321	383	copy.versionindex = -1;
	384	+
	385	+// Save(true);
322	386	}
323	387
324	388	SetupUI2(callee.GetEditor());
..	..	@@ -342,7 +406,8 @@
342	406	//parent = p;
343	407
344	408	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
345		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	409	+ if (Globals.DEBUG)
	410	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
346	411	//gd.setFullScreenWindow(this);
347	412	//setResizable(false);
348	413	//if (!isDisplayable())
..	..	@@ -353,11 +418,13 @@
353	418	copy = localCopy;
354	419	copy.editWindow = this;
355	420
356		- if (copy.versionlist == null)
357		- {
358		-// copy.versions = new byte[100][];
	421	+// if (copy.versionlist == null)
	422	+// {
	423	+// copy.versionlist = new Object3D[100];
359	424	// copy.versionindex = -1;
360		- }
	425	+//
	426	+// Save(true);
	427	+// }
361	428
362	429	SetupMenu();
363	430
..	..	@@ -377,6 +444,9 @@
377	444
378	445	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
379	446
	447	+ // This is to refresh the UI of the material panel.
	448	+ boolean patchMaterial;
	449	+
380	450	void SetupMenu()
381	451	{
382	452	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -426,6 +496,8 @@
426	496
427	497	ChangeListener changeListener = new ChangeListener()
428	498	{
	499	+ //String name;
	500	+
429	501	public void stateChanged(ChangeEvent changeEvent)
430	502	{
431	503	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -444,7 +516,37 @@
444	516	// EditSelection(false);
445	517	// }
446	518
447		- refreshContents(false); // To refresh Info tab
	519	+// if (objectPanel.getSelectedIndex() == 4)
	520	+// {
	521	+// name = copy.skyboxname;
	522	+//
	523	+// if (name == null)
	524	+// {
	525	+// name = "";
	526	+// }
	527	+//
	528	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	529	+// copy.skyboxext = "jpg";
	530	+// }
	531	+// else
	532	+// {
	533	+// if (name != null)
	534	+// {
	535	+// if (name.equals(""))
	536	+// {
	537	+// copy.skyboxname = null;
	538	+// copy.skyboxext = null;
	539	+// }
	540	+// else
	541	+// {
	542	+// copy.skyboxname = name;
	543	+// }
	544	+// }
	545	+// }
	546	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	547	+
	548	+// refreshContents(false); // To refresh Info tab
	549	+ cameraView.repaint();
448	550	}
449	551	};
450	552	objectPanel.addChangeListener(changeListener);
..	..	@@ -466,6 +568,8 @@
466	568
467	569	toolboxPanel = new cGridBag().setVertical(true);
468	570	//toolboxPanel.setName("Toolbox");
	571	+
	572	+ skyboxPanel = new cGridBag().setVertical(true);
469	573
470	574	materialPanel = new cGridBag().setVertical(false);
471	575	//materialPanel.setName("Material");
..	..	@@ -751,6 +855,7 @@
751	855	boolean maximized;
752	856
753	857	cButton fullscreenLayout;
	858	+ cButton expandedLayout;
754	859
755	860	void Minimize()
756	861	{
..	..	@@ -790,10 +895,12 @@
790	895	cButton minButton;
791	896	cButton maxButton;
792	897	cButton fullButton;
	898	+ cButton collapseButton;
	899	+ cButton maximize3DButton;
793	900
794	901	void ToggleFullScreen()
795	902	{
796		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	903	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797	904
798	905	cameraView.ToggleFullScreen();
799	906
..	..	@@ -814,13 +921,13 @@
814	921	// X frame.getContentPane().remove(/"Center",/bigThree);
815	922	// X framePanel.add(bigThree);
816	923	// X frame.getContentPane().add(/"Center",/framePanel);
817		- framePanel.setDividerLocation(46);
	924	+// framePanel.setDividerLocation(46); // icons are 24x24
818	925
819	926	//frame.setVisible(true);
820		- radio.layout = keepButton;
	927	+// radio.layout = keepButton;
821	928	//theFrame = null;
822	929	keepButton = null;
823		- radio.layout.doClick();
	930	+// radio.layout.doClick();
824	931
825	932	} else
826	933	{
..	..	@@ -841,10 +948,10 @@
841	948	// X frame.getContentPane().remove(/"Center",/framePanel);
842	949	// X framePanel.remove(bigThree);
843	950	// X frame.getContentPane().add(/"Center",/bigThree);
844		- framePanel.setDividerLocation(0);
	951	+// framePanel.setDividerLocation(0);
845	952
846		- radio.layout = fullscreenLayout;
847		- radio.layout.doClick();
	953	+// radio.layout = fullscreenLayout;
	954	+// radio.layout.doClick();
848	955	//frame.setVisible(true);
849	956	}
850	957	frame.validate();
..	..	@@ -852,23 +959,42 @@
852	959	cameraView.requestFocusInWindow();
853	960	}
854	961
855		- private Object3D CompressCopy()
	962	+ void CollapseToolbar()
	963	+ {
	964	+ framePanel.setDividerLocation(0);
	965	+ //frame.validate();
	966	+
	967	+ cameraView.requestFocusInWindow();
	968	+ }
	969	+
	970	+ private Object3D Duplicate(Object3D object)
856	971	{
857	972	boolean temp = CameraPane.SWITCH;
858	973	CameraPane.SWITCH = false;
859	974
860		- copy.ExtractBigData(versiontable);
	975	+ if (Grafreed.grafreed.universe.versiontable == null)
	976	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	977	+
	978	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
861	979	// if (copy == client)
862	980
863		- Object3D versions[] = copy.versionlist;
864		- copy.versionlist = null;
	981	+ Object3D versions[] = object.versionlist;
	982	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	983	+ object.versionlist = null;
	984	+ object.versiontable = null;
	985	+
	986	+ Object3D parent = object.parent;
	987	+ object.parent = null;
865	988
866	989	//byte[] compress = Compress(copy);
867		- Object3D compress = (Object3D)Grafreed.clone(copy);
	990	+ Object3D compress = (Object3D)Grafreed.clone(object);
868	991
869		- copy.versionlist = versions;
	992	+ object.parent = parent;
870	993
871		- copy.RestoreBigData(versiontable);
	994	+ object.versionlist = versions;
	995	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	996	+
	997	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
872	998
873	999	CameraPane.SWITCH = temp;
874	1000
..	..	@@ -1205,6 +1331,18 @@
1205	1331
1206	1332	namePanel = new cGridBag();
1207	1333
	1334	+ //if (copy.pinned)
	1335	+ {
	1336	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1337	+ pinButton.setSelected(copy.pinned);
	1338	+ cGridBag t = new cGridBag();
	1339	+ t.preferredWidth = 2;
	1340	+ t.add(pinButton);
	1341	+ namePanel.add(t);
	1342	+
	1343	+ pinButton.addItemListener(this);
	1344	+ }
	1345	+
1208	1346	nameField = AddText(namePanel, copy.GetName());
1209	1347	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1210	1348	oe.ctrlPanel.add(namePanel);
..	..	@@ -1218,14 +1356,14 @@
1218	1356
1219	1357	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1220	1358	liveCB.setToolTipText("Animate object");
	1359	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1360	+ markCB.setToolTipText("Set target transform");
1221	1361	selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1222	1362	selectableCB.setToolTipText("Make object selectable");
1223	1363	// Return();
1224	1364
1225	1365	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1226	1366	hideCB.setToolTipText("Hide object");
1227		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1228		- markCB.setToolTipText("As animation target transform");
1229	1367
1230	1368	ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1231	1369
..	..	@@ -1427,22 +1565,9 @@
1427	1565
1428	1566	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1429	1567	{
1430		- System.out.println("CREATE CAMERAS");
1431		- cams = new cTemplate();
1432		- cams.name = "Cameras";
1433		- copy.insertElementAt(cams, 0);
1434		- //cams.parent = copy;
1435		-
1436		- cam = new Camera(); // LA.newVector(3, 2, 1));
1437		- cams.addChild(cam);
1438		- cam = new Camera(1);
1439		- cams.addChild(cam);
1440		- cam = new Camera(2);
1441		- cams.addChild(cam);
1442		- cam = new Camera(3);
1443		- cams.addChild(cam);
1444		- cam = new Camera(4); // Light
1445		- cams.addChild(cam);
	1568	+ if (Globals.DEBUG)
	1569	+ System.out.println("CREATE CAMERAS");
	1570	+ cams = CreateCameras();
1446	1571	} else
1447	1572	{
1448	1573	cams = (cGroup) copy.get(0);
..	..	@@ -1508,6 +1633,45 @@
1508	1633	//frontView.object = copy;
1509	1634	//sideView.object = copy;
1510	1635
	1636	+ transformPanel = new cGridBag().setVertical(true);
	1637	+
	1638	+ cGridBag resetTransformPanel = new cGridBag();
	1639	+
	1640	+ resetTransformPanel.preferredHeight = 2;
	1641	+
	1642	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1643	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1644	+ resetTransform.addMouseListener(new MouseAdapter()
	1645	+ {
	1646	+ public void mouseClicked(MouseEvent e)
	1647	+ {
	1648	+ ResetTransform();
	1649	+ }
	1650	+ });
	1651	+ resetTransformPanel.add(resetTransform);
	1652	+
	1653	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1654	+ resetTransform.setToolTipText("Reset Translation only");
	1655	+ resetTransform.addMouseListener(new MouseAdapter()
	1656	+ {
	1657	+ public void mouseClicked(MouseEvent e)
	1658	+ {
	1659	+ ResetTransform(1);
	1660	+ }
	1661	+ });
	1662	+ resetTransformPanel.add(resetTransform);
	1663	+
	1664	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1665	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1666	+ resetTransform.addMouseListener(new MouseAdapter()
	1667	+ {
	1668	+ public void mouseClicked(MouseEvent e)
	1669	+ {
	1670	+ ResetTransform(2);
	1671	+ }
	1672	+ });
	1673	+ resetTransformPanel.add(resetTransform);
	1674	+
1511	1675	XYZPanel = new cGridBag().setVertical(true);
1512	1676	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1513	1677
..	..	@@ -1517,6 +1681,9 @@
1517	1681	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1518	1682	//XYZPanel.setName("XYZ");
1519	1683
	1684	+ transformPanel.add(resetTransformPanel);
	1685	+ transformPanel.add(XYZPanel);
	1686	+
1520	1687	/*
1521	1688	gridPanel = new JPanel(); //new BorderLayout());
1522	1689	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1524,12 +1691,12 @@
1524	1691	gridPanel.add(cameraView);
1525	1692	gridPanel.add(XYZPanel);
1526	1693	*/
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);
	1694	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1695	+// gridPanel.setContinuousLayout(true);
	1696	+// gridPanel.setOneTouchExpandable(true);
	1697	+// gridPanel.setDividerLocation(1.0);
	1698	+// gridPanel.setDividerSize(9);
	1699	+// gridPanel.setResizeWeight(0.85);
1533	1700
1534	1701	// aConstraints.weighty = 0;
1535	1702	//System.out.println("THIS = " + this);
..	..	@@ -1552,31 +1719,34 @@
1552	1719
1553	1720	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1554	1721	//tmp.setName("Edit");
	1722	+ objectPanel.add(skyboxPanel);
	1723	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1724	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1725	+
	1726	+ objectPanel.add(toolboxPanel);
	1727	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1728	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1729	+
1555	1730	objectPanel.add(materialPanel);
1556		- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1557		- objectPanel.setToolTipTextAt(0, "Material");
	1731	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1732	+ objectPanel.setToolTipTextAt(2, "Material");
1558	1733
1559	1734	// JPanel north = new JPanel(new BorderLayout());
1560	1735	// north.setName("Edit");
1561	1736	// north.add(ctrlPanel, BorderLayout.NORTH);
1562	1737	// objectPanel.add(north);
1563	1738	objectPanel.add(editPanel);
1564		- objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1565		- objectPanel.setToolTipTextAt(1, "Edit controls");
	1739	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
	1740	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1566	1741
1567		- //if (Globals.ADVANCED)
1568		- objectPanel.add(infoPanel);
1569		- objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1570		- objectPanel.setToolTipTextAt(2, "Information");
	1742	+ objectPanel.add(transformPanel);
	1743	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1744	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1571	1745
1572		- objectPanel.add(XYZPanel);
1573		- objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1574		- objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
1575		-
1576		- objectPanel.add(toolboxPanel);
1577		- objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1578		- objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1579		-
	1746	+ patchMaterial = true;
	1747	+ cameraView.patchMaterial = this;
	1748	+ objectPanel.setSelectedIndex(2);
	1749	+
1580	1750	/*
1581	1751	aConstraints.gridx = 0;
1582	1752	aConstraints.gridwidth = 1;
..	..	@@ -1596,7 +1766,7 @@
1596	1766	scrollpane.addMouseWheelListener(this); // Default not fast enough
1597	1767
1598	1768	/JTabbedPane/ scenePanel = new cGridBag();
1599		- scenePanel.preferredWidth = 5;
	1769	+ scenePanel.preferredWidth = 6;
1600	1770
1601	1771	JTabbedPane tabbedPane = new JTabbedPane();
1602	1772	tabbedPane.add(scrollpane);
..	..	@@ -1607,11 +1777,51 @@
1607	1777
1608	1778	AddOptions(optionsPanel); //, aConstraints);
1609	1779
1610		- tabbedPane.add(optionsPanel);
1611		-
1612	1780	tabbedPane.add(FSPane = new cFileSystemPane(this));
1613	1781
	1782	+ tabbedPane.add(optionsPanel);
	1783	+
1614	1784	scenePanel.add(tabbedPane);
	1785	+
	1786	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1787	+ creditsPanel.setName("Credits");
	1788	+
	1789	+ cLabel ogaLabel = new cLabel(" Most Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1790	+ creditsPanel.add(ogaLabel);
	1791	+
	1792	+ cButton opengameartButton;
	1793	+ creditsPanel.add(opengameartButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1794	+ opengameartButton.setToolTipText("https://opengameart.org");
	1795	+
	1796	+ opengameartButton.addMouseListener(new MouseAdapter()
	1797	+ {
	1798	+ public void mouseClicked(MouseEvent e)
	1799	+ {
	1800	+ try
	1801	+ {
	1802	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1803	+ } catch (Exception e1)
	1804	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1805	+ {
	1806	+ e1.printStackTrace();
	1807	+ }
	1808	+ }
	1809	+ });
	1810	+
	1811	+ for (int i=10; --i>=0;)
	1812	+ {
	1813	+ creditsPanel.add(new cGridBag());
	1814	+ }
	1815	+
	1816	+ tabbedPane.add(creditsPanel);
	1817	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1818	+
	1819	+ if (Globals.ADVANCED)
	1820	+ {
	1821	+ tabbedPane.add(infoPanel);
	1822	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1823	+ tabbedPane.setToolTipTextAt(4, "Information");
	1824	+ }
1615	1825
1616	1826	/*
1617	1827	cTree jTree = new cTree(null);
..	..	@@ -1633,13 +1843,13 @@
1633	1843	jtp.add(tree);
1634	1844	*/
1635	1845
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");
	1846	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1847	+// bigPanel.setContinuousLayout(true);
	1848	+// bigPanel.setOneTouchExpandable(true);
	1849	+// bigPanel.setDividerLocation(0.8);
	1850	+// bigPanel.setDividerSize(15);
	1851	+// bigPanel.setResizeWeight(0.15);
	1852	+// bigPanel.setName("Scene");
1643	1853
1644	1854	//bigPanel.setLayout(new BorderLayout());
1645	1855	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1683,6 +1893,23 @@
1683	1893	// aConstraints.gridheight = 1;
1684	1894
1685	1895	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1896	+
	1897	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1898	+ new java.beans.PropertyChangeListener()
	1899	+ {
	1900	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1901	+ {
	1902	+ if ((Integer)pce.getOldValue() == 1)
	1903	+ {
	1904	+ if (radio.layout != expandedLayout)
	1905	+ {
	1906	+ radio.layout = expandedLayout;
	1907	+ radio.layout.doClick();
	1908	+ }
	1909	+ }
	1910	+ }
	1911	+ });
	1912	+
1686	1913	framePanel.setContinuousLayout(false);
1687	1914	framePanel.setOneTouchExpandable(false);
1688	1915	//.setDividerLocation(0.8);
..	..	@@ -1692,7 +1919,7 @@
1692	1919
1693	1920	frame.getContentPane().setLayout(new BorderLayout());
1694	1921	/**/
1695		- JTabbedPane worldPane = new JTabbedPane();
	1922	+ //JTabbedPane worldPane = new JTabbedPane();
1696	1923	//worldPane.add(bigPanel);
1697	1924	//worldPane.add(worldPanel);
1698	1925	/**/
..	..	@@ -1706,7 +1933,7 @@
1706	1933
1707	1934	cameraView.requestFocusInWindow();
1708	1935
1709		- gridPanel.setDividerLocation(1.0);
	1936	+// gridPanel.setDividerLocation(1.0);
1710	1937
1711	1938	frame.validate();
1712	1939
..	..	@@ -1740,7 +1967,9 @@
1740	1967	void SetupMaterial(cGridBag materialpanel)
1741	1968	{
1742	1969	cGridBag presetpanel = new cGridBag().setVertical(true);
1743		- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1970	+
	1971	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	1972	+ skin.setToolTipText("Skin");
1744	1973	skin.addMouseListener(new MouseAdapter()
1745	1974	{
1746	1975	public void mouseClicked(MouseEvent e)
..	..	@@ -1750,7 +1979,15 @@
1750	1979
1751	1980	// Skin
1752	1981	colorField.setFloat(material.color);
1753		- saturationField.setFloat(material.modulation);
	1982	+ float saturation = material.modulation;
	1983	+
	1984	+ if (!cameraView.Skinshader)
	1985	+ {
	1986	+ saturation /= 1.5;
	1987	+ }
	1988	+
	1989	+ saturationField.setFloat(saturation);
	1990	+
1754	1991	subsurfaceField.setFloat(material.subsurface);
1755	1992	selfshadowField.setFloat(material.diffuseness);
1756	1993	diffusenessField.setFloat(material.factor);
..	..	@@ -1769,8 +2006,116 @@
1769	2006	});
1770	2007	presetpanel.add(skin);
1771	2008
1772		- cLabel rough2 = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
1773		- rough2.addMouseListener(new MouseAdapter()
	2009	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2010	+ lambert.setToolTipText("Diffuse");
	2011	+ lambert.addMouseListener(new MouseAdapter()
	2012	+ {
	2013	+ public void mouseClicked(MouseEvent e)
	2014	+ {
	2015	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2016	+ cMaterial material = object.material;
	2017	+
	2018	+ diffusenessField.setFloat(material.factor);
	2019	+ selfshadowField.setFloat(material.diffuseness);
	2020	+
	2021	+ materialtouched = true;
	2022	+ applySelf();
	2023	+ }
	2024	+ });
	2025	+ presetpanel.add(lambert);
	2026	+
	2027	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2028	+ diffuse2.setToolTipText("Diffuse2");
	2029	+ diffuse2.addMouseListener(new MouseAdapter()
	2030	+ {
	2031	+ public void mouseClicked(MouseEvent e)
	2032	+ {
	2033	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2034	+ cMaterial material = object.material;
	2035	+
	2036	+ diffusenessField.setFloat(material.factor);
	2037	+ selfshadowField.setFloat(material.diffuseness);
	2038	+
	2039	+ materialtouched = true;
	2040	+ applySelf();
	2041	+ }
	2042	+ });
	2043	+ presetpanel.add(diffuse2);
	2044	+
	2045	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2046	+ diffusemoon.setToolTipText("Moon");
	2047	+ diffusemoon.addMouseListener(new MouseAdapter()
	2048	+ {
	2049	+ public void mouseClicked(MouseEvent e)
	2050	+ {
	2051	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2052	+ cMaterial material = object.material;
	2053	+
	2054	+ diffusenessField.setFloat(material.factor);
	2055	+ selfshadowField.setFloat(material.diffuseness);
	2056	+
	2057	+ materialtouched = true;
	2058	+ applySelf();
	2059	+ }
	2060	+ });
	2061	+ presetpanel.add(diffusemoon);
	2062	+
	2063	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2064	+ diffusemoon2.setToolTipText("Moon2");
	2065	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2066	+ {
	2067	+ public void mouseClicked(MouseEvent e)
	2068	+ {
	2069	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2070	+ cMaterial material = object.material;
	2071	+
	2072	+ diffusenessField.setFloat(material.factor);
	2073	+ selfshadowField.setFloat(material.diffuseness);
	2074	+
	2075	+ materialtouched = true;
	2076	+ applySelf();
	2077	+ }
	2078	+ });
	2079	+ presetpanel.add(diffusemoon2);
	2080	+
	2081	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2082	+ diffusemoon3.setToolTipText("Moon3");
	2083	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2084	+ {
	2085	+ public void mouseClicked(MouseEvent e)
	2086	+ {
	2087	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2088	+ cMaterial material = object.material;
	2089	+
	2090	+ diffusenessField.setFloat(material.factor);
	2091	+ selfshadowField.setFloat(material.diffuseness);
	2092	+
	2093	+ materialtouched = true;
	2094	+ applySelf();
	2095	+ }
	2096	+ });
	2097	+ presetpanel.add(diffusemoon3);
	2098	+
	2099	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2100	+ diffusesheen.setToolTipText("Sheen");
	2101	+ diffusesheen.addMouseListener(new MouseAdapter()
	2102	+ {
	2103	+ public void mouseClicked(MouseEvent e)
	2104	+ {
	2105	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2106	+ cMaterial material = object.material;
	2107	+
	2108	+ sheenField.setFloat(material.sheen);
	2109	+
	2110	+ materialtouched = true;
	2111	+ applySelf();
	2112	+ }
	2113	+ });
	2114	+ presetpanel.add(diffusesheen);
	2115	+
	2116	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2117	+ rough.setToolTipText("Rough metal");
	2118	+ rough.addMouseListener(new MouseAdapter()
1774	2119	{
1775	2120	public void mouseClicked(MouseEvent e)
1776	2121	{
..	..	@@ -1784,31 +2129,254 @@
1784	2129	applySelf();
1785	2130	}
1786	2131	});
	2132	+ presetpanel.add(rough);
	2133	+
	2134	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2135	+ rough2.setToolTipText("Medium metal");
	2136	+ rough2.addMouseListener(new MouseAdapter()
	2137	+ {
	2138	+ public void mouseClicked(MouseEvent e)
	2139	+ {
	2140	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2141	+ cMaterial material = object.material;
	2142	+
	2143	+ shininessField.setFloat(material.shininess);
	2144	+ lightareaField.setFloat(material.lightarea);
	2145	+
	2146	+ materialtouched = true;
	2147	+ applySelf();
	2148	+ }
	2149	+ });
1787	2150	presetpanel.add(rough2);
1788	2151
1789		- presetpanel.add(GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF));
1790		- presetpanel.add(GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF));
1791		- presetpanel.add(GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF));
1792		- presetpanel.add(GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF));
1793		- presetpanel.add(GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF));
1794		- presetpanel.add(GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF));
1795		- presetpanel.add(GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF));
1796		- presetpanel.add(GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF));
1797		- presetpanel.add(GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF));
1798		- presetpanel.add(GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF));
1799		- presetpanel.add(GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF));
1800		- presetpanel.add(GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF));
1801		- presetpanel.add(GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF));
1802		- presetpanel.add(GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF));
1803		- presetpanel.add(GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF));
1804		- presetpanel.add(GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF));
	2152	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2153	+ shini0.setToolTipText("Shiny");
	2154	+ shini0.addMouseListener(new MouseAdapter()
	2155	+ {
	2156	+ public void mouseClicked(MouseEvent e)
	2157	+ {
	2158	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2159	+ cMaterial material = object.material;
	2160	+
	2161	+ shininessField.setFloat(material.shininess);
	2162	+ lightareaField.setFloat(material.lightarea);
	2163	+
	2164	+ materialtouched = true;
	2165	+ applySelf();
	2166	+ }
	2167	+ });
	2168	+ presetpanel.add(shini0);
	2169	+
	2170	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2171	+ shini1.setToolTipText("Shiny2");
	2172	+ shini1.addMouseListener(new MouseAdapter()
	2173	+ {
	2174	+ public void mouseClicked(MouseEvent e)
	2175	+ {
	2176	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2177	+ cMaterial material = object.material;
	2178	+
	2179	+ shininessField.setFloat(material.shininess);
	2180	+ lightareaField.setFloat(material.lightarea);
	2181	+
	2182	+ materialtouched = true;
	2183	+ applySelf();
	2184	+ }
	2185	+ });
	2186	+ presetpanel.add(shini1);
	2187	+
	2188	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2189	+ shini2.setToolTipText("Shiny3");
	2190	+ shini2.addMouseListener(new MouseAdapter()
	2191	+ {
	2192	+ public void mouseClicked(MouseEvent e)
	2193	+ {
	2194	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2195	+ cMaterial material = object.material;
	2196	+
	2197	+ shininessField.setFloat(material.shininess);
	2198	+ lightareaField.setFloat(material.lightarea);
	2199	+
	2200	+ materialtouched = true;
	2201	+ applySelf();
	2202	+ }
	2203	+ });
	2204	+ presetpanel.add(shini2);
	2205	+
	2206	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2207	+ aniso.setToolTipText("AnisoU");
	2208	+ aniso.addMouseListener(new MouseAdapter()
	2209	+ {
	2210	+ public void mouseClicked(MouseEvent e)
	2211	+ {
	2212	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2213	+ cMaterial material = object.material;
	2214	+
	2215	+ anisoField.setFloat(material.aniso);
	2216	+ anisoVField.setFloat(material.anisoV);
	2217	+
	2218	+ materialtouched = true;
	2219	+ applySelf();
	2220	+ }
	2221	+ });
	2222	+ presetpanel.add(aniso);
	2223	+
	2224	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2225	+ aniso2.setToolTipText("AnisoV");
	2226	+ aniso2.addMouseListener(new MouseAdapter()
	2227	+ {
	2228	+ public void mouseClicked(MouseEvent e)
	2229	+ {
	2230	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2231	+ cMaterial material = object.material;
	2232	+
	2233	+ anisoField.setFloat(material.aniso);
	2234	+ anisoVField.setFloat(material.anisoV);
	2235	+
	2236	+ materialtouched = true;
	2237	+ applySelf();
	2238	+ }
	2239	+ });
	2240	+ presetpanel.add(aniso2);
	2241	+
	2242	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2243	+ aniso3.setToolTipText("AnisoUV");
	2244	+ aniso3.addMouseListener(new MouseAdapter()
	2245	+ {
	2246	+ public void mouseClicked(MouseEvent e)
	2247	+ {
	2248	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2249	+ cMaterial material = object.material;
	2250	+
	2251	+ anisoField.setFloat(material.aniso);
	2252	+ anisoVField.setFloat(material.anisoV);
	2253	+
	2254	+ materialtouched = true;
	2255	+ applySelf();
	2256	+ }
	2257	+ });
	2258	+ presetpanel.add(aniso3);
	2259	+
	2260	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2261	+ velvet0.setToolTipText("Velvet");
	2262	+ velvet0.addMouseListener(new MouseAdapter()
	2263	+ {
	2264	+ public void mouseClicked(MouseEvent e)
	2265	+ {
	2266	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2267	+ cMaterial material = object.material;
	2268	+
	2269	+ diffusenessField.setFloat(material.factor);
	2270	+ selfshadowField.setFloat(material.diffuseness);
	2271	+ sheenField.setFloat(material.sheen);
	2272	+ shininessField.setFloat(material.shininess);
	2273	+ velvetField.setFloat(material.velvet);
	2274	+ shiftField.setFloat(material.shift);
	2275	+
	2276	+ materialtouched = true;
	2277	+ applySelf();
	2278	+ }
	2279	+ });
	2280	+ presetpanel.add(velvet0);
	2281	+
	2282	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2283	+ bump0.setToolTipText("Bump texture");
	2284	+ bump0.addMouseListener(new MouseAdapter()
	2285	+ {
	2286	+ public void mouseClicked(MouseEvent e)
	2287	+ {
	2288	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2289	+ cMaterial material = object.material;
	2290	+
	2291	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2292	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2293	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2294	+
	2295	+ materialtouched = true;
	2296	+ applySelf();
	2297	+ }
	2298	+ });
	2299	+ presetpanel.add(bump0);
	2300	+
	2301	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2302	+ borderShader.setToolTipText("Border fade");
	2303	+ borderShader.addMouseListener(new MouseAdapter()
	2304	+ {
	2305	+ public void mouseClicked(MouseEvent e)
	2306	+ {
	2307	+ borderfadeField.setFloat(0.5);
	2308	+ opacityField.setFloat(0.75);
	2309	+
	2310	+ materialtouched = true;
	2311	+ applySelf();
	2312	+ }
	2313	+ });
	2314	+ presetpanel.add(borderShader);
	2315	+
	2316	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
	2317	+ halo.setToolTipText("Halo");
	2318	+ halo.addMouseListener(new MouseAdapter()
	2319	+ {
	2320	+ public void mouseClicked(MouseEvent e)
	2321	+ {
	2322	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2323	+ cMaterial material = object.material;
	2324	+
	2325	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2326	+
	2327	+ materialtouched = true;
	2328	+ applySelf();
	2329	+ }
	2330	+ });
	2331	+ presetpanel.add(halo);
	2332	+
	2333	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2334	+ candle.setToolTipText("Candle");
	2335	+ candle.addMouseListener(new MouseAdapter()
	2336	+ {
	2337	+ public void mouseClicked(MouseEvent e)
	2338	+ {
	2339	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2340	+ cMaterial material = object.material;
	2341	+
	2342	+ subsurfaceField.setFloat(material.subsurface);
	2343	+ shadowbiasField.setFloat(material.shadowbias);
	2344	+ ambientField.setFloat(material.ambient);
	2345	+ specularField.setFloat(material.specular);
	2346	+ lightareaField.setFloat(material.lightarea);
	2347	+ shininessField.setFloat(material.shininess);
	2348	+
	2349	+ materialtouched = true;
	2350	+ applySelf();
	2351	+ }
	2352	+ });
	2353	+ presetpanel.add(candle);
	2354	+
	2355	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2356	+ shadowShader.setToolTipText("Shadow");
	2357	+ shadowShader.addMouseListener(new MouseAdapter()
	2358	+ {
	2359	+ public void mouseClicked(MouseEvent e)
	2360	+ {
	2361	+ diffuseField.setFloat(0.001);
	2362	+ ambientField.setFloat(0.001);
	2363	+ cameraField.setFloat(0.001);
	2364	+ specularField.setFloat(0.001);
	2365	+ fakedepthField.setFloat(0.001);
	2366	+ opacityField.setFloat(0.6);
	2367	+
	2368	+ materialtouched = true;
	2369	+ applySelf();
	2370	+ }
	2371	+ });
	2372	+ presetpanel.add(shadowShader);
1805	2373
1806	2374	cGridBag panel = new cGridBag().setVertical(true);
1807	2375
1808	2376	presetpanel.preferredWidth = 1;
1809	2377
1810		- materialpanel.add(panel);
1811	2378	materialpanel.add(presetpanel);
	2379	+ materialpanel.add(panel);
1812	2380
1813	2381	panel.preferredWidth = 8;
1814	2382
..	..	@@ -1819,19 +2387,19 @@
1819	2387
1820	2388	cGridBag editBar = new cGridBag().setVertical(false);
1821	2389
1822		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2390	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
1823	2391	createMaterialButton.setToolTipText("Create material");
1824	2392
1825	2393	/*
1826	2394	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1827	2395	*/
1828	2396
1829		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2397	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
1830	2398	clearMaterialButton.setToolTipText("Clear material");
1831	2399
1832	2400	if (Globals.ADVANCED)
1833	2401	{
1834		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2402	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
1835	2403	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1836	2404	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1837	2405	}
..	..	@@ -1852,9 +2420,20 @@
1852	2420
1853	2421	cGridBag huepanel = new cGridBag();
1854	2422	cGridBag huelabel = new cGridBag();
1855		- skin = GetLabel("icons/hue.png", false);
1856		- skin.fit = true;
1857		- huelabel.add(skin);
	2423	+ cLabel hue = GetLabel("icons/hue.png", false);
	2424	+ hue.fit = true;
	2425	+
	2426	+ hue.addMouseListener(new MouseAdapter()
	2427	+ {
	2428	+ public void mousePressed(MouseEvent e)
	2429	+ {
	2430	+ int x = e.getX();
	2431	+
	2432	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2433	+ }
	2434	+ });
	2435	+
	2436	+ huelabel.add(hue);
1858	2437	huelabel.preferredWidth = 20;
1859	2438	huepanel.add(new cGridBag()); // Label
1860	2439	huepanel.add(huelabel); // Field/slider
..	..	@@ -3130,32 +3709,8 @@
3130	3709
3131	3710	if (multiplyToggle != null)
3132	3711	multiplyToggle.setSelected(mat.multiply);
3133		-
3134		- assert (object.projectedVertices != null);
3135		-
3136		- if (object.projectedVertices.length <= 2)
3137		- {
3138		- // Side effect...
3139		- Object3D.cVector2[] keep = object.projectedVertices;
3140		- object.projectedVertices = new Object3D.cVector2[3];
3141		- for (int i = 0; i < 3; i++)
3142		- {
3143		- if (i < keep.length)
3144		- {
3145		- object.projectedVertices[i] = keep[i];
3146		- } else
3147		- {
3148		- object.projectedVertices[i] = new Object3D.cVector2();
3149		- }
3150		- /*
3151		- if(keep.length == 0)
3152		- object.projectedVertices[0] = new Object3D.cVector2();
3153		- else
3154		- object.projectedVertices[0] = keep[0];
3155		- object.projectedVertices[1] = new Object3D.cVector2();
3156		- */
3157		- }
3158		- }
	3712	+
	3713	+ AllocProjectedVertices(object);
3159	3714
3160	3715	SetMaterial(mat, object.projectedVertices);
3161	3716	}
..	..	@@ -3275,6 +3830,17 @@
3275	3830	public void itemStateChanged(ItemEvent event)
3276	3831	{
3277	3832	// System.out.println("Propagate = " + propagate);
	3833	+ if (event.getSource() == pinButton)
	3834	+ {
	3835	+ copy.pinned ^= true;
	3836	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3837	+ {
	3838	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3839	+ copy.CloseUI();
	3840	+ //copy.editWindow.refreshContents();
	3841	+ }
	3842	+ }
	3843	+ else
3278	3844	if (event.getSource() == propagateToggle)
3279	3845	{
3280	3846	propagate ^= true;
..	..	@@ -3454,7 +4020,7 @@
3454	4020	//System.out.println("ObjEditor " + event);
3455	4021	applySelf0(true);
3456	4022	//parent.applySelf();
3457		- objEditor.refreshContents();
	4023	+ // conflicts with requestFocus objEditor.refreshContents();
3458	4024	} else if (source == resetButton)
3459	4025	{
3460	4026	CameraPane.fullreset = true;
..	..	@@ -3634,11 +4200,18 @@
3634	4200
3635	4201	void New()
3636	4202	{
3637		- while (copy.Size() > 1)
	4203	+ while (copy.Size() > 0)
3638	4204	{
3639		- copy.remove(1);
	4205	+ copy.remove(0);
3640	4206	}
3641	4207
	4208	+ copy.selection.clear();
	4209	+
	4210	+ if (copy == Grafreed.grafreed.universe)
	4211	+ {
	4212	+ CreateCameras();
	4213	+ cameraView.SetCamera(GetCamera(copy, 0));
	4214	+ }
3642	4215	ResetModel();
3643	4216	objEditor.refreshContents();
3644	4217	}
..	..	@@ -3747,7 +4320,7 @@
3747	4320	{
3748	4321	//Save(true);
3749	4322	Replace();
3750		- SetUndoStates();
	4323	+ SetVersionStates();
3751	4324	}
3752	4325
3753	4326	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3766,8 +4339,6 @@
3766	4339	return true;
3767	4340	}
3768	4341
3769		- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3770		-
3771	4342	void DeleteVersion()
3772	4343	{
3773	4344	for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..	..	@@ -3775,19 +4346,23 @@
3775	4346	copy.versionlist[i] = copy.versionlist[i+1];
3776	4347	}
3777	4348
3778		- CopyChanged();
	4349	+ if (copy.versionlist[copy.versionindex] == null)
	4350	+ copy.versionindex -= 1;
3779	4351
3780		- SetUndoStates();
	4352	+ if (copy.versionindex != -1)
	4353	+ CopyChanged();
	4354	+
	4355	+ SetVersionStates();
3781	4356	}
3782	4357
3783	4358	public boolean Save(boolean user)
3784	4359	{
3785	4360	System.err.println("Save");
3786		- //Replace();
	4361	+ Replace();
3787	4362
3788		- cRadio tab = GetCurrentTab();
	4363	+ //cRadio tab = GetCurrentTab();
3789	4364
3790		- Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
	4365	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3791	4366
3792	4367	boolean thesame = false;
3793	4368
..	..	@@ -3823,7 +4398,7 @@
3823	4398	// copy.versionlist[i] = null;
3824	4399	// }
3825	4400
3826		- SetUndoStates();
	4401	+ SetVersionStates();
3827	4402
3828	4403	// test save
3829	4404	if (false)
..	..	@@ -3881,14 +4456,14 @@
3881	4456
3882	4457	void CopyChanged()
3883	4458	{
3884		- Object3D obj = copy.versionlist[copy.versionindex];
	4459	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
3885	4460
3886		- SetUndoStates();
	4461	+ SetVersionStates();
3887	4462
3888	4463	boolean temp = CameraPane.SWITCH;
3889	4464	CameraPane.SWITCH = false;
3890	4465
3891		- copy.ExtractBigData(versiontable);
	4466	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3892	4467
3893	4468	copy.clear();
3894	4469
..	..	@@ -3900,7 +4475,7 @@
3900	4475	copy.add(obj.get(i));
3901	4476	}
3902	4477
3903		- copy.RestoreBigData(versiontable);
	4478	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3904	4479
3905	4480	CameraPane.SWITCH = temp;
3906	4481
..	..	@@ -3950,23 +4525,45 @@
3950	4525	return count;
3951	4526	}
3952	4527
3953		- void SetUndoStates()
	4528	+ public cGridBag versionSliderPane;
	4529	+
	4530	+ void SetVersionStates()
3954	4531	{
3955		- cRadio tab = GetCurrentTab();
	4532	+ //if (true)
	4533	+ // return;
	4534	+
	4535	+ //cRadio tab = GetCurrentTab();
3956	4536
3957		- restoreButton.setEnabled(true); // copy.versionindex != -1);
3958		- replaceButton.setEnabled(true); // copy.versionindex != -1);
3959		-
3960		- previousVersionButton.setEnabled(copy.versionindex > 0);
3961		- nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
3962		-
3963		- deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
3964		- copy.versionlist[copy.versionindex + 1] != null);
3965		-
3966		- muteSlider = true;
3967		- versionSlider.setMaximum(VersionCount() - 1);
3968		- versionSlider.setInteger(copy.versionindex);
3969		- muteSlider = false;
	4537	+ if (copy.versionlist == null)
	4538	+ {
	4539	+ saveVersionButton.setEnabled(false);
	4540	+ restoreButton.setEnabled(false);
	4541	+ replaceButton.setEnabled(false);
	4542	+ previousVersionButton.setEnabled(false);
	4543	+ nextVersionButton.setEnabled(false);
	4544	+ deleteVersionButton.setEnabled(false);
	4545	+ versionSliderPane.setVisible(false);
	4546	+ }
	4547	+ else
	4548	+ {
	4549	+ restoreButton.setEnabled(copy.versionindex != -1);
	4550	+ replaceButton.setEnabled(copy.versionindex != -1);
	4551	+
	4552	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4553	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4554	+
	4555	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4556	+ //copy.versionlist[copy.versionindex + 1] != null);
	4557	+
	4558	+ muteSlider = true;
	4559	+ versionSlider.setMinimum(0);
	4560	+ versionSlider.setMaximum(VersionCount() - 1);
	4561	+ versionSlider.setInteger(copy.versionindex);
	4562	+ versionSlider.setEnabled(copy.versionindex != -1);
	4563	+ muteSlider = false;
	4564	+
	4565	+ versionSliderPane.setVisible(true);
	4566	+ }
3970	4567	}
3971	4568
3972	4569	public boolean PreviousVersion()
..	..	@@ -3976,7 +4573,7 @@
3976	4573
3977	4574	System.err.println("Undo");
3978	4575
3979		- cRadio tab = GetCurrentTab();
	4576	+ //cRadio tab = GetCurrentTab();
3980	4577
3981	4578	if (copy.versionindex == 0)
3982	4579	{
..	..	@@ -4008,7 +4605,7 @@
4008	4605	{
4009	4606	System.err.println("Restore");
4010	4607
4011		- cRadio tab = GetCurrentTab();
	4608	+ //cRadio tab = GetCurrentTab();
4012	4609
4013	4610	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4014	4611	{
..	..	@@ -4024,9 +4621,9 @@
4024	4621
4025	4622	public boolean Replace()
4026	4623	{
4027		- System.err.println("Replace");
	4624	+ //System.err.println("Replace");
4028	4625
4029		- cRadio tab = GetCurrentTab();
	4626	+ //cRadio tab = GetCurrentTab();
4030	4627
4031	4628	if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
4032	4629	{
..	..	@@ -4034,7 +4631,7 @@
4034	4631	return false;
4035	4632	}
4036	4633
4037		- copy.versionlist[copy.versionindex] = CompressCopy();
	4634	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
4038	4635
4039	4636	return true;
4040	4637	}
..	..	@@ -4044,7 +4641,7 @@
4044	4641	// Option?
4045	4642	Replace();
4046	4643
4047		- cRadio tab = GetCurrentTab();
	4644	+ //cRadio tab = GetCurrentTab();
4048	4645
4049	4646	if (copy.versionlist[copy.versionindex + 1] == null)
4050	4647	{
..	..	@@ -4251,6 +4848,12 @@
4251	4848	// else
4252	4849	// applySelf(true);
4253	4850	// }
	4851	+
	4852	+ boolean Equal(double a, double b)
	4853	+ {
	4854	+ return Math.abs(a - b) < 0.001;
	4855	+ }
	4856	+
4254	4857	void applySelf0(boolean name)
4255	4858	{
4256	4859	if (name)
..	..	@@ -4300,29 +4903,52 @@
4300	4903	{
4301	4904	cMaterial mat = copy.material;
4302	4905
4303		- colorField.SetToolTipValue((mat.color));
4304		- saturationField.SetToolTipValue((mat.modulation));
4305		- metalnessField.SetToolTipValue((mat.metalness));
4306		- diffuseField.SetToolTipValue((mat.diffuse));
4307		- specularField.SetToolTipValue((mat.specular));
4308		- shininessField.SetToolTipValue((mat.shininess));
4309		- shiftField.SetToolTipValue((mat.shift));
4310		- ambientField.SetToolTipValue((mat.ambient));
4311		- lightareaField.SetToolTipValue((mat.lightarea));
4312		- diffusenessField.SetToolTipValue((mat.factor));
4313		- velvetField.SetToolTipValue((mat.velvet));
4314		- sheenField.SetToolTipValue((mat.sheen));
4315		- subsurfaceField.SetToolTipValue((mat.subsurface));
4316		- backlitField.SetToolTipValue((mat.bump));
4317		- anisoField.SetToolTipValue((mat.aniso));
4318		- anisoVField.SetToolTipValue((mat.anisoV));
4319		- cameraField.SetToolTipValue((mat.cameralight));
4320		- selfshadowField.SetToolTipValue((mat.diffuseness));
4321		- shadowField.SetToolTipValue((mat.shadow));
4322		- textureField.SetToolTipValue((mat.texture));
4323		- opacityField.SetToolTipValue((mat.opacity));
4324		- fakedepthField.SetToolTipValue((mat.fakedepth));
4325		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	4906	+ if (!Equal(colorField.getFloat(), mat.color))
	4907	+ colorField.SetToolTipValue((mat.color));
	4908	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4909	+ saturationField.SetToolTipValue((mat.modulation));
	4910	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4911	+ metalnessField.SetToolTipValue((mat.metalness));
	4912	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4913	+ diffuseField.SetToolTipValue((mat.diffuse));
	4914	+ if (!Equal(specularField.getFloat(), mat.specular))
	4915	+ specularField.SetToolTipValue((mat.specular));
	4916	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4917	+ shininessField.SetToolTipValue((mat.shininess));
	4918	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4919	+ shiftField.SetToolTipValue((mat.shift));
	4920	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4921	+ ambientField.SetToolTipValue((mat.ambient));
	4922	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4923	+ lightareaField.SetToolTipValue((mat.lightarea));
	4924	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4925	+ diffusenessField.SetToolTipValue((mat.factor));
	4926	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4927	+ velvetField.SetToolTipValue((mat.velvet));
	4928	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4929	+ sheenField.SetToolTipValue((mat.sheen));
	4930	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4931	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4932	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4933	+ backlitField.SetToolTipValue((mat.bump));
	4934	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4935	+ anisoField.SetToolTipValue((mat.aniso));
	4936	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4937	+ anisoVField.SetToolTipValue((mat.anisoV));
	4938	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4939	+ cameraField.SetToolTipValue((mat.cameralight));
	4940	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	4941	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4942	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	4943	+ shadowField.SetToolTipValue((mat.shadow));
	4944	+ if (!Equal(textureField.getFloat(), mat.texture))
	4945	+ textureField.SetToolTipValue((mat.texture));
	4946	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	4947	+ opacityField.SetToolTipValue((mat.opacity));
	4948	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	4949	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4950	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	4951	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4326	4952	}
4327	4953
4328	4954	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4357,15 +4983,17 @@
4357	4983
4358	4984	public void stateChanged(ChangeEvent e)
4359	4985	{
4360		- // assert(false);
	4986	+ // assert(false);
4361	4987	if (e.getSource() == versionSlider)
4362	4988	{
4363	4989	if (muteSlider)
4364	4990	return;
4365	4991
	4992	+ Replace();
	4993	+
4366	4994	int version = versionSlider.getInteger();
4367	4995
4368		- if (copy.versionlist[version] != null)
	4996	+ if (version != -1 && copy.versionlist[version] != null)
4369	4997	{
4370	4998	copy.versionindex = version;
4371	4999	CopyChanged();
..	..	@@ -4409,7 +5037,7 @@
4409	5037	//System.out.println("stateChanged = " + this);
4410	5038	materialtouched = true;
4411	5039
4412		- if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5040	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
4413	5041	{
4414	5042	saturationField.setFloat(1);
4415	5043	}
..	..	@@ -4724,7 +5352,9 @@
4724	5352	}
4725	5353
4726	5354	if (previousVersionButton != null && copy.versionlist != null)
4727		- SetUndoStates();
	5355	+ SetVersionStates();
	5356	+
	5357	+ cameraView.requestFocusInWindow();
4728	5358	}
4729	5359
4730	5360	static TweenManager tweenManager = new TweenManager();
..	..	@@ -4756,7 +5386,7 @@
4756	5386	// group = (Composite) group.get(0);
4757	5387	// }
4758	5388
4759		- System.out.println("makeSomething of " + thing);
	5389	+ //System.out.println("makeSomething of " + thing);
4760	5390
4761	5391	/*
4762	5392	if (deselect && jList != null)
..	..	@@ -5110,11 +5740,15 @@
5110	5740
5111	5741	copy.versionlist = readobj.versionlist;
5112	5742	copy.versionindex = readobj.versionindex;
	5743	+ copy.versiontable = readobj.versiontable;
5113	5744
5114	5745	if (copy.versionlist == null)
5115	5746	{
	5747	+ // Backward compatibility
5116	5748	copy.versionlist = new Object3D[100];
5117	5749	copy.versionindex = -1;
	5750	+
	5751	+ //Save(true);
5118	5752	}
5119	5753
5120	5754	//? SetUndoStates();
..	..	@@ -5206,6 +5840,8 @@
5206	5840
5207	5841	void save()
5208	5842	{
	5843	+ Replace();
	5844	+
5209	5845	if (lastname == null)
5210	5846	{
5211	5847	return;
..	..	@@ -5448,6 +6084,7 @@
5448	6084	ButtonGroup buttonGroup;
5449	6085
5450	6086	cGridBag toolboxPanel;
	6087	+ cGridBag skyboxPanel;
5451	6088	cGridBag materialPanel;
5452	6089	cGridBag ctrlPanel;
5453	6090
..	..	@@ -5459,6 +6096,7 @@
5459	6096	boolean materialFlushed;
5460	6097	Object3D latestObject;
5461	6098
	6099	+ cGridBag transformPanel;
5462	6100	cGridBag XYZPanel;
5463	6101
5464	6102	JSplitPane gridPanel;
..	..	@@ -5552,6 +6190,7 @@
5552	6190	cNumberSlider anisoField;
5553	6191	JLabel anisoVLabel;
5554	6192	cNumberSlider anisoVField;
	6193	+
5555	6194	JLabel cameraLabel;
5556	6195	cNumberSlider cameraField;
5557	6196	JLabel selfshadowLabel;
..	..	@@ -5566,6 +6205,7 @@
5566	6205	cNumberSlider fakedepthField;
5567	6206	JLabel shadowbiasLabel;
5568	6207	cNumberSlider shadowbiasField;
	6208	+
5569	6209	JLabel bumpLabel;
5570	6210	cNumberSlider bumpField;
5571	6211	JLabel noiseLabel;