~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,78 @@
41	42	JFrame frame;
42	43
43	44	static ObjEditor theFrame;
	45	+
	46	+ public cGridBag GetSeparator()
	47	+ {
	48	+ cGridBag separator = new cGridBag();
	49	+ separator.add(new JSeparator());
	50	+ separator.preferredHeight = 5;
	51	+ return separator;
	52	+ }
44	53
45	54	cButton GetButton(String name, boolean border)
46	55	{
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		- }
	56	+ ImageIcon icon = GetIcon(name);
	57	+ return new cButton(icon, border);
	58	+ }
	59	+
	60	+ cLabel GetLabel(String name, boolean border)
	61	+ {
	62	+ //ImageIcon icon = GetIcon(name);
	63	+ return new cLabel(GetImage(name), border);
56	64	}
57	65
58	66	cToggleButton GetToggleButton(String name, boolean border)
59	67	{
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		- }
	68	+ ImageIcon icon = GetIcon(name);
	69	+ return new cToggleButton(icon, border);
69	70	}
70	71
71	72	cCheckBox GetCheckBox(String name, boolean border)
72	73	{
	74	+ ImageIcon icon = GetIcon(name);
	75	+ return new cCheckBox(icon, border);
	76	+ }
	77	+
	78	+ ImageIcon GetIcon(String name)
	79	+ {
73	80	try
74	81	{
75		- ImageIcon icon = GetIcon(name);
76		- return new cCheckBox(icon, border);
	82	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	83	+
	84	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	85	+// {
	86	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	87	+// Graphics2D g = resized.createGraphics();
	88	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	89	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	90	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	91	+// g.dispose();
	92	+//
	93	+// image = resized;
	94	+// }
	95	+
	96	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	97	+ return icon;
77	98	}
78	99	catch (Exception e)
79	100	{
80		- return new cCheckBox(name, border);
	101	+ return null;
81	102	}
82	103	}
83		-
84		- private ImageIcon GetIcon(String name) throws IOException
	104	+
	105	+ BufferedImage GetImage(String name)
85	106	{
86		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87		-
88		- if (image.getWidth() != 24 && image.getHeight() != 24)
	107	+ try
89	108	{
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;
	109	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	110	+
	111	+ return image;
98	112	}
99		-
100		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101		- return icon;
	113	+ catch (Exception e)
	114	+ {
	115	+ return null;
	116	+ }
102	117	}
103	118
104	119	// SCRIPT
..	..	@@ -282,6 +297,14 @@
282	297	client = inClient;
283	298	copy = client;
284	299
	300	+// if (copy.versionlist == null)
	301	+// {
	302	+// copy.versionlist = new Object3D[100];
	303	+// copy.versionindex = -1;
	304	+//
	305	+// callee.Save(true);
	306	+// }
	307	+
285	308	// "this" is not called: SetupUI2(objEditor);
286	309	}
287	310
..	..	@@ -295,6 +318,14 @@
295	318	client = inClient;
296	319	copy = client;
297	320
	321	+ if (copy.versionlist == null)
	322	+ {
	323	+ copy.versionlist = new Object3D[100];
	324	+ copy.versionindex = -1;
	325	+
	326	+// Save(true);
	327	+ }
	328	+
298	329	SetupUI2(callee.GetEditor());
299	330	}
300	331
..	..	@@ -327,6 +358,14 @@
327	358	copy = localCopy;
328	359	copy.editWindow = this;
329	360
	361	+// if (copy.versionlist == null)
	362	+// {
	363	+// copy.versionlist = new Object3D[100];
	364	+// copy.versionindex = -1;
	365	+//
	366	+// Save(true);
	367	+// }
	368	+
330	369	SetupMenu();
331	370
332	371	//SetupName(objEditor); // new
..	..	@@ -394,6 +433,8 @@
394	433
395	434	ChangeListener changeListener = new ChangeListener()
396	435	{
	436	+ String name;
	437	+
397	438	public void stateChanged(ChangeEvent changeEvent)
398	439	{
399	440	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -412,18 +453,48 @@
412	453	// EditSelection(false);
413	454	// }
414	455
415		- refreshContents(false); // To refresh Info tab
	456	+ if (objectPanel.getSelectedIndex() == 4)
	457	+ {
	458	+ name = copy.skyboxname;
	459	+
	460	+ if (name == null)
	461	+ {
	462	+ name = "";
	463	+ }
	464	+
	465	+ copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	466	+ copy.skyboxext = "jpg";
	467	+ }
	468	+ else
	469	+ {
	470	+ if (name != null)
	471	+ {
	472	+ if (name.equals(""))
	473	+ {
	474	+ copy.skyboxname = null;
	475	+ copy.skyboxext = null;
	476	+ }
	477	+ else
	478	+ {
	479	+ copy.skyboxname = name;
	480	+ }
	481	+ }
	482	+ }
	483	+
	484	+// refreshContents(false); // To refresh Info tab
	485	+ cameraView.repaint();
416	486	}
417	487	};
418	488	objectPanel.addChangeListener(changeListener);
419	489
420	490	toolbarPanel = new JPanel();
421	491	toolbarPanel.setName("Toolbar");
	492	+
422	493	treePanel = new cGridBag();
423	494	treePanel.setName("Tree");
424	495
425	496	editPanel = new cGridBag().setVertical(true);
426		- editPanel.setName("Edit");
	497	+ //editPanel.setName("Edit");
427	498
428	499	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429	500
..	..	@@ -431,11 +502,13 @@
431	502	editPanel.add(editCommandsPanel);
432	503	editPanel.add(ctrlPanel);
433	504
434		- toolboxPanel = new cGridBag().setVertical(false);
435		- toolboxPanel.setName("Toolbox");
	505	+ toolboxPanel = new cGridBag().setVertical(true);
	506	+ //toolboxPanel.setName("Toolbox");
436	507
437		- materialPanel = new cGridBag().setVertical(true);
438		- materialPanel.setName("Material");
	508	+ skyboxPanel = new cGridBag().setVertical(true);
	509	+
	510	+ materialPanel = new cGridBag().setVertical(false);
	511	+ //materialPanel.setName("Material");
439	512
440	513	/JTextPane/
441	514	infoarea = createTextPane();
..	..	@@ -443,6 +516,7 @@
443	516
444	517	infoarea.setEditable(true);
445	518	SetText();
	519	+
446	520	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447	521	// infoarea.setOpaque(false);
448	522	// //infoarea.setForeground(textcolor);
..	..	@@ -450,7 +524,7 @@
450	524	// TEXTAREA infoarea.setWrapStyleWord(true);
451	525	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452	526	infoPanel.setPreferredSize(new Dimension(1, 1));
453		- infoPanel.setName("Info");
	527	+ //infoPanel.setName("Info");
454	528	//infoPanel.setLayout(new BorderLayout());
455	529	//infoPanel.add(createTextPane());
456	530
..	..	@@ -717,6 +791,7 @@
717	791	boolean maximized;
718	792
719	793	cButton fullscreenLayout;
	794	+ cButton expandedLayout;
720	795
721	796	void Minimize()
722	797	{
..	..	@@ -756,10 +831,12 @@
756	831	cButton minButton;
757	832	cButton maxButton;
758	833	cButton fullButton;
	834	+ cButton collapseButton;
	835	+ cButton maximize3DButton;
759	836
760	837	void ToggleFullScreen()
761	838	{
762		-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	839	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
763	840
764	841	cameraView.ToggleFullScreen();
765	842
..	..	@@ -780,13 +857,13 @@
780	857	// X frame.getContentPane().remove(/"Center",/bigThree);
781	858	// X framePanel.add(bigThree);
782	859	// X frame.getContentPane().add(/"Center",/framePanel);
783		- framePanel.setDividerLocation(46);
	860	+// framePanel.setDividerLocation(46); // icons are 24x24
784	861
785	862	//frame.setVisible(true);
786		- radio.layout = keepButton;
	863	+// radio.layout = keepButton;
787	864	//theFrame = null;
788	865	keepButton = null;
789		- radio.layout.doClick();
	866	+// radio.layout.doClick();
790	867
791	868	} else
792	869	{
..	..	@@ -807,14 +884,47 @@
807	884	// X frame.getContentPane().remove(/"Center",/framePanel);
808	885	// X framePanel.remove(bigThree);
809	886	// X frame.getContentPane().add(/"Center",/bigThree);
810		- framePanel.setDividerLocation(0);
	887	+// framePanel.setDividerLocation(0);
811	888
812		- radio.layout = fullscreenLayout;
813		- radio.layout.doClick();
	889	+// radio.layout = fullscreenLayout;
	890	+// radio.layout.doClick();
814	891	//frame.setVisible(true);
815	892	}
816	893	frame.validate();
	894	+
	895	+ cameraView.requestFocusInWindow();
817	896	}
	897	+
	898	+ void CollapseToolbar()
	899	+ {
	900	+ framePanel.setDividerLocation(0);
	901	+ //frame.validate();
	902	+
	903	+ cameraView.requestFocusInWindow();
	904	+ }
	905	+
	906	+ private Object3D Duplicate(Object3D object)
	907	+ {
	908	+ boolean temp = CameraPane.SWITCH;
	909	+ CameraPane.SWITCH = false;
	910	+
	911	+ object.ExtractBigData(versiontable);
	912	+ // if (copy == client)
	913	+
	914	+ Object3D versions[] = object.versionlist;
	915	+ object.versionlist = null;
	916	+
	917	+ //byte[] compress = Compress(copy);
	918	+ Object3D compress = (Object3D)Grafreed.clone(object);
	919	+
	920	+ object.versionlist = versions;
	921	+
	922	+ object.RestoreBigData(versiontable);
	923	+
	924	+ CameraPane.SWITCH = temp;
	925	+
	926	+ return compress;
	927	+ }
818	928
819	929	private JTextPane createTextPane()
820	930	{
..	..	@@ -937,6 +1047,7 @@
937	1047	{
938	1048	SetupMaterial(materialPanel);
939	1049	}
	1050	+
940	1051	//SetupName();
941	1052	//SetupViews();
942	1053	}
..	..	@@ -946,7 +1057,7 @@
946	1057	// NumberSlider vDivsField;
947	1058	// JCheckBox endcaps;
948	1059	JCheckBox liveCB;
949		- JCheckBox selectCB;
	1060	+ JCheckBox selectableCB;
950	1061	JCheckBox hideCB;
951	1062	JCheckBox link2masterCB;
952	1063	JCheckBox markCB;
..	..	@@ -1145,6 +1256,18 @@
1145	1256
1146	1257	namePanel = new cGridBag();
1147	1258
	1259	+ //if (copy.pinned)
	1260	+ {
	1261	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1262	+ pinButton.setSelected(copy.pinned);
	1263	+ cGridBag t = new cGridBag();
	1264	+ t.preferredWidth = 2;
	1265	+ t.add(pinButton);
	1266	+ namePanel.add(t);
	1267	+
	1268	+ pinButton.addItemListener(this);
	1269	+ }
	1270	+
1148	1271	nameField = AddText(namePanel, copy.GetName());
1149	1272	namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1150	1273	oe.ctrlPanel.add(namePanel);
..	..	@@ -1158,13 +1281,16 @@
1158	1281
1159	1282	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1160	1283	liveCB.setToolTipText("Animate object");
1161		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1162		- selectCB.setToolTipText("Make object selectable");
	1284	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1285	+ selectableCB.setToolTipText("Make object selectable");
1163	1286	// Return();
	1287	+
1164	1288	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1165	1289	hideCB.setToolTipText("Hide object");
1166	1290	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1167	1291	markCB.setToolTipText("As animation target transform");
	1292	+
	1293	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1168	1294
1169	1295	setupPanel2 = new cGridBag().setVertical(false);
1170	1296
..	..	@@ -1174,10 +1300,11 @@
1174	1300	randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1175	1301	randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1176	1302
	1303	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1304	+ link2masterCB.setToolTipText("Attach to support");
	1305	+
1177	1306	if (Globals.ADVANCED)
1178	1307	{
1179		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1180		- link2masterCB.setToolTipText("Attach to support");
1181	1308	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1182	1309	speedupCB.setToolTipText("Option motion capture");
1183	1310	}
..	..	@@ -1451,6 +1578,7 @@
1451	1578	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1452	1579	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1453	1580	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1581	+ //XYZPanel.setName("XYZ");
1454	1582
1455	1583	/*
1456	1584	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1488,17 +1616,29 @@
1488	1616	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1489	1617	//tmp.setName("Edit");
1490	1618	objectPanel.add(materialPanel);
	1619	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1620	+ objectPanel.setToolTipTextAt(0, "Material");
	1621	+
	1622	+ objectPanel.add(toolboxPanel);
	1623	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1624	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1625	+
	1626	+ objectPanel.add(skyboxPanel);
	1627	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1628	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1629	+
1491	1630	// JPanel north = new JPanel(new BorderLayout());
1492	1631	// north.setName("Edit");
1493	1632	// north.add(ctrlPanel, BorderLayout.NORTH);
1494	1633	// objectPanel.add(north);
1495	1634	objectPanel.add(editPanel);
	1635	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1636	+ objectPanel.setToolTipTextAt(3, "Edit controls");
1496	1637
1497		- //if (Globals.ADVANCED)
1498		- objectPanel.add(infoPanel);
	1638	+ objectPanel.add(XYZPanel);
	1639	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1640	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1499	1641
1500		- objectPanel.add(toolboxPanel);
1501		-
1502	1642	/*
1503	1643	aConstraints.gridx = 0;
1504	1644	aConstraints.gridwidth = 1;
..	..	@@ -1518,7 +1658,7 @@
1518	1658	scrollpane.addMouseWheelListener(this); // Default not fast enough
1519	1659
1520	1660	/JTabbedPane/ scenePanel = new cGridBag();
1521		- scenePanel.preferredWidth = 6;
	1661	+ scenePanel.preferredWidth = 5;
1522	1662
1523	1663	JTabbedPane tabbedPane = new JTabbedPane();
1524	1664	tabbedPane.add(scrollpane);
..	..	@@ -1535,6 +1675,11 @@
1535	1675
1536	1676	scenePanel.add(tabbedPane);
1537	1677
	1678	+ //if (Globals.ADVANCED)
	1679	+ tabbedPane.add(infoPanel);
	1680	+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1681	+ tabbedPane.setToolTipTextAt(3, "Information");
	1682	+
1538	1683	/*
1539	1684	cTree jTree = new cTree(null);
1540	1685	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1596,7 +1741,7 @@
1596	1741	bigThree = new cGridBag();
1597	1742	bigThree.addComponent(scenePanel);
1598	1743	bigThree.addComponent(centralPanel);
1599		- bigThree.addComponent(XYZPanel);
	1744	+ //bigThree.addComponent(XYZPanel);
1600	1745
1601	1746	// // SIDE EFFECT!!!
1602	1747	// aConstraints.gridx = 0;
..	..	@@ -1605,6 +1750,23 @@
1605	1750	// aConstraints.gridheight = 1;
1606	1751
1607	1752	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
	1753	+
	1754	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1755	+ new java.beans.PropertyChangeListener()
	1756	+ {
	1757	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1758	+ {
	1759	+ if ((Integer)pce.getOldValue() == 1)
	1760	+ {
	1761	+ if (radio.layout != expandedLayout)
	1762	+ {
	1763	+ radio.layout = expandedLayout;
	1764	+ radio.layout.doClick();
	1765	+ }
	1766	+ }
	1767	+ }
	1768	+ });
	1769	+
1608	1770	framePanel.setContinuousLayout(false);
1609	1771	framePanel.setOneTouchExpandable(false);
1610	1772	//.setDividerLocation(0.8);
..	..	@@ -1637,7 +1799,6 @@
1637	1799	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1638	1800	frame.addWindowListener(new WindowAdapter()
1639	1801	{
1640		-
1641	1802	public void windowClosing(WindowEvent e)
1642	1803	{
1643	1804	Close();
..	..	@@ -1660,12 +1821,403 @@
1660	1821	ctrlPanel.removeAll();
1661	1822	}
1662	1823
1663		- void SetupMaterial(cGridBag panel)
	1824	+ void SetupMaterial(cGridBag materialpanel)
1664	1825	{
1665		- /*
	1826	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1827	+
	1828	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1829	+ skin.setToolTipText("Skin");
	1830	+ skin.addMouseListener(new MouseAdapter()
	1831	+ {
	1832	+ public void mouseClicked(MouseEvent e)
	1833	+ {
	1834	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1835	+ cMaterial material = object.material;
	1836	+
	1837	+ // Skin
	1838	+ colorField.setFloat(material.color);
	1839	+ saturationField.setFloat(material.modulation);
	1840	+ subsurfaceField.setFloat(material.subsurface);
	1841	+ selfshadowField.setFloat(material.diffuseness);
	1842	+ diffusenessField.setFloat(material.factor);
	1843	+ shininessField.setFloat(material.shininess);
	1844	+ shadowbiasField.setFloat(material.shadowbias);
	1845	+ diffuseField.setFloat(material.diffuse);
	1846	+ specularField.setFloat(material.specular);
	1847	+
	1848	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1849	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1850	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1851	+
	1852	+ materialtouched = true;
	1853	+ applySelf();
	1854	+ }
	1855	+ });
	1856	+ presetpanel.add(skin);
	1857	+
	1858	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1859	+ lambert.setToolTipText("Diffuse");
	1860	+ lambert.addMouseListener(new MouseAdapter()
	1861	+ {
	1862	+ public void mouseClicked(MouseEvent e)
	1863	+ {
	1864	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1865	+ cMaterial material = object.material;
	1866	+
	1867	+ diffusenessField.setFloat(material.factor);
	1868	+ selfshadowField.setFloat(material.diffuseness);
	1869	+
	1870	+ materialtouched = true;
	1871	+ applySelf();
	1872	+ }
	1873	+ });
	1874	+ presetpanel.add(lambert);
	1875	+
	1876	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1877	+ diffuse2.setToolTipText("Diffuse2");
	1878	+ diffuse2.addMouseListener(new MouseAdapter()
	1879	+ {
	1880	+ public void mouseClicked(MouseEvent e)
	1881	+ {
	1882	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1883	+ cMaterial material = object.material;
	1884	+
	1885	+ diffusenessField.setFloat(material.factor);
	1886	+ selfshadowField.setFloat(material.diffuseness);
	1887	+
	1888	+ materialtouched = true;
	1889	+ applySelf();
	1890	+ }
	1891	+ });
	1892	+ presetpanel.add(diffuse2);
	1893	+
	1894	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1895	+ diffusemoon.setToolTipText("Moon");
	1896	+ diffusemoon.addMouseListener(new MouseAdapter()
	1897	+ {
	1898	+ public void mouseClicked(MouseEvent e)
	1899	+ {
	1900	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1901	+ cMaterial material = object.material;
	1902	+
	1903	+ diffusenessField.setFloat(material.factor);
	1904	+ selfshadowField.setFloat(material.diffuseness);
	1905	+
	1906	+ materialtouched = true;
	1907	+ applySelf();
	1908	+ }
	1909	+ });
	1910	+ presetpanel.add(diffusemoon);
	1911	+
	1912	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1913	+ diffusemoon2.setToolTipText("Moon2");
	1914	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1915	+ {
	1916	+ public void mouseClicked(MouseEvent e)
	1917	+ {
	1918	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1919	+ cMaterial material = object.material;
	1920	+
	1921	+ diffusenessField.setFloat(material.factor);
	1922	+ selfshadowField.setFloat(material.diffuseness);
	1923	+
	1924	+ materialtouched = true;
	1925	+ applySelf();
	1926	+ }
	1927	+ });
	1928	+ presetpanel.add(diffusemoon2);
	1929	+
	1930	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1931	+ diffusemoon3.setToolTipText("Moon3");
	1932	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1933	+ {
	1934	+ public void mouseClicked(MouseEvent e)
	1935	+ {
	1936	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1937	+ cMaterial material = object.material;
	1938	+
	1939	+ diffusenessField.setFloat(material.factor);
	1940	+ selfshadowField.setFloat(material.diffuseness);
	1941	+
	1942	+ materialtouched = true;
	1943	+ applySelf();
	1944	+ }
	1945	+ });
	1946	+ presetpanel.add(diffusemoon3);
	1947	+
	1948	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1949	+ diffusesheen.setToolTipText("Sheen");
	1950	+ diffusesheen.addMouseListener(new MouseAdapter()
	1951	+ {
	1952	+ public void mouseClicked(MouseEvent e)
	1953	+ {
	1954	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1955	+ cMaterial material = object.material;
	1956	+
	1957	+ sheenField.setFloat(material.sheen);
	1958	+
	1959	+ materialtouched = true;
	1960	+ applySelf();
	1961	+ }
	1962	+ });
	1963	+ presetpanel.add(diffusesheen);
	1964	+
	1965	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1966	+ rough.setToolTipText("Rough metal");
	1967	+ rough.addMouseListener(new MouseAdapter()
	1968	+ {
	1969	+ public void mouseClicked(MouseEvent e)
	1970	+ {
	1971	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1972	+ cMaterial material = object.material;
	1973	+
	1974	+ shininessField.setFloat(material.shininess);
	1975	+ velvetField.setFloat(material.velvet);
	1976	+
	1977	+ materialtouched = true;
	1978	+ applySelf();
	1979	+ }
	1980	+ });
	1981	+ presetpanel.add(rough);
	1982	+
	1983	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1984	+ rough2.setToolTipText("Medium metal");
	1985	+ rough2.addMouseListener(new MouseAdapter()
	1986	+ {
	1987	+ public void mouseClicked(MouseEvent e)
	1988	+ {
	1989	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1990	+ cMaterial material = object.material;
	1991	+
	1992	+ shininessField.setFloat(material.shininess);
	1993	+ lightareaField.setFloat(material.lightarea);
	1994	+
	1995	+ materialtouched = true;
	1996	+ applySelf();
	1997	+ }
	1998	+ });
	1999	+ presetpanel.add(rough2);
	2000	+
	2001	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2002	+ shini0.setToolTipText("Shiny");
	2003	+ shini0.addMouseListener(new MouseAdapter()
	2004	+ {
	2005	+ public void mouseClicked(MouseEvent e)
	2006	+ {
	2007	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2008	+ cMaterial material = object.material;
	2009	+
	2010	+ shininessField.setFloat(material.shininess);
	2011	+ lightareaField.setFloat(material.lightarea);
	2012	+
	2013	+ materialtouched = true;
	2014	+ applySelf();
	2015	+ }
	2016	+ });
	2017	+ presetpanel.add(shini0);
	2018	+
	2019	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2020	+ shini1.setToolTipText("Shiny2");
	2021	+ shini1.addMouseListener(new MouseAdapter()
	2022	+ {
	2023	+ public void mouseClicked(MouseEvent e)
	2024	+ {
	2025	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2026	+ cMaterial material = object.material;
	2027	+
	2028	+ shininessField.setFloat(material.shininess);
	2029	+ lightareaField.setFloat(material.lightarea);
	2030	+
	2031	+ materialtouched = true;
	2032	+ applySelf();
	2033	+ }
	2034	+ });
	2035	+ presetpanel.add(shini1);
	2036	+
	2037	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2038	+ shini2.setToolTipText("Shiny3");
	2039	+ shini2.addMouseListener(new MouseAdapter()
	2040	+ {
	2041	+ public void mouseClicked(MouseEvent e)
	2042	+ {
	2043	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2044	+ cMaterial material = object.material;
	2045	+
	2046	+ shininessField.setFloat(material.shininess);
	2047	+ lightareaField.setFloat(material.lightarea);
	2048	+
	2049	+ materialtouched = true;
	2050	+ applySelf();
	2051	+ }
	2052	+ });
	2053	+ presetpanel.add(shini2);
	2054	+
	2055	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2056	+ aniso.setToolTipText("AnisoU");
	2057	+ aniso.addMouseListener(new MouseAdapter()
	2058	+ {
	2059	+ public void mouseClicked(MouseEvent e)
	2060	+ {
	2061	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2062	+ cMaterial material = object.material;
	2063	+
	2064	+ anisoField.setFloat(material.aniso);
	2065	+ anisoVField.setFloat(material.anisoV);
	2066	+
	2067	+ materialtouched = true;
	2068	+ applySelf();
	2069	+ }
	2070	+ });
	2071	+ presetpanel.add(aniso);
	2072	+
	2073	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2074	+ aniso2.setToolTipText("AnisoV");
	2075	+ aniso2.addMouseListener(new MouseAdapter()
	2076	+ {
	2077	+ public void mouseClicked(MouseEvent e)
	2078	+ {
	2079	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2080	+ cMaterial material = object.material;
	2081	+
	2082	+ anisoField.setFloat(material.aniso);
	2083	+ anisoVField.setFloat(material.anisoV);
	2084	+
	2085	+ materialtouched = true;
	2086	+ applySelf();
	2087	+ }
	2088	+ });
	2089	+ presetpanel.add(aniso2);
	2090	+
	2091	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2092	+ aniso3.setToolTipText("AnisoUV");
	2093	+ aniso3.addMouseListener(new MouseAdapter()
	2094	+ {
	2095	+ public void mouseClicked(MouseEvent e)
	2096	+ {
	2097	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2098	+ cMaterial material = object.material;
	2099	+
	2100	+ anisoField.setFloat(material.aniso);
	2101	+ anisoVField.setFloat(material.anisoV);
	2102	+
	2103	+ materialtouched = true;
	2104	+ applySelf();
	2105	+ }
	2106	+ });
	2107	+ presetpanel.add(aniso3);
	2108	+
	2109	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2110	+ velvet0.setToolTipText("Velvet");
	2111	+ velvet0.addMouseListener(new MouseAdapter()
	2112	+ {
	2113	+ public void mouseClicked(MouseEvent e)
	2114	+ {
	2115	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2116	+ cMaterial material = object.material;
	2117	+
	2118	+ diffusenessField.setFloat(material.factor);
	2119	+ selfshadowField.setFloat(material.diffuseness);
	2120	+ sheenField.setFloat(material.sheen);
	2121	+ shininessField.setFloat(material.shininess);
	2122	+ velvetField.setFloat(material.velvet);
	2123	+ shiftField.setFloat(material.shift);
	2124	+
	2125	+ materialtouched = true;
	2126	+ applySelf();
	2127	+ }
	2128	+ });
	2129	+ presetpanel.add(velvet0);
	2130	+
	2131	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2132	+ bump0.setToolTipText("Bump texture");
	2133	+ bump0.addMouseListener(new MouseAdapter()
	2134	+ {
	2135	+ public void mouseClicked(MouseEvent e)
	2136	+ {
	2137	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2138	+ cMaterial material = object.material;
	2139	+
	2140	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2141	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2142	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2143	+
	2144	+ materialtouched = true;
	2145	+ applySelf();
	2146	+ }
	2147	+ });
	2148	+ presetpanel.add(bump0);
	2149	+
	2150	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2151	+ halo.setToolTipText("Halo");
	2152	+ halo.addMouseListener(new MouseAdapter()
	2153	+ {
	2154	+ public void mouseClicked(MouseEvent e)
	2155	+ {
	2156	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2157	+ cMaterial material = object.material;
	2158	+
	2159	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2160	+
	2161	+ materialtouched = true;
	2162	+ applySelf();
	2163	+ }
	2164	+ });
	2165	+ presetpanel.add(halo);
	2166	+
	2167	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2168	+ candle.setToolTipText("Candle");
	2169	+ candle.addMouseListener(new MouseAdapter()
	2170	+ {
	2171	+ public void mouseClicked(MouseEvent e)
	2172	+ {
	2173	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2174	+ cMaterial material = object.material;
	2175	+
	2176	+ subsurfaceField.setFloat(material.subsurface);
	2177	+ shadowbiasField.setFloat(material.shadowbias);
	2178	+ ambientField.setFloat(material.ambient);
	2179	+ specularField.setFloat(material.specular);
	2180	+ lightareaField.setFloat(material.lightarea);
	2181	+ shininessField.setFloat(material.shininess);
	2182	+
	2183	+ materialtouched = true;
	2184	+ applySelf();
	2185	+ }
	2186	+ });
	2187	+ presetpanel.add(candle);
	2188	+
	2189	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2190	+ shadowShader.setToolTipText("Shadow");
	2191	+ shadowShader.addMouseListener(new MouseAdapter()
	2192	+ {
	2193	+ public void mouseClicked(MouseEvent e)
	2194	+ {
	2195	+ diffuseField.setFloat(0.001);
	2196	+ ambientField.setFloat(0.001);
	2197	+ cameraField.setFloat(0.001);
	2198	+ specularField.setFloat(0.001);
	2199	+ fakedepthField.setFloat(0.001);
	2200	+ opacityField.setFloat(0.6);
	2201	+
	2202	+ materialtouched = true;
	2203	+ applySelf();
	2204	+ }
	2205	+ });
	2206	+ presetpanel.add(shadowShader);
	2207	+
	2208	+ cGridBag panel = new cGridBag().setVertical(true);
	2209	+
	2210	+ presetpanel.preferredWidth = 1;
	2211	+
	2212	+ materialpanel.add(presetpanel);
	2213	+ materialpanel.add(panel);
	2214	+
	2215	+ panel.preferredWidth = 8;
	2216	+
	2217	+ /*
1666	2218	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1667	2219	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1668		- */
	2220	+ */
1669	2221
1670	2222	cGridBag editBar = new cGridBag().setVertical(false);
1671	2223
..	..	@@ -1699,27 +2251,50 @@
1699	2251	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1700	2252
1701	2253	cGridBag colorSection = new cGridBag().setVertical(true);
	2254	+
	2255	+ cGridBag huepanel = new cGridBag();
	2256	+ cGridBag huelabel = new cGridBag();
	2257	+ skin = GetLabel("icons/hue.png", false);
	2258	+ skin.fit = true;
	2259	+ huelabel.add(skin);
	2260	+ huelabel.preferredWidth = 20;
	2261	+ huepanel.add(new cGridBag()); // Label
	2262	+ huepanel.add(huelabel); // Field/slider
	2263	+
	2264	+ huepanel.preferredHeight = 7;
	2265	+
	2266	+ colorSection.add(huepanel);
1702	2267
1703	2268	cGridBag color = new cGridBag();
1704		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1705		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2269	+
	2270	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2271	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2272	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2273	+
1707	2274	//colorField.preferredWidth = 200;
1708	2275	colorSection.add(color);
1709	2276
1710	2277	cGridBag modulation = new cGridBag();
1711	2278	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1712	2279	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1713		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2280	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1714	2281	colorSection.add(modulation);
1715	2282
	2283	+ cGridBag opacity = new cGridBag();
	2284	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2285	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2286	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2287	+ colorSection.add(opacity);
	2288	+
	2289	+ colorSection.add(GetSeparator());
	2290	+
1716	2291	cGridBag texture = new cGridBag();
1717	2292	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1718	2293	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1719	2294	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1720	2295	colorSection.add(texture);
1721	2296
1722		- panel.add(new JSeparator());
	2297	+ panel.add(GetSeparator());
1723	2298
1724	2299	panel.add(colorSection);
1725	2300
..	..	@@ -1775,7 +2350,7 @@
1775	2350	shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1776	2351	diffuseSection.add(shadowbias);
1777	2352
1778		- panel.add(new JSeparator());
	2353	+ panel.add(GetSeparator());
1779	2354
1780	2355	panel.add(diffuseSection);
1781	2356
..	..	@@ -1838,7 +2413,7 @@
1838	2413	specularSection.add(anisoV);
1839	2414
1840	2415
1841		- panel.add(new JSeparator());
	2416	+ panel.add(GetSeparator());
1842	2417
1843	2418	panel.add(specularSection);
1844	2419
..	..	@@ -1863,12 +2438,6 @@
1863	2438	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1864	2439	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1865	2440	colorSection.add(backlit);
1866		-
1867		- cGridBag opacity = new cGridBag();
1868		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1869		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1870		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1871		- colorSection.add(opacity);
1872	2441
1873	2442	//panel.add(new JSeparator());
1874	2443
..	..	@@ -1914,7 +2483,7 @@
1914	2483	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1915	2484	textureSection.add(opacityPower);
1916	2485
1917		- panel.add(new JSeparator());
	2486	+ panel.add(GetSeparator());
1918	2487
1919	2488	panel.add(textureSection);
1920	2489
..	..	@@ -2901,7 +3470,7 @@
2901	3470
2902	3471	freezematerial = true;
2903	3472	colorField.setFloat(mat.color);
2904		- modulationField.setFloat(mat.modulation);
	3473	+ saturationField.setFloat(mat.modulation);
2905	3474	metalnessField.setFloat(mat.metalness);
2906	3475	diffuseField.setFloat(mat.diffuse);
2907	3476	specularField.setFloat(mat.specular);
..	..	@@ -3108,6 +3677,17 @@
3108	3677	public void itemStateChanged(ItemEvent event)
3109	3678	{
3110	3679	// System.out.println("Propagate = " + propagate);
	3680	+ if (event.getSource() == pinButton)
	3681	+ {
	3682	+ copy.pinned ^= true;
	3683	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3684	+ {
	3685	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3686	+ copy.CloseUI();
	3687	+ //copy.editWindow.refreshContents();
	3688	+ }
	3689	+ }
	3690	+ else
3111	3691	if (event.getSource() == propagateToggle)
3112	3692	{
3113	3693	propagate ^= true;
..	..	@@ -3212,8 +3792,9 @@
3212	3792	} else if (event.getSource() == liveCB)
3213	3793	{
3214	3794	copy.live ^= true;
	3795	+ objEditor.refreshContents(true); // To show item colors
3215	3796	return;
3216		- } else if (event.getSource() == selectCB)
	3797	+ } else if (event.getSource() == selectableCB)
3217	3798	{
3218	3799	copy.dontselect ^= true;
3219	3800	return;
..	..	@@ -3221,7 +3802,7 @@
3221	3802	{
3222	3803	copy.hide ^= true;
3223	3804	copy.Touch(); // display list issue
3224		- objEditor.refreshContents();
	3805	+ objEditor.refreshContents(true); // To show item colors
3225	3806	return;
3226	3807	} else if (event.getSource() == link2masterCB)
3227	3808	{
..	..	@@ -3477,11 +4058,12 @@
3477	4058
3478	4059	static public byte[] Compress(Object3D o)
3479	4060	{
	4061	+ // Slower to actually compress.
3480	4062	try
3481	4063	{
3482	4064	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3483		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3484		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4065	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4066	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3485	4067
3486	4068	Object3D parent = o.parent;
3487	4069	o.parent = null;
..	..	@@ -3492,10 +4074,14 @@
3492	4074
3493	4075	out.flush();
3494	4076
3495		- zstream.close();
	4077	+ baos //zstream
	4078	+ .close();
3496	4079	out.close();
3497	4080
3498		- return baos.toByteArray();
	4081	+ byte[] bytes = baos.toByteArray();
	4082	+
	4083	+ System.out.println("save #bytes = " + bytes.length);
	4084	+ return bytes;
3499	4085	} catch (Exception e)
3500	4086	{
3501	4087	System.err.println(e);
..	..	@@ -3505,13 +4091,16 @@
3505	4091
3506	4092	static public Object Uncompress(byte[] bytes)
3507	4093	{
3508		- System.out.println("#bytes = " + bytes.length);
	4094	+ System.out.println("restore #bytes = " + bytes.length);
3509	4095	try
3510	4096	{
3511	4097	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3512		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3513		- ObjectInputStream in = new ObjectInputStream(istream);
	4098	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4099	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3514	4100	Object obj = in.readObject();
	4101	+
	4102	+ bais //istream
	4103	+ .close();
3515	4104	in.close();
3516	4105
3517	4106	return obj;
..	..	@@ -3566,12 +4155,12 @@
3566	4155	return null;
3567	4156	}
3568	4157
3569		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3570	4158
3571	4159	public void Save()
3572	4160	{
3573		- // Default reduces the probability of heuristics errors.
3574		- Save(true);
	4161	+ //Save(true);
	4162	+ Replace();
	4163	+ SetVersionStates();
3575	4164	}
3576	4165
3577	4166	private boolean Equal(byte[] compress, byte[] name)
..	..	@@ -3590,54 +4179,71 @@
3590	4179	return true;
3591	4180	}
3592	4181
	4182	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4183	+
	4184	+ void DeleteVersion()
	4185	+ {
	4186	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4187	+ {
	4188	+ copy.versionlist[i] = copy.versionlist[i+1];
	4189	+ }
	4190	+
	4191	+ CopyChanged();
	4192	+
	4193	+ SetVersionStates();
	4194	+ }
	4195	+
3593	4196	public boolean Save(boolean user)
3594	4197	{
3595	4198	System.err.println("Save");
	4199	+ Replace();
3596	4200
3597		- cRadio tab = GetCurrentTab();
	4201	+ //cRadio tab = GetCurrentTab();
3598	4202
3599		- boolean temp = CameraPane.SWITCH;
3600		- CameraPane.SWITCH = false;
3601		-
3602		- copy.ExtractBigData(hashtable);
3603		-
3604		- byte[] compress = Compress(copy);
3605		-
3606		- CameraPane.SWITCH = temp;
	4203	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3607	4204
3608	4205	boolean thesame = false;
3609	4206
3610		- // Quick heuristic using length. Works only when stream is compressed.
3611		- if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
3612		- {
3613		- thesame = true;
3614		- }
	4207	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4208	+// {
	4209	+// thesame = true;
	4210	+// }
3615	4211
3616	4212	//EditorFrame.m_MainFrame.requestFocusInWindow();
3617	4213	if (!thesame)
3618	4214	{
3619		- tab.user[tab.undoindex] = user;
3620		- tab.graphs[tab.undoindex++] = compress;
	4215	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4216	+ {
	4217	+ copy.versionlist[i] = copy.versionlist[i-1];
	4218	+ }
	4219	+
	4220	+ //tab.user[tab.versionindex] = user;
	4221	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4222	+
	4223	+ copy.versionlist[++copy.versionindex] = compress;
	4224	+
	4225	+ // if (increment)
	4226	+ // tab.versionindex++;
3621	4227	}
3622	4228
3623		- copy.RestoreBigData(hashtable);
	4229	+ //copy.RestoreBigData(versiontable);
3624	4230
3625	4231	//assert(hashtable.isEmpty());
3626	4232
3627		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
3628		- {
3629		- tab.user[i] = false;
3630		- tab.graphs[i] = null;
3631		- }
	4233	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4234	+// {
	4235	+// //tab.user[i] = false;
	4236	+// copy.versionlist[i] = null;
	4237	+// }
3632	4238
3633		- SetUndoStates();
	4239	+ SetVersionStates();
3634	4240
3635	4241	// test save
3636	4242	if (false)
3637	4243	{
3638	4244	try
3639	4245	{
3640		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4246	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3641	4247	ObjectOutputStream p = new ObjectOutputStream(ostream);
3642	4248
3643	4249	p.writeObject(copy);
..	..	@@ -3653,27 +4259,65 @@
3653	4259
3654	4260	return !thesame;
3655	4261	}
3656		-
3657		- void CopyChanged(Object3D obj)
	4262	+
	4263	+ boolean flashIt = true;
	4264	+
	4265	+ void RefreshSelection()
3658	4266	{
3659		- SetUndoStates();
	4267	+ Object3D selection = new Object3D();
	4268	+
	4269	+ for (int i = 0; i < copy.selection.size(); i++)
	4270	+ {
	4271	+ Object3D elem = copy.selection.elementAt(i);
	4272	+
	4273	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4274	+
	4275	+ if (obj == null)
	4276	+ {
	4277	+ copy.selection.remove(i--);
	4278	+ }
	4279	+ else
	4280	+ {
	4281	+ selection.add(obj);
	4282	+ copy.selection.setElementAt(obj, i);
	4283	+ }
	4284	+ }
	4285	+
	4286	+ flashIt = false;
	4287	+ GetTree().clearSelection();
	4288	+ for (int i = 0; i < selection.size(); i++)
	4289	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4290	+ flashIt = true;
	4291	+
	4292	+ //refreshContents(false);
	4293	+ }
	4294	+
	4295	+ void CopyChanged()
	4296	+ {
	4297	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4298	+
	4299	+ SetVersionStates();
3660	4300
3661	4301	boolean temp = CameraPane.SWITCH;
3662	4302	CameraPane.SWITCH = false;
3663	4303
3664		- copy.ExtractBigData(hashtable);
	4304	+ copy.ExtractBigData(versiontable);
3665	4305
3666	4306	copy.clear();
3667	4307
	4308	+ copy.skyboxname = obj.skyboxname;
	4309	+ copy.skyboxext = obj.skyboxext;
	4310	+
3668	4311	for (int i=0; i<obj.Size(); i++)
3669	4312	{
3670	4313	copy.add(obj.get(i));
3671	4314	}
3672	4315
3673		- copy.RestoreBigData(hashtable);
	4316	+ copy.RestoreBigData(versiontable);
3674	4317
3675	4318	CameraPane.SWITCH = temp;
3676	4319
	4320	+ RefreshSelection();
3677	4321	//assert(hashtable.isEmpty());
3678	4322
3679	4323	copy.Touch();
..	..	@@ -3694,68 +4338,144 @@
3694	4338	}
3695	4339	}
3696	4340
3697		- refreshContents();
	4341	+ refreshContents(true);
3698	4342	}
3699	4343
3700		- cButton undoButton;
3701		- cButton redoButton;
	4344	+ cButton previousVersionButton;
	4345	+ cButton restoreButton;
	4346	+ cButton replaceButton;
	4347	+ cButton nextVersionButton;
	4348	+ cButton saveVersionButton;
	4349	+ cButton deleteVersionButton;
3702	4350
3703		- void SetUndoStates()
	4351	+ boolean muteSlider;
	4352	+
	4353	+ int VersionCount()
3704	4354	{
3705		- cRadio tab = GetCurrentTab();
	4355	+ int count = 0;
3706	4356
3707		- undoButton.setEnabled(tab.undoindex > 0);
3708		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	4357	+ for (int i = copy.versionlist.length; --i >= 0;)
	4358	+ {
	4359	+ if (copy.versionlist[i] != null)
	4360	+ count++;
	4361	+ }
	4362	+
	4363	+ return count;
3709	4364	}
3710	4365
3711		- public boolean Undo()
	4366	+ void SetVersionStates()
3712	4367	{
	4368	+ //if (true)
	4369	+ // return;
	4370	+
	4371	+ //cRadio tab = GetCurrentTab();
	4372	+
	4373	+ restoreButton.setEnabled(copy.versionindex != -1);
	4374	+ replaceButton.setEnabled(copy.versionindex != -1);
	4375	+
	4376	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4377	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4378	+
	4379	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4380	+ copy.versionlist[copy.versionindex + 1] != null);
	4381	+
	4382	+ muteSlider = true;
	4383	+ versionSlider.setMinimum(0);
	4384	+ versionSlider.setMaximum(VersionCount() - 1);
	4385	+ versionSlider.setInteger(copy.versionindex);
	4386	+ versionSlider.setEnabled(copy.versionindex != -1);
	4387	+ muteSlider = false;
	4388	+ }
	4389	+
	4390	+ public boolean PreviousVersion()
	4391	+ {
	4392	+ // Option?
	4393	+ Replace();
	4394	+
3713	4395	System.err.println("Undo");
3714	4396
3715		- cRadio tab = GetCurrentTab();
	4397	+ //cRadio tab = GetCurrentTab();
3716	4398
3717		- if (tab.undoindex == 0)
	4399	+ if (copy.versionindex == 0)
3718	4400	{
3719	4401	java.awt.Toolkit.getDefaultToolkit().beep();
3720	4402	return false;
3721	4403	}
3722	4404
3723		- if (tab.graphs[tab.undoindex] == null \|\| !tab.user[tab.undoindex])
3724		- {
3725		- if (Save(false))
3726		- tab.undoindex -= 1;
3727		- else
3728		- {
3729		- if (tab.undoindex <= 0)
3730		- return false;
3731		- else
3732		- tab.undoindex -= 1;
3733		- }
3734		- }
	4405	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4406	+// {
	4407	+// if (Save(false))
	4408	+// tab.versionindex -= 1;
	4409	+// else
	4410	+// {
	4411	+// if (tab.versionindex <= 0)
	4412	+// return false;
	4413	+// else
	4414	+// tab.versionindex -= 1;
	4415	+// }
	4416	+// }
3735	4417
3736		- tab.undoindex -= 1;
	4418	+ copy.versionindex -= 1;
3737	4419
3738		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4420	+ CopyChanged();
3739	4421
3740	4422	return true;
3741	4423	}
3742	4424
3743		- public void Redo()
	4425	+ public boolean Restore()
3744	4426	{
3745		- cRadio tab = GetCurrentTab();
	4427	+ System.err.println("Restore");
3746	4428
3747		- if (tab.graphs[tab.undoindex + 1] == null)
	4429	+ //cRadio tab = GetCurrentTab();
	4430	+
	4431	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4432	+ {
	4433	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4434	+ return false;
	4435	+ }
	4436	+
	4437	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4438	+ CopyChanged();
	4439	+
	4440	+ return true;
	4441	+ }
	4442	+
	4443	+ public boolean Replace()
	4444	+ {
	4445	+ System.err.println("Replace");
	4446	+
	4447	+ //cRadio tab = GetCurrentTab();
	4448	+
	4449	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4450	+ {
	4451	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4452	+ return false;
	4453	+ }
	4454	+
	4455	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4456	+
	4457	+ return true;
	4458	+ }
	4459	+
	4460	+ public void NextVersion()
	4461	+ {
	4462	+ // Option?
	4463	+ Replace();
	4464	+
	4465	+ //cRadio tab = GetCurrentTab();
	4466	+
	4467	+ if (copy.versionlist[copy.versionindex + 1] == null)
3748	4468	{
3749	4469	java.awt.Toolkit.getDefaultToolkit().beep();
3750	4470	return;
3751	4471	}
3752	4472
3753		- tab.undoindex += 1;
	4473	+ copy.versionindex += 1;
3754	4474
3755		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4475	+ CopyChanged();
3756	4476
3757		- if (!tab.user[tab.undoindex])
3758		- tab.graphs[tab.undoindex] = null;
	4477	+ //if (!tab.user[tab.versionindex])
	4478	+ // tab.graphs[tab.versionindex] = null;
3759	4479	}
3760	4480
3761	4481	void ImportGFD()
..	..	@@ -3966,7 +4686,7 @@
3966	4686	//copy.material = new cMaterial(copy.GetMaterial());
3967	4687
3968	4688	current.color = (float) colorField.getFloat();
3969		- current.modulation = (float) modulationField.getFloat();
	4689	+ current.modulation = (float) saturationField.getFloat();
3970	4690	current.metalness = (float) metalnessField.getFloat();
3971	4691	current.diffuse = (float) diffuseField.getFloat();
3972	4692	current.specular = (float) specularField.getFloat();
..	..	@@ -3999,7 +4719,7 @@
3999	4719	cMaterial mat = copy.material;
4000	4720
4001	4721	colorField.SetToolTipValue((mat.color));
4002		- modulationField.SetToolTipValue((mat.modulation));
	4722	+ saturationField.SetToolTipValue((mat.modulation));
4003	4723	metalnessField.SetToolTipValue((mat.metalness));
4004	4724	diffuseField.SetToolTipValue((mat.diffuse));
4005	4725	specularField.SetToolTipValue((mat.specular));
..	..	@@ -4051,9 +4771,26 @@
4051	4771	//copy.Touch();
4052	4772	}
4053	4773
	4774	+ cNumberSlider versionSlider;
	4775	+
4054	4776	public void stateChanged(ChangeEvent e)
4055	4777	{
4056	4778	// assert(false);
	4779	+ if (e.getSource() == versionSlider)
	4780	+ {
	4781	+ if (muteSlider)
	4782	+ return;
	4783	+
	4784	+ int version = versionSlider.getInteger();
	4785	+
	4786	+ if (version != -1 && copy.versionlist[version] != null)
	4787	+ {
	4788	+ copy.versionindex = version;
	4789	+ CopyChanged();
	4790	+ }
	4791	+
	4792	+ return;
	4793	+ }
4057	4794
4058	4795	if (freezematerial)
4059	4796	{
..	..	@@ -4089,6 +4826,12 @@
4089	4826	{
4090	4827	//System.out.println("stateChanged = " + this);
4091	4828	materialtouched = true;
	4829	+
	4830	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4831	+ {
	4832	+ saturationField.setFloat(1);
	4833	+ }
	4834	+
4092	4835	applySelf();
4093	4836	//System.out.println("this = " + this);
4094	4837	//System.out.println("PARENT = " + parent);
..	..	@@ -4388,6 +5131,7 @@
4388	5131	{
4389	5132	if (GetTree() != null)
4390	5133	{
	5134	+ GetTree().revalidate();
4391	5135	GetTree().repaint();
4392	5136	}
4393	5137
..	..	@@ -4396,13 +5140,16 @@
4396	5140	ctrlPanel.validate(); // ? new
4397	5141	ctrlPanel.repaint();
4398	5142	}
	5143	+
	5144	+ if (previousVersionButton != null && copy.versionlist != null)
	5145	+ SetVersionStates();
4399	5146	}
4400	5147
4401	5148	static TweenManager tweenManager = new TweenManager();
4402	5149
4403	5150	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4404	5151	{
4405		- if (Globals.SAVEONMAKE) // && resetmodel)
	5152	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4406	5153	Save();
4407	5154	//Tween.set(thing, 0).target(1).start(tweenManager);
4408	5155	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4644,7 +5391,9 @@
4644	5391	readobj.ResetDisplayList();
4645	5392	} catch (Exception e)
4646	5393	{
4647		- //e.printStackTrace();
	5394	+ if (!e.toString().contains("GZIP"))
	5395	+ e.printStackTrace();
	5396	+
4648	5397	try
4649	5398	{
4650	5399	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4718,12 +5467,14 @@
4718	5467
4719	5468	if (readobj != null)
4720	5469	{
4721		- if (Globals.SAVEONMAKE)
4722		- Save();
	5470	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5471	+ // Save();
4723	5472	try
4724	5473	{
4725	5474	//readobj.deepCopySelf(copy);
4726	5475	copy.clear(); // june 2014
	5476	+ copy.skyboxname = readobj.skyboxname;
	5477	+ copy.skyboxext = readobj.skyboxext;
4727	5478	for (int i = 0; i < readobj.size(); i++)
4728	5479	{
4729	5480	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4764,6 +5515,7 @@
4764	5515	}
4765	5516	} catch (ClassCastException e)
4766	5517	{
	5518	+ e.printStackTrace();
4767	5519	assert (false);
4768	5520	Composite c = (Composite) copy;
4769	5521	c.children.clear();
..	..	@@ -4774,6 +5526,20 @@
4774	5526	c.addChild(csg);
4775	5527	}
4776	5528
	5529	+ copy.versionlist = readobj.versionlist;
	5530	+ copy.versionindex = readobj.versionindex;
	5531	+
	5532	+ if (copy.versionlist == null)
	5533	+ {
	5534	+ // Backward compatibility
	5535	+ copy.versionlist = new Object3D[100];
	5536	+ copy.versionindex = -1;
	5537	+
	5538	+ Save(true);
	5539	+ }
	5540	+
	5541	+ //? SetUndoStates();
	5542	+
4777	5543	ResetModel();
4778	5544	copy.HardTouch(); // recompile?
4779	5545	refreshContents();
..	..	@@ -4784,7 +5550,7 @@
4784	5550	{
4785	5551	if (Grafreed.standAlone)
4786	5552	{
4787		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5553	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4788	5554	browser.show();
4789	5555	String filename = browser.getFile();
4790	5556	if (filename != null && filename.length() > 0)
..	..	@@ -4861,6 +5627,8 @@
4861	5627
4862	5628	void save()
4863	5629	{
	5630	+ Replace();
	5631	+
4864	5632	if (lastname == null)
4865	5633	{
4866	5634	return;
..	..	@@ -4883,6 +5651,7 @@
4883	5651	//ps.print(buffer.toString());
4884	5652	} catch (IOException e)
4885	5653	{
	5654	+ e.printStackTrace();
4886	5655	}
4887	5656	}
4888	5657
..	..	@@ -5102,6 +5871,7 @@
5102	5871	ButtonGroup buttonGroup;
5103	5872
5104	5873	cGridBag toolboxPanel;
	5874	+ cGridBag skyboxPanel;
5105	5875	cGridBag materialPanel;
5106	5876	cGridBag ctrlPanel;
5107	5877
..	..	@@ -5175,7 +5945,7 @@
5175	5945	JLabel colorLabel;
5176	5946	cNumberSlider colorField;
5177	5947	JLabel modulationLabel;
5178		- cNumberSlider modulationField;
	5948	+ cNumberSlider saturationField;
5179	5949	JLabel metalnessLabel;
5180	5950	cNumberSlider metalnessField;
5181	5951	JLabel diffuseLabel;
..	..	@@ -5206,6 +5976,7 @@
5206	5976	cNumberSlider anisoField;
5207	5977	JLabel anisoVLabel;
5208	5978	cNumberSlider anisoVField;
	5979	+
5209	5980	JLabel cameraLabel;
5210	5981	cNumberSlider cameraField;
5211	5982	JLabel selfshadowLabel;
..	..	@@ -5220,6 +5991,7 @@
5220	5991	cNumberSlider fakedepthField;
5221	5992	JLabel shadowbiasLabel;
5222	5993	cNumberSlider shadowbiasField;
	5994	+
5223	5995	JLabel bumpLabel;
5224	5996	cNumberSlider bumpField;
5225	5997	JLabel noiseLabel;