~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,64 +42,122 @@
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 cGridBag GetSeparator()
	76	+ {
	77	+ cGridBag separator = new cGridBag();
	78	+ separator.add(new JSeparator());
	79	+ separator.preferredHeight = 5;
	80	+ return separator;
	81	+ }
44	82
45	83	cButton GetButton(String name, boolean border)
46	84	{
47		- try
48		- {
49		- ImageIcon icon = GetIcon(name);
	85	+ ImageIcon icon = GetIcon(name);
	86	+ if (icon != null)
50	87	return new cButton(icon, border);
51		- }
52		- catch (Exception e)
53		- {
	88	+ else
54	89	return new cButton(name, border);
55		- }
	90	+ }
	91	+
	92	+ cLabel GetLabel(String name, boolean border)
	93	+ {
	94	+ //ImageIcon icon = GetIcon(name);
	95	+ return new cLabel(GetImage(name), border);
56	96	}
57	97
58	98	cToggleButton GetToggleButton(String name, boolean border)
59	99	{
60		- try
61		- {
62		- ImageIcon icon = GetIcon(name);
63		- return new cToggleButton(icon, border);
64		- }
65		- catch (Exception e)
66		- {
67		- return new cToggleButton(name, border);
68		- }
	100	+ ImageIcon icon = GetIcon(name);
	101	+ return new cToggleButton(icon, border);
69	102	}
70	103
71	104	cCheckBox GetCheckBox(String name, boolean border)
72	105	{
	106	+ ImageIcon icon = GetIcon(name);
	107	+ return new cCheckBox(icon, border);
	108	+ }
	109	+
	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)
	113	+ {
	114	+ javax.swing.ImageIcon iconCache = icons.get(name);
	115	+ if (iconCache != null)
	116	+ {
	117	+ return iconCache;
	118	+ }
	119	+
73	120	try
74	121	{
75		- ImageIcon icon = GetIcon(name);
76		- return new cCheckBox(icon, border);
	122	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	123	+
	124	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	125	+// {
	126	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	127	+// Graphics2D g = resized.createGraphics();
	128	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	129	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	130	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	131	+// g.dispose();
	132	+//
	133	+// image = resized;
	134	+// }
	135	+
	136	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	137	+
	138	+ icons.put(name, icon);
	139	+
	140	+ return icon;
77	141	}
78	142	catch (Exception e)
79	143	{
80		- return new cCheckBox(name, border);
	144	+ //icons.put(name, null);
	145	+ return null;
81	146	}
82	147	}
83		-
84		- private ImageIcon GetIcon(String name) throws IOException
	148	+
	149	+ BufferedImage GetImage(String name)
85	150	{
86		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87		-
88		- if (image.getWidth() != 24 && image.getHeight() != 24)
	151	+ try
89	152	{
90		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
91		- Graphics2D g = resized.createGraphics();
92		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
93		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
94		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
95		- g.dispose();
96		-
97		- image = resized;
	153	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	154	+
	155	+ return image;
98	156	}
99		-
100		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101		- return icon;
	157	+ catch (Exception e)
	158	+ {
	159	+ return null;
	160	+ }
102	161	}
103	162
104	163	// SCRIPT
..	..	@@ -282,6 +341,14 @@
282	341	client = inClient;
283	342	copy = client;
284	343
	344	+// if (copy.versionlist == null)
	345	+// {
	346	+// copy.versionlist = new Object3D[100];
	347	+// copy.versionindex = -1;
	348	+//
	349	+// callee.Save(true);
	350	+// }
	351	+
285	352	// "this" is not called: SetupUI2(objEditor);
286	353	}
287	354
..	..	@@ -295,6 +362,14 @@
295	362	client = inClient;
296	363	copy = client;
297	364
	365	+ if (copy.versionlist == null)
	366	+ {
	367	+ copy.versionlist = new Object3D[100];
	368	+ copy.versionindex = -1;
	369	+
	370	+// Save(true);
	371	+ }
	372	+
298	373	SetupUI2(callee.GetEditor());
299	374	}
300	375
..	..	@@ -316,7 +391,8 @@
316	391	//parent = p;
317	392
318	393	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
319		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	394	+ if (Globals.DEBUG)
	395	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
320	396	//gd.setFullScreenWindow(this);
321	397	//setResizable(false);
322	398	//if (!isDisplayable())
..	..	@@ -327,6 +403,14 @@
327	403	copy = localCopy;
328	404	copy.editWindow = this;
329	405
	406	+// if (copy.versionlist == null)
	407	+// {
	408	+// copy.versionlist = new Object3D[100];
	409	+// copy.versionindex = -1;
	410	+//
	411	+// Save(true);
	412	+// }
	413	+
330	414	SetupMenu();
331	415
332	416	//SetupName(objEditor); // new
..	..	@@ -345,6 +429,9 @@
345	429
346	430	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
347	431
	432	+ // This is to refresh the UI of the material panel.
	433	+ boolean patchMaterial;
	434	+
348	435	void SetupMenu()
349	436	{
350	437	frame.setMenuBar(menuBar = new MenuBar());
..	..	@@ -394,6 +481,8 @@
394	481
395	482	ChangeListener changeListener = new ChangeListener()
396	483	{
	484	+ //String name;
	485	+
397	486	public void stateChanged(ChangeEvent changeEvent)
398	487	{
399	488	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -412,18 +501,49 @@
412	501	// EditSelection(false);
413	502	// }
414	503
415		- 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();
416	535	}
417	536	};
418	537	objectPanel.addChangeListener(changeListener);
419	538
420	539	toolbarPanel = new JPanel();
421	540	toolbarPanel.setName("Toolbar");
	541	+
422	542	treePanel = new cGridBag();
423	543	treePanel.setName("Tree");
424	544
425	545	editPanel = new cGridBag().setVertical(true);
426		- editPanel.setName("Edit");
	546	+ //editPanel.setName("Edit");
427	547
428	548	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429	549
..	..	@@ -431,11 +551,13 @@
431	551	editPanel.add(editCommandsPanel);
432	552	editPanel.add(ctrlPanel);
433	553
434		- toolboxPanel = new cGridBag().setVertical(false);
435		- toolboxPanel.setName("Toolbox");
	554	+ toolboxPanel = new cGridBag().setVertical(true);
	555	+ //toolboxPanel.setName("Toolbox");
436	556
437		- materialPanel = new cGridBag().setVertical(true);
438		- materialPanel.setName("Material");
	557	+ skyboxPanel = new cGridBag().setVertical(true);
	558	+
	559	+ materialPanel = new cGridBag().setVertical(false);
	560	+ //materialPanel.setName("Material");
439	561
440	562	/JTextPane/
441	563	infoarea = createTextPane();
..	..	@@ -443,6 +565,7 @@
443	565
444	566	infoarea.setEditable(true);
445	567	SetText();
	568	+
446	569	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447	570	// infoarea.setOpaque(false);
448	571	// //infoarea.setForeground(textcolor);
..	..	@@ -450,7 +573,7 @@
450	573	// TEXTAREA infoarea.setWrapStyleWord(true);
451	574	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452	575	infoPanel.setPreferredSize(new Dimension(1, 1));
453		- infoPanel.setName("Info");
	576	+ //infoPanel.setName("Info");
454	577	//infoPanel.setLayout(new BorderLayout());
455	578	//infoPanel.add(createTextPane());
456	579
..	..	@@ -717,6 +840,7 @@
717	840	boolean maximized;
718	841
719	842	cButton fullscreenLayout;
	843	+ cButton expandedLayout;
720	844
721	845	void Minimize()
722	846	{
..	..	@@ -756,10 +880,12 @@
756	880	cButton minButton;
757	881	cButton maxButton;
758	882	cButton fullButton;
	883	+ cButton collapseButton;
	884	+ cButton maximize3DButton;
759	885
760	886	void ToggleFullScreen()
761	887	{
762		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	888	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
763	889
764	890	cameraView.ToggleFullScreen();
765	891
..	..	@@ -780,13 +906,13 @@
780	906	// X frame.getContentPane().remove(/"Center",/bigThree);
781	907	// X framePanel.add(bigThree);
782	908	// X frame.getContentPane().add(/"Center",/framePanel);
783		- framePanel.setDividerLocation(46);
	909	+// framePanel.setDividerLocation(46); // icons are 24x24
784	910
785	911	//frame.setVisible(true);
786		- radio.layout = keepButton;
	912	+// radio.layout = keepButton;
787	913	//theFrame = null;
788	914	keepButton = null;
789		- radio.layout.doClick();
	915	+// radio.layout.doClick();
790	916
791	917	} else
792	918	{
..	..	@@ -807,14 +933,58 @@
807	933	// X frame.getContentPane().remove(/"Center",/framePanel);
808	934	// X framePanel.remove(bigThree);
809	935	// X frame.getContentPane().add(/"Center",/bigThree);
810		- framePanel.setDividerLocation(0);
	936	+// framePanel.setDividerLocation(0);
811	937
812		- radio.layout = fullscreenLayout;
813		- radio.layout.doClick();
	938	+// radio.layout = fullscreenLayout;
	939	+// radio.layout.doClick();
814	940	//frame.setVisible(true);
815	941	}
816	942	frame.validate();
	943	+
	944	+ cameraView.requestFocusInWindow();
817	945	}
	946	+
	947	+ void CollapseToolbar()
	948	+ {
	949	+ framePanel.setDividerLocation(0);
	950	+ //frame.validate();
	951	+
	952	+ cameraView.requestFocusInWindow();
	953	+ }
	954	+
	955	+ private Object3D Duplicate(Object3D object)
	956	+ {
	957	+ boolean temp = CameraPane.SWITCH;
	958	+ CameraPane.SWITCH = false;
	959	+
	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);
	964	+ // if (copy == client)
	965	+
	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;
	973	+
	974	+ //byte[] compress = Compress(copy);
	975	+ Object3D compress = (Object3D)Grafreed.clone(object);
	976	+
	977	+ object.parent = parent;
	978	+
	979	+ object.versionlist = versions;
	980	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	981	+
	982	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	983	+
	984	+ CameraPane.SWITCH = temp;
	985	+
	986	+ return compress;
	987	+ }
818	988
819	989	private JTextPane createTextPane()
820	990	{
..	..	@@ -937,6 +1107,7 @@
937	1107	{
938	1108	SetupMaterial(materialPanel);
939	1109	}
	1110	+
940	1111	//SetupName();
941	1112	//SetupViews();
942	1113	}
..	..	@@ -946,7 +1117,7 @@
946	1117	// NumberSlider vDivsField;
947	1118	// JCheckBox endcaps;
948	1119	JCheckBox liveCB;
949		- JCheckBox selectCB;
	1120	+ JCheckBox selectableCB;
950	1121	JCheckBox hideCB;
951	1122	JCheckBox link2masterCB;
952	1123	JCheckBox markCB;
..	..	@@ -1145,6 +1316,18 @@
1145	1316
1146	1317	namePanel = new cGridBag();
1147	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	+
1148	1331	nameField = AddText(namePanel, copy.GetName());
1149	1332	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1150	1333	oe.ctrlPanel.add(namePanel);
..	..	@@ -1158,13 +1341,16 @@
1158	1341
1159	1342	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1160	1343	liveCB.setToolTipText("Animate object");
1161		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1162		- selectCB.setToolTipText("Make object selectable");
	1344	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1345	+ markCB.setToolTipText("Set target transform");
	1346	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1347	+ selectableCB.setToolTipText("Make object selectable");
1163	1348	// Return();
	1349	+
1164	1350	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1165	1351	hideCB.setToolTipText("Hide object");
1166		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1167		- markCB.setToolTipText("As animation target transform");
	1352	+
	1353	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1168	1354
1169	1355	setupPanel2 = new cGridBag().setVertical(false);
1170	1356
..	..	@@ -1364,6 +1550,7 @@
1364	1550
1365	1551	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1366	1552	{
	1553	+ if (Globals.DEBUG)
1367	1554	System.out.println("CREATE CAMERAS");
1368	1555	cams = new cTemplate();
1369	1556	cams.name = "Cameras";
..	..	@@ -1445,6 +1632,42 @@
1445	1632	//frontView.object = copy;
1446	1633	//sideView.object = copy;
1447	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	+
1448	1671	XYZPanel = new cGridBag().setVertical(true);
1449	1672	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1450	1673
..	..	@@ -1452,7 +1675,11 @@
1452	1675	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1453	1676	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1454	1677	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1678	+ //XYZPanel.setName("XYZ");
1455	1679
	1680	+ transformPanel.add(resetTransformPanel);
	1681	+ transformPanel.add(XYZPanel);
	1682	+
1456	1683	/*
1457	1684	gridPanel = new JPanel(); //new BorderLayout());
1458	1685	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1460,12 +1687,12 @@
1460	1687	gridPanel.add(cameraView);
1461	1688	gridPanel.add(XYZPanel);
1462	1689	*/
1463		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1464		- gridPanel.setContinuousLayout(true);
1465		- gridPanel.setOneTouchExpandable(true);
1466		- gridPanel.setDividerLocation(1.0);
1467		- gridPanel.setDividerSize(9);
1468		- 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);
1469	1696
1470	1697	// aConstraints.weighty = 0;
1471	1698	//System.out.println("THIS = " + this);
..	..	@@ -1488,18 +1715,34 @@
1488	1715
1489	1716	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1490	1717	//tmp.setName("Edit");
	1718	+ objectPanel.add(toolboxPanel);
	1719	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1720	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
	1721	+
1491	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	+
1492	1730	// JPanel north = new JPanel(new BorderLayout());
1493	1731	// north.setName("Edit");
1494	1732	// north.add(ctrlPanel, BorderLayout.NORTH);
1495	1733	// objectPanel.add(north);
1496	1734	objectPanel.add(editPanel);
	1735	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1736	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1497	1737
1498		- //if (Globals.ADVANCED)
1499		- objectPanel.add(infoPanel);
	1738	+ objectPanel.add(transformPanel);
	1739	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1740	+ objectPanel.setToolTipTextAt(4, "TRS transform");
1500	1741
1501		- objectPanel.add(toolboxPanel);
1502		-
	1742	+ patchMaterial = true;
	1743	+ cameraView.patchMaterial = this;
	1744	+ objectPanel.setSelectedIndex(1);
	1745	+
1503	1746	/*
1504	1747	aConstraints.gridx = 0;
1505	1748	aConstraints.gridwidth = 1;
..	..	@@ -1536,6 +1779,11 @@
1536	1779
1537	1780	scenePanel.add(tabbedPane);
1538	1781
	1782	+ //if (Globals.ADVANCED)
	1783	+// tabbedPane.add(infoPanel);
	1784	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1785	+// tabbedPane.setToolTipTextAt(3, "Information");
	1786	+
1539	1787	/*
1540	1788	cTree jTree = new cTree(null);
1541	1789	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1556,13 +1804,13 @@
1556	1804	jtp.add(tree);
1557	1805	*/
1558	1806
1559		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1560		- bigPanel.setContinuousLayout(true);
1561		- bigPanel.setOneTouchExpandable(true);
1562		- bigPanel.setDividerLocation(0.8);
1563		- bigPanel.setDividerSize(15);
1564		- bigPanel.setResizeWeight(0.15);
1565		- 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");
1566	1814
1567	1815	//bigPanel.setLayout(new BorderLayout());
1568	1816	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1597,7 +1845,7 @@
1597	1845	bigThree = new cGridBag();
1598	1846	bigThree.addComponent(scenePanel);
1599	1847	bigThree.addComponent(centralPanel);
1600		- bigThree.addComponent(XYZPanel);
	1848	+ //bigThree.addComponent(XYZPanel);
1601	1849
1602	1850	// // SIDE EFFECT!!!
1603	1851	// aConstraints.gridx = 0;
..	..	@@ -1606,6 +1854,23 @@
1606	1854	// aConstraints.gridheight = 1;
1607	1855
1608	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	+
1609	1874	framePanel.setContinuousLayout(false);
1610	1875	framePanel.setOneTouchExpandable(false);
1611	1876	//.setDividerLocation(0.8);
..	..	@@ -1615,7 +1880,7 @@
1615	1880
1616	1881	frame.getContentPane().setLayout(new BorderLayout());
1617	1882	/**/
1618		- JTabbedPane worldPane = new JTabbedPane();
	1883	+ //JTabbedPane worldPane = new JTabbedPane();
1619	1884	//worldPane.add(bigPanel);
1620	1885	//worldPane.add(worldPanel);
1621	1886	/**/
..	..	@@ -1629,7 +1894,7 @@
1629	1894
1630	1895	cameraView.requestFocusInWindow();
1631	1896
1632		- gridPanel.setDividerLocation(1.0);
	1897	+// gridPanel.setDividerLocation(1.0);
1633	1898
1634	1899	frame.validate();
1635	1900
..	..	@@ -1638,7 +1903,6 @@
1638	1903	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1639	1904	frame.addWindowListener(new WindowAdapter()
1640	1905	{
1641		-
1642	1906	public void windowClosing(WindowEvent e)
1643	1907	{
1644	1908	Close();
..	..	@@ -1661,12 +1925,426 @@
1661	1925	ctrlPanel.removeAll();
1662	1926	}
1663	1927
1664		- void SetupMaterial(cGridBag panel)
	1928	+ void SetupMaterial(cGridBag materialpanel)
1665	1929	{
1666		- /*
	1930	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1931	+
	1932	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1933	+ skin.setToolTipText("Skin");
	1934	+ skin.addMouseListener(new MouseAdapter()
	1935	+ {
	1936	+ public void mouseClicked(MouseEvent e)
	1937	+ {
	1938	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1939	+ cMaterial material = object.material;
	1940	+
	1941	+ // Skin
	1942	+ colorField.setFloat(material.color);
	1943	+ float saturation = material.modulation;
	1944	+
	1945	+ if (!cameraView.Skinshader)
	1946	+ {
	1947	+ saturation /= 1.5;
	1948	+ }
	1949	+
	1950	+ saturationField.setFloat(saturation);
	1951	+
	1952	+ subsurfaceField.setFloat(material.subsurface);
	1953	+ selfshadowField.setFloat(material.diffuseness);
	1954	+ diffusenessField.setFloat(material.factor);
	1955	+ shininessField.setFloat(material.shininess);
	1956	+ shadowbiasField.setFloat(material.shadowbias);
	1957	+ diffuseField.setFloat(material.diffuse);
	1958	+ specularField.setFloat(material.specular);
	1959	+
	1960	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1961	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1962	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1963	+
	1964	+ materialtouched = true;
	1965	+ applySelf();
	1966	+ }
	1967	+ });
	1968	+ presetpanel.add(skin);
	1969	+
	1970	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1971	+ lambert.setToolTipText("Diffuse");
	1972	+ lambert.addMouseListener(new MouseAdapter()
	1973	+ {
	1974	+ public void mouseClicked(MouseEvent e)
	1975	+ {
	1976	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1977	+ cMaterial material = object.material;
	1978	+
	1979	+ diffusenessField.setFloat(material.factor);
	1980	+ selfshadowField.setFloat(material.diffuseness);
	1981	+
	1982	+ materialtouched = true;
	1983	+ applySelf();
	1984	+ }
	1985	+ });
	1986	+ presetpanel.add(lambert);
	1987	+
	1988	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1989	+ diffuse2.setToolTipText("Diffuse2");
	1990	+ diffuse2.addMouseListener(new MouseAdapter()
	1991	+ {
	1992	+ public void mouseClicked(MouseEvent e)
	1993	+ {
	1994	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1995	+ cMaterial material = object.material;
	1996	+
	1997	+ diffusenessField.setFloat(material.factor);
	1998	+ selfshadowField.setFloat(material.diffuseness);
	1999	+
	2000	+ materialtouched = true;
	2001	+ applySelf();
	2002	+ }
	2003	+ });
	2004	+ presetpanel.add(diffuse2);
	2005	+
	2006	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2007	+ diffusemoon.setToolTipText("Moon");
	2008	+ diffusemoon.addMouseListener(new MouseAdapter()
	2009	+ {
	2010	+ public void mouseClicked(MouseEvent e)
	2011	+ {
	2012	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2013	+ cMaterial material = object.material;
	2014	+
	2015	+ diffusenessField.setFloat(material.factor);
	2016	+ selfshadowField.setFloat(material.diffuseness);
	2017	+
	2018	+ materialtouched = true;
	2019	+ applySelf();
	2020	+ }
	2021	+ });
	2022	+ presetpanel.add(diffusemoon);
	2023	+
	2024	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2025	+ diffusemoon2.setToolTipText("Moon2");
	2026	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2027	+ {
	2028	+ public void mouseClicked(MouseEvent e)
	2029	+ {
	2030	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2031	+ cMaterial material = object.material;
	2032	+
	2033	+ diffusenessField.setFloat(material.factor);
	2034	+ selfshadowField.setFloat(material.diffuseness);
	2035	+
	2036	+ materialtouched = true;
	2037	+ applySelf();
	2038	+ }
	2039	+ });
	2040	+ presetpanel.add(diffusemoon2);
	2041	+
	2042	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2043	+ diffusemoon3.setToolTipText("Moon3");
	2044	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2045	+ {
	2046	+ public void mouseClicked(MouseEvent e)
	2047	+ {
	2048	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2049	+ cMaterial material = object.material;
	2050	+
	2051	+ diffusenessField.setFloat(material.factor);
	2052	+ selfshadowField.setFloat(material.diffuseness);
	2053	+
	2054	+ materialtouched = true;
	2055	+ applySelf();
	2056	+ }
	2057	+ });
	2058	+ presetpanel.add(diffusemoon3);
	2059	+
	2060	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2061	+ diffusesheen.setToolTipText("Sheen");
	2062	+ diffusesheen.addMouseListener(new MouseAdapter()
	2063	+ {
	2064	+ public void mouseClicked(MouseEvent e)
	2065	+ {
	2066	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2067	+ cMaterial material = object.material;
	2068	+
	2069	+ sheenField.setFloat(material.sheen);
	2070	+
	2071	+ materialtouched = true;
	2072	+ applySelf();
	2073	+ }
	2074	+ });
	2075	+ presetpanel.add(diffusesheen);
	2076	+
	2077	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2078	+ rough.setToolTipText("Rough metal");
	2079	+ rough.addMouseListener(new MouseAdapter()
	2080	+ {
	2081	+ public void mouseClicked(MouseEvent e)
	2082	+ {
	2083	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2084	+ cMaterial material = object.material;
	2085	+
	2086	+ shininessField.setFloat(material.shininess);
	2087	+ velvetField.setFloat(material.velvet);
	2088	+
	2089	+ materialtouched = true;
	2090	+ applySelf();
	2091	+ }
	2092	+ });
	2093	+ presetpanel.add(rough);
	2094	+
	2095	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2096	+ rough2.setToolTipText("Medium metal");
	2097	+ rough2.addMouseListener(new MouseAdapter()
	2098	+ {
	2099	+ public void mouseClicked(MouseEvent e)
	2100	+ {
	2101	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2102	+ cMaterial material = object.material;
	2103	+
	2104	+ shininessField.setFloat(material.shininess);
	2105	+ lightareaField.setFloat(material.lightarea);
	2106	+
	2107	+ materialtouched = true;
	2108	+ applySelf();
	2109	+ }
	2110	+ });
	2111	+ presetpanel.add(rough2);
	2112	+
	2113	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2114	+ shini0.setToolTipText("Shiny");
	2115	+ shini0.addMouseListener(new MouseAdapter()
	2116	+ {
	2117	+ public void mouseClicked(MouseEvent e)
	2118	+ {
	2119	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2120	+ cMaterial material = object.material;
	2121	+
	2122	+ shininessField.setFloat(material.shininess);
	2123	+ lightareaField.setFloat(material.lightarea);
	2124	+
	2125	+ materialtouched = true;
	2126	+ applySelf();
	2127	+ }
	2128	+ });
	2129	+ presetpanel.add(shini0);
	2130	+
	2131	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2132	+ shini1.setToolTipText("Shiny2");
	2133	+ shini1.addMouseListener(new MouseAdapter()
	2134	+ {
	2135	+ public void mouseClicked(MouseEvent e)
	2136	+ {
	2137	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2138	+ cMaterial material = object.material;
	2139	+
	2140	+ shininessField.setFloat(material.shininess);
	2141	+ lightareaField.setFloat(material.lightarea);
	2142	+
	2143	+ materialtouched = true;
	2144	+ applySelf();
	2145	+ }
	2146	+ });
	2147	+ presetpanel.add(shini1);
	2148	+
	2149	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2150	+ shini2.setToolTipText("Shiny3");
	2151	+ shini2.addMouseListener(new MouseAdapter()
	2152	+ {
	2153	+ public void mouseClicked(MouseEvent e)
	2154	+ {
	2155	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2156	+ cMaterial material = object.material;
	2157	+
	2158	+ shininessField.setFloat(material.shininess);
	2159	+ lightareaField.setFloat(material.lightarea);
	2160	+
	2161	+ materialtouched = true;
	2162	+ applySelf();
	2163	+ }
	2164	+ });
	2165	+ presetpanel.add(shini2);
	2166	+
	2167	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2168	+ aniso.setToolTipText("AnisoU");
	2169	+ aniso.addMouseListener(new MouseAdapter()
	2170	+ {
	2171	+ public void mouseClicked(MouseEvent e)
	2172	+ {
	2173	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2174	+ cMaterial material = object.material;
	2175	+
	2176	+ anisoField.setFloat(material.aniso);
	2177	+ anisoVField.setFloat(material.anisoV);
	2178	+
	2179	+ materialtouched = true;
	2180	+ applySelf();
	2181	+ }
	2182	+ });
	2183	+ presetpanel.add(aniso);
	2184	+
	2185	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2186	+ aniso2.setToolTipText("AnisoV");
	2187	+ aniso2.addMouseListener(new MouseAdapter()
	2188	+ {
	2189	+ public void mouseClicked(MouseEvent e)
	2190	+ {
	2191	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2192	+ cMaterial material = object.material;
	2193	+
	2194	+ anisoField.setFloat(material.aniso);
	2195	+ anisoVField.setFloat(material.anisoV);
	2196	+
	2197	+ materialtouched = true;
	2198	+ applySelf();
	2199	+ }
	2200	+ });
	2201	+ presetpanel.add(aniso2);
	2202	+
	2203	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2204	+ aniso3.setToolTipText("AnisoUV");
	2205	+ aniso3.addMouseListener(new MouseAdapter()
	2206	+ {
	2207	+ public void mouseClicked(MouseEvent e)
	2208	+ {
	2209	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2210	+ cMaterial material = object.material;
	2211	+
	2212	+ anisoField.setFloat(material.aniso);
	2213	+ anisoVField.setFloat(material.anisoV);
	2214	+
	2215	+ materialtouched = true;
	2216	+ applySelf();
	2217	+ }
	2218	+ });
	2219	+ presetpanel.add(aniso3);
	2220	+
	2221	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2222	+ velvet0.setToolTipText("Velvet");
	2223	+ velvet0.addMouseListener(new MouseAdapter()
	2224	+ {
	2225	+ public void mouseClicked(MouseEvent e)
	2226	+ {
	2227	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2228	+ cMaterial material = object.material;
	2229	+
	2230	+ diffusenessField.setFloat(material.factor);
	2231	+ selfshadowField.setFloat(material.diffuseness);
	2232	+ sheenField.setFloat(material.sheen);
	2233	+ shininessField.setFloat(material.shininess);
	2234	+ velvetField.setFloat(material.velvet);
	2235	+ shiftField.setFloat(material.shift);
	2236	+
	2237	+ materialtouched = true;
	2238	+ applySelf();
	2239	+ }
	2240	+ });
	2241	+ presetpanel.add(velvet0);
	2242	+
	2243	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2244	+ bump0.setToolTipText("Bump texture");
	2245	+ bump0.addMouseListener(new MouseAdapter()
	2246	+ {
	2247	+ public void mouseClicked(MouseEvent e)
	2248	+ {
	2249	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2250	+ cMaterial material = object.material;
	2251	+
	2252	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2253	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2254	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2255	+
	2256	+ materialtouched = true;
	2257	+ applySelf();
	2258	+ }
	2259	+ });
	2260	+ presetpanel.add(bump0);
	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	+
	2277	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2278	+ halo.setToolTipText("Halo");
	2279	+ halo.addMouseListener(new MouseAdapter()
	2280	+ {
	2281	+ public void mouseClicked(MouseEvent e)
	2282	+ {
	2283	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2284	+ cMaterial material = object.material;
	2285	+
	2286	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2287	+
	2288	+ materialtouched = true;
	2289	+ applySelf();
	2290	+ }
	2291	+ });
	2292	+ presetpanel.add(halo);
	2293	+
	2294	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2295	+ candle.setToolTipText("Candle");
	2296	+ candle.addMouseListener(new MouseAdapter()
	2297	+ {
	2298	+ public void mouseClicked(MouseEvent e)
	2299	+ {
	2300	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2301	+ cMaterial material = object.material;
	2302	+
	2303	+ subsurfaceField.setFloat(material.subsurface);
	2304	+ shadowbiasField.setFloat(material.shadowbias);
	2305	+ ambientField.setFloat(material.ambient);
	2306	+ specularField.setFloat(material.specular);
	2307	+ lightareaField.setFloat(material.lightarea);
	2308	+ shininessField.setFloat(material.shininess);
	2309	+
	2310	+ materialtouched = true;
	2311	+ applySelf();
	2312	+ }
	2313	+ });
	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);
	2334	+
	2335	+ cGridBag panel = new cGridBag().setVertical(true);
	2336	+
	2337	+ presetpanel.preferredWidth = 1;
	2338	+
	2339	+ materialpanel.add(presetpanel);
	2340	+ materialpanel.add(panel);
	2341	+
	2342	+ panel.preferredWidth = 8;
	2343	+
	2344	+ /*
1667	2345	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1668	2346	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1669		- */
	2347	+ */
1670	2348
1671	2349	cGridBag editBar = new cGridBag().setVertical(false);
1672	2350
..	..	@@ -1700,27 +2378,61 @@
1700	2378	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1701	2379
1702	2380	cGridBag colorSection = new cGridBag().setVertical(true);
	2381	+
	2382	+ cGridBag huepanel = new cGridBag();
	2383	+ cGridBag huelabel = new cGridBag();
	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);
	2398	+ huelabel.preferredWidth = 20;
	2399	+ huepanel.add(new cGridBag()); // Label
	2400	+ huepanel.add(huelabel); // Field/slider
	2401	+
	2402	+ huepanel.preferredHeight = 7;
	2403	+
	2404	+ colorSection.add(huepanel);
1703	2405
1704	2406	cGridBag color = new cGridBag();
1705		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1706		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1707		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2407	+
	2408	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2409	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2410	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2411	+
1708	2412	//colorField.preferredWidth = 200;
1709	2413	colorSection.add(color);
1710	2414
1711	2415	cGridBag modulation = new cGridBag();
1712	2416	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1713	2417	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1714		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2418	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1715	2419	colorSection.add(modulation);
1716	2420
	2421	+ cGridBag opacity = new cGridBag();
	2422	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2423	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2424	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2425	+ colorSection.add(opacity);
	2426	+
	2427	+ colorSection.add(GetSeparator());
	2428	+
1717	2429	cGridBag texture = new cGridBag();
1718	2430	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1719	2431	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1720	2432	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1721	2433	colorSection.add(texture);
1722	2434
1723		- panel.add(new JSeparator());
	2435	+ panel.add(GetSeparator());
1724	2436
1725	2437	panel.add(colorSection);
1726	2438
..	..	@@ -1776,7 +2488,7 @@
1776	2488	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1777	2489	diffuseSection.add(shadowbias);
1778	2490
1779		- panel.add(new JSeparator());
	2491	+ panel.add(GetSeparator());
1780	2492
1781	2493	panel.add(diffuseSection);
1782	2494
..	..	@@ -1839,7 +2551,7 @@
1839	2551	specularSection.add(anisoV);
1840	2552
1841	2553
1842		- panel.add(new JSeparator());
	2554	+ panel.add(GetSeparator());
1843	2555
1844	2556	panel.add(specularSection);
1845	2557
..	..	@@ -1864,12 +2576,6 @@
1864	2576	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1865	2577	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1866	2578	colorSection.add(backlit);
1867		-
1868		- cGridBag opacity = new cGridBag();
1869		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1870		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1871		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1872		- colorSection.add(opacity);
1873	2579
1874	2580	//panel.add(new JSeparator());
1875	2581
..	..	@@ -1915,7 +2621,7 @@
1915	2621	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1916	2622	textureSection.add(opacityPower);
1917	2623
1918		- panel.add(new JSeparator());
	2624	+ panel.add(GetSeparator());
1919	2625
1920	2626	panel.add(textureSection);
1921	2627
..	..	@@ -2902,7 +3608,7 @@
2902	3608
2903	3609	freezematerial = true;
2904	3610	colorField.setFloat(mat.color);
2905		- modulationField.setFloat(mat.modulation);
	3611	+ saturationField.setFloat(mat.modulation);
2906	3612	metalnessField.setFloat(mat.metalness);
2907	3613	diffuseField.setFloat(mat.diffuse);
2908	3614	specularField.setFloat(mat.specular);
..	..	@@ -2964,32 +3670,8 @@
2964	3670
2965	3671	if (multiplyToggle != null)
2966	3672	multiplyToggle.setSelected(mat.multiply);
2967		-
2968		- assert (object.projectedVertices != null);
2969		-
2970		- if (object.projectedVertices.length <= 2)
2971		- {
2972		- // Side effect...
2973		- Object3D.cVector2[] keep = object.projectedVertices;
2974		- object.projectedVertices = new Object3D.cVector2[3];
2975		- for (int i = 0; i < 3; i++)
2976		- {
2977		- if (i < keep.length)
2978		- {
2979		- object.projectedVertices[i] = keep[i];
2980		- } else
2981		- {
2982		- object.projectedVertices[i] = new Object3D.cVector2();
2983		- }
2984		- /*
2985		- if(keep.length == 0)
2986		- object.projectedVertices[0] = new Object3D.cVector2();
2987		- else
2988		- object.projectedVertices[0] = keep[0];
2989		- object.projectedVertices[1] = new Object3D.cVector2();
2990		- */
2991		- }
2992		- }
	3673	+
	3674	+ AllocProjectedVertices(object);
2993	3675
2994	3676	SetMaterial(mat, object.projectedVertices);
2995	3677	}
..	..	@@ -3109,6 +3791,17 @@
3109	3791	public void itemStateChanged(ItemEvent event)
3110	3792	{
3111	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
3112	3805	if (event.getSource() == propagateToggle)
3113	3806	{
3114	3807	propagate ^= true;
..	..	@@ -3213,8 +3906,9 @@
3213	3906	} else if (event.getSource() == liveCB)
3214	3907	{
3215	3908	copy.live ^= true;
	3909	+ objEditor.refreshContents(true); // To show item colors
3216	3910	return;
3217		- } else if (event.getSource() == selectCB)
	3911	+ } else if (event.getSource() == selectableCB)
3218	3912	{
3219	3913	copy.dontselect ^= true;
3220	3914	return;
..	..	@@ -3222,7 +3916,7 @@
3222	3916	{
3223	3917	copy.hide ^= true;
3224	3918	copy.Touch(); // display list issue
3225		- objEditor.refreshContents();
	3919	+ objEditor.refreshContents(true); // To show item colors
3226	3920	return;
3227	3921	} else if (event.getSource() == link2masterCB)
3228	3922	{
..	..	@@ -3287,7 +3981,7 @@
3287	3981	//System.out.println("ObjEditor " + event);
3288	3982	applySelf0(true);
3289	3983	//parent.applySelf();
3290		- objEditor.refreshContents();
	3984	+ // conflicts with requestFocus objEditor.refreshContents();
3291	3985	} else if (source == resetButton)
3292	3986	{
3293	3987	CameraPane.fullreset = true;
..	..	@@ -3478,6 +4172,7 @@
3478	4172
3479	4173	static public byte[] Compress(Object3D o)
3480	4174	{
	4175	+ // Slower to actually compress.
3481	4176	try
3482	4177	{
3483	4178	ByteArrayOutputStream baos = new ByteArrayOutputStream();
..	..	@@ -3574,11 +4269,12 @@
3574	4269	return null;
3575	4270	}
3576	4271
3577		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3578	4272
3579	4273	public void Save()
3580	4274	{
3581		- Save(true);
	4275	+ //Save(true);
	4276	+ Replace();
	4277	+ SetVersionStates();
3582	4278	}
3583	4279
3584	4280	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3597,59 +4293,73 @@
3597	4293	return true;
3598	4294	}
3599	4295
	4296	+ void DeleteVersion()
	4297	+ {
	4298	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4299	+ {
	4300	+ copy.versionlist[i] = copy.versionlist[i+1];
	4301	+ }
	4302	+
	4303	+ if (copy.versionlist[copy.versionindex] == null)
	4304	+ copy.versionindex -= 1;
	4305	+
	4306	+ if (copy.versionindex != -1)
	4307	+ CopyChanged();
	4308	+
	4309	+ SetVersionStates();
	4310	+ }
	4311	+
3600	4312	public boolean Save(boolean user)
3601	4313	{
3602	4314	System.err.println("Save");
	4315	+ Replace();
3603	4316
3604		- cRadio tab = GetCurrentTab();
	4317	+ //cRadio tab = GetCurrentTab();
3605	4318
3606		- boolean temp = CameraPane.SWITCH;
3607		- CameraPane.SWITCH = false;
3608		-
3609		- copy.ExtractBigData(hashtable);
3610		-
3611		- byte[] compress = Compress(copy);
3612		-
3613		- CameraPane.SWITCH = temp;
	4319	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3614	4320
3615	4321	boolean thesame = false;
3616	4322
3617		- // Quick heuristic using length. Works only when stream is compressed.
3618		- if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
3619		- {
3620		- thesame = true;
3621		- }
	4323	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4324	+// {
	4325	+// thesame = true;
	4326	+// }
3622	4327
3623	4328	//EditorFrame.m_MainFrame.requestFocusInWindow();
3624	4329	if (!thesame)
3625	4330	{
3626		- //tab.user[tab.undoindex] = user;
3627		- boolean increment = tab.graphs[tab.undoindex] == null;
	4331	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4332	+ {
	4333	+ copy.versionlist[i] = copy.versionlist[i-1];
	4334	+ }
3628	4335
3629		- tab.graphs[tab.undoindex] = compress;
	4336	+ //tab.user[tab.versionindex] = user;
	4337	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
3630	4338
3631		- if (increment)
3632		- tab.undoindex++;
	4339	+ copy.versionlist[++copy.versionindex] = compress;
	4340	+
	4341	+ // if (increment)
	4342	+ // tab.versionindex++;
3633	4343	}
3634	4344
3635		- copy.RestoreBigData(hashtable);
	4345	+ //copy.RestoreBigData(versiontable);
3636	4346
3637	4347	//assert(hashtable.isEmpty());
3638	4348
3639		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
3640		- {
3641		- //tab.user[i] = false;
3642		- // tab.graphs[i] = null;
3643		- }
	4349	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4350	+// {
	4351	+// //tab.user[i] = false;
	4352	+// copy.versionlist[i] = null;
	4353	+// }
3644	4354
3645		- SetUndoStates();
	4355	+ SetVersionStates();
3646	4356
3647	4357	// test save
3648	4358	if (false)
3649	4359	{
3650	4360	try
3651	4361	{
3652		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4362	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3653	4363	ObjectOutputStream p = new ObjectOutputStream(ostream);
3654	4364
3655	4365	p.writeObject(copy);
..	..	@@ -3665,27 +4375,65 @@
3665	4375
3666	4376	return !thesame;
3667	4377	}
3668		-
3669		- void CopyChanged(Object3D obj)
	4378	+
	4379	+ boolean flashIt = true;
	4380	+
	4381	+ void RefreshSelection()
3670	4382	{
3671		- SetUndoStates();
	4383	+ Object3D selection = new Object3D();
	4384	+
	4385	+ for (int i = 0; i < copy.selection.size(); i++)
	4386	+ {
	4387	+ Object3D elem = copy.selection.elementAt(i);
	4388	+
	4389	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4390	+
	4391	+ if (obj == null)
	4392	+ {
	4393	+ copy.selection.remove(i--);
	4394	+ }
	4395	+ else
	4396	+ {
	4397	+ selection.add(obj);
	4398	+ copy.selection.setElementAt(obj, i);
	4399	+ }
	4400	+ }
	4401	+
	4402	+ flashIt = false;
	4403	+ GetTree().clearSelection();
	4404	+ for (int i = 0; i < selection.size(); i++)
	4405	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4406	+ flashIt = true;
	4407	+
	4408	+ //refreshContents(false);
	4409	+ }
	4410	+
	4411	+ void CopyChanged()
	4412	+ {
	4413	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4414	+
	4415	+ SetVersionStates();
3672	4416
3673	4417	boolean temp = CameraPane.SWITCH;
3674	4418	CameraPane.SWITCH = false;
3675	4419
3676		- copy.ExtractBigData(hashtable);
	4420	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3677	4421
3678	4422	copy.clear();
3679	4423
	4424	+ copy.skyboxname = obj.skyboxname;
	4425	+ copy.skyboxext = obj.skyboxext;
	4426	+
3680	4427	for (int i=0; i<obj.Size(); i++)
3681	4428	{
3682	4429	copy.add(obj.get(i));
3683	4430	}
3684	4431
3685		- copy.RestoreBigData(hashtable);
	4432	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3686	4433
3687	4434	CameraPane.SWITCH = temp;
3688	4435
	4436	+ RefreshSelection();
3689	4437	//assert(hashtable.isEmpty());
3690	4438
3691	4439	copy.Touch();
..	..	@@ -3706,68 +4454,161 @@
3706	4454	}
3707	4455	}
3708	4456
3709		- refreshContents();
	4457	+ refreshContents(true);
3710	4458	}
3711	4459
3712		- cButton undoButton;
3713		- cButton redoButton;
	4460	+ cButton previousVersionButton;
	4461	+ cButton restoreButton;
	4462	+ cButton replaceButton;
	4463	+ cButton nextVersionButton;
	4464	+ cButton saveVersionButton;
	4465	+ cButton deleteVersionButton;
3714	4466
3715		- void SetUndoStates()
	4467	+ boolean muteSlider;
	4468	+
	4469	+ int VersionCount()
3716	4470	{
3717		- cRadio tab = GetCurrentTab();
	4471	+ int count = 0;
3718	4472
3719		- undoButton.setEnabled(tab.undoindex > 0);
3720		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	4473	+ for (int i = copy.versionlist.length; --i >= 0;)
	4474	+ {
	4475	+ if (copy.versionlist[i] != null)
	4476	+ count++;
	4477	+ }
	4478	+
	4479	+ return count;
3721	4480	}
3722	4481
3723		- public boolean Undo()
	4482	+ public cGridBag versionSliderPane;
	4483	+
	4484	+ void SetVersionStates()
3724	4485	{
	4486	+ //if (true)
	4487	+ // return;
	4488	+
	4489	+ //cRadio tab = GetCurrentTab();
	4490	+
	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	+ }
	4521	+ }
	4522	+
	4523	+ public boolean PreviousVersion()
	4524	+ {
	4525	+ // Option?
	4526	+ Replace();
	4527	+
3725	4528	System.err.println("Undo");
3726	4529
3727		- cRadio tab = GetCurrentTab();
	4530	+ //cRadio tab = GetCurrentTab();
3728	4531
3729		- if (tab.undoindex == 0)
	4532	+ if (copy.versionindex == 0)
3730	4533	{
3731	4534	java.awt.Toolkit.getDefaultToolkit().beep();
3732	4535	return false;
3733	4536	}
3734	4537
3735		- if (tab.graphs[tab.undoindex] == null) // \|\| !tab.user[tab.undoindex])
3736		- {
3737		- if (Save(false))
3738		- tab.undoindex -= 1;
3739		- else
3740		- {
3741		- if (tab.undoindex <= 0)
3742		- return false;
3743		- else
3744		- tab.undoindex -= 1;
3745		- }
3746		- }
	4538	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4539	+// {
	4540	+// if (Save(false))
	4541	+// tab.versionindex -= 1;
	4542	+// else
	4543	+// {
	4544	+// if (tab.versionindex <= 0)
	4545	+// return false;
	4546	+// else
	4547	+// tab.versionindex -= 1;
	4548	+// }
	4549	+// }
3747	4550
3748		- tab.undoindex -= 1;
	4551	+ copy.versionindex -= 1;
3749	4552
3750		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4553	+ CopyChanged();
3751	4554
3752	4555	return true;
3753	4556	}
3754	4557
3755		- public void Redo()
	4558	+ public boolean Restore()
3756	4559	{
3757		- cRadio tab = GetCurrentTab();
	4560	+ System.err.println("Restore");
3758	4561
3759		- if (tab.graphs[tab.undoindex + 1] == null)
	4562	+ //cRadio tab = GetCurrentTab();
	4563	+
	4564	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4565	+ {
	4566	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4567	+ return false;
	4568	+ }
	4569	+
	4570	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4571	+ CopyChanged();
	4572	+
	4573	+ return true;
	4574	+ }
	4575	+
	4576	+ public boolean Replace()
	4577	+ {
	4578	+ //System.err.println("Replace");
	4579	+
	4580	+ //cRadio tab = GetCurrentTab();
	4581	+
	4582	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4583	+ {
	4584	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4585	+ return false;
	4586	+ }
	4587	+
	4588	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4589	+
	4590	+ return true;
	4591	+ }
	4592	+
	4593	+ public void NextVersion()
	4594	+ {
	4595	+ // Option?
	4596	+ Replace();
	4597	+
	4598	+ //cRadio tab = GetCurrentTab();
	4599	+
	4600	+ if (copy.versionlist[copy.versionindex + 1] == null)
3760	4601	{
3761	4602	java.awt.Toolkit.getDefaultToolkit().beep();
3762	4603	return;
3763	4604	}
3764	4605
3765		- tab.undoindex += 1;
	4606	+ copy.versionindex += 1;
3766	4607
3767		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4608	+ CopyChanged();
3768	4609
3769		- //if (!tab.user[tab.undoindex])
3770		- // tab.graphs[tab.undoindex] = null;
	4610	+ //if (!tab.user[tab.versionindex])
	4611	+ // tab.graphs[tab.versionindex] = null;
3771	4612	}
3772	4613
3773	4614	void ImportGFD()
..	..	@@ -3961,6 +4802,12 @@
3961	4802	// else
3962	4803	// applySelf(true);
3963	4804	// }
	4805	+
	4806	+ boolean Equal(double a, double b)
	4807	+ {
	4808	+ return Math.abs(a - b) < 0.001;
	4809	+ }
	4810	+
3964	4811	void applySelf0(boolean name)
3965	4812	{
3966	4813	if (name)
..	..	@@ -3978,7 +4825,7 @@
3978	4825	//copy.material = new cMaterial(copy.GetMaterial());
3979	4826
3980	4827	current.color = (float) colorField.getFloat();
3981		- current.modulation = (float) modulationField.getFloat();
	4828	+ current.modulation = (float) saturationField.getFloat();
3982	4829	current.metalness = (float) metalnessField.getFloat();
3983	4830	current.diffuse = (float) diffuseField.getFloat();
3984	4831	current.specular = (float) specularField.getFloat();
..	..	@@ -4010,29 +4857,52 @@
4010	4857	{
4011	4858	cMaterial mat = copy.material;
4012	4859
4013		- colorField.SetToolTipValue((mat.color));
4014		- modulationField.SetToolTipValue((mat.modulation));
4015		- metalnessField.SetToolTipValue((mat.metalness));
4016		- diffuseField.SetToolTipValue((mat.diffuse));
4017		- specularField.SetToolTipValue((mat.specular));
4018		- shininessField.SetToolTipValue((mat.shininess));
4019		- shiftField.SetToolTipValue((mat.shift));
4020		- ambientField.SetToolTipValue((mat.ambient));
4021		- lightareaField.SetToolTipValue((mat.lightarea));
4022		- diffusenessField.SetToolTipValue((mat.factor));
4023		- velvetField.SetToolTipValue((mat.velvet));
4024		- sheenField.SetToolTipValue((mat.sheen));
4025		- subsurfaceField.SetToolTipValue((mat.subsurface));
4026		- backlitField.SetToolTipValue((mat.bump));
4027		- anisoField.SetToolTipValue((mat.aniso));
4028		- anisoVField.SetToolTipValue((mat.anisoV));
4029		- cameraField.SetToolTipValue((mat.cameralight));
4030		- selfshadowField.SetToolTipValue((mat.diffuseness));
4031		- shadowField.SetToolTipValue((mat.shadow));
4032		- textureField.SetToolTipValue((mat.texture));
4033		- opacityField.SetToolTipValue((mat.opacity));
4034		- fakedepthField.SetToolTipValue((mat.fakedepth));
4035		- 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));
4036	4906	}
4037	4907
4038	4908	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -4063,9 +4933,28 @@
4063	4933	//copy.Touch();
4064	4934	}
4065	4935
	4936	+ cNumberSlider versionSlider;
	4937	+
4066	4938	public void stateChanged(ChangeEvent e)
4067	4939	{
4068		- // assert(false);
	4940	+ // assert(false);
	4941	+ if (e.getSource() == versionSlider)
	4942	+ {
	4943	+ if (muteSlider)
	4944	+ return;
	4945	+
	4946	+ Replace();
	4947	+
	4948	+ int version = versionSlider.getInteger();
	4949	+
	4950	+ if (version != -1 && copy.versionlist[version] != null)
	4951	+ {
	4952	+ copy.versionindex = version;
	4953	+ CopyChanged();
	4954	+ }
	4955	+
	4956	+ return;
	4957	+ }
4069	4958
4070	4959	if (freezematerial)
4071	4960	{
..	..	@@ -4101,6 +4990,12 @@
4101	4990	{
4102	4991	//System.out.println("stateChanged = " + this);
4103	4992	materialtouched = true;
	4993	+
	4994	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4995	+ {
	4996	+ saturationField.setFloat(1);
	4997	+ }
	4998	+
4104	4999	applySelf();
4105	5000	//System.out.println("this = " + this);
4106	5001	//System.out.println("PARENT = " + parent);
..	..	@@ -4400,6 +5295,7 @@
4400	5295	{
4401	5296	if (GetTree() != null)
4402	5297	{
	5298	+ GetTree().revalidate();
4403	5299	GetTree().repaint();
4404	5300	}
4405	5301
..	..	@@ -4408,13 +5304,18 @@
4408	5304	ctrlPanel.validate(); // ? new
4409	5305	ctrlPanel.repaint();
4410	5306	}
	5307	+
	5308	+ if (previousVersionButton != null && copy.versionlist != null)
	5309	+ SetVersionStates();
	5310	+
	5311	+ cameraView.requestFocusInWindow();
4411	5312	}
4412	5313
4413	5314	static TweenManager tweenManager = new TweenManager();
4414	5315
4415	5316	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4416	5317	{
4417		- if (Globals.SAVEONMAKE) // && resetmodel)
	5318	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4418	5319	Save();
4419	5320	//Tween.set(thing, 0).target(1).start(tweenManager);
4420	5321	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4439,7 +5340,7 @@
4439	5340	// group = (Composite) group.get(0);
4440	5341	// }
4441	5342
4442		- System.out.println("makeSomething of " + thing);
	5343	+ //System.out.println("makeSomething of " + thing);
4443	5344
4444	5345	/*
4445	5346	if (deselect && jList != null)
..	..	@@ -4656,7 +5557,9 @@
4656	5557	readobj.ResetDisplayList();
4657	5558	} catch (Exception e)
4658	5559	{
4659		- //e.printStackTrace();
	5560	+ if (!e.toString().contains("GZIP"))
	5561	+ e.printStackTrace();
	5562	+
4660	5563	try
4661	5564	{
4662	5565	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4736,6 +5639,8 @@
4736	5639	{
4737	5640	//readobj.deepCopySelf(copy);
4738	5641	copy.clear(); // june 2014
	5642	+ copy.skyboxname = readobj.skyboxname;
	5643	+ copy.skyboxext = readobj.skyboxext;
4739	5644	for (int i = 0; i < readobj.size(); i++)
4740	5645	{
4741	5646	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4776,6 +5681,7 @@
4776	5681	}
4777	5682	} catch (ClassCastException e)
4778	5683	{
	5684	+ e.printStackTrace();
4779	5685	assert (false);
4780	5686	Composite c = (Composite) copy;
4781	5687	c.children.clear();
..	..	@@ -4786,6 +5692,21 @@
4786	5692	c.addChild(csg);
4787	5693	}
4788	5694
	5695	+ copy.versionlist = readobj.versionlist;
	5696	+ copy.versionindex = readobj.versionindex;
	5697	+ copy.versiontable = readobj.versiontable;
	5698	+
	5699	+ if (copy.versionlist == null)
	5700	+ {
	5701	+ // Backward compatibility
	5702	+ copy.versionlist = new Object3D[100];
	5703	+ copy.versionindex = -1;
	5704	+
	5705	+ //Save(true);
	5706	+ }
	5707	+
	5708	+ //? SetUndoStates();
	5709	+
4789	5710	ResetModel();
4790	5711	copy.HardTouch(); // recompile?
4791	5712	refreshContents();
..	..	@@ -4796,7 +5717,7 @@
4796	5717	{
4797	5718	if (Grafreed.standAlone)
4798	5719	{
4799		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5720	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4800	5721	browser.show();
4801	5722	String filename = browser.getFile();
4802	5723	if (filename != null && filename.length() > 0)
..	..	@@ -4873,6 +5794,8 @@
4873	5794
4874	5795	void save()
4875	5796	{
	5797	+ Replace();
	5798	+
4876	5799	if (lastname == null)
4877	5800	{
4878	5801	return;
..	..	@@ -4895,6 +5818,7 @@
4895	5818	//ps.print(buffer.toString());
4896	5819	} catch (IOException e)
4897	5820	{
	5821	+ e.printStackTrace();
4898	5822	}
4899	5823	}
4900	5824
..	..	@@ -5114,6 +6038,7 @@
5114	6038	ButtonGroup buttonGroup;
5115	6039
5116	6040	cGridBag toolboxPanel;
	6041	+ cGridBag skyboxPanel;
5117	6042	cGridBag materialPanel;
5118	6043	cGridBag ctrlPanel;
5119	6044
..	..	@@ -5125,6 +6050,7 @@
5125	6050	boolean materialFlushed;
5126	6051	Object3D latestObject;
5127	6052
	6053	+ cGridBag transformPanel;
5128	6054	cGridBag XYZPanel;
5129	6055
5130	6056	JSplitPane gridPanel;
..	..	@@ -5187,7 +6113,7 @@
5187	6113	JLabel colorLabel;
5188	6114	cNumberSlider colorField;
5189	6115	JLabel modulationLabel;
5190		- cNumberSlider modulationField;
	6116	+ cNumberSlider saturationField;
5191	6117	JLabel metalnessLabel;
5192	6118	cNumberSlider metalnessField;
5193	6119	JLabel diffuseLabel;
..	..	@@ -5218,6 +6144,7 @@
5218	6144	cNumberSlider anisoField;
5219	6145	JLabel anisoVLabel;
5220	6146	cNumberSlider anisoVField;
	6147	+
5221	6148	JLabel cameraLabel;
5222	6149	cNumberSlider cameraField;
5223	6150	JLabel selfshadowLabel;
..	..	@@ -5232,6 +6159,7 @@
5232	6159	cNumberSlider fakedepthField;
5233	6160	JLabel shadowbiasLabel;
5234	6161	cNumberSlider shadowbiasField;
	6162	+
5235	6163	JLabel bumpLabel;
5236	6164	cNumberSlider bumpField;
5237	6165	JLabel noiseLabel;