~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,119 @@
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);
50		- return new cButton(icon, border);
51		- }
52		- catch (Exception e)
53		- {
54		- return new cButton(name, border);
55		- }
	85	+ ImageIcon icon = GetIcon(name);
	86	+ return new cButton(icon, border);
	87	+ }
	88	+
	89	+ cLabel GetLabel(String name, boolean border)
	90	+ {
	91	+ //ImageIcon icon = GetIcon(name);
	92	+ return new cLabel(GetImage(name), border);
56	93	}
57	94
58	95	cToggleButton GetToggleButton(String name, boolean border)
59	96	{
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		- }
	97	+ ImageIcon icon = GetIcon(name);
	98	+ return new cToggleButton(icon, border);
69	99	}
70	100
71	101	cCheckBox GetCheckBox(String name, boolean border)
72	102	{
	103	+ ImageIcon icon = GetIcon(name);
	104	+ return new cCheckBox(icon, border);
	105	+ }
	106	+
	107	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	108	+
	109	+ ImageIcon GetIcon(String name)
	110	+ {
	111	+ javax.swing.ImageIcon iconCache = icons.get(name);
	112	+ if (iconCache != null)
	113	+ {
	114	+ return iconCache;
	115	+ }
	116	+
73	117	try
74	118	{
75		- ImageIcon icon = GetIcon(name);
76		- return new cCheckBox(icon, border);
	119	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	120	+
	121	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	122	+// {
	123	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	124	+// Graphics2D g = resized.createGraphics();
	125	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	126	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	127	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	128	+// g.dispose();
	129	+//
	130	+// image = resized;
	131	+// }
	132	+
	133	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	134	+
	135	+ icons.put(name, icon);
	136	+
	137	+ return icon;
77	138	}
78	139	catch (Exception e)
79	140	{
80		- return new cCheckBox(name, border);
	141	+ //icons.put(name, null);
	142	+ return null;
81	143	}
82	144	}
83		-
84		- private ImageIcon GetIcon(String name) throws IOException
	145	+
	146	+ BufferedImage GetImage(String name)
85	147	{
86		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87		-
88		- if (image.getWidth() != 24 && image.getHeight() != 24)
	148	+ try
89	149	{
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;
	150	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	151	+
	152	+ return image;
98	153	}
99		-
100		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101		- return icon;
	154	+ catch (Exception e)
	155	+ {
	156	+ return null;
	157	+ }
102	158	}
103	159
104	160	// SCRIPT
..	..	@@ -282,6 +338,14 @@
282	338	client = inClient;
283	339	copy = client;
284	340
	341	+// if (copy.versionlist == null)
	342	+// {
	343	+// copy.versionlist = new Object3D[100];
	344	+// copy.versionindex = -1;
	345	+//
	346	+// callee.Save(true);
	347	+// }
	348	+
285	349	// "this" is not called: SetupUI2(objEditor);
286	350	}
287	351
..	..	@@ -295,6 +359,14 @@
295	359	client = inClient;
296	360	copy = client;
297	361
	362	+ if (copy.versionlist == null)
	363	+ {
	364	+ copy.versionlist = new Object3D[100];
	365	+ copy.versionindex = -1;
	366	+
	367	+// Save(true);
	368	+ }
	369	+
298	370	SetupUI2(callee.GetEditor());
299	371	}
300	372
..	..	@@ -327,6 +399,14 @@
327	399	copy = localCopy;
328	400	copy.editWindow = this;
329	401
	402	+// if (copy.versionlist == null)
	403	+// {
	404	+// copy.versionlist = new Object3D[100];
	405	+// copy.versionindex = -1;
	406	+//
	407	+// Save(true);
	408	+// }
	409	+
330	410	SetupMenu();
331	411
332	412	//SetupName(objEditor); // new
..	..	@@ -394,6 +474,8 @@
394	474
395	475	ChangeListener changeListener = new ChangeListener()
396	476	{
	477	+ //String name;
	478	+
397	479	public void stateChanged(ChangeEvent changeEvent)
398	480	{
399	481	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -412,18 +494,49 @@
412	494	// EditSelection(false);
413	495	// }
414	496
415		- refreshContents(false); // To refresh Info tab
	497	+// if (objectPanel.getSelectedIndex() == 4)
	498	+// {
	499	+// name = copy.skyboxname;
	500	+//
	501	+// if (name == null)
	502	+// {
	503	+// name = "";
	504	+// }
	505	+//
	506	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	507	+// copy.skyboxext = "jpg";
	508	+// }
	509	+// else
	510	+// {
	511	+// if (name != null)
	512	+// {
	513	+// if (name.equals(""))
	514	+// {
	515	+// copy.skyboxname = null;
	516	+// copy.skyboxext = null;
	517	+// }
	518	+// else
	519	+// {
	520	+// copy.skyboxname = name;
	521	+// }
	522	+// }
	523	+// }
	524	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	525	+
	526	+// refreshContents(false); // To refresh Info tab
	527	+ cameraView.repaint();
416	528	}
417	529	};
418	530	objectPanel.addChangeListener(changeListener);
419	531
420	532	toolbarPanel = new JPanel();
421	533	toolbarPanel.setName("Toolbar");
	534	+
422	535	treePanel = new cGridBag();
423	536	treePanel.setName("Tree");
424	537
425	538	editPanel = new cGridBag().setVertical(true);
426		- editPanel.setName("Edit");
	539	+ //editPanel.setName("Edit");
427	540
428	541	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429	542
..	..	@@ -431,11 +544,13 @@
431	544	editPanel.add(editCommandsPanel);
432	545	editPanel.add(ctrlPanel);
433	546
434		- toolboxPanel = new cGridBag().setVertical(false);
435		- toolboxPanel.setName("Toolbox");
	547	+ toolboxPanel = new cGridBag().setVertical(true);
	548	+ //toolboxPanel.setName("Toolbox");
436	549
437		- materialPanel = new cGridBag().setVertical(true);
438		- materialPanel.setName("Material");
	550	+ skyboxPanel = new cGridBag().setVertical(true);
	551	+
	552	+ materialPanel = new cGridBag().setVertical(false);
	553	+ //materialPanel.setName("Material");
439	554
440	555	/JTextPane/
441	556	infoarea = createTextPane();
..	..	@@ -443,6 +558,7 @@
443	558
444	559	infoarea.setEditable(true);
445	560	SetText();
	561	+
446	562	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447	563	// infoarea.setOpaque(false);
448	564	// //infoarea.setForeground(textcolor);
..	..	@@ -450,7 +566,7 @@
450	566	// TEXTAREA infoarea.setWrapStyleWord(true);
451	567	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452	568	infoPanel.setPreferredSize(new Dimension(1, 1));
453		- infoPanel.setName("Info");
	569	+ //infoPanel.setName("Info");
454	570	//infoPanel.setLayout(new BorderLayout());
455	571	//infoPanel.add(createTextPane());
456	572
..	..	@@ -717,6 +833,7 @@
717	833	boolean maximized;
718	834
719	835	cButton fullscreenLayout;
	836	+ cButton expandedLayout;
720	837
721	838	void Minimize()
722	839	{
..	..	@@ -756,10 +873,12 @@
756	873	cButton minButton;
757	874	cButton maxButton;
758	875	cButton fullButton;
	876	+ cButton collapseButton;
	877	+ cButton maximize3DButton;
759	878
760	879	void ToggleFullScreen()
761	880	{
762		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	881	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
763	882
764	883	cameraView.ToggleFullScreen();
765	884
..	..	@@ -780,13 +899,13 @@
780	899	// X frame.getContentPane().remove(/"Center",/bigThree);
781	900	// X framePanel.add(bigThree);
782	901	// X frame.getContentPane().add(/"Center",/framePanel);
783		- framePanel.setDividerLocation(46);
	902	+// framePanel.setDividerLocation(46); // icons are 24x24
784	903
785	904	//frame.setVisible(true);
786		- radio.layout = keepButton;
	905	+// radio.layout = keepButton;
787	906	//theFrame = null;
788	907	keepButton = null;
789		- radio.layout.doClick();
	908	+// radio.layout.doClick();
790	909
791	910	} else
792	911	{
..	..	@@ -807,14 +926,47 @@
807	926	// X frame.getContentPane().remove(/"Center",/framePanel);
808	927	// X framePanel.remove(bigThree);
809	928	// X frame.getContentPane().add(/"Center",/bigThree);
810		- framePanel.setDividerLocation(0);
	929	+// framePanel.setDividerLocation(0);
811	930
812		- radio.layout = fullscreenLayout;
813		- radio.layout.doClick();
	931	+// radio.layout = fullscreenLayout;
	932	+// radio.layout.doClick();
814	933	//frame.setVisible(true);
815	934	}
816	935	frame.validate();
	936	+
	937	+ cameraView.requestFocusInWindow();
817	938	}
	939	+
	940	+ void CollapseToolbar()
	941	+ {
	942	+ framePanel.setDividerLocation(0);
	943	+ //frame.validate();
	944	+
	945	+ cameraView.requestFocusInWindow();
	946	+ }
	947	+
	948	+ private Object3D Duplicate(Object3D object)
	949	+ {
	950	+ boolean temp = CameraPane.SWITCH;
	951	+ CameraPane.SWITCH = false;
	952	+
	953	+ object.ExtractBigData(versiontable);
	954	+ // if (copy == client)
	955	+
	956	+ Object3D versions[] = object.versionlist;
	957	+ object.versionlist = null;
	958	+
	959	+ //byte[] compress = Compress(copy);
	960	+ Object3D compress = (Object3D)Grafreed.clone(object);
	961	+
	962	+ object.versionlist = versions;
	963	+
	964	+ object.RestoreBigData(versiontable);
	965	+
	966	+ CameraPane.SWITCH = temp;
	967	+
	968	+ return compress;
	969	+ }
818	970
819	971	private JTextPane createTextPane()
820	972	{
..	..	@@ -937,6 +1089,7 @@
937	1089	{
938	1090	SetupMaterial(materialPanel);
939	1091	}
	1092	+
940	1093	//SetupName();
941	1094	//SetupViews();
942	1095	}
..	..	@@ -946,7 +1099,7 @@
946	1099	// NumberSlider vDivsField;
947	1100	// JCheckBox endcaps;
948	1101	JCheckBox liveCB;
949		- JCheckBox selectCB;
	1102	+ JCheckBox selectableCB;
950	1103	JCheckBox hideCB;
951	1104	JCheckBox link2masterCB;
952	1105	JCheckBox markCB;
..	..	@@ -1145,6 +1298,18 @@
1145	1298
1146	1299	namePanel = new cGridBag();
1147	1300
	1301	+ //if (copy.pinned)
	1302	+ {
	1303	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1304	+ pinButton.setSelected(copy.pinned);
	1305	+ cGridBag t = new cGridBag();
	1306	+ t.preferredWidth = 2;
	1307	+ t.add(pinButton);
	1308	+ namePanel.add(t);
	1309	+
	1310	+ pinButton.addItemListener(this);
	1311	+ }
	1312	+
1148	1313	nameField = AddText(namePanel, copy.GetName());
1149	1314	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1150	1315	oe.ctrlPanel.add(namePanel);
..	..	@@ -1158,13 +1323,16 @@
1158	1323
1159	1324	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1160	1325	liveCB.setToolTipText("Animate object");
1161		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1162		- selectCB.setToolTipText("Make object selectable");
	1326	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1327	+ selectableCB.setToolTipText("Make object selectable");
1163	1328	// Return();
	1329	+
1164	1330	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1165	1331	hideCB.setToolTipText("Hide object");
1166	1332	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1167	1333	markCB.setToolTipText("As animation target transform");
	1334	+
	1335	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1168	1336
1169	1337	setupPanel2 = new cGridBag().setVertical(false);
1170	1338
..	..	@@ -1452,6 +1620,7 @@
1452	1620	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1453	1621	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1454	1622	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1623	+ //XYZPanel.setName("XYZ");
1455	1624
1456	1625	/*
1457	1626	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1489,17 +1658,29 @@
1489	1658	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1490	1659	//tmp.setName("Edit");
1491	1660	objectPanel.add(materialPanel);
	1661	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1662	+ objectPanel.setToolTipTextAt(0, "Material");
	1663	+
	1664	+ objectPanel.add(toolboxPanel);
	1665	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1666	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1667	+
	1668	+ objectPanel.add(skyboxPanel);
	1669	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1670	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1671	+
1492	1672	// JPanel north = new JPanel(new BorderLayout());
1493	1673	// north.setName("Edit");
1494	1674	// north.add(ctrlPanel, BorderLayout.NORTH);
1495	1675	// objectPanel.add(north);
1496	1676	objectPanel.add(editPanel);
	1677	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1678	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1497	1679
1498		- //if (Globals.ADVANCED)
1499		- objectPanel.add(infoPanel);
	1680	+ objectPanel.add(XYZPanel);
	1681	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1682	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1500	1683
1501		- objectPanel.add(toolboxPanel);
1502		-
1503	1684	/*
1504	1685	aConstraints.gridx = 0;
1505	1686	aConstraints.gridwidth = 1;
..	..	@@ -1519,7 +1700,7 @@
1519	1700	scrollpane.addMouseWheelListener(this); // Default not fast enough
1520	1701
1521	1702	/JTabbedPane/ scenePanel = new cGridBag();
1522		- scenePanel.preferredWidth = 6;
	1703	+ scenePanel.preferredWidth = 5;
1523	1704
1524	1705	JTabbedPane tabbedPane = new JTabbedPane();
1525	1706	tabbedPane.add(scrollpane);
..	..	@@ -1536,6 +1717,11 @@
1536	1717
1537	1718	scenePanel.add(tabbedPane);
1538	1719
	1720	+ //if (Globals.ADVANCED)
	1721	+// tabbedPane.add(infoPanel);
	1722	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1723	+// tabbedPane.setToolTipTextAt(3, "Information");
	1724	+
1539	1725	/*
1540	1726	cTree jTree = new cTree(null);
1541	1727	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1597,7 +1783,7 @@
1597	1783	bigThree = new cGridBag();
1598	1784	bigThree.addComponent(scenePanel);
1599	1785	bigThree.addComponent(centralPanel);
1600		- bigThree.addComponent(XYZPanel);
	1786	+ //bigThree.addComponent(XYZPanel);
1601	1787
1602	1788	// // SIDE EFFECT!!!
1603	1789	// aConstraints.gridx = 0;
..	..	@@ -1606,6 +1792,23 @@
1606	1792	// aConstraints.gridheight = 1;
1607	1793
1608	1794	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1795	+
	1796	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1797	+ new java.beans.PropertyChangeListener()
	1798	+ {
	1799	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1800	+ {
	1801	+ if ((Integer)pce.getOldValue() == 1)
	1802	+ {
	1803	+ if (radio.layout != expandedLayout)
	1804	+ {
	1805	+ radio.layout = expandedLayout;
	1806	+ radio.layout.doClick();
	1807	+ }
	1808	+ }
	1809	+ }
	1810	+ });
	1811	+
1609	1812	framePanel.setContinuousLayout(false);
1610	1813	framePanel.setOneTouchExpandable(false);
1611	1814	//.setDividerLocation(0.8);
..	..	@@ -1615,7 +1818,7 @@
1615	1818
1616	1819	frame.getContentPane().setLayout(new BorderLayout());
1617	1820	/**/
1618		- JTabbedPane worldPane = new JTabbedPane();
	1821	+ //JTabbedPane worldPane = new JTabbedPane();
1619	1822	//worldPane.add(bigPanel);
1620	1823	//worldPane.add(worldPanel);
1621	1824	/**/
..	..	@@ -1638,7 +1841,6 @@
1638	1841	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1639	1842	frame.addWindowListener(new WindowAdapter()
1640	1843	{
1641		-
1642	1844	public void windowClosing(WindowEvent e)
1643	1845	{
1644	1846	Close();
..	..	@@ -1661,12 +1863,418 @@
1661	1863	ctrlPanel.removeAll();
1662	1864	}
1663	1865
1664		- void SetupMaterial(cGridBag panel)
	1866	+ void SetupMaterial(cGridBag materialpanel)
1665	1867	{
1666		- /*
	1868	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1869	+
	1870	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1871	+ skin.setToolTipText("Skin");
	1872	+ skin.addMouseListener(new MouseAdapter()
	1873	+ {
	1874	+ public void mouseClicked(MouseEvent e)
	1875	+ {
	1876	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1877	+ cMaterial material = object.material;
	1878	+
	1879	+ // Skin
	1880	+ colorField.setFloat(material.color);
	1881	+ saturationField.setFloat(material.modulation);
	1882	+ subsurfaceField.setFloat(material.subsurface);
	1883	+ selfshadowField.setFloat(material.diffuseness);
	1884	+ diffusenessField.setFloat(material.factor);
	1885	+ shininessField.setFloat(material.shininess);
	1886	+ shadowbiasField.setFloat(material.shadowbias);
	1887	+ diffuseField.setFloat(material.diffuse);
	1888	+ specularField.setFloat(material.specular);
	1889	+
	1890	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1891	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1892	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1893	+
	1894	+ materialtouched = true;
	1895	+ applySelf();
	1896	+ }
	1897	+ });
	1898	+ presetpanel.add(skin);
	1899	+
	1900	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1901	+ lambert.setToolTipText("Diffuse");
	1902	+ lambert.addMouseListener(new MouseAdapter()
	1903	+ {
	1904	+ public void mouseClicked(MouseEvent e)
	1905	+ {
	1906	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1907	+ cMaterial material = object.material;
	1908	+
	1909	+ diffusenessField.setFloat(material.factor);
	1910	+ selfshadowField.setFloat(material.diffuseness);
	1911	+
	1912	+ materialtouched = true;
	1913	+ applySelf();
	1914	+ }
	1915	+ });
	1916	+ presetpanel.add(lambert);
	1917	+
	1918	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1919	+ diffuse2.setToolTipText("Diffuse2");
	1920	+ diffuse2.addMouseListener(new MouseAdapter()
	1921	+ {
	1922	+ public void mouseClicked(MouseEvent e)
	1923	+ {
	1924	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1925	+ cMaterial material = object.material;
	1926	+
	1927	+ diffusenessField.setFloat(material.factor);
	1928	+ selfshadowField.setFloat(material.diffuseness);
	1929	+
	1930	+ materialtouched = true;
	1931	+ applySelf();
	1932	+ }
	1933	+ });
	1934	+ presetpanel.add(diffuse2);
	1935	+
	1936	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1937	+ diffusemoon.setToolTipText("Moon");
	1938	+ diffusemoon.addMouseListener(new MouseAdapter()
	1939	+ {
	1940	+ public void mouseClicked(MouseEvent e)
	1941	+ {
	1942	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1943	+ cMaterial material = object.material;
	1944	+
	1945	+ diffusenessField.setFloat(material.factor);
	1946	+ selfshadowField.setFloat(material.diffuseness);
	1947	+
	1948	+ materialtouched = true;
	1949	+ applySelf();
	1950	+ }
	1951	+ });
	1952	+ presetpanel.add(diffusemoon);
	1953	+
	1954	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1955	+ diffusemoon2.setToolTipText("Moon2");
	1956	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1957	+ {
	1958	+ public void mouseClicked(MouseEvent e)
	1959	+ {
	1960	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1961	+ cMaterial material = object.material;
	1962	+
	1963	+ diffusenessField.setFloat(material.factor);
	1964	+ selfshadowField.setFloat(material.diffuseness);
	1965	+
	1966	+ materialtouched = true;
	1967	+ applySelf();
	1968	+ }
	1969	+ });
	1970	+ presetpanel.add(diffusemoon2);
	1971	+
	1972	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1973	+ diffusemoon3.setToolTipText("Moon3");
	1974	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1975	+ {
	1976	+ public void mouseClicked(MouseEvent e)
	1977	+ {
	1978	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1979	+ cMaterial material = object.material;
	1980	+
	1981	+ diffusenessField.setFloat(material.factor);
	1982	+ selfshadowField.setFloat(material.diffuseness);
	1983	+
	1984	+ materialtouched = true;
	1985	+ applySelf();
	1986	+ }
	1987	+ });
	1988	+ presetpanel.add(diffusemoon3);
	1989	+
	1990	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1991	+ diffusesheen.setToolTipText("Sheen");
	1992	+ diffusesheen.addMouseListener(new MouseAdapter()
	1993	+ {
	1994	+ public void mouseClicked(MouseEvent e)
	1995	+ {
	1996	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1997	+ cMaterial material = object.material;
	1998	+
	1999	+ sheenField.setFloat(material.sheen);
	2000	+
	2001	+ materialtouched = true;
	2002	+ applySelf();
	2003	+ }
	2004	+ });
	2005	+ presetpanel.add(diffusesheen);
	2006	+
	2007	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2008	+ rough.setToolTipText("Rough metal");
	2009	+ rough.addMouseListener(new MouseAdapter()
	2010	+ {
	2011	+ public void mouseClicked(MouseEvent e)
	2012	+ {
	2013	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2014	+ cMaterial material = object.material;
	2015	+
	2016	+ shininessField.setFloat(material.shininess);
	2017	+ velvetField.setFloat(material.velvet);
	2018	+
	2019	+ materialtouched = true;
	2020	+ applySelf();
	2021	+ }
	2022	+ });
	2023	+ presetpanel.add(rough);
	2024	+
	2025	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2026	+ rough2.setToolTipText("Medium metal");
	2027	+ rough2.addMouseListener(new MouseAdapter()
	2028	+ {
	2029	+ public void mouseClicked(MouseEvent e)
	2030	+ {
	2031	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2032	+ cMaterial material = object.material;
	2033	+
	2034	+ shininessField.setFloat(material.shininess);
	2035	+ lightareaField.setFloat(material.lightarea);
	2036	+
	2037	+ materialtouched = true;
	2038	+ applySelf();
	2039	+ }
	2040	+ });
	2041	+ presetpanel.add(rough2);
	2042	+
	2043	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2044	+ shini0.setToolTipText("Shiny");
	2045	+ shini0.addMouseListener(new MouseAdapter()
	2046	+ {
	2047	+ public void mouseClicked(MouseEvent e)
	2048	+ {
	2049	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2050	+ cMaterial material = object.material;
	2051	+
	2052	+ shininessField.setFloat(material.shininess);
	2053	+ lightareaField.setFloat(material.lightarea);
	2054	+
	2055	+ materialtouched = true;
	2056	+ applySelf();
	2057	+ }
	2058	+ });
	2059	+ presetpanel.add(shini0);
	2060	+
	2061	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2062	+ shini1.setToolTipText("Shiny2");
	2063	+ shini1.addMouseListener(new MouseAdapter()
	2064	+ {
	2065	+ public void mouseClicked(MouseEvent e)
	2066	+ {
	2067	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2068	+ cMaterial material = object.material;
	2069	+
	2070	+ shininessField.setFloat(material.shininess);
	2071	+ lightareaField.setFloat(material.lightarea);
	2072	+
	2073	+ materialtouched = true;
	2074	+ applySelf();
	2075	+ }
	2076	+ });
	2077	+ presetpanel.add(shini1);
	2078	+
	2079	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2080	+ shini2.setToolTipText("Shiny3");
	2081	+ shini2.addMouseListener(new MouseAdapter()
	2082	+ {
	2083	+ public void mouseClicked(MouseEvent e)
	2084	+ {
	2085	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2086	+ cMaterial material = object.material;
	2087	+
	2088	+ shininessField.setFloat(material.shininess);
	2089	+ lightareaField.setFloat(material.lightarea);
	2090	+
	2091	+ materialtouched = true;
	2092	+ applySelf();
	2093	+ }
	2094	+ });
	2095	+ presetpanel.add(shini2);
	2096	+
	2097	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2098	+ aniso.setToolTipText("AnisoU");
	2099	+ aniso.addMouseListener(new MouseAdapter()
	2100	+ {
	2101	+ public void mouseClicked(MouseEvent e)
	2102	+ {
	2103	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2104	+ cMaterial material = object.material;
	2105	+
	2106	+ anisoField.setFloat(material.aniso);
	2107	+ anisoVField.setFloat(material.anisoV);
	2108	+
	2109	+ materialtouched = true;
	2110	+ applySelf();
	2111	+ }
	2112	+ });
	2113	+ presetpanel.add(aniso);
	2114	+
	2115	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2116	+ aniso2.setToolTipText("AnisoV");
	2117	+ aniso2.addMouseListener(new MouseAdapter()
	2118	+ {
	2119	+ public void mouseClicked(MouseEvent e)
	2120	+ {
	2121	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2122	+ cMaterial material = object.material;
	2123	+
	2124	+ anisoField.setFloat(material.aniso);
	2125	+ anisoVField.setFloat(material.anisoV);
	2126	+
	2127	+ materialtouched = true;
	2128	+ applySelf();
	2129	+ }
	2130	+ });
	2131	+ presetpanel.add(aniso2);
	2132	+
	2133	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2134	+ aniso3.setToolTipText("AnisoUV");
	2135	+ aniso3.addMouseListener(new MouseAdapter()
	2136	+ {
	2137	+ public void mouseClicked(MouseEvent e)
	2138	+ {
	2139	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2140	+ cMaterial material = object.material;
	2141	+
	2142	+ anisoField.setFloat(material.aniso);
	2143	+ anisoVField.setFloat(material.anisoV);
	2144	+
	2145	+ materialtouched = true;
	2146	+ applySelf();
	2147	+ }
	2148	+ });
	2149	+ presetpanel.add(aniso3);
	2150	+
	2151	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2152	+ velvet0.setToolTipText("Velvet");
	2153	+ velvet0.addMouseListener(new MouseAdapter()
	2154	+ {
	2155	+ public void mouseClicked(MouseEvent e)
	2156	+ {
	2157	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2158	+ cMaterial material = object.material;
	2159	+
	2160	+ diffusenessField.setFloat(material.factor);
	2161	+ selfshadowField.setFloat(material.diffuseness);
	2162	+ sheenField.setFloat(material.sheen);
	2163	+ shininessField.setFloat(material.shininess);
	2164	+ velvetField.setFloat(material.velvet);
	2165	+ shiftField.setFloat(material.shift);
	2166	+
	2167	+ materialtouched = true;
	2168	+ applySelf();
	2169	+ }
	2170	+ });
	2171	+ presetpanel.add(velvet0);
	2172	+
	2173	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2174	+ bump0.setToolTipText("Bump texture");
	2175	+ bump0.addMouseListener(new MouseAdapter()
	2176	+ {
	2177	+ public void mouseClicked(MouseEvent e)
	2178	+ {
	2179	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2180	+ cMaterial material = object.material;
	2181	+
	2182	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2183	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2184	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2185	+
	2186	+ materialtouched = true;
	2187	+ applySelf();
	2188	+ }
	2189	+ });
	2190	+ presetpanel.add(bump0);
	2191	+
	2192	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2193	+ borderShader.setToolTipText("Border fade");
	2194	+ borderShader.addMouseListener(new MouseAdapter()
	2195	+ {
	2196	+ public void mouseClicked(MouseEvent e)
	2197	+ {
	2198	+ borderfadeField.setFloat(0.5);
	2199	+ opacityField.setFloat(0.6);
	2200	+
	2201	+ materialtouched = true;
	2202	+ applySelf();
	2203	+ }
	2204	+ });
	2205	+ presetpanel.add(borderShader);
	2206	+
	2207	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2208	+ halo.setToolTipText("Halo");
	2209	+ halo.addMouseListener(new MouseAdapter()
	2210	+ {
	2211	+ public void mouseClicked(MouseEvent e)
	2212	+ {
	2213	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2214	+ cMaterial material = object.material;
	2215	+
	2216	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2217	+
	2218	+ materialtouched = true;
	2219	+ applySelf();
	2220	+ }
	2221	+ });
	2222	+ presetpanel.add(halo);
	2223	+
	2224	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2225	+ candle.setToolTipText("Candle");
	2226	+ candle.addMouseListener(new MouseAdapter()
	2227	+ {
	2228	+ public void mouseClicked(MouseEvent e)
	2229	+ {
	2230	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2231	+ cMaterial material = object.material;
	2232	+
	2233	+ subsurfaceField.setFloat(material.subsurface);
	2234	+ shadowbiasField.setFloat(material.shadowbias);
	2235	+ ambientField.setFloat(material.ambient);
	2236	+ specularField.setFloat(material.specular);
	2237	+ lightareaField.setFloat(material.lightarea);
	2238	+ shininessField.setFloat(material.shininess);
	2239	+
	2240	+ materialtouched = true;
	2241	+ applySelf();
	2242	+ }
	2243	+ });
	2244	+ presetpanel.add(candle);
	2245	+
	2246	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2247	+ shadowShader.setToolTipText("Shadow");
	2248	+ shadowShader.addMouseListener(new MouseAdapter()
	2249	+ {
	2250	+ public void mouseClicked(MouseEvent e)
	2251	+ {
	2252	+ diffuseField.setFloat(0.001);
	2253	+ ambientField.setFloat(0.001);
	2254	+ cameraField.setFloat(0.001);
	2255	+ specularField.setFloat(0.001);
	2256	+ fakedepthField.setFloat(0.001);
	2257	+ opacityField.setFloat(0.6);
	2258	+
	2259	+ materialtouched = true;
	2260	+ applySelf();
	2261	+ }
	2262	+ });
	2263	+ presetpanel.add(shadowShader);
	2264	+
	2265	+ cGridBag panel = new cGridBag().setVertical(true);
	2266	+
	2267	+ presetpanel.preferredWidth = 1;
	2268	+
	2269	+ materialpanel.add(presetpanel);
	2270	+ materialpanel.add(panel);
	2271	+
	2272	+ panel.preferredWidth = 8;
	2273	+
	2274	+ /*
1667	2275	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1668	2276	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1669		- */
	2277	+ */
1670	2278
1671	2279	cGridBag editBar = new cGridBag().setVertical(false);
1672	2280
..	..	@@ -1700,27 +2308,50 @@
1700	2308	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1701	2309
1702	2310	cGridBag colorSection = new cGridBag().setVertical(true);
	2311	+
	2312	+ cGridBag huepanel = new cGridBag();
	2313	+ cGridBag huelabel = new cGridBag();
	2314	+ skin = GetLabel("icons/hue.png", false);
	2315	+ skin.fit = true;
	2316	+ huelabel.add(skin);
	2317	+ huelabel.preferredWidth = 20;
	2318	+ huepanel.add(new cGridBag()); // Label
	2319	+ huepanel.add(huelabel); // Field/slider
	2320	+
	2321	+ huepanel.preferredHeight = 7;
	2322	+
	2323	+ colorSection.add(huepanel);
1703	2324
1704	2325	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);
	2326	+
	2327	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2328	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2329	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2330	+
1708	2331	//colorField.preferredWidth = 200;
1709	2332	colorSection.add(color);
1710	2333
1711	2334	cGridBag modulation = new cGridBag();
1712	2335	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1713	2336	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1714		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2337	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1715	2338	colorSection.add(modulation);
1716	2339
	2340	+ cGridBag opacity = new cGridBag();
	2341	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2342	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2343	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2344	+ colorSection.add(opacity);
	2345	+
	2346	+ colorSection.add(GetSeparator());
	2347	+
1717	2348	cGridBag texture = new cGridBag();
1718	2349	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1719	2350	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1720	2351	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1721	2352	colorSection.add(texture);
1722	2353
1723		- panel.add(new JSeparator());
	2354	+ panel.add(GetSeparator());
1724	2355
1725	2356	panel.add(colorSection);
1726	2357
..	..	@@ -1776,7 +2407,7 @@
1776	2407	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1777	2408	diffuseSection.add(shadowbias);
1778	2409
1779		- panel.add(new JSeparator());
	2410	+ panel.add(GetSeparator());
1780	2411
1781	2412	panel.add(diffuseSection);
1782	2413
..	..	@@ -1839,7 +2470,7 @@
1839	2470	specularSection.add(anisoV);
1840	2471
1841	2472
1842		- panel.add(new JSeparator());
	2473	+ panel.add(GetSeparator());
1843	2474
1844	2475	panel.add(specularSection);
1845	2476
..	..	@@ -1864,12 +2495,6 @@
1864	2495	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1865	2496	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1866	2497	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	2498
1874	2499	//panel.add(new JSeparator());
1875	2500
..	..	@@ -1915,7 +2540,7 @@
1915	2540	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1916	2541	textureSection.add(opacityPower);
1917	2542
1918		- panel.add(new JSeparator());
	2543	+ panel.add(GetSeparator());
1919	2544
1920	2545	panel.add(textureSection);
1921	2546
..	..	@@ -2902,7 +3527,7 @@
2902	3527
2903	3528	freezematerial = true;
2904	3529	colorField.setFloat(mat.color);
2905		- modulationField.setFloat(mat.modulation);
	3530	+ saturationField.setFloat(mat.modulation);
2906	3531	metalnessField.setFloat(mat.metalness);
2907	3532	diffuseField.setFloat(mat.diffuse);
2908	3533	specularField.setFloat(mat.specular);
..	..	@@ -2964,32 +3589,8 @@
2964	3589
2965	3590	if (multiplyToggle != null)
2966	3591	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		- }
	3592	+
	3593	+ AllocProjectedVertices(object);
2993	3594
2994	3595	SetMaterial(mat, object.projectedVertices);
2995	3596	}
..	..	@@ -3109,6 +3710,17 @@
3109	3710	public void itemStateChanged(ItemEvent event)
3110	3711	{
3111	3712	// System.out.println("Propagate = " + propagate);
	3713	+ if (event.getSource() == pinButton)
	3714	+ {
	3715	+ copy.pinned ^= true;
	3716	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3717	+ {
	3718	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3719	+ copy.CloseUI();
	3720	+ //copy.editWindow.refreshContents();
	3721	+ }
	3722	+ }
	3723	+ else
3112	3724	if (event.getSource() == propagateToggle)
3113	3725	{
3114	3726	propagate ^= true;
..	..	@@ -3213,8 +3825,9 @@
3213	3825	} else if (event.getSource() == liveCB)
3214	3826	{
3215	3827	copy.live ^= true;
	3828	+ objEditor.refreshContents(true); // To show item colors
3216	3829	return;
3217		- } else if (event.getSource() == selectCB)
	3830	+ } else if (event.getSource() == selectableCB)
3218	3831	{
3219	3832	copy.dontselect ^= true;
3220	3833	return;
..	..	@@ -3222,7 +3835,7 @@
3222	3835	{
3223	3836	copy.hide ^= true;
3224	3837	copy.Touch(); // display list issue
3225		- objEditor.refreshContents();
	3838	+ objEditor.refreshContents(true); // To show item colors
3226	3839	return;
3227	3840	} else if (event.getSource() == link2masterCB)
3228	3841	{
..	..	@@ -3478,6 +4091,7 @@
3478	4091
3479	4092	static public byte[] Compress(Object3D o)
3480	4093	{
	4094	+ // Slower to actually compress.
3481	4095	try
3482	4096	{
3483	4097	ByteArrayOutputStream baos = new ByteArrayOutputStream();
..	..	@@ -3574,11 +4188,12 @@
3574	4188	return null;
3575	4189	}
3576	4190
3577		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3578	4191
3579	4192	public void Save()
3580	4193	{
3581		- Save(true);
	4194	+ //Save(true);
	4195	+ Replace();
	4196	+ SetVersionStates();
3582	4197	}
3583	4198
3584	4199	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3597,59 +4212,71 @@
3597	4212	return true;
3598	4213	}
3599	4214
	4215	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4216	+
	4217	+ void DeleteVersion()
	4218	+ {
	4219	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4220	+ {
	4221	+ copy.versionlist[i] = copy.versionlist[i+1];
	4222	+ }
	4223	+
	4224	+ CopyChanged();
	4225	+
	4226	+ SetVersionStates();
	4227	+ }
	4228	+
3600	4229	public boolean Save(boolean user)
3601	4230	{
3602	4231	System.err.println("Save");
	4232	+ Replace();
3603	4233
3604		- cRadio tab = GetCurrentTab();
	4234	+ //cRadio tab = GetCurrentTab();
3605	4235
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;
	4236	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3614	4237
3615	4238	boolean thesame = false;
3616	4239
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		- }
	4240	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4241	+// {
	4242	+// thesame = true;
	4243	+// }
3622	4244
3623	4245	//EditorFrame.m_MainFrame.requestFocusInWindow();
3624	4246	if (!thesame)
3625	4247	{
3626		- //tab.user[tab.undoindex] = user;
3627		- boolean increment = tab.graphs[tab.undoindex] == null;
	4248	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4249	+ {
	4250	+ copy.versionlist[i] = copy.versionlist[i-1];
	4251	+ }
3628	4252
3629		- tab.graphs[tab.undoindex] = compress;
	4253	+ //tab.user[tab.versionindex] = user;
	4254	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
3630	4255
3631		- if (increment)
3632		- tab.undoindex++;
	4256	+ copy.versionlist[++copy.versionindex] = compress;
	4257	+
	4258	+ // if (increment)
	4259	+ // tab.versionindex++;
3633	4260	}
3634	4261
3635		- copy.RestoreBigData(hashtable);
	4262	+ //copy.RestoreBigData(versiontable);
3636	4263
3637	4264	//assert(hashtable.isEmpty());
3638	4265
3639		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
3640		- {
3641		- //tab.user[i] = false;
3642		- // tab.graphs[i] = null;
3643		- }
	4266	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4267	+// {
	4268	+// //tab.user[i] = false;
	4269	+// copy.versionlist[i] = null;
	4270	+// }
3644	4271
3645		- SetUndoStates();
	4272	+ SetVersionStates();
3646	4273
3647	4274	// test save
3648	4275	if (false)
3649	4276	{
3650	4277	try
3651	4278	{
3652		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4279	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3653	4280	ObjectOutputStream p = new ObjectOutputStream(ostream);
3654	4281
3655	4282	p.writeObject(copy);
..	..	@@ -3665,27 +4292,65 @@
3665	4292
3666	4293	return !thesame;
3667	4294	}
3668		-
3669		- void CopyChanged(Object3D obj)
	4295	+
	4296	+ boolean flashIt = true;
	4297	+
	4298	+ void RefreshSelection()
3670	4299	{
3671		- SetUndoStates();
	4300	+ Object3D selection = new Object3D();
	4301	+
	4302	+ for (int i = 0; i < copy.selection.size(); i++)
	4303	+ {
	4304	+ Object3D elem = copy.selection.elementAt(i);
	4305	+
	4306	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4307	+
	4308	+ if (obj == null)
	4309	+ {
	4310	+ copy.selection.remove(i--);
	4311	+ }
	4312	+ else
	4313	+ {
	4314	+ selection.add(obj);
	4315	+ copy.selection.setElementAt(obj, i);
	4316	+ }
	4317	+ }
	4318	+
	4319	+ flashIt = false;
	4320	+ GetTree().clearSelection();
	4321	+ for (int i = 0; i < selection.size(); i++)
	4322	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4323	+ flashIt = true;
	4324	+
	4325	+ //refreshContents(false);
	4326	+ }
	4327	+
	4328	+ void CopyChanged()
	4329	+ {
	4330	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4331	+
	4332	+ SetVersionStates();
3672	4333
3673	4334	boolean temp = CameraPane.SWITCH;
3674	4335	CameraPane.SWITCH = false;
3675	4336
3676		- copy.ExtractBigData(hashtable);
	4337	+ copy.ExtractBigData(versiontable);
3677	4338
3678	4339	copy.clear();
3679	4340
	4341	+ copy.skyboxname = obj.skyboxname;
	4342	+ copy.skyboxext = obj.skyboxext;
	4343	+
3680	4344	for (int i=0; i<obj.Size(); i++)
3681	4345	{
3682	4346	copy.add(obj.get(i));
3683	4347	}
3684	4348
3685		- copy.RestoreBigData(hashtable);
	4349	+ copy.RestoreBigData(versiontable);
3686	4350
3687	4351	CameraPane.SWITCH = temp;
3688	4352
	4353	+ RefreshSelection();
3689	4354	//assert(hashtable.isEmpty());
3690	4355
3691	4356	copy.Touch();
..	..	@@ -3706,68 +4371,144 @@
3706	4371	}
3707	4372	}
3708	4373
3709		- refreshContents();
	4374	+ refreshContents(true);
3710	4375	}
3711	4376
3712		- cButton undoButton;
3713		- cButton redoButton;
	4377	+ cButton previousVersionButton;
	4378	+ cButton restoreButton;
	4379	+ cButton replaceButton;
	4380	+ cButton nextVersionButton;
	4381	+ cButton saveVersionButton;
	4382	+ cButton deleteVersionButton;
3714	4383
3715		- void SetUndoStates()
	4384	+ boolean muteSlider;
	4385	+
	4386	+ int VersionCount()
3716	4387	{
3717		- cRadio tab = GetCurrentTab();
	4388	+ int count = 0;
3718	4389
3719		- undoButton.setEnabled(tab.undoindex > 0);
3720		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	4390	+ for (int i = copy.versionlist.length; --i >= 0;)
	4391	+ {
	4392	+ if (copy.versionlist[i] != null)
	4393	+ count++;
	4394	+ }
	4395	+
	4396	+ return count;
3721	4397	}
3722	4398
3723		- public boolean Undo()
	4399	+ void SetVersionStates()
3724	4400	{
	4401	+ //if (true)
	4402	+ // return;
	4403	+
	4404	+ //cRadio tab = GetCurrentTab();
	4405	+
	4406	+ restoreButton.setEnabled(copy.versionindex != -1);
	4407	+ replaceButton.setEnabled(copy.versionindex != -1);
	4408	+
	4409	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4410	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4411	+
	4412	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4413	+ copy.versionlist[copy.versionindex + 1] != null);
	4414	+
	4415	+ muteSlider = true;
	4416	+ versionSlider.setMinimum(0);
	4417	+ versionSlider.setMaximum(VersionCount() - 1);
	4418	+ versionSlider.setInteger(copy.versionindex);
	4419	+ versionSlider.setEnabled(copy.versionindex != -1);
	4420	+ muteSlider = false;
	4421	+ }
	4422	+
	4423	+ public boolean PreviousVersion()
	4424	+ {
	4425	+ // Option?
	4426	+ Replace();
	4427	+
3725	4428	System.err.println("Undo");
3726	4429
3727		- cRadio tab = GetCurrentTab();
	4430	+ //cRadio tab = GetCurrentTab();
3728	4431
3729		- if (tab.undoindex == 0)
	4432	+ if (copy.versionindex == 0)
3730	4433	{
3731	4434	java.awt.Toolkit.getDefaultToolkit().beep();
3732	4435	return false;
3733	4436	}
3734	4437
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		- }
	4438	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4439	+// {
	4440	+// if (Save(false))
	4441	+// tab.versionindex -= 1;
	4442	+// else
	4443	+// {
	4444	+// if (tab.versionindex <= 0)
	4445	+// return false;
	4446	+// else
	4447	+// tab.versionindex -= 1;
	4448	+// }
	4449	+// }
3747	4450
3748		- tab.undoindex -= 1;
	4451	+ copy.versionindex -= 1;
3749	4452
3750		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4453	+ CopyChanged();
3751	4454
3752	4455	return true;
3753	4456	}
3754	4457
3755		- public void Redo()
	4458	+ public boolean Restore()
3756	4459	{
3757		- cRadio tab = GetCurrentTab();
	4460	+ System.err.println("Restore");
3758	4461
3759		- if (tab.graphs[tab.undoindex + 1] == null)
	4462	+ //cRadio tab = GetCurrentTab();
	4463	+
	4464	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4465	+ {
	4466	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4467	+ return false;
	4468	+ }
	4469	+
	4470	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4471	+ CopyChanged();
	4472	+
	4473	+ return true;
	4474	+ }
	4475	+
	4476	+ public boolean Replace()
	4477	+ {
	4478	+ System.err.println("Replace");
	4479	+
	4480	+ //cRadio tab = GetCurrentTab();
	4481	+
	4482	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4483	+ {
	4484	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4485	+ return false;
	4486	+ }
	4487	+
	4488	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4489	+
	4490	+ return true;
	4491	+ }
	4492	+
	4493	+ public void NextVersion()
	4494	+ {
	4495	+ // Option?
	4496	+ Replace();
	4497	+
	4498	+ //cRadio tab = GetCurrentTab();
	4499	+
	4500	+ if (copy.versionlist[copy.versionindex + 1] == null)
3760	4501	{
3761	4502	java.awt.Toolkit.getDefaultToolkit().beep();
3762	4503	return;
3763	4504	}
3764	4505
3765		- tab.undoindex += 1;
	4506	+ copy.versionindex += 1;
3766	4507
3767		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4508	+ CopyChanged();
3768	4509
3769		- //if (!tab.user[tab.undoindex])
3770		- // tab.graphs[tab.undoindex] = null;
	4510	+ //if (!tab.user[tab.versionindex])
	4511	+ // tab.graphs[tab.versionindex] = null;
3771	4512	}
3772	4513
3773	4514	void ImportGFD()
..	..	@@ -3978,7 +4719,7 @@
3978	4719	//copy.material = new cMaterial(copy.GetMaterial());
3979	4720
3980	4721	current.color = (float) colorField.getFloat();
3981		- current.modulation = (float) modulationField.getFloat();
	4722	+ current.modulation = (float) saturationField.getFloat();
3982	4723	current.metalness = (float) metalnessField.getFloat();
3983	4724	current.diffuse = (float) diffuseField.getFloat();
3984	4725	current.specular = (float) specularField.getFloat();
..	..	@@ -4011,7 +4752,7 @@
4011	4752	cMaterial mat = copy.material;
4012	4753
4013	4754	colorField.SetToolTipValue((mat.color));
4014		- modulationField.SetToolTipValue((mat.modulation));
	4755	+ saturationField.SetToolTipValue((mat.modulation));
4015	4756	metalnessField.SetToolTipValue((mat.metalness));
4016	4757	diffuseField.SetToolTipValue((mat.diffuse));
4017	4758	specularField.SetToolTipValue((mat.specular));
..	..	@@ -4063,9 +4804,28 @@
4063	4804	//copy.Touch();
4064	4805	}
4065	4806
	4807	+ cNumberSlider versionSlider;
	4808	+
4066	4809	public void stateChanged(ChangeEvent e)
4067	4810	{
4068	4811	// assert(false);
	4812	+ if (e.getSource() == versionSlider)
	4813	+ {
	4814	+ if (muteSlider)
	4815	+ return;
	4816	+
	4817	+ Replace();
	4818	+
	4819	+ int version = versionSlider.getInteger();
	4820	+
	4821	+ if (version != -1 && copy.versionlist[version] != null)
	4822	+ {
	4823	+ copy.versionindex = version;
	4824	+ CopyChanged();
	4825	+ }
	4826	+
	4827	+ return;
	4828	+ }
4069	4829
4070	4830	if (freezematerial)
4071	4831	{
..	..	@@ -4101,6 +4861,12 @@
4101	4861	{
4102	4862	//System.out.println("stateChanged = " + this);
4103	4863	materialtouched = true;
	4864	+
	4865	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4866	+ {
	4867	+ saturationField.setFloat(1);
	4868	+ }
	4869	+
4104	4870	applySelf();
4105	4871	//System.out.println("this = " + this);
4106	4872	//System.out.println("PARENT = " + parent);
..	..	@@ -4400,6 +5166,7 @@
4400	5166	{
4401	5167	if (GetTree() != null)
4402	5168	{
	5169	+ GetTree().revalidate();
4403	5170	GetTree().repaint();
4404	5171	}
4405	5172
..	..	@@ -4408,13 +5175,16 @@
4408	5175	ctrlPanel.validate(); // ? new
4409	5176	ctrlPanel.repaint();
4410	5177	}
	5178	+
	5179	+ if (previousVersionButton != null && copy.versionlist != null)
	5180	+ SetVersionStates();
4411	5181	}
4412	5182
4413	5183	static TweenManager tweenManager = new TweenManager();
4414	5184
4415	5185	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4416	5186	{
4417		- if (Globals.SAVEONMAKE) // && resetmodel)
	5187	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4418	5188	Save();
4419	5189	//Tween.set(thing, 0).target(1).start(tweenManager);
4420	5190	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4656,7 +5426,9 @@
4656	5426	readobj.ResetDisplayList();
4657	5427	} catch (Exception e)
4658	5428	{
4659		- //e.printStackTrace();
	5429	+ if (!e.toString().contains("GZIP"))
	5430	+ e.printStackTrace();
	5431	+
4660	5432	try
4661	5433	{
4662	5434	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4736,6 +5508,8 @@
4736	5508	{
4737	5509	//readobj.deepCopySelf(copy);
4738	5510	copy.clear(); // june 2014
	5511	+ copy.skyboxname = readobj.skyboxname;
	5512	+ copy.skyboxext = readobj.skyboxext;
4739	5513	for (int i = 0; i < readobj.size(); i++)
4740	5514	{
4741	5515	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4776,6 +5550,7 @@
4776	5550	}
4777	5551	} catch (ClassCastException e)
4778	5552	{
	5553	+ e.printStackTrace();
4779	5554	assert (false);
4780	5555	Composite c = (Composite) copy;
4781	5556	c.children.clear();
..	..	@@ -4786,6 +5561,20 @@
4786	5561	c.addChild(csg);
4787	5562	}
4788	5563
	5564	+ copy.versionlist = readobj.versionlist;
	5565	+ copy.versionindex = readobj.versionindex;
	5566	+
	5567	+ if (copy.versionlist == null)
	5568	+ {
	5569	+ // Backward compatibility
	5570	+ copy.versionlist = new Object3D[100];
	5571	+ copy.versionindex = -1;
	5572	+
	5573	+ //Save(true);
	5574	+ }
	5575	+
	5576	+ //? SetUndoStates();
	5577	+
4789	5578	ResetModel();
4790	5579	copy.HardTouch(); // recompile?
4791	5580	refreshContents();
..	..	@@ -4796,7 +5585,7 @@
4796	5585	{
4797	5586	if (Grafreed.standAlone)
4798	5587	{
4799		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5588	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4800	5589	browser.show();
4801	5590	String filename = browser.getFile();
4802	5591	if (filename != null && filename.length() > 0)
..	..	@@ -4873,6 +5662,8 @@
4873	5662
4874	5663	void save()
4875	5664	{
	5665	+ Replace();
	5666	+
4876	5667	if (lastname == null)
4877	5668	{
4878	5669	return;
..	..	@@ -4895,6 +5686,7 @@
4895	5686	//ps.print(buffer.toString());
4896	5687	} catch (IOException e)
4897	5688	{
	5689	+ e.printStackTrace();
4898	5690	}
4899	5691	}
4900	5692
..	..	@@ -5114,6 +5906,7 @@
5114	5906	ButtonGroup buttonGroup;
5115	5907
5116	5908	cGridBag toolboxPanel;
	5909	+ cGridBag skyboxPanel;
5117	5910	cGridBag materialPanel;
5118	5911	cGridBag ctrlPanel;
5119	5912
..	..	@@ -5187,7 +5980,7 @@
5187	5980	JLabel colorLabel;
5188	5981	cNumberSlider colorField;
5189	5982	JLabel modulationLabel;
5190		- cNumberSlider modulationField;
	5983	+ cNumberSlider saturationField;
5191	5984	JLabel metalnessLabel;
5192	5985	cNumberSlider metalnessField;
5193	5986	JLabel diffuseLabel;
..	..	@@ -5218,6 +6011,7 @@
5218	6011	cNumberSlider anisoField;
5219	6012	JLabel anisoVLabel;
5220	6013	cNumberSlider anisoVField;
	6014	+
5221	6015	JLabel cameraLabel;
5222	6016	cNumberSlider cameraField;
5223	6017	JLabel selfshadowLabel;
..	..	@@ -5232,6 +6026,7 @@
5232	6026	cNumberSlider fakedepthField;
5233	6027	JLabel shadowbiasLabel;
5234	6028	cNumberSlider shadowbiasField;
	6029	+
5235	6030	JLabel bumpLabel;
5236	6031	cNumberSlider bumpField;
5237	6032	JLabel noiseLabel;