~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
..	..	@@ -316,7 +388,8 @@
316	388	//parent = p;
317	389
318	390	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
319		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	391	+ if (Globals.DEBUG)
	392	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
320	393	//gd.setFullScreenWindow(this);
321	394	//setResizable(false);
322	395	//if (!isDisplayable())
..	..	@@ -327,6 +400,14 @@
327	400	copy = localCopy;
328	401	copy.editWindow = this;
329	402
	403	+// if (copy.versionlist == null)
	404	+// {
	405	+// copy.versionlist = new Object3D[100];
	406	+// copy.versionindex = -1;
	407	+//
	408	+// Save(true);
	409	+// }
	410	+
330	411	SetupMenu();
331	412
332	413	//SetupName(objEditor); // new
..	..	@@ -394,6 +475,8 @@
394	475
395	476	ChangeListener changeListener = new ChangeListener()
396	477	{
	478	+ //String name;
	479	+
397	480	public void stateChanged(ChangeEvent changeEvent)
398	481	{
399	482	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -412,18 +495,49 @@
412	495	// EditSelection(false);
413	496	// }
414	497
415		- refreshContents(false); // To refresh Info tab
	498	+// if (objectPanel.getSelectedIndex() == 4)
	499	+// {
	500	+// name = copy.skyboxname;
	501	+//
	502	+// if (name == null)
	503	+// {
	504	+// name = "";
	505	+// }
	506	+//
	507	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	508	+// copy.skyboxext = "jpg";
	509	+// }
	510	+// else
	511	+// {
	512	+// if (name != null)
	513	+// {
	514	+// if (name.equals(""))
	515	+// {
	516	+// copy.skyboxname = null;
	517	+// copy.skyboxext = null;
	518	+// }
	519	+// else
	520	+// {
	521	+// copy.skyboxname = name;
	522	+// }
	523	+// }
	524	+// }
	525	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	526	+
	527	+// refreshContents(false); // To refresh Info tab
	528	+ cameraView.repaint();
416	529	}
417	530	};
418	531	objectPanel.addChangeListener(changeListener);
419	532
420	533	toolbarPanel = new JPanel();
421	534	toolbarPanel.setName("Toolbar");
	535	+
422	536	treePanel = new cGridBag();
423	537	treePanel.setName("Tree");
424	538
425	539	editPanel = new cGridBag().setVertical(true);
426		- editPanel.setName("Edit");
	540	+ //editPanel.setName("Edit");
427	541
428	542	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429	543
..	..	@@ -431,11 +545,13 @@
431	545	editPanel.add(editCommandsPanel);
432	546	editPanel.add(ctrlPanel);
433	547
434		- toolboxPanel = new cGridBag().setVertical(false);
435		- toolboxPanel.setName("Toolbox");
	548	+ toolboxPanel = new cGridBag().setVertical(true);
	549	+ //toolboxPanel.setName("Toolbox");
436	550
437		- materialPanel = new cGridBag().setVertical(true);
438		- materialPanel.setName("Material");
	551	+ skyboxPanel = new cGridBag().setVertical(true);
	552	+
	553	+ materialPanel = new cGridBag().setVertical(false);
	554	+ //materialPanel.setName("Material");
439	555
440	556	/JTextPane/
441	557	infoarea = createTextPane();
..	..	@@ -443,6 +559,7 @@
443	559
444	560	infoarea.setEditable(true);
445	561	SetText();
	562	+
446	563	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447	564	// infoarea.setOpaque(false);
448	565	// //infoarea.setForeground(textcolor);
..	..	@@ -450,7 +567,7 @@
450	567	// TEXTAREA infoarea.setWrapStyleWord(true);
451	568	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452	569	infoPanel.setPreferredSize(new Dimension(1, 1));
453		- infoPanel.setName("Info");
	570	+ //infoPanel.setName("Info");
454	571	//infoPanel.setLayout(new BorderLayout());
455	572	//infoPanel.add(createTextPane());
456	573
..	..	@@ -717,6 +834,7 @@
717	834	boolean maximized;
718	835
719	836	cButton fullscreenLayout;
	837	+ cButton expandedLayout;
720	838
721	839	void Minimize()
722	840	{
..	..	@@ -756,10 +874,12 @@
756	874	cButton minButton;
757	875	cButton maxButton;
758	876	cButton fullButton;
	877	+ cButton collapseButton;
	878	+ cButton maximize3DButton;
759	879
760	880	void ToggleFullScreen()
761	881	{
762		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	882	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
763	883
764	884	cameraView.ToggleFullScreen();
765	885
..	..	@@ -780,13 +900,13 @@
780	900	// X frame.getContentPane().remove(/"Center",/bigThree);
781	901	// X framePanel.add(bigThree);
782	902	// X frame.getContentPane().add(/"Center",/framePanel);
783		- framePanel.setDividerLocation(46);
	903	+// framePanel.setDividerLocation(46); // icons are 24x24
784	904
785	905	//frame.setVisible(true);
786		- radio.layout = keepButton;
	906	+// radio.layout = keepButton;
787	907	//theFrame = null;
788	908	keepButton = null;
789		- radio.layout.doClick();
	909	+// radio.layout.doClick();
790	910
791	911	} else
792	912	{
..	..	@@ -807,14 +927,47 @@
807	927	// X frame.getContentPane().remove(/"Center",/framePanel);
808	928	// X framePanel.remove(bigThree);
809	929	// X frame.getContentPane().add(/"Center",/bigThree);
810		- framePanel.setDividerLocation(0);
	930	+// framePanel.setDividerLocation(0);
811	931
812		- radio.layout = fullscreenLayout;
813		- radio.layout.doClick();
	932	+// radio.layout = fullscreenLayout;
	933	+// radio.layout.doClick();
814	934	//frame.setVisible(true);
815	935	}
816	936	frame.validate();
	937	+
	938	+ cameraView.requestFocusInWindow();
817	939	}
	940	+
	941	+ void CollapseToolbar()
	942	+ {
	943	+ framePanel.setDividerLocation(0);
	944	+ //frame.validate();
	945	+
	946	+ cameraView.requestFocusInWindow();
	947	+ }
	948	+
	949	+ private Object3D Duplicate(Object3D object)
	950	+ {
	951	+ boolean temp = CameraPane.SWITCH;
	952	+ CameraPane.SWITCH = false;
	953	+
	954	+ object.ExtractBigData(versiontable);
	955	+ // if (copy == client)
	956	+
	957	+ Object3D versions[] = object.versionlist;
	958	+ object.versionlist = null;
	959	+
	960	+ //byte[] compress = Compress(copy);
	961	+ Object3D compress = (Object3D)Grafreed.clone(object);
	962	+
	963	+ object.versionlist = versions;
	964	+
	965	+ object.RestoreBigData(versiontable);
	966	+
	967	+ CameraPane.SWITCH = temp;
	968	+
	969	+ return compress;
	970	+ }
818	971
819	972	private JTextPane createTextPane()
820	973	{
..	..	@@ -937,6 +1090,7 @@
937	1090	{
938	1091	SetupMaterial(materialPanel);
939	1092	}
	1093	+
940	1094	//SetupName();
941	1095	//SetupViews();
942	1096	}
..	..	@@ -946,7 +1100,7 @@
946	1100	// NumberSlider vDivsField;
947	1101	// JCheckBox endcaps;
948	1102	JCheckBox liveCB;
949		- JCheckBox selectCB;
	1103	+ JCheckBox selectableCB;
950	1104	JCheckBox hideCB;
951	1105	JCheckBox link2masterCB;
952	1106	JCheckBox markCB;
..	..	@@ -1145,6 +1299,18 @@
1145	1299
1146	1300	namePanel = new cGridBag();
1147	1301
	1302	+ //if (copy.pinned)
	1303	+ {
	1304	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1305	+ pinButton.setSelected(copy.pinned);
	1306	+ cGridBag t = new cGridBag();
	1307	+ t.preferredWidth = 2;
	1308	+ t.add(pinButton);
	1309	+ namePanel.add(t);
	1310	+
	1311	+ pinButton.addItemListener(this);
	1312	+ }
	1313	+
1148	1314	nameField = AddText(namePanel, copy.GetName());
1149	1315	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1150	1316	oe.ctrlPanel.add(namePanel);
..	..	@@ -1158,13 +1324,16 @@
1158	1324
1159	1325	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1160	1326	liveCB.setToolTipText("Animate object");
1161		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1162		- selectCB.setToolTipText("Make object selectable");
	1327	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1328	+ markCB.setToolTipText("Set target transform");
	1329	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1330	+ selectableCB.setToolTipText("Make object selectable");
1163	1331	// Return();
	1332	+
1164	1333	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1165	1334	hideCB.setToolTipText("Hide object");
1166		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1167		- markCB.setToolTipText("As animation target transform");
	1335	+
	1336	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1168	1337
1169	1338	setupPanel2 = new cGridBag().setVertical(false);
1170	1339
..	..	@@ -1364,6 +1533,7 @@
1364	1533
1365	1534	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1366	1535	{
	1536	+ if (Globals.DEBUG)
1367	1537	System.out.println("CREATE CAMERAS");
1368	1538	cams = new cTemplate();
1369	1539	cams.name = "Cameras";
..	..	@@ -1452,6 +1622,7 @@
1452	1622	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1453	1623	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1454	1624	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1625	+ //XYZPanel.setName("XYZ");
1455	1626
1456	1627	/*
1457	1628	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1489,17 +1660,29 @@
1489	1660	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1490	1661	//tmp.setName("Edit");
1491	1662	objectPanel.add(materialPanel);
	1663	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1664	+ objectPanel.setToolTipTextAt(0, "Material");
	1665	+
	1666	+ objectPanel.add(toolboxPanel);
	1667	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1668	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1669	+
	1670	+ objectPanel.add(skyboxPanel);
	1671	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1672	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1673	+
1492	1674	// JPanel north = new JPanel(new BorderLayout());
1493	1675	// north.setName("Edit");
1494	1676	// north.add(ctrlPanel, BorderLayout.NORTH);
1495	1677	// objectPanel.add(north);
1496	1678	objectPanel.add(editPanel);
	1679	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1680	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1497	1681
1498		- //if (Globals.ADVANCED)
1499		- objectPanel.add(infoPanel);
	1682	+ objectPanel.add(XYZPanel);
	1683	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1684	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1500	1685
1501		- objectPanel.add(toolboxPanel);
1502		-
1503	1686	/*
1504	1687	aConstraints.gridx = 0;
1505	1688	aConstraints.gridwidth = 1;
..	..	@@ -1519,7 +1702,7 @@
1519	1702	scrollpane.addMouseWheelListener(this); // Default not fast enough
1520	1703
1521	1704	/JTabbedPane/ scenePanel = new cGridBag();
1522		- scenePanel.preferredWidth = 6;
	1705	+ scenePanel.preferredWidth = 5;
1523	1706
1524	1707	JTabbedPane tabbedPane = new JTabbedPane();
1525	1708	tabbedPane.add(scrollpane);
..	..	@@ -1536,6 +1719,11 @@
1536	1719
1537	1720	scenePanel.add(tabbedPane);
1538	1721
	1722	+ //if (Globals.ADVANCED)
	1723	+// tabbedPane.add(infoPanel);
	1724	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1725	+// tabbedPane.setToolTipTextAt(3, "Information");
	1726	+
1539	1727	/*
1540	1728	cTree jTree = new cTree(null);
1541	1729	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1597,7 +1785,7 @@
1597	1785	bigThree = new cGridBag();
1598	1786	bigThree.addComponent(scenePanel);
1599	1787	bigThree.addComponent(centralPanel);
1600		- bigThree.addComponent(XYZPanel);
	1788	+ //bigThree.addComponent(XYZPanel);
1601	1789
1602	1790	// // SIDE EFFECT!!!
1603	1791	// aConstraints.gridx = 0;
..	..	@@ -1606,6 +1794,23 @@
1606	1794	// aConstraints.gridheight = 1;
1607	1795
1608	1796	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1797	+
	1798	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1799	+ new java.beans.PropertyChangeListener()
	1800	+ {
	1801	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1802	+ {
	1803	+ if ((Integer)pce.getOldValue() == 1)
	1804	+ {
	1805	+ if (radio.layout != expandedLayout)
	1806	+ {
	1807	+ radio.layout = expandedLayout;
	1808	+ radio.layout.doClick();
	1809	+ }
	1810	+ }
	1811	+ }
	1812	+ });
	1813	+
1609	1814	framePanel.setContinuousLayout(false);
1610	1815	framePanel.setOneTouchExpandable(false);
1611	1816	//.setDividerLocation(0.8);
..	..	@@ -1615,7 +1820,7 @@
1615	1820
1616	1821	frame.getContentPane().setLayout(new BorderLayout());
1617	1822	/**/
1618		- JTabbedPane worldPane = new JTabbedPane();
	1823	+ //JTabbedPane worldPane = new JTabbedPane();
1619	1824	//worldPane.add(bigPanel);
1620	1825	//worldPane.add(worldPanel);
1621	1826	/**/
..	..	@@ -1638,7 +1843,6 @@
1638	1843	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1639	1844	frame.addWindowListener(new WindowAdapter()
1640	1845	{
1641		-
1642	1846	public void windowClosing(WindowEvent e)
1643	1847	{
1644	1848	Close();
..	..	@@ -1661,12 +1865,418 @@
1661	1865	ctrlPanel.removeAll();
1662	1866	}
1663	1867
1664		- void SetupMaterial(cGridBag panel)
	1868	+ void SetupMaterial(cGridBag materialpanel)
1665	1869	{
1666		- /*
	1870	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1871	+
	1872	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1873	+ skin.setToolTipText("Skin");
	1874	+ skin.addMouseListener(new MouseAdapter()
	1875	+ {
	1876	+ public void mouseClicked(MouseEvent e)
	1877	+ {
	1878	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1879	+ cMaterial material = object.material;
	1880	+
	1881	+ // Skin
	1882	+ colorField.setFloat(material.color);
	1883	+ saturationField.setFloat(material.modulation);
	1884	+ subsurfaceField.setFloat(material.subsurface);
	1885	+ selfshadowField.setFloat(material.diffuseness);
	1886	+ diffusenessField.setFloat(material.factor);
	1887	+ shininessField.setFloat(material.shininess);
	1888	+ shadowbiasField.setFloat(material.shadowbias);
	1889	+ diffuseField.setFloat(material.diffuse);
	1890	+ specularField.setFloat(material.specular);
	1891	+
	1892	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1893	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1894	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1895	+
	1896	+ materialtouched = true;
	1897	+ applySelf();
	1898	+ }
	1899	+ });
	1900	+ presetpanel.add(skin);
	1901	+
	1902	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1903	+ lambert.setToolTipText("Diffuse");
	1904	+ lambert.addMouseListener(new MouseAdapter()
	1905	+ {
	1906	+ public void mouseClicked(MouseEvent e)
	1907	+ {
	1908	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1909	+ cMaterial material = object.material;
	1910	+
	1911	+ diffusenessField.setFloat(material.factor);
	1912	+ selfshadowField.setFloat(material.diffuseness);
	1913	+
	1914	+ materialtouched = true;
	1915	+ applySelf();
	1916	+ }
	1917	+ });
	1918	+ presetpanel.add(lambert);
	1919	+
	1920	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1921	+ diffuse2.setToolTipText("Diffuse2");
	1922	+ diffuse2.addMouseListener(new MouseAdapter()
	1923	+ {
	1924	+ public void mouseClicked(MouseEvent e)
	1925	+ {
	1926	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1927	+ cMaterial material = object.material;
	1928	+
	1929	+ diffusenessField.setFloat(material.factor);
	1930	+ selfshadowField.setFloat(material.diffuseness);
	1931	+
	1932	+ materialtouched = true;
	1933	+ applySelf();
	1934	+ }
	1935	+ });
	1936	+ presetpanel.add(diffuse2);
	1937	+
	1938	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1939	+ diffusemoon.setToolTipText("Moon");
	1940	+ diffusemoon.addMouseListener(new MouseAdapter()
	1941	+ {
	1942	+ public void mouseClicked(MouseEvent e)
	1943	+ {
	1944	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1945	+ cMaterial material = object.material;
	1946	+
	1947	+ diffusenessField.setFloat(material.factor);
	1948	+ selfshadowField.setFloat(material.diffuseness);
	1949	+
	1950	+ materialtouched = true;
	1951	+ applySelf();
	1952	+ }
	1953	+ });
	1954	+ presetpanel.add(diffusemoon);
	1955	+
	1956	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1957	+ diffusemoon2.setToolTipText("Moon2");
	1958	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1959	+ {
	1960	+ public void mouseClicked(MouseEvent e)
	1961	+ {
	1962	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1963	+ cMaterial material = object.material;
	1964	+
	1965	+ diffusenessField.setFloat(material.factor);
	1966	+ selfshadowField.setFloat(material.diffuseness);
	1967	+
	1968	+ materialtouched = true;
	1969	+ applySelf();
	1970	+ }
	1971	+ });
	1972	+ presetpanel.add(diffusemoon2);
	1973	+
	1974	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1975	+ diffusemoon3.setToolTipText("Moon3");
	1976	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1977	+ {
	1978	+ public void mouseClicked(MouseEvent e)
	1979	+ {
	1980	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1981	+ cMaterial material = object.material;
	1982	+
	1983	+ diffusenessField.setFloat(material.factor);
	1984	+ selfshadowField.setFloat(material.diffuseness);
	1985	+
	1986	+ materialtouched = true;
	1987	+ applySelf();
	1988	+ }
	1989	+ });
	1990	+ presetpanel.add(diffusemoon3);
	1991	+
	1992	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1993	+ diffusesheen.setToolTipText("Sheen");
	1994	+ diffusesheen.addMouseListener(new MouseAdapter()
	1995	+ {
	1996	+ public void mouseClicked(MouseEvent e)
	1997	+ {
	1998	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1999	+ cMaterial material = object.material;
	2000	+
	2001	+ sheenField.setFloat(material.sheen);
	2002	+
	2003	+ materialtouched = true;
	2004	+ applySelf();
	2005	+ }
	2006	+ });
	2007	+ presetpanel.add(diffusesheen);
	2008	+
	2009	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2010	+ rough.setToolTipText("Rough metal");
	2011	+ rough.addMouseListener(new MouseAdapter()
	2012	+ {
	2013	+ public void mouseClicked(MouseEvent e)
	2014	+ {
	2015	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2016	+ cMaterial material = object.material;
	2017	+
	2018	+ shininessField.setFloat(material.shininess);
	2019	+ velvetField.setFloat(material.velvet);
	2020	+
	2021	+ materialtouched = true;
	2022	+ applySelf();
	2023	+ }
	2024	+ });
	2025	+ presetpanel.add(rough);
	2026	+
	2027	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2028	+ rough2.setToolTipText("Medium metal");
	2029	+ rough2.addMouseListener(new MouseAdapter()
	2030	+ {
	2031	+ public void mouseClicked(MouseEvent e)
	2032	+ {
	2033	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2034	+ cMaterial material = object.material;
	2035	+
	2036	+ shininessField.setFloat(material.shininess);
	2037	+ lightareaField.setFloat(material.lightarea);
	2038	+
	2039	+ materialtouched = true;
	2040	+ applySelf();
	2041	+ }
	2042	+ });
	2043	+ presetpanel.add(rough2);
	2044	+
	2045	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2046	+ shini0.setToolTipText("Shiny");
	2047	+ shini0.addMouseListener(new MouseAdapter()
	2048	+ {
	2049	+ public void mouseClicked(MouseEvent e)
	2050	+ {
	2051	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2052	+ cMaterial material = object.material;
	2053	+
	2054	+ shininessField.setFloat(material.shininess);
	2055	+ lightareaField.setFloat(material.lightarea);
	2056	+
	2057	+ materialtouched = true;
	2058	+ applySelf();
	2059	+ }
	2060	+ });
	2061	+ presetpanel.add(shini0);
	2062	+
	2063	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2064	+ shini1.setToolTipText("Shiny2");
	2065	+ shini1.addMouseListener(new MouseAdapter()
	2066	+ {
	2067	+ public void mouseClicked(MouseEvent e)
	2068	+ {
	2069	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2070	+ cMaterial material = object.material;
	2071	+
	2072	+ shininessField.setFloat(material.shininess);
	2073	+ lightareaField.setFloat(material.lightarea);
	2074	+
	2075	+ materialtouched = true;
	2076	+ applySelf();
	2077	+ }
	2078	+ });
	2079	+ presetpanel.add(shini1);
	2080	+
	2081	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2082	+ shini2.setToolTipText("Shiny3");
	2083	+ shini2.addMouseListener(new MouseAdapter()
	2084	+ {
	2085	+ public void mouseClicked(MouseEvent e)
	2086	+ {
	2087	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2088	+ cMaterial material = object.material;
	2089	+
	2090	+ shininessField.setFloat(material.shininess);
	2091	+ lightareaField.setFloat(material.lightarea);
	2092	+
	2093	+ materialtouched = true;
	2094	+ applySelf();
	2095	+ }
	2096	+ });
	2097	+ presetpanel.add(shini2);
	2098	+
	2099	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2100	+ aniso.setToolTipText("AnisoU");
	2101	+ aniso.addMouseListener(new MouseAdapter()
	2102	+ {
	2103	+ public void mouseClicked(MouseEvent e)
	2104	+ {
	2105	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2106	+ cMaterial material = object.material;
	2107	+
	2108	+ anisoField.setFloat(material.aniso);
	2109	+ anisoVField.setFloat(material.anisoV);
	2110	+
	2111	+ materialtouched = true;
	2112	+ applySelf();
	2113	+ }
	2114	+ });
	2115	+ presetpanel.add(aniso);
	2116	+
	2117	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2118	+ aniso2.setToolTipText("AnisoV");
	2119	+ aniso2.addMouseListener(new MouseAdapter()
	2120	+ {
	2121	+ public void mouseClicked(MouseEvent e)
	2122	+ {
	2123	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2124	+ cMaterial material = object.material;
	2125	+
	2126	+ anisoField.setFloat(material.aniso);
	2127	+ anisoVField.setFloat(material.anisoV);
	2128	+
	2129	+ materialtouched = true;
	2130	+ applySelf();
	2131	+ }
	2132	+ });
	2133	+ presetpanel.add(aniso2);
	2134	+
	2135	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2136	+ aniso3.setToolTipText("AnisoUV");
	2137	+ aniso3.addMouseListener(new MouseAdapter()
	2138	+ {
	2139	+ public void mouseClicked(MouseEvent e)
	2140	+ {
	2141	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2142	+ cMaterial material = object.material;
	2143	+
	2144	+ anisoField.setFloat(material.aniso);
	2145	+ anisoVField.setFloat(material.anisoV);
	2146	+
	2147	+ materialtouched = true;
	2148	+ applySelf();
	2149	+ }
	2150	+ });
	2151	+ presetpanel.add(aniso3);
	2152	+
	2153	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2154	+ velvet0.setToolTipText("Velvet");
	2155	+ velvet0.addMouseListener(new MouseAdapter()
	2156	+ {
	2157	+ public void mouseClicked(MouseEvent e)
	2158	+ {
	2159	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2160	+ cMaterial material = object.material;
	2161	+
	2162	+ diffusenessField.setFloat(material.factor);
	2163	+ selfshadowField.setFloat(material.diffuseness);
	2164	+ sheenField.setFloat(material.sheen);
	2165	+ shininessField.setFloat(material.shininess);
	2166	+ velvetField.setFloat(material.velvet);
	2167	+ shiftField.setFloat(material.shift);
	2168	+
	2169	+ materialtouched = true;
	2170	+ applySelf();
	2171	+ }
	2172	+ });
	2173	+ presetpanel.add(velvet0);
	2174	+
	2175	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2176	+ bump0.setToolTipText("Bump texture");
	2177	+ bump0.addMouseListener(new MouseAdapter()
	2178	+ {
	2179	+ public void mouseClicked(MouseEvent e)
	2180	+ {
	2181	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2182	+ cMaterial material = object.material;
	2183	+
	2184	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2185	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2186	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2187	+
	2188	+ materialtouched = true;
	2189	+ applySelf();
	2190	+ }
	2191	+ });
	2192	+ presetpanel.add(bump0);
	2193	+
	2194	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2195	+ borderShader.setToolTipText("Border fade");
	2196	+ borderShader.addMouseListener(new MouseAdapter()
	2197	+ {
	2198	+ public void mouseClicked(MouseEvent e)
	2199	+ {
	2200	+ borderfadeField.setFloat(0.5);
	2201	+ opacityField.setFloat(0.75);
	2202	+
	2203	+ materialtouched = true;
	2204	+ applySelf();
	2205	+ }
	2206	+ });
	2207	+ presetpanel.add(borderShader);
	2208	+
	2209	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2210	+ halo.setToolTipText("Halo");
	2211	+ halo.addMouseListener(new MouseAdapter()
	2212	+ {
	2213	+ public void mouseClicked(MouseEvent e)
	2214	+ {
	2215	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2216	+ cMaterial material = object.material;
	2217	+
	2218	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2219	+
	2220	+ materialtouched = true;
	2221	+ applySelf();
	2222	+ }
	2223	+ });
	2224	+ presetpanel.add(halo);
	2225	+
	2226	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2227	+ candle.setToolTipText("Candle");
	2228	+ candle.addMouseListener(new MouseAdapter()
	2229	+ {
	2230	+ public void mouseClicked(MouseEvent e)
	2231	+ {
	2232	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2233	+ cMaterial material = object.material;
	2234	+
	2235	+ subsurfaceField.setFloat(material.subsurface);
	2236	+ shadowbiasField.setFloat(material.shadowbias);
	2237	+ ambientField.setFloat(material.ambient);
	2238	+ specularField.setFloat(material.specular);
	2239	+ lightareaField.setFloat(material.lightarea);
	2240	+ shininessField.setFloat(material.shininess);
	2241	+
	2242	+ materialtouched = true;
	2243	+ applySelf();
	2244	+ }
	2245	+ });
	2246	+ presetpanel.add(candle);
	2247	+
	2248	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2249	+ shadowShader.setToolTipText("Shadow");
	2250	+ shadowShader.addMouseListener(new MouseAdapter()
	2251	+ {
	2252	+ public void mouseClicked(MouseEvent e)
	2253	+ {
	2254	+ diffuseField.setFloat(0.001);
	2255	+ ambientField.setFloat(0.001);
	2256	+ cameraField.setFloat(0.001);
	2257	+ specularField.setFloat(0.001);
	2258	+ fakedepthField.setFloat(0.001);
	2259	+ opacityField.setFloat(0.6);
	2260	+
	2261	+ materialtouched = true;
	2262	+ applySelf();
	2263	+ }
	2264	+ });
	2265	+ presetpanel.add(shadowShader);
	2266	+
	2267	+ cGridBag panel = new cGridBag().setVertical(true);
	2268	+
	2269	+ presetpanel.preferredWidth = 1;
	2270	+
	2271	+ materialpanel.add(presetpanel);
	2272	+ materialpanel.add(panel);
	2273	+
	2274	+ panel.preferredWidth = 8;
	2275	+
	2276	+ /*
1667	2277	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1668	2278	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1669		- */
	2279	+ */
1670	2280
1671	2281	cGridBag editBar = new cGridBag().setVertical(false);
1672	2282
..	..	@@ -1700,27 +2310,61 @@
1700	2310	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1701	2311
1702	2312	cGridBag colorSection = new cGridBag().setVertical(true);
	2313	+
	2314	+ cGridBag huepanel = new cGridBag();
	2315	+ cGridBag huelabel = new cGridBag();
	2316	+ cLabel hue = GetLabel("icons/hue.png", false);
	2317	+ hue.fit = true;
	2318	+
	2319	+ hue.addMouseListener(new MouseAdapter()
	2320	+ {
	2321	+ public void mousePressed(MouseEvent e)
	2322	+ {
	2323	+ int x = e.getX();
	2324	+
	2325	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2326	+ }
	2327	+ });
	2328	+
	2329	+ huelabel.add(hue);
	2330	+ huelabel.preferredWidth = 20;
	2331	+ huepanel.add(new cGridBag()); // Label
	2332	+ huepanel.add(huelabel); // Field/slider
	2333	+
	2334	+ huepanel.preferredHeight = 7;
	2335	+
	2336	+ colorSection.add(huepanel);
1703	2337
1704	2338	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);
	2339	+
	2340	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2341	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2342	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2343	+
1708	2344	//colorField.preferredWidth = 200;
1709	2345	colorSection.add(color);
1710	2346
1711	2347	cGridBag modulation = new cGridBag();
1712	2348	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1713	2349	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1714		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2350	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1715	2351	colorSection.add(modulation);
1716	2352
	2353	+ cGridBag opacity = new cGridBag();
	2354	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2355	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2356	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2357	+ colorSection.add(opacity);
	2358	+
	2359	+ colorSection.add(GetSeparator());
	2360	+
1717	2361	cGridBag texture = new cGridBag();
1718	2362	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1719	2363	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1720	2364	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1721	2365	colorSection.add(texture);
1722	2366
1723		- panel.add(new JSeparator());
	2367	+ panel.add(GetSeparator());
1724	2368
1725	2369	panel.add(colorSection);
1726	2370
..	..	@@ -1776,7 +2420,7 @@
1776	2420	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1777	2421	diffuseSection.add(shadowbias);
1778	2422
1779		- panel.add(new JSeparator());
	2423	+ panel.add(GetSeparator());
1780	2424
1781	2425	panel.add(diffuseSection);
1782	2426
..	..	@@ -1839,7 +2483,7 @@
1839	2483	specularSection.add(anisoV);
1840	2484
1841	2485
1842		- panel.add(new JSeparator());
	2486	+ panel.add(GetSeparator());
1843	2487
1844	2488	panel.add(specularSection);
1845	2489
..	..	@@ -1864,12 +2508,6 @@
1864	2508	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1865	2509	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1866	2510	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	2511
1874	2512	//panel.add(new JSeparator());
1875	2513
..	..	@@ -1915,7 +2553,7 @@
1915	2553	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1916	2554	textureSection.add(opacityPower);
1917	2555
1918		- panel.add(new JSeparator());
	2556	+ panel.add(GetSeparator());
1919	2557
1920	2558	panel.add(textureSection);
1921	2559
..	..	@@ -2902,7 +3540,7 @@
2902	3540
2903	3541	freezematerial = true;
2904	3542	colorField.setFloat(mat.color);
2905		- modulationField.setFloat(mat.modulation);
	3543	+ saturationField.setFloat(mat.modulation);
2906	3544	metalnessField.setFloat(mat.metalness);
2907	3545	diffuseField.setFloat(mat.diffuse);
2908	3546	specularField.setFloat(mat.specular);
..	..	@@ -2964,32 +3602,8 @@
2964	3602
2965	3603	if (multiplyToggle != null)
2966	3604	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		- }
	3605	+
	3606	+ AllocProjectedVertices(object);
2993	3607
2994	3608	SetMaterial(mat, object.projectedVertices);
2995	3609	}
..	..	@@ -3109,6 +3723,17 @@
3109	3723	public void itemStateChanged(ItemEvent event)
3110	3724	{
3111	3725	// System.out.println("Propagate = " + propagate);
	3726	+ if (event.getSource() == pinButton)
	3727	+ {
	3728	+ copy.pinned ^= true;
	3729	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3730	+ {
	3731	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3732	+ copy.CloseUI();
	3733	+ //copy.editWindow.refreshContents();
	3734	+ }
	3735	+ }
	3736	+ else
3112	3737	if (event.getSource() == propagateToggle)
3113	3738	{
3114	3739	propagate ^= true;
..	..	@@ -3213,8 +3838,9 @@
3213	3838	} else if (event.getSource() == liveCB)
3214	3839	{
3215	3840	copy.live ^= true;
	3841	+ objEditor.refreshContents(true); // To show item colors
3216	3842	return;
3217		- } else if (event.getSource() == selectCB)
	3843	+ } else if (event.getSource() == selectableCB)
3218	3844	{
3219	3845	copy.dontselect ^= true;
3220	3846	return;
..	..	@@ -3222,7 +3848,7 @@
3222	3848	{
3223	3849	copy.hide ^= true;
3224	3850	copy.Touch(); // display list issue
3225		- objEditor.refreshContents();
	3851	+ objEditor.refreshContents(true); // To show item colors
3226	3852	return;
3227	3853	} else if (event.getSource() == link2masterCB)
3228	3854	{
..	..	@@ -3478,6 +4104,7 @@
3478	4104
3479	4105	static public byte[] Compress(Object3D o)
3480	4106	{
	4107	+ // Slower to actually compress.
3481	4108	try
3482	4109	{
3483	4110	ByteArrayOutputStream baos = new ByteArrayOutputStream();
..	..	@@ -3574,11 +4201,12 @@
3574	4201	return null;
3575	4202	}
3576	4203
3577		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3578	4204
3579	4205	public void Save()
3580	4206	{
3581		- Save(true);
	4207	+ //Save(true);
	4208	+ Replace();
	4209	+ SetVersionStates();
3582	4210	}
3583	4211
3584	4212	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3597,59 +4225,71 @@
3597	4225	return true;
3598	4226	}
3599	4227
	4228	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4229	+
	4230	+ void DeleteVersion()
	4231	+ {
	4232	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4233	+ {
	4234	+ copy.versionlist[i] = copy.versionlist[i+1];
	4235	+ }
	4236	+
	4237	+ CopyChanged();
	4238	+
	4239	+ SetVersionStates();
	4240	+ }
	4241	+
3600	4242	public boolean Save(boolean user)
3601	4243	{
3602	4244	System.err.println("Save");
	4245	+ Replace();
3603	4246
3604		- cRadio tab = GetCurrentTab();
	4247	+ //cRadio tab = GetCurrentTab();
3605	4248
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;
	4249	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3614	4250
3615	4251	boolean thesame = false;
3616	4252
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		- }
	4253	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4254	+// {
	4255	+// thesame = true;
	4256	+// }
3622	4257
3623	4258	//EditorFrame.m_MainFrame.requestFocusInWindow();
3624	4259	if (!thesame)
3625	4260	{
3626		- //tab.user[tab.undoindex] = user;
3627		- boolean increment = tab.graphs[tab.undoindex] == null;
	4261	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4262	+ {
	4263	+ copy.versionlist[i] = copy.versionlist[i-1];
	4264	+ }
3628	4265
3629		- tab.graphs[tab.undoindex] = compress;
	4266	+ //tab.user[tab.versionindex] = user;
	4267	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
3630	4268
3631		- if (increment)
3632		- tab.undoindex++;
	4269	+ copy.versionlist[++copy.versionindex] = compress;
	4270	+
	4271	+ // if (increment)
	4272	+ // tab.versionindex++;
3633	4273	}
3634	4274
3635		- copy.RestoreBigData(hashtable);
	4275	+ //copy.RestoreBigData(versiontable);
3636	4276
3637	4277	//assert(hashtable.isEmpty());
3638	4278
3639		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
3640		- {
3641		- //tab.user[i] = false;
3642		- // tab.graphs[i] = null;
3643		- }
	4279	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4280	+// {
	4281	+// //tab.user[i] = false;
	4282	+// copy.versionlist[i] = null;
	4283	+// }
3644	4284
3645		- SetUndoStates();
	4285	+ SetVersionStates();
3646	4286
3647	4287	// test save
3648	4288	if (false)
3649	4289	{
3650	4290	try
3651	4291	{
3652		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4292	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3653	4293	ObjectOutputStream p = new ObjectOutputStream(ostream);
3654	4294
3655	4295	p.writeObject(copy);
..	..	@@ -3665,27 +4305,65 @@
3665	4305
3666	4306	return !thesame;
3667	4307	}
3668		-
3669		- void CopyChanged(Object3D obj)
	4308	+
	4309	+ boolean flashIt = true;
	4310	+
	4311	+ void RefreshSelection()
3670	4312	{
3671		- SetUndoStates();
	4313	+ Object3D selection = new Object3D();
	4314	+
	4315	+ for (int i = 0; i < copy.selection.size(); i++)
	4316	+ {
	4317	+ Object3D elem = copy.selection.elementAt(i);
	4318	+
	4319	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4320	+
	4321	+ if (obj == null)
	4322	+ {
	4323	+ copy.selection.remove(i--);
	4324	+ }
	4325	+ else
	4326	+ {
	4327	+ selection.add(obj);
	4328	+ copy.selection.setElementAt(obj, i);
	4329	+ }
	4330	+ }
	4331	+
	4332	+ flashIt = false;
	4333	+ GetTree().clearSelection();
	4334	+ for (int i = 0; i < selection.size(); i++)
	4335	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4336	+ flashIt = true;
	4337	+
	4338	+ //refreshContents(false);
	4339	+ }
	4340	+
	4341	+ void CopyChanged()
	4342	+ {
	4343	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4344	+
	4345	+ SetVersionStates();
3672	4346
3673	4347	boolean temp = CameraPane.SWITCH;
3674	4348	CameraPane.SWITCH = false;
3675	4349
3676		- copy.ExtractBigData(hashtable);
	4350	+ copy.ExtractBigData(versiontable);
3677	4351
3678	4352	copy.clear();
3679	4353
	4354	+ copy.skyboxname = obj.skyboxname;
	4355	+ copy.skyboxext = obj.skyboxext;
	4356	+
3680	4357	for (int i=0; i<obj.Size(); i++)
3681	4358	{
3682	4359	copy.add(obj.get(i));
3683	4360	}
3684	4361
3685		- copy.RestoreBigData(hashtable);
	4362	+ copy.RestoreBigData(versiontable);
3686	4363
3687	4364	CameraPane.SWITCH = temp;
3688	4365
	4366	+ RefreshSelection();
3689	4367	//assert(hashtable.isEmpty());
3690	4368
3691	4369	copy.Touch();
..	..	@@ -3706,68 +4384,144 @@
3706	4384	}
3707	4385	}
3708	4386
3709		- refreshContents();
	4387	+ refreshContents(true);
3710	4388	}
3711	4389
3712		- cButton undoButton;
3713		- cButton redoButton;
	4390	+ cButton previousVersionButton;
	4391	+ cButton restoreButton;
	4392	+ cButton replaceButton;
	4393	+ cButton nextVersionButton;
	4394	+ cButton saveVersionButton;
	4395	+ cButton deleteVersionButton;
3714	4396
3715		- void SetUndoStates()
	4397	+ boolean muteSlider;
	4398	+
	4399	+ int VersionCount()
3716	4400	{
3717		- cRadio tab = GetCurrentTab();
	4401	+ int count = 0;
3718	4402
3719		- undoButton.setEnabled(tab.undoindex > 0);
3720		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	4403	+ for (int i = copy.versionlist.length; --i >= 0;)
	4404	+ {
	4405	+ if (copy.versionlist[i] != null)
	4406	+ count++;
	4407	+ }
	4408	+
	4409	+ return count;
3721	4410	}
3722	4411
3723		- public boolean Undo()
	4412	+ void SetVersionStates()
3724	4413	{
	4414	+ //if (true)
	4415	+ // return;
	4416	+
	4417	+ //cRadio tab = GetCurrentTab();
	4418	+
	4419	+ restoreButton.setEnabled(copy.versionindex != -1);
	4420	+ replaceButton.setEnabled(copy.versionindex != -1);
	4421	+
	4422	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4423	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4424	+
	4425	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4426	+ copy.versionlist[copy.versionindex + 1] != null);
	4427	+
	4428	+ muteSlider = true;
	4429	+ versionSlider.setMinimum(0);
	4430	+ versionSlider.setMaximum(VersionCount() - 1);
	4431	+ versionSlider.setInteger(copy.versionindex);
	4432	+ versionSlider.setEnabled(copy.versionindex != -1);
	4433	+ muteSlider = false;
	4434	+ }
	4435	+
	4436	+ public boolean PreviousVersion()
	4437	+ {
	4438	+ // Option?
	4439	+ Replace();
	4440	+
3725	4441	System.err.println("Undo");
3726	4442
3727		- cRadio tab = GetCurrentTab();
	4443	+ //cRadio tab = GetCurrentTab();
3728	4444
3729		- if (tab.undoindex == 0)
	4445	+ if (copy.versionindex == 0)
3730	4446	{
3731	4447	java.awt.Toolkit.getDefaultToolkit().beep();
3732	4448	return false;
3733	4449	}
3734	4450
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		- }
	4451	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4452	+// {
	4453	+// if (Save(false))
	4454	+// tab.versionindex -= 1;
	4455	+// else
	4456	+// {
	4457	+// if (tab.versionindex <= 0)
	4458	+// return false;
	4459	+// else
	4460	+// tab.versionindex -= 1;
	4461	+// }
	4462	+// }
3747	4463
3748		- tab.undoindex -= 1;
	4464	+ copy.versionindex -= 1;
3749	4465
3750		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4466	+ CopyChanged();
3751	4467
3752	4468	return true;
3753	4469	}
3754	4470
3755		- public void Redo()
	4471	+ public boolean Restore()
3756	4472	{
3757		- cRadio tab = GetCurrentTab();
	4473	+ System.err.println("Restore");
3758	4474
3759		- if (tab.graphs[tab.undoindex + 1] == null)
	4475	+ //cRadio tab = GetCurrentTab();
	4476	+
	4477	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4478	+ {
	4479	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4480	+ return false;
	4481	+ }
	4482	+
	4483	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4484	+ CopyChanged();
	4485	+
	4486	+ return true;
	4487	+ }
	4488	+
	4489	+ public boolean Replace()
	4490	+ {
	4491	+ System.err.println("Replace");
	4492	+
	4493	+ //cRadio tab = GetCurrentTab();
	4494	+
	4495	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4496	+ {
	4497	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4498	+ return false;
	4499	+ }
	4500	+
	4501	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4502	+
	4503	+ return true;
	4504	+ }
	4505	+
	4506	+ public void NextVersion()
	4507	+ {
	4508	+ // Option?
	4509	+ Replace();
	4510	+
	4511	+ //cRadio tab = GetCurrentTab();
	4512	+
	4513	+ if (copy.versionlist[copy.versionindex + 1] == null)
3760	4514	{
3761	4515	java.awt.Toolkit.getDefaultToolkit().beep();
3762	4516	return;
3763	4517	}
3764	4518
3765		- tab.undoindex += 1;
	4519	+ copy.versionindex += 1;
3766	4520
3767		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4521	+ CopyChanged();
3768	4522
3769		- //if (!tab.user[tab.undoindex])
3770		- // tab.graphs[tab.undoindex] = null;
	4523	+ //if (!tab.user[tab.versionindex])
	4524	+ // tab.graphs[tab.versionindex] = null;
3771	4525	}
3772	4526
3773	4527	void ImportGFD()
..	..	@@ -3978,7 +4732,7 @@
3978	4732	//copy.material = new cMaterial(copy.GetMaterial());
3979	4733
3980	4734	current.color = (float) colorField.getFloat();
3981		- current.modulation = (float) modulationField.getFloat();
	4735	+ current.modulation = (float) saturationField.getFloat();
3982	4736	current.metalness = (float) metalnessField.getFloat();
3983	4737	current.diffuse = (float) diffuseField.getFloat();
3984	4738	current.specular = (float) specularField.getFloat();
..	..	@@ -4011,7 +4765,7 @@
4011	4765	cMaterial mat = copy.material;
4012	4766
4013	4767	colorField.SetToolTipValue((mat.color));
4014		- modulationField.SetToolTipValue((mat.modulation));
	4768	+ saturationField.SetToolTipValue((mat.modulation));
4015	4769	metalnessField.SetToolTipValue((mat.metalness));
4016	4770	diffuseField.SetToolTipValue((mat.diffuse));
4017	4771	specularField.SetToolTipValue((mat.specular));
..	..	@@ -4063,9 +4817,28 @@
4063	4817	//copy.Touch();
4064	4818	}
4065	4819
	4820	+ cNumberSlider versionSlider;
	4821	+
4066	4822	public void stateChanged(ChangeEvent e)
4067	4823	{
4068	4824	// assert(false);
	4825	+ if (e.getSource() == versionSlider)
	4826	+ {
	4827	+ if (muteSlider)
	4828	+ return;
	4829	+
	4830	+ Replace();
	4831	+
	4832	+ int version = versionSlider.getInteger();
	4833	+
	4834	+ if (version != -1 && copy.versionlist[version] != null)
	4835	+ {
	4836	+ copy.versionindex = version;
	4837	+ CopyChanged();
	4838	+ }
	4839	+
	4840	+ return;
	4841	+ }
4069	4842
4070	4843	if (freezematerial)
4071	4844	{
..	..	@@ -4101,6 +4874,12 @@
4101	4874	{
4102	4875	//System.out.println("stateChanged = " + this);
4103	4876	materialtouched = true;
	4877	+
	4878	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4879	+ {
	4880	+ saturationField.setFloat(1);
	4881	+ }
	4882	+
4104	4883	applySelf();
4105	4884	//System.out.println("this = " + this);
4106	4885	//System.out.println("PARENT = " + parent);
..	..	@@ -4400,6 +5179,7 @@
4400	5179	{
4401	5180	if (GetTree() != null)
4402	5181	{
	5182	+ GetTree().revalidate();
4403	5183	GetTree().repaint();
4404	5184	}
4405	5185
..	..	@@ -4408,13 +5188,18 @@
4408	5188	ctrlPanel.validate(); // ? new
4409	5189	ctrlPanel.repaint();
4410	5190	}
	5191	+
	5192	+ if (previousVersionButton != null && copy.versionlist != null)
	5193	+ SetVersionStates();
	5194	+
	5195	+ cameraView.requestFocusInWindow();
4411	5196	}
4412	5197
4413	5198	static TweenManager tweenManager = new TweenManager();
4414	5199
4415	5200	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4416	5201	{
4417		- if (Globals.SAVEONMAKE) // && resetmodel)
	5202	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4418	5203	Save();
4419	5204	//Tween.set(thing, 0).target(1).start(tweenManager);
4420	5205	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4439,7 +5224,7 @@
4439	5224	// group = (Composite) group.get(0);
4440	5225	// }
4441	5226
4442		- System.out.println("makeSomething of " + thing);
	5227	+ //System.out.println("makeSomething of " + thing);
4443	5228
4444	5229	/*
4445	5230	if (deselect && jList != null)
..	..	@@ -4656,7 +5441,9 @@
4656	5441	readobj.ResetDisplayList();
4657	5442	} catch (Exception e)
4658	5443	{
4659		- //e.printStackTrace();
	5444	+ if (!e.toString().contains("GZIP"))
	5445	+ e.printStackTrace();
	5446	+
4660	5447	try
4661	5448	{
4662	5449	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4736,6 +5523,8 @@
4736	5523	{
4737	5524	//readobj.deepCopySelf(copy);
4738	5525	copy.clear(); // june 2014
	5526	+ copy.skyboxname = readobj.skyboxname;
	5527	+ copy.skyboxext = readobj.skyboxext;
4739	5528	for (int i = 0; i < readobj.size(); i++)
4740	5529	{
4741	5530	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4776,6 +5565,7 @@
4776	5565	}
4777	5566	} catch (ClassCastException e)
4778	5567	{
	5568	+ e.printStackTrace();
4779	5569	assert (false);
4780	5570	Composite c = (Composite) copy;
4781	5571	c.children.clear();
..	..	@@ -4786,6 +5576,20 @@
4786	5576	c.addChild(csg);
4787	5577	}
4788	5578
	5579	+ copy.versionlist = readobj.versionlist;
	5580	+ copy.versionindex = readobj.versionindex;
	5581	+
	5582	+ if (copy.versionlist == null)
	5583	+ {
	5584	+ // Backward compatibility
	5585	+ copy.versionlist = new Object3D[100];
	5586	+ copy.versionindex = -1;
	5587	+
	5588	+ //Save(true);
	5589	+ }
	5590	+
	5591	+ //? SetUndoStates();
	5592	+
4789	5593	ResetModel();
4790	5594	copy.HardTouch(); // recompile?
4791	5595	refreshContents();
..	..	@@ -4796,7 +5600,7 @@
4796	5600	{
4797	5601	if (Grafreed.standAlone)
4798	5602	{
4799		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5603	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4800	5604	browser.show();
4801	5605	String filename = browser.getFile();
4802	5606	if (filename != null && filename.length() > 0)
..	..	@@ -4873,6 +5677,8 @@
4873	5677
4874	5678	void save()
4875	5679	{
	5680	+ Replace();
	5681	+
4876	5682	if (lastname == null)
4877	5683	{
4878	5684	return;
..	..	@@ -4895,6 +5701,7 @@
4895	5701	//ps.print(buffer.toString());
4896	5702	} catch (IOException e)
4897	5703	{
	5704	+ e.printStackTrace();
4898	5705	}
4899	5706	}
4900	5707
..	..	@@ -5114,6 +5921,7 @@
5114	5921	ButtonGroup buttonGroup;
5115	5922
5116	5923	cGridBag toolboxPanel;
	5924	+ cGridBag skyboxPanel;
5117	5925	cGridBag materialPanel;
5118	5926	cGridBag ctrlPanel;
5119	5927
..	..	@@ -5187,7 +5995,7 @@
5187	5995	JLabel colorLabel;
5188	5996	cNumberSlider colorField;
5189	5997	JLabel modulationLabel;
5190		- cNumberSlider modulationField;
	5998	+ cNumberSlider saturationField;
5191	5999	JLabel metalnessLabel;
5192	6000	cNumberSlider metalnessField;
5193	6001	JLabel diffuseLabel;
..	..	@@ -5218,6 +6026,7 @@
5218	6026	cNumberSlider anisoField;
5219	6027	JLabel anisoVLabel;
5220	6028	cNumberSlider anisoVField;
	6029	+
5221	6030	JLabel cameraLabel;
5222	6031	cNumberSlider cameraField;
5223	6032	JLabel selfshadowLabel;
..	..	@@ -5232,6 +6041,7 @@
5232	6041	cNumberSlider fakedepthField;
5233	6042	JLabel shadowbiasLabel;
5234	6043	cNumberSlider shadowbiasField;
	6044	+
5235	6045	JLabel bumpLabel;
5236	6046	cNumberSlider bumpField;
5237	6047	JLabel noiseLabel;